d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure the cross assembler, linker and objcopy are used for the build32

Browse Source 
stage, just like for the regular world stage.

Reviewed by:	rodrigc, imp, bapt, emaste
MFC after:	1 week
Differential Revision: https://reviews.freebsd.org/D2187
This commit is contained in:
Dimitry Andric 2015-04-02 06:58:17 +00:00
parent 0daa281ac0
commit 76e2c537bc
10 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc1
View File

@ -411,8 +411,9 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE}
LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \
MACHINE_CPU="i686 mmx sse sse2"
LIB32WMAKEFLAGS= \
AS="${AS} --32" \
LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32"
AS="${XAS} --32" \
LD="${XLD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
OBJCOPY="${XOBJCOPY}"
.elif ${TARGET_ARCH} == "powerpc64"
.if empty(TARGET_CPUTYPE)
@ -422,7 +423,8 @@ LIB32CPUFLAGS= -mcpu=${TARGET_CPUTYPE}
.endif
LIB32WMAKEENV= MACHINE=powerpc MACHINE_ARCH=powerpc
LIB32WMAKEFLAGS= \
LD="${LD} -m elf32ppc_fbsd"
LD="${XLD} -m elf32ppc_fbsd" \
OBJCOPY="${XOBJCOPY}"
.endif

4
lib/csu/i386-elf/Makefile
View File

@ -35,7 +35,7 @@ crt1_c.o: crt1_c.s
crt1.o: crt1_c.o crt1_s.o
${LD} ${_LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o
objcopy --localize-symbol _start1 crt1.o
${OBJCOPY} --localize-symbol _start1 crt1.o
Scrt1_c.s: crt1_c.c
${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1_c.c
@ -46,7 +46,7 @@ Scrt1_c.o: Scrt1_c.s
Scrt1.o: Scrt1_c.o crt1_s.o
${LD} ${_LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o
objcopy --localize-symbol _start1 Scrt1.o
${OBJCOPY} --localize-symbol _start1 Scrt1.o
realinstall:
${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \

4
sys/boot/i386/boot2/Makefile
View File

@ -61,7 +61,7 @@ boot: boot1 boot2
CLEANFILES+= boot1 boot1.out boot1.o
boot1: boot1.out
objcopy -S -O binary boot1.out ${.TARGET}
${OBJCOPY} -S -O binary boot1.out ${.TARGET}
boot1.out: boot1.o
${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
@ -82,7 +82,7 @@ boot2.ldr:
dd if=/dev/zero of=${.TARGET} bs=512 count=1
boot2.bin: boot2.out
objcopy -S -O binary boot2.out ${.TARGET}
${OBJCOPY} -S -O binary boot2.out ${.TARGET}
boot2.out: ${BTXCRT} boot2.o sio.o
${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}

4
sys/boot/i386/gptboot/Makefile
View File

@ -55,7 +55,7 @@ gptboot: gptldr.bin gptboot.bin ${BTXKERN}
CLEANFILES+= gptldr.bin gptldr.out gptldr.o
gptldr.bin: gptldr.out
objcopy -S -O binary gptldr.out ${.TARGET}
${OBJCOPY} -S -O binary gptldr.out ${.TARGET}
gptldr.out: gptldr.o
${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
@ -64,7 +64,7 @@ CLEANFILES+= gptboot.bin gptboot.out gptboot.o sio.o gpt.o crc32.o drv.o \
cons.o util.o
gptboot.bin: gptboot.out
objcopy -S -O binary gptboot.out ${.TARGET}
${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} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}

4
sys/boot/i386/gptzfsboot/Makefile
View File

@ -53,7 +53,7 @@ gptzfsboot: gptldr.bin gptzfsboot.bin ${BTXKERN}
CLEANFILES+= gptldr.bin gptldr.out gptldr.o
gptldr.bin: gptldr.out
objcopy -S -O binary gptldr.out ${.TARGET}
${OBJCOPY} -S -O binary gptldr.out ${.TARGET}
gptldr.out: gptldr.o
${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
@ -62,7 +62,7 @@ CLEANFILES+= gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o cons.o \
drv.o gpt.o util.o
gptzfsboot.bin: gptzfsboot.out
objcopy -S -O binary gptzfsboot.out ${.TARGET}
${OBJCOPY} -S -O binary gptzfsboot.out ${.TARGET}
gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o
${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}

4
sys/boot/i386/zfsboot/Makefile
View File

@ -49,7 +49,7 @@ zfsboot: zfsboot1 zfsboot2
CLEANFILES+= zfsboot1 zfsldr.out zfsldr.o
zfsboot1: zfsldr.out
objcopy -S -O binary zfsldr.out ${.TARGET}
${OBJCOPY} -S -O binary zfsldr.out ${.TARGET}
zfsldr.out: zfsldr.o
${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o
@ -75,7 +75,7 @@ zfsboot.ldr:
cp /dev/null ${.TARGET}
zfsboot.bin: zfsboot.out
objcopy -S -O binary zfsboot.out ${.TARGET}
${OBJCOPY} -S -O binary zfsboot.out ${.TARGET}
zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}

2
sys/boot/mips/beri/boot2/Makefile
View File

@ -74,7 +74,7 @@ flashboot.elf: relocate.o start.o boot2.o altera_jtag_uart.o cfi.o sdcard.o
${LD} ${_LDFLAGS} -T ${.CURDIR}/flashboot.ldscript -o ${.TARGET} \
${.ALLSRC} ${LIBSTAND}
flashboot: flashboot.elf
objcopy -S -O binary ${.TARGET}.elf ${.TARGET}
${OBJCOPY} -S -O binary ${.TARGET}.elf ${.TARGET}
flashboot.md5: flashboot
md5 flashboot > flashboot.md5

2
sys/boot/pc98/boot0.5/Makefile
View File

@ -21,6 +21,6 @@ ${BOOT}: ${BOOT}.bin
cat ${BOOT}.bin /dev/zero | dd of=${BOOT} bs=1 count=7168
${BOOT}.bin: ${BOOT}.out
objcopy -S -O binary ${BOOT}.out ${.TARGET}
${OBJCOPY} -S -O binary ${BOOT}.out ${.TARGET}
.include <bsd.prog.mk>

2
sys/boot/pc98/boot0/Makefile
View File

@ -16,6 +16,6 @@ BOOT_BOOT0_ORG?= 0x0000
LDFLAGS=-e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-N
${BOOT}: ${BOOT}.out
objcopy -S -O binary ${BOOT}.out ${.TARGET}
${OBJCOPY} -S -O binary ${BOOT}.out ${.TARGET}
.include <bsd.prog.mk>

4
sys/boot/pc98/boot2/Makefile
View File

@ -67,7 +67,7 @@ boot: boot1 boot2
CLEANFILES+= boot1 boot1.out boot1.o
boot1: boot1.out
objcopy -S -O binary boot1.out ${.TARGET}
${OBJCOPY} -S -O binary boot1.out ${.TARGET}
boot1.out: boot1.o
${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
@ -88,7 +88,7 @@ boot2.ldr:
dd if=/dev/zero of=${.TARGET} bs=276 count=1
boot2.bin: boot2.out
objcopy -S -O binary boot2.out ${.TARGET}
${OBJCOPY} -S -O binary boot2.out ${.TARGET}
boot2.out: ${BTXCRT} boot2.o sio.o
${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}