From 72bb39c0237f8bcc3afa8b623e8b097eec6d69cd Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Mon, 6 Oct 2014 15:39:48 -0700
Subject: Import upstream version 0.7

---
 cert.S | 71 +++++++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 20 deletions(-)

(limited to 'cert.S')

diff --git a/cert.S b/cert.S
index 2ed9b6d7..3cfd665f 100644
--- a/cert.S
+++ b/cert.S
@@ -1,36 +1,67 @@
+	.globl cert_table
+	.data
+	.align 16
+	.type	cert_table, @object
+	.size	cert_table, 4
+	.section .vendor_cert, "a", @progbits
+cert_table:
+#if defined(VENDOR_CERT_FILE)
+	.long	vendor_cert_priv_end - vendor_cert_priv
+#else
+	.long	0
+#endif
+#if defined(VENDOR_DBX_FILE)
+	.long	vendor_dbx_priv_end - vendor_dbx_priv
+#else
+	.long	0
+#endif
+	.long	vendor_cert_priv - cert_table
+	.long	vendor_dbx_priv - cert_table
 #if defined(VENDOR_CERT_FILE)
-	.globl	vendor_cert_size
 	.data
 	.align	1
-	.type	vendor_cert_size, @object
-	.size	vendor_cert_size, 4
+	.type	vendor_cert_priv, @object
+	.size	vendor_cert_priv, vendor_cert_priv_end-vendor_cert_priv
+	.section .vendor_cert, "a", @progbits
+vendor_cert_priv:
+.incbin VENDOR_CERT_FILE
+vendor_cert_priv_end:
+#else
+	.bss
+	.type	vendor_cert_priv, @object
+	.size	vendor_cert_priv, 1
 	.section .vendor_cert, "a", @progbits
-vendor_cert_size:
-	.long	.L0 - vendor_cert
-	.globl	vendor_cert
+vendor_cert_priv:
+	.zero	1
+
+	.data
+	.align 4
+	.type	vendor_cert_size_priv, @object
+	.size	vendor_cert_size_priv, 4
+	.section .vendor_cert, "a", @progbits
+vendor_cert_priv_end:
+#endif
+#if defined(VENDOR_DBX_FILE)
 	.data
 	.align	1
-	.type	vendor_cert, @object
-	.size	vendor_cert, .L0-vendor_cert
+	.type	vendor_dbx_priv, @object
+	.size	vendor_dbx_priv, vendor_dbx_priv_end-vendor_dbx_priv
 	.section .vendor_cert, "a", @progbits
-vendor_cert:
-.incbin VENDOR_CERT_FILE
-.L0:
+vendor_dbx_priv:
+.incbin VENDOR_DBX_FILE
+vendor_dbx_priv_end:
 #else
-	.globl	vendor_cert
 	.bss
-	.type	vendor_cert, @object
-	.size	vendor_cert, 1
+	.type	vendor_dbx_priv, @object
+	.size	vendor_dbx_priv, 1
 	.section .vendor_cert, "a", @progbits
-vendor_cert:
+vendor_dbx_priv:
 	.zero	1
 
-	.globl	vendor_cert_size
 	.data
 	.align 4
-	.type	vendor_cert_size, @object
-	.size	vendor_cert_size, 4
+	.type	vendor_dbx_size_priv, @object
+	.size	vendor_dbx_size_priv, 4
 	.section .vendor_cert, "a", @progbits
-vendor_cert_size:
-	.long	1
+vendor_dbx_priv_end:
 #endif
-- 
cgit v1.2.3