svn commit: r208376 - in projects/clangbsd/sys/boot: i386/boot0 i386/btx/btx i386/btx/btxldr i386/cdboot i386/mbr i386/pmbr i386/pxeldr pc98/boot0.5 pc98/btx/btx pc98/btx/btxldr pc98/cdboot

Roman Divacky rdivacky at FreeBSD.org
Fri May 21 15:47:57 UTC 2010


Author: rdivacky
Date: Fri May 21 15:47:56 2010
New Revision: 208376
URL: http://svn.freebsd.org/changeset/base/208376

Log:
  Flags to ld should be passed via -Wl.

Modified:
  projects/clangbsd/sys/boot/i386/boot0/Makefile
  projects/clangbsd/sys/boot/i386/btx/btx/Makefile
  projects/clangbsd/sys/boot/i386/btx/btxldr/Makefile
  projects/clangbsd/sys/boot/i386/cdboot/Makefile
  projects/clangbsd/sys/boot/i386/mbr/Makefile
  projects/clangbsd/sys/boot/i386/pmbr/Makefile
  projects/clangbsd/sys/boot/i386/pxeldr/Makefile
  projects/clangbsd/sys/boot/pc98/boot0.5/Makefile
  projects/clangbsd/sys/boot/pc98/btx/btx/Makefile
  projects/clangbsd/sys/boot/pc98/btx/btxldr/Makefile
  projects/clangbsd/sys/boot/pc98/cdboot/Makefile

Modified: projects/clangbsd/sys/boot/i386/boot0/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/boot0/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/i386/boot0/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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: projects/clangbsd/sys/boot/i386/btx/btx/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/btx/btx/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/i386/btx/btx/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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: projects/clangbsd/sys/boot/i386/btx/btxldr/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/btx/btxldr/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/i386/btx/btxldr/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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: projects/clangbsd/sys/boot/i386/cdboot/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/cdboot/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/i386/cdboot/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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: projects/clangbsd/sys/boot/i386/mbr/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/mbr/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/i386/mbr/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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: projects/clangbsd/sys/boot/i386/pmbr/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/pmbr/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/i386/pmbr/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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: projects/clangbsd/sys/boot/i386/pxeldr/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/pxeldr/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/i386/pxeldr/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -32,7 +32,7 @@ ${BOOT}: ${LDR} ${LOADER}
 	dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
 	rm ${.TARGET}.tmp
 
-LDFLAGS+= -N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
+LDFLAGS+=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
 
 CLEANFILES+= ${LOADER}
 

Modified: projects/clangbsd/sys/boot/pc98/boot0.5/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/pc98/boot0.5/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/pc98/boot0.5/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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: projects/clangbsd/sys/boot/pc98/btx/btx/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/pc98/btx/btx/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/pc98/btx/btx/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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: projects/clangbsd/sys/boot/pc98/btx/btxldr/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/pc98/btx/btxldr/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/pc98/btx/btxldr/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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: projects/clangbsd/sys/boot/pc98/cdboot/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/pc98/cdboot/Makefile	Fri May 21 13:29:28 2010	(r208375)
+++ projects/clangbsd/sys/boot/pc98/cdboot/Makefile	Fri May 21 15:47:56 2010	(r208376)
@@ -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>


More information about the svn-src-projects mailing list