svn commit: r260291 - in stable: 10/sys/boot/i386 10/sys/boot/i386/boot2 10/sys/boot/i386/gptboot 10/sys/boot/i386/gptzfsboot 10/sys/boot/i386/zfsboot 10/sys/boot/pc98/boot2 7/sys/boot/i386 7/sys/b...

Dimitry Andric dim at FreeBSD.org
Sat Jan 4 22:00:10 UTC 2014


Author: dim
Date: Sat Jan  4 22:00:07 2014
New Revision: 260291
URL: http://svnweb.freebsd.org/changeset/base/260291

Log:
  MFC r260095:
  
  For sys/boot/i386 and sys/boot/pc98, separate flags to be passed
  directly to the linker (LD_FLAGS) from flags passed indirectly, via the
  compiler driver (LDFLAGS).
  
  This is because several Makefiles under sys/boot/i386 and sys/boot/pc98
  use ${LD} directly to link, and the normal LDFLAGS value should not be
  used in these cases.

Modified:
  stable/8/sys/boot/i386/Makefile.inc
  stable/8/sys/boot/i386/boot2/Makefile
  stable/8/sys/boot/i386/gptboot/Makefile
  stable/8/sys/boot/i386/gptzfsboot/Makefile
  stable/8/sys/boot/i386/zfsboot/Makefile
  stable/8/sys/boot/pc98/boot2/Makefile
Directory Properties:
  stable/8/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/boot/i386/Makefile.inc
  stable/10/sys/boot/i386/boot2/Makefile
  stable/10/sys/boot/i386/gptboot/Makefile
  stable/10/sys/boot/i386/gptzfsboot/Makefile
  stable/10/sys/boot/i386/zfsboot/Makefile
  stable/10/sys/boot/pc98/boot2/Makefile
  stable/7/sys/boot/i386/Makefile.inc
  stable/7/sys/boot/i386/boot2/Makefile
  stable/7/sys/boot/i386/gptboot/Makefile
  stable/7/sys/boot/i386/gptzfsboot/Makefile
  stable/7/sys/boot/i386/zfsboot/Makefile
  stable/7/sys/boot/pc98/boot2/Makefile
  stable/9/sys/boot/i386/Makefile.inc
  stable/9/sys/boot/i386/boot2/Makefile
  stable/9/sys/boot/i386/gptboot/Makefile
  stable/9/sys/boot/i386/gptzfsboot/Makefile
  stable/9/sys/boot/i386/zfsboot/Makefile
  stable/9/sys/boot/pc98/boot2/Makefile
Directory Properties:
  stable/10/   (props changed)
  stable/7/sys/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/8/sys/boot/i386/Makefile.inc
==============================================================================
--- stable/8/sys/boot/i386/Makefile.inc	Sat Jan  4 21:55:06 2014	(r260290)
+++ stable/8/sys/boot/i386/Makefile.inc	Sat Jan  4 22:00:07 2014	(r260291)
@@ -11,7 +11,8 @@ LDFLAGS+=	-nostdlib
 
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+=	-m32
-LDFLAGS+=	-m elf_i386_fbsd
+# LD_FLAGS is passed directly to ${LD}, not via ${CC}:
+LD_FLAGS+=	-m elf_i386_fbsd
 AFLAGS+=	--32
 .endif
 

Modified: stable/8/sys/boot/i386/boot2/Makefile
==============================================================================
--- stable/8/sys/boot/i386/boot2/Makefile	Sat Jan  4 21:55:06 2014	(r260290)
+++ stable/8/sys/boot/i386/boot2/Makefile	Sat Jan  4 22:00:07 2014	(r260291)
@@ -40,7 +40,7 @@ CFLAGS=	-Os \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Winline --param max-inline-insns-single=100
 
-LDFLAGS=-static -N --gc-sections
+LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
@@ -56,7 +56,7 @@ boot1: boot1.out
 	objcopy -S -O binary boot1.out ${.TARGET}
 
 boot1.out: boot1.o
-	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
+	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
 
 CLEANFILES+=	boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \
 		boot2.s boot2.s.tmp boot2.h sio.o
@@ -77,7 +77,7 @@ boot2.bin: boot2.out
 	objcopy -S -O binary boot2.out ${.TARGET}
 
 boot2.out: ${BTXCRT} boot2.o sio.o
-	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
+	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
 
 boot2.o: boot2.s
 

Modified: stable/8/sys/boot/i386/gptboot/Makefile
==============================================================================
--- stable/8/sys/boot/i386/gptboot/Makefile	Sat Jan  4 21:55:06 2014	(r260290)
+++ stable/8/sys/boot/i386/gptboot/Makefile	Sat Jan  4 22:00:07 2014	(r260291)
@@ -36,7 +36,7 @@ CFLAGS=	-DBOOTPROG=\"gptboot\" \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Winline --param max-inline-insns-single=100
 
-LDFLAGS=-static -N --gc-sections
+LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
@@ -53,7 +53,7 @@ gptldr.bin: gptldr.out
 	objcopy -S -O binary gptldr.out ${.TARGET}
 
 gptldr.out: gptldr.o
-	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
+	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
 
 CLEANFILES+=	gptboot.bin gptboot.out gptboot.o sio.o gpt.o crc32.o drv.o \
 		cons.o util.o
@@ -62,7 +62,7 @@ gptboot.bin: gptboot.out
 	objcopy -S -O binary gptboot.out ${.TARGET}
 
 gptboot.out: ${BTXCRT} gptboot.o sio.o gpt.o crc32.o drv.o cons.o util.o
-	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
+	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 gptboot.o: ${.CURDIR}/../../common/ufsread.c
 

Modified: stable/8/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- stable/8/sys/boot/i386/gptzfsboot/Makefile	Sat Jan  4 21:55:06 2014	(r260290)
+++ stable/8/sys/boot/i386/gptzfsboot/Makefile	Sat Jan  4 22:00:07 2014	(r260291)
@@ -35,7 +35,7 @@ CFLAGS=	-DBOOTPROG=\"gptzfsboot\" \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Winline --param max-inline-insns-single=100
 
-LDFLAGS=-static -N --gc-sections
+LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
@@ -52,7 +52,7 @@ gptldr.bin: gptldr.out
 	objcopy -S -O binary gptldr.out ${.TARGET}
 
 gptldr.out: gptldr.o
-	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
+	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
 
 CLEANFILES+=	gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o
 
@@ -60,7 +60,7 @@ gptzfsboot.bin: gptzfsboot.out
 	objcopy -S -O binary gptzfsboot.out ${.TARGET}
 
 gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o
-	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
+	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c
 

Modified: stable/8/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- stable/8/sys/boot/i386/zfsboot/Makefile	Sat Jan  4 21:55:06 2014	(r260290)
+++ stable/8/sys/boot/i386/zfsboot/Makefile	Sat Jan  4 22:00:07 2014	(r260291)
@@ -32,7 +32,7 @@ CFLAGS=	-DBOOTPROG=\"zfsboot\" \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Winline --param max-inline-insns-single=100
 
-LDFLAGS=-static -N --gc-sections
+LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
@@ -48,7 +48,7 @@ zfsboot1: zfsldr.out
 	objcopy -S -O binary zfsldr.out ${.TARGET}
 
 zfsldr.out: zfsldr.o
-	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o
+	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o
 
 CLEANFILES+=	zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \
 		zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o util.o
@@ -74,7 +74,7 @@ zfsboot.bin: zfsboot.out
 	objcopy -S -O binary zfsboot.out ${.TARGET}
 
 zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
-	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
+	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 SRCS=	zfsboot.c
 

Modified: stable/8/sys/boot/pc98/boot2/Makefile
==============================================================================
--- stable/8/sys/boot/pc98/boot2/Makefile	Sat Jan  4 21:55:06 2014	(r260290)
+++ stable/8/sys/boot/pc98/boot2/Makefile	Sat Jan  4 22:00:07 2014	(r260291)
@@ -44,7 +44,7 @@ CFLAGS=	-Os \
 # Initialize the bi_bios_geom using the BIOS geometry
 #CFLAGS+=	-DGET_BIOSGEOM
 
-LDFLAGS=-static -N --gc-sections
+LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
@@ -62,7 +62,7 @@ boot1: boot1.out
 	objcopy -S -O binary boot1.out ${.TARGET}
 
 boot1.out: boot1.o
-	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
+	${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
 
 CLEANFILES+=	boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \
 		boot2.s boot2.s.tmp boot2.h sio.o
@@ -83,7 +83,7 @@ boot2.bin: boot2.out
 	objcopy -S -O binary boot2.out ${.TARGET}
 
 boot2.out: ${BTXCRT} boot2.o sio.o
-	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
+	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
 
 boot2.o: boot2.s
 


More information about the svn-src-all mailing list