summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormp <mp@FreeBSD.org>2001-08-09 20:47:58 +0000
committermp <mp@FreeBSD.org>2001-08-09 20:47:58 +0000
commitc3c304385c58f8adadd0ae9c8e92ee6316a4597b (patch)
tree584404f08955b8d07278888c6f32a7abb4fad07c
parenta3649b3839e2d0514dc2e48c62c4e2ffca0032fa (diff)
downloadFreeBSD-src-c3c304385c58f8adadd0ae9c8e92ee6316a4597b.zip
FreeBSD-src-c3c304385c58f8adadd0ae9c8e92ee6316a4597b.tar.gz
Allow for text section alignment to properly align the "end" symbol at the
actual end of the section. The new gas (binutils) puts in additional padding which was misaligning the concatenated btx loader. Reported by: Oliver Hartmann <ohartman@klima.physik.uni-mainz.de>, Harti Brandt <brandt@fokus.gmd.de> Tested by: Oliver Hartmann <ohartman@klima.physik.uni-mainz.de>, David Wolfskill <dhw@whistle.com>, ps Reviewed by: jhb MFC after: 1 day
-rw-r--r--sys/boot/i386/cdboot/cdboot.s1
-rw-r--r--sys/boot/i386/cdldr/cdldr.s1
-rw-r--r--sys/boot/i386/pxeldr/pxeldr.S1
-rw-r--r--sys/boot/i386/pxeldr/pxeldr.s1
4 files changed, 4 insertions, 0 deletions
diff --git a/sys/boot/i386/cdboot/cdboot.s b/sys/boot/i386/cdboot/cdboot.s
index 7f033c0..8c6da0b 100644
--- a/sys/boot/i386/cdboot/cdboot.s
+++ b/sys/boot/i386/cdboot/cdboot.s
@@ -257,4 +257,5 @@ bootinfo_msg: .asciz "Building the boot loader arguments\r\n"
relocate_msg: .asciz "Relocating the loader and the BTX\r\n"
jump_message: .asciz "Starting the BTX loader\r\n"
+ .p2align 4
end:
diff --git a/sys/boot/i386/cdldr/cdldr.s b/sys/boot/i386/cdldr/cdldr.s
index 7f033c0..8c6da0b 100644
--- a/sys/boot/i386/cdldr/cdldr.s
+++ b/sys/boot/i386/cdldr/cdldr.s
@@ -257,4 +257,5 @@ bootinfo_msg: .asciz "Building the boot loader arguments\r\n"
relocate_msg: .asciz "Relocating the loader and the BTX\r\n"
jump_message: .asciz "Starting the BTX loader\r\n"
+ .p2align 4
end:
diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S
index 30e30a8..05383e0 100644
--- a/sys/boot/i386/pxeldr/pxeldr.S
+++ b/sys/boot/i386/pxeldr/pxeldr.S
@@ -278,4 +278,5 @@ bootinfo_msg: .asciz "Building the boot loader arguments\r\n"
relocate_msg: .asciz "Relocating the loader and the BTX\r\n"
jump_message: .asciz "Starting the BTX loader\r\n"
+ .p2align 4
end:
diff --git a/sys/boot/i386/pxeldr/pxeldr.s b/sys/boot/i386/pxeldr/pxeldr.s
index 30e30a8..05383e0 100644
--- a/sys/boot/i386/pxeldr/pxeldr.s
+++ b/sys/boot/i386/pxeldr/pxeldr.s
@@ -278,4 +278,5 @@ bootinfo_msg: .asciz "Building the boot loader arguments\r\n"
relocate_msg: .asciz "Relocating the loader and the BTX\r\n"
jump_message: .asciz "Starting the BTX loader\r\n"
+ .p2align 4
end:
OpenPOWER on IntegriCloud