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

Authored by dim on Mar 31 2015, 8:54 PM.

Details

Reviewers

• rodrigc
emaste
bapt
imp

Commits

rS281289: MFC r280980:
rS280980: Ensure the cross assembler, linker and objcopy are used for the build32

Summary

When I tried replicating Craig Rodrigues's efforts at building head
with the amd64-xtoolchain-gcc package, I noticed that during the build32
stage it still uses the base system ld and objcopy:

[...]
--- lib/csu/i386-elf__L ---
ld -m elf_i386_fbsd -Y P,/usr/obj/home/dim/head/lib32/usr/lib32  -o crt1.o -r crt1_s.o crt1_c.o
[...]
--- lib/csu/i386-elf__L ---
objcopy --localize-symbol _start1 crt1.o
[...]
--- lib/csu/i386-elf__L ---
ld -m elf_i386_fbsd -Y P,/usr/obj/home/dim/head/lib32/usr/lib32  -o Scrt1.o -r crt1_s.o Scrt1_c.o
[...]
--- lib/csu/i386-elf__L ---
objcopy --localize-symbol _start1 Scrt1.o

And a bunch more of those. I went through the various Makefiles I could
find, replacing literal 'objcopy' with ${OBJCOPY}, which fixes the case
for objcopy.

Also, I changed LD=${LD} and AS=${AS} to use their X variants in the
definition of LIB32WMAKEFLAGS in Makefile.inc1, and added
OBJCOPY=${XOBJCOPY} to the list.

Together, these changes should ensure that the cross tools are always
used instead of the base system tools.

Test Plan

A make universe is probably required, at least.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

dim updated this revision to Diff 4554.Mar 31 2015, 8:54 PM

dim retitled this revision from to Ensure cross assembler, linker and objcopy are used for the build32 stage.

dim updated this object.

dim edited the test plan for this revision. (Show Details)

dim added reviewers: imp, bapt, • rodrigc.

dim added a subscriber: Unknown Object (MLST).

Herald added a subscriber: imp. · View Herald TranscriptMar 31 2015, 8:54 PM

bapt added inline comments.Mar 31 2015, 8:59 PM

Makefile.inc1
416	You should probably test if XAS if defined: something like AS=${XAS:U${AS}} and so on
426–427	Same apply here

dim added inline comments.Mar 31 2015, 9:07 PM

Makefile.inc1

416

These are also unconditionally used in the previous block for WMAKENV, e.g.:

WMAKEENV+=      CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \
                DEPFLAGS="${DEPFLAGS}" \
                CPP="${XCPP} ${XCFLAGS}" \
                AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
                OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
                RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
                SIZE="${XSIZE}"

and just before that, they are unconditionally defined:

XCOMPILERS=     CC CXX CPP
.for COMPILER in ${XCOMPILERS}
.if defined(CROSS_COMPILER_PREFIX)
X${COMPILER}?=  ${CROSS_COMPILER_PREFIX}${${COMPILER}}
.else
X${COMPILER}?=  ${${COMPILER}}
.endif
.endfor
XBINUTILS=      AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS
.for BINUTIL in ${XBINUTILS}
.if defined(CROSS_BINUTILS_PREFIX)
X${BINUTIL}?=   ${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
.else
X${BINUTIL}?=   ${${BINUTIL}}
.endif
.endfor

So I think it is unnecessary to check them again.

yup you are right

This looks ok for me I still would be more confident with @imp reviewing as well :)

This revision is now accepted and ready to land.Mar 31 2015, 9:19 PM

In D2187#7, @bapt wrote:

yup you are right

This looks ok for me I still would be more confident with @imp reviewing as well :)

Using Xfoo unconditionally is good.

Where is OBJCOPY defined?

Makefile.inc1
416	Do we need a similar change for powerpc? Using Xfoo unconditionally is cool.

Agreed it would be nice to have @imp sign off, but looks good to me.

In D2187#11, @imp wrote:

Where is OBJCOPY defined?

In share/mk/sys.mk, as long as if !defined(%POSIX)

imp accepted this revision.Apr 1 2015, 3:38 AM

imp edited edge metadata.

dim added inline comments.Apr 1 2015, 5:45 AM

Makefile.inc1
416	I just looked for the LD="${LD}" assignments, and replaced them all. Maybe, for consistency, we should add OBJCOPY=${XOBJCOPY} for the powerpc case too, but I'm not sure if it's used at all in the powerpc build...