svn commit: r208789 - in head/sys/boot: i386/boot0 i386/btx/btx
i386/btx/btxldr i386/cdboot i386/mbr i386/pmbr pc98/boot0
pc98/boot0.5 pc98/btx/btx pc98/btx/btxldr pc98/cdboot sparc64/boot1
Ed Schouten
ed at FreeBSD.org
Thu Jun 3 17:42:32 UTC 2010
Author: ed
Date: Thu Jun 3 17:42:32 2010
New Revision: 208789
URL: http://svn.freebsd.org/changeset/base/208789
Log:
Use -Wl,-N instead of the undocumented -N option for GCC.
GCC forwards the -N flag directly to ld. This flag is not documented and
not supported by (for example) Clang. Just use -Wl,-N.
Submitted by: Pawel Worach
Modified:
head/sys/boot/i386/boot0/Makefile
head/sys/boot/i386/btx/btx/Makefile
head/sys/boot/i386/btx/btxldr/Makefile
head/sys/boot/i386/cdboot/Makefile
head/sys/boot/i386/mbr/Makefile
head/sys/boot/i386/pmbr/Makefile
head/sys/boot/pc98/boot0.5/Makefile
head/sys/boot/pc98/boot0/Makefile
head/sys/boot/pc98/btx/btx/Makefile
head/sys/boot/pc98/btx/btxldr/Makefile
head/sys/boot/pc98/cdboot/Makefile
head/sys/boot/sparc64/boot1/Makefile
Modified: head/sys/boot/i386/boot0/Makefile
==============================================================================
--- head/sys/boot/i386/boot0/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/i386/boot0/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -74,6 +74,6 @@ CFLAGS+=-DFLAGS=${BOOT_BOOT0_FLAGS} \
-DTICKS=${BOOT_BOOT0_TICKS} \
-DCOMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary
+LDFLAGS=-e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: head/sys/boot/i386/btx/btx/Makefile
==============================================================================
--- head/sys/boot/i386/btx/btx/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/i386/btx/btx/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -24,6 +24,6 @@ CFLAGS+=-DBTX_SERIAL -DSIOPRT=${BOOT_COM
ORG= 0x9000
-LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
+LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: head/sys/boot/i386/btx/btxldr/Makefile
==============================================================================
--- head/sys/boot/i386/btx/btxldr/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/i386/btx/btxldr/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -11,6 +11,6 @@ CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRES
CFLAGS+=-DBTXLDR_VERBOSE
.endif
-LDFLAGS=-N -e start -Ttext ${LOADER_ADDRESS} -Wl,-S,--oformat,binary
+LDFLAGS=-e start -Ttext ${LOADER_ADDRESS} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: head/sys/boot/i386/cdboot/Makefile
==============================================================================
--- head/sys/boot/i386/cdboot/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/i386/cdboot/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -8,6 +8,6 @@ SRCS= ${PROG}.s
ORG= 0x7c00
-LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
+LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: head/sys/boot/i386/mbr/Makefile
==============================================================================
--- head/sys/boot/i386/mbr/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/i386/mbr/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -12,6 +12,6 @@ BOOT_MBR_FLAGS?= 0x80
ORG= 0x600
AFLAGS+=--defsym FLAGS=${BOOT_MBR_FLAGS}
-LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
+LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: head/sys/boot/i386/pmbr/Makefile
==============================================================================
--- head/sys/boot/i386/pmbr/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/i386/pmbr/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -9,6 +9,6 @@ SRCS= ${PROG}.s
ORG= 0x600
AFLAGS+=--defsym FLAGS=${BOOT_MBR_FLAGS}
-LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
+LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: head/sys/boot/pc98/boot0.5/Makefile
==============================================================================
--- head/sys/boot/pc98/boot0.5/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/pc98/boot0.5/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -14,7 +14,7 @@ BOOT= boot0.5
# unless you are glutton for punishment.
BOOT_BOOT0_ORG?= 0x0000
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-T,${.CURDIR}/ldscript
+LDFLAGS=-e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-N,-T,${.CURDIR}/ldscript
# The size of boot0.5 must be 7168 bytes
${BOOT}: ${BOOT}.bin
Modified: head/sys/boot/pc98/boot0/Makefile
==============================================================================
--- head/sys/boot/pc98/boot0/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/pc98/boot0/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -13,7 +13,7 @@ BOOT= boot0
# unless you are glutton for punishment.
BOOT_BOOT0_ORG?= 0x0000
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG}
+LDFLAGS=-e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-N
${BOOT}: ${BOOT}.out
objcopy -S -O binary ${BOOT}.out ${.TARGET}
Modified: head/sys/boot/pc98/btx/btx/Makefile
==============================================================================
--- head/sys/boot/pc98/btx/btx/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/pc98/btx/btx/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -24,6 +24,6 @@ CFLAGS+=-DBTX_SERIAL -DSIOPRT=${BOOT_COM
ORG= 0x9000
-LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
+LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: head/sys/boot/pc98/btx/btxldr/Makefile
==============================================================================
--- head/sys/boot/pc98/btx/btxldr/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/pc98/btx/btxldr/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -11,6 +11,6 @@ CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRES
CFLAGS+=-DBTXLDR_VERBOSE
.endif
-LDFLAGS=-N -e start -Ttext ${LOADER_ADDRESS} -Wl,-S,--oformat,binary
+LDFLAGS=-e start -Ttext ${LOADER_ADDRESS} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: head/sys/boot/pc98/cdboot/Makefile
==============================================================================
--- head/sys/boot/pc98/cdboot/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/pc98/cdboot/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -8,6 +8,6 @@ SRCS= ${PROG}.s
ORG= 0x0000
-LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
+LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
.include <bsd.prog.mk>
Modified: head/sys/boot/sparc64/boot1/Makefile
==============================================================================
--- head/sys/boot/sparc64/boot1/Makefile Thu Jun 3 17:20:27 2010 (r208788)
+++ head/sys/boot/sparc64/boot1/Makefile Thu Jun 3 17:42:32 2010 (r208789)
@@ -9,7 +9,7 @@ SRCS= _start.s boot1.c
BOOTBLOCKBASE= 0x4000
CFLAGS= -mcmodel=medlow -Os -I${.CURDIR}/../../common
-LDFLAGS=-N -Ttext ${BOOTBLOCKBASE}
+LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N
# Construct boot1. sunlabel expects it to contain zeroed-out space for the
# label, and to be of the correct size.
More information about the svn-src-head
mailing list