From: Vladimir Serbinenko <phcoder@google.com>
Date: Tue, 26 Mar 2019 13:56:59 +0000 (+0100)
Subject: A workaround for clang problem assembling startup_raw.S
X-Git-Tag: grub-2.04-rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6725996a950b5237c1374dfe5d88862420e118c;p=thirdparty%2Fgrub.git

A workaround for clang problem assembling startup_raw.S

Signed-off-by: Vladimir Serbinenko <phcoder@google.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S
index 8bce7985c..28974821e 100644
--- a/grub-core/boot/i386/pc/startup_raw.S
+++ b/grub-core/boot/i386/pc/startup_raw.S
@@ -118,7 +118,16 @@ LOCAL (codestart):
 
 #include "../../../kern/i386/realmode.S"
 
+/*
+ *
+ * This is a workaround for clang adding a section containing only .addrsig
+ * Since clang itself is unable to assemble this pseudo-opcode, just replace
+ * it with .text
+ *
+ */
+#define addrsig text
 #include <rs_decoder.h>
+#undef addrsig
 
 	.text