[Xen-changelog] [xen-unstable] tools: Avoid -nostdlib argument to $(LD).

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1194976642 0
# Node ID 5e4d4934a5d74ec08931d8b7ff0f686877cdacaa
# Parent  37be0bb6051888621b516e4b79f83765f0b795be
tools: Avoid -nostdlib argument to $(LD).
This interacts badly with GNU ld on Solaris.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/firmware/hvmloader/Makefile |    2 +-
 tools/firmware/vmxassist/Makefile |    2 +-
 tools/tests/blowfish.mk           |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff -r 37be0bb60518 -r 5e4d4934a5d7 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Tue Nov 13 17:28:44 2007 +0000
+++ b/tools/firmware/hvmloader/Makefile Tue Nov 13 17:57:22 2007 +0000
@@ -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 -r 37be0bb60518 -r 5e4d4934a5d7 tools/firmware/vmxassist/Makefile
--- a/tools/firmware/vmxassist/Makefile Tue Nov 13 17:28:44 2007 +0000
+++ b/tools/firmware/vmxassist/Makefile Tue Nov 13 17:57:22 2007 +0000
@@ -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 -r 37be0bb60518 -r 5e4d4934a5d7 tools/tests/blowfish.mk
--- a/tools/tests/blowfish.mk   Tue Nov 13 17:28:44 2007 +0000
+++ b/tools/tests/blowfish.mk   Tue Nov 13 17:57:22 2007 +0000
@@ -10,13 +10,12 @@ CFLAGS  += $(call cc-option,$(CC),-fno-s
 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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog