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

[dim]

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.

[bapt]

Makefile.inc1

416 ↗

(On Diff #4554)

You should probably test if XAS if defined: something like AS=${XAS:U${AS}} and so on

426 ↗

(On Diff #4554)

Same apply here

[dim]

Makefile.inc1

416 ↗

(On Diff #4554)

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.

[bapt]

yup you are right

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

[imp]

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.

[imp]

Where is OBJCOPY defined?

Makefile.inc1

416 ↗

(On Diff #4554)

Do we need a similar change for powerpc?

Using Xfoo unconditionally is cool.

[emaste]

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

[emaste]

In D2187#11, @imp wrote:

Where is OBJCOPY defined?

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

[dim]

Makefile.inc1

416 ↗

(On Diff #4554)

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...

[imp]

Makefile.inc1

416 ↗

(On Diff #4554)

The OBJCOPY was more my concern. Why do we need it for i386 on amd64 and nor for powerpc on powerpc64?

[emaste]

Makefile.inc1

416 ↗

(On Diff #4554)

objcopy is used if you generate standalone debug.

[dim]

Add XOBJCOPY for powerpc too.

[emaste]

LGTM

[dim]

Makefile.inc1

427 ↗

(On Diff #4577)

Btw, I'm not sure about AS here, since it might not even be used in the 32 bit stage, and also I'm not sure of the syntax. Is it -a32?

[dim]

Closed by commit rS280980 (authored by @dim).