On 26/05/2022 19.39, Dan Cross wrote:
Change x86/Makefile.common to invoke the linker directly instead
of using the C compiler as a linker driver.
This supports building on illumos, allowing the user to use
gold instead of the Solaris linker. Tested on Linux and illumos.
Signed-off-by: Dan Cross <cross@xxxxxxxxxxxxxxxxx>
---
x86/Makefile.common | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/x86/Makefile.common b/x86/Makefile.common
index b903988..0a0f7b9 100644
--- a/x86/Makefile.common
+++ b/x86/Makefile.common
@@ -62,7 +62,7 @@ else
.PRECIOUS: %.elf %.o
%.elf: %.o $(FLATLIBS) $(SRCDIR)/x86/flat.lds $(cstart.o)
- $(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,$(SRCDIR)/x86/flat.lds \
+ $(LD) -T $(SRCDIR)/x86/flat.lds -nostdlib -o $@ \
$(filter %.o, $^) $(FLATLIBS)
@chmod a-x $@
Hi,
something seems to be missing here - this is failing our 32-bit
CI job:
https://gitlab.com/thuth/kvm-unit-tests/-/jobs/2531237708
ld -T /builds/thuth/kvm-unit-tests/x86/flat.lds -nostdlib -o x86/taskswitch2.elf \
x86/taskswitch2.o x86/cstart.o lib/libcflat.a
ld: i386 architecture of input file `x86/taskswitch.o' is incompatible with i386:x86-64 output
ld: i386 architecture of input file `x86/cstart.o' is incompatible with i386:x86-64 output
ld: i386 architecture of input file `lib/libcflat.a(argv.o)' is incompatible with i386:x86-64 output
ld: i386 architecture of input file `lib/libcflat.a(printf.o)' is incompatible with i386:x86-64 output
...
You can find the job definition in the .gitlab-ci.yml file (it's
basically just about running "configure" with --arch=i386).
Thomas
