diff options
| author | Keir Fraser <keir@xensource.com> | 2007-11-13 17:57:22 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xensource.com> | 2007-11-13 17:57:22 +0000 |
| commit | ad703ba1679b0944da3a0d0109f2b1b92b496aff (patch) | |
| tree | f4d018c133e360355efacea37ced482e74709862 | |
| parent | 6d659d7442e486afe80a6c29f4ca41b757a01e2b (diff) | |
| download | xen-ad703ba1679b0944da3a0d0109f2b1b92b496aff.tar.gz xen-ad703ba1679b0944da3a0d0109f2b1b92b496aff.tar.bz2 xen-ad703ba1679b0944da3a0d0109f2b1b92b496aff.zip | |
tools: Avoid -nostdlib argument to $(LD).
This interacts badly with GNU ld on Solaris.
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | tools/firmware/hvmloader/Makefile | 2 | ||||
| -rw-r--r-- | tools/firmware/vmxassist/Makefile | 2 | ||||
| -rw-r--r-- | tools/tests/blowfish.mk | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 739a170558..6b6c63411e 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -41,7 +41,7 @@ all: hvmloader hvmloader: roms.h acpi/acpi.a $(SRCS) $(CC) $(CFLAGS) -c $(SRCS) - $(LD) $(LDFLAGS_DIRECT) -nostdlib -N -Ttext $(LOADADDR) -o hvmloader.tmp $(OBJS) acpi/acpi.a + $(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $(OBJS) acpi/acpi.a $(OBJCOPY) hvmloader.tmp hvmloader rm -f hvmloader.tmp diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile index 3bb1998a82..b00224ae8a 100644 --- a/tools/firmware/vmxassist/Makefile +++ b/tools/firmware/vmxassist/Makefile @@ -46,7 +46,7 @@ all: vmxassist.bin vmxassist.bin: vmxassist.ld $(OBJECTS) $(CPP) $(DEFINES) vmxassist.ld > vmxassist.tmp - $(LD) -o vmxassist $(LDFLAGS_DIRECT) -nostdlib --fatal-warnings -N -T vmxassist.tmp $(OBJECTS) + $(LD) -o vmxassist $(LDFLAGS_DIRECT) --fatal-warnings -N -T vmxassist.tmp $(OBJECTS) nm -n vmxassist > vmxassist.sym $(OBJCOPY) -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0 vmxassist vmxassist.tmp dd if=vmxassist.tmp of=vmxassist.bin ibs=512 conv=sync diff --git a/tools/tests/blowfish.mk b/tools/tests/blowfish.mk index 95c39ae4ab..ecad7836a4 100644 --- a/tools/tests/blowfish.mk +++ b/tools/tests/blowfish.mk @@ -10,13 +10,12 @@ CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) CFLAGS += -fno-builtin -O2 -msoft-float -LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0x100000 .PHONY: all all: blowfish.bin blowfish.bin: blowfish.c $(CC) $(CFLAGS) -c blowfish.c - $(CC) $(CFLAGS) $(LDFLAGS) -o blowfish.tmp blowfish.o + $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0x100000 -o blowfish.tmp blowfish.o $(OBJCOPY) -O binary blowfish.tmp blowfish.bin rm -f blowfish.tmp |