x86, setup: move 32-bit code to .text32

Impact: cleanup

The setup code is mostly 16-bit code, but there is a small stub of
32-bit code at the end.  Move the 32-bit code to a separate segment,
.text32, to avoid scrambling the disassembly.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

2 files changed, 3 insertions, 1 deletions

diff --git a/arch/x86/boot/pmjump.S b/arch/x86/boot/pmjump.S
index 019c17a75851..3e0edc6d2a20 100644
--- a/arch/x86/boot/pmjump.S
+++ b/arch/x86/boot/pmjump.S
@@ -47,6 +47,7 @@ GLOBAL(protected_mode_jump)
 ENDPROC(protected_mode_jump)
 
         .code32
+        .section ".text32","ax"
 GLOBAL(in_pm32)
         # Set up data segments for flat 32-bit mode
         movl    %ecx, %ds
diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld
index df9234b3a5e0..bb8dc2de7969 100644
--- a/arch/x86/boot/setup.ld
+++ b/arch/x86/boot/setup.ld
@@ -17,7 +17,8 @@ SECTIONS
         .header         : { *(.header) }
         .inittext       : { *(.inittext) }
         .initdata       : { *(.initdata) }
-        .text           : { *(.text*) }
+        .text           : { *(.text) }
+        .text32         : { *(.text32) }
 
         . = ALIGN(16);
         .rodata         : { *(.rodata*) }