From a606451bd20daa4ca2ee5de1c13a7a166e5d7648 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sun, 25 Apr 2004 20:36:44 +0000
Subject: Use a more compact syntax for passing the "binary" options to 'ld'.

---
 sys/boot/i386/boot0/Makefile      | 2 +-
 sys/boot/i386/btx/btx/Makefile    | 2 +-
 sys/boot/i386/btx/btxldr/Makefile | 2 +-
 sys/boot/i386/cdboot/Makefile     | 2 +-
 sys/boot/i386/mbr/Makefile        | 2 +-
 sys/boot/i386/pxeldr/Makefile     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sys/boot/i386')

diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index dea34028ef06..b8a5e649df02 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -33,6 +33,6 @@ AFLAGS+=--defsym FLAGS=${BOOT_BOOT0_FLAGS} \
 	--defsym TICKS=${BOOT_BOOT0_TICKS} \
 	--defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
 
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S -Wl,--oformat -Wl,binary
+LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary
 
 .include <bsd.prog.mk>
diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile
index 25374baffbbb..dec49195b093 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/sys/boot/i386/btx/btx/Makefile
@@ -29,6 +29,6 @@ CFLAGS+=-DBTX_SERIAL -DSIOPRT=${BOOT_COMCONSOLE_PORT} \
 
 ORG=	0x9000
 
-LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S -Wl,--oformat -Wl,binary
+LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
 
 .include <bsd.prog.mk>
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index 8658acadf950..ce295e3f4b3c 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/sys/boot/i386/btx/btxldr/Makefile
@@ -12,6 +12,6 @@ CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}
 CFLAGS+=-DBTXLDR_VERBOSE
 .endif
 
-LDFLAGS=-N -e start -Ttext ${LOADER_ADDRESS} -Wl,-S -Wl,--oformat -Wl,binary
+LDFLAGS=-N -e start -Ttext ${LOADER_ADDRESS} -Wl,-S,--oformat,binary
 
 .include <bsd.prog.mk>
diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile
index a3a0c03dc61a..3119dd5f37df 100644
--- a/sys/boot/i386/cdboot/Makefile
+++ b/sys/boot/i386/cdboot/Makefile
@@ -10,6 +10,6 @@ CLEANFILES= ${BOOT}
 BOOT=	cdboot
 ORG=	0x7c00
 
-LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S -Wl,--oformat -Wl,binary
+LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
 
 .include <bsd.prog.mk>
diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile
index b52aef05bcea..e8ead79923dc 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -10,6 +10,6 @@ CLEANFILES= ${BOOT}
 BOOT=	mbr
 ORG=	0x600
 
-LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S -Wl,--oformat -Wl,binary
+LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
 
 .include <bsd.prog.mk>
diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile
index 2a8b57d73582..faa7964d608b 100644
--- a/sys/boot/i386/pxeldr/Makefile
+++ b/sys/boot/i386/pxeldr/Makefile
@@ -34,7 +34,7 @@ ${BOOT}: ${LDR} ${LOADER}
 
 CLEANFILES+= ${LDR}
 
-LDFLAGS+= -N -e start -Ttext ${ORG} -Wl,-S -Wl,--oformat -Wl,binary
+LDFLAGS+= -N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
 
 CLEANFILES+= ${LOADER}
 
-- 
cgit v1.2.3