[build] Fix building with newer binutils

Newer versions of the GNU assembler (observed with binutils 2.41) will complain about the ".arch i386" in files assembled with "as --64", with the message "Error: 64bit mode not supported on 'i386'". Fix by moving ".arch i386" below ".code32", so that the assembler is no longer expecting 64-bit instructions to be used by the time that the ".arch i386" directive is encountered. Signed-off-by: Michael Brown <[email protected]>
ipxe · Dec 14, 2023 · 47efa60 · 47efa60
1 parent 8cb141e
commit 47efa60
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/callback.S b/src/callback.S
@@ -51,8 +51,8 @@
 
 #if defined(__i386__) || defined(__x86_64__)
 
-	.arch	i386
 	.code32
+	.arch	i386
 
 	/* Call an arbitrary real-mode function */
 	.section ".text", "ax", @progbits

diff --git a/src/prefix.S b/src/prefix.S
@@ -68,6 +68,7 @@ _prefix:
 
 #if defined(__i386__) || defined(__x86_64__)
 
+	.code32
 	.arch	i386
 
 	.org	0x1f1

diff --git a/src/startup.S b/src/startup.S
@@ -35,8 +35,8 @@
 
 #if defined(__i386__) || defined(__x86_64__)
 
-	.arch	i386
 	.code32
+	.arch	i386
 
 	/* Startup code */
 	.section ".text", "ax", @progbits
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,6 +68,7 @@ _prefix: @@
     #if defined(__i386__) || defined(__x86_64__)
+    	.code32
     	.arch	i386
     	.org	0x1f1
@@ Expand Down @@