ia64/xen-unstable

changeset 16308:055d98aa2dd0

solaris: Fix Solaris tools build.
Signed-off-by: John Levon <john.levon@sun.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir@xensource.com>
date Fri Nov 02 10:16:37 2007 +0000 (2007-11-02)
parents d7d40acebdc1
children 3e397fa3a6ad
files tools/firmware/hvmloader/Makefile tools/firmware/hvmloader/acpi/acpi2_0.h tools/firmware/hvmloader/mp_tables.c tools/firmware/vmxassist/Makefile tools/tests/blowfish.mk
line diff
     1.1 --- a/tools/firmware/hvmloader/Makefile	Fri Nov 02 09:53:28 2007 +0000
     1.2 +++ b/tools/firmware/hvmloader/Makefile	Fri Nov 02 10:16:37 2007 +0000
     1.3 @@ -31,9 +31,7 @@ CFLAGS  += $(call cc-option,$(CC),-nopie
     1.4  CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector,)
     1.5  CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector-all,)
     1.6  
     1.7 -OBJCOPY  = objcopy
     1.8  CFLAGS  += -fno-builtin -O2 -msoft-float
     1.9 -LDFLAGS  = -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR)
    1.10  
    1.11  SRCS = hvmloader.c mp_tables.c util.c smbios.c 32bitbios_support.c
    1.12  OBJS = $(patsubst %.c,%.o,$(SRCS))
    1.13 @@ -43,7 +41,7 @@ all: hvmloader
    1.14  
    1.15  hvmloader: roms.h acpi/acpi.a $(SRCS)
    1.16  	$(CC) $(CFLAGS) -c $(SRCS)
    1.17 -	$(CC) $(CFLAGS) $(LDFLAGS) -o hvmloader.tmp $(OBJS) acpi/acpi.a
    1.18 +	$(LD) $(LDFLAGS_DIRECT) -nostdlib -N -Ttext $(LOADADDR) -o hvmloader.tmp $(OBJS) acpi/acpi.a
    1.19  	$(OBJCOPY) hvmloader.tmp hvmloader
    1.20  	rm -f hvmloader.tmp
    1.21  
     2.1 --- a/tools/firmware/hvmloader/acpi/acpi2_0.h	Fri Nov 02 09:53:28 2007 +0000
     2.2 +++ b/tools/firmware/hvmloader/acpi/acpi2_0.h	Fri Nov 02 10:16:37 2007 +0000
     2.3 @@ -18,20 +18,7 @@
     2.4  #ifndef _ACPI_2_0_H_
     2.5  #define _ACPI_2_0_H_
     2.6  
     2.7 -typedef unsigned char  uint8_t;
     2.8 -typedef   signed char  int8_t;
     2.9 -typedef unsigned short uint16_t;
    2.10 -typedef   signed short int16_t;
    2.11 -typedef unsigned int   uint32_t;
    2.12 -typedef   signed int   int32_t;
    2.13 -#ifdef __i386__
    2.14 -typedef unsigned long long uint64_t;
    2.15 -typedef   signed long long int64_t;
    2.16 -#else
    2.17 -typedef unsigned long uint64_t;
    2.18 -typedef   signed long int64_t;
    2.19 -#endif
    2.20 -
    2.21 +#include <stdint.h>
    2.22  #include <xen/xen.h>
    2.23  
    2.24  #define ASCII32(a,b,c,d)         \
     3.1 --- a/tools/firmware/hvmloader/mp_tables.c	Fri Nov 02 09:53:28 2007 +0000
     3.2 +++ b/tools/firmware/hvmloader/mp_tables.c	Fri Nov 02 10:16:37 2007 +0000
     3.3 @@ -28,23 +28,9 @@
     3.4   * Place - Suite 330, Boston, MA 02111-1307 USA.
     3.5   */
     3.6  
     3.7 +#include <stdint.h>
     3.8  #include "config.h"
     3.9  
    3.10 -/* FIXME find a header that already has types defined!!! */
    3.11 -typedef unsigned char  uint8_t;
    3.12 -typedef   signed char  int8_t;
    3.13 -typedef unsigned short uint16_t;
    3.14 -typedef   signed short int16_t;
    3.15 -typedef unsigned int   uint32_t;
    3.16 -typedef   signed int   int32_t;
    3.17 -#ifdef __i386__
    3.18 -typedef unsigned long long uint64_t;
    3.19 -typedef   signed long long int64_t;
    3.20 -#else
    3.21 -typedef unsigned long uint64_t;
    3.22 -typedef   signed long int64_t;
    3.23 -#endif
    3.24 -
    3.25  /* number of non-processor MP table entries */
    3.26  #define NR_NONPROC_ENTRIES     18
    3.27  
     4.1 --- a/tools/firmware/vmxassist/Makefile	Fri Nov 02 09:53:28 2007 +0000
     4.2 +++ b/tools/firmware/vmxassist/Makefile	Fri Nov 02 10:16:37 2007 +0000
     4.3 @@ -37,7 +37,6 @@ CFLAGS  += $(call cc-option,$(CC),-fno-s
     4.4  CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector-all,)
     4.5  
     4.6  CPP      = cpp -P
     4.7 -OBJCOPY  = objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
     4.8  CFLAGS  += $(DEFINES) -I. $(XENINC) -fno-builtin -O2 -msoft-float
     4.9  
    4.10  OBJECTS = head.o trap.o vm86.o setup.o util.o
    4.11 @@ -49,7 +48,7 @@ vmxassist.bin: vmxassist.ld $(OBJECTS)
    4.12  	$(CPP) $(DEFINES) vmxassist.ld > vmxassist.tmp
    4.13  	$(LD) -o vmxassist $(LDFLAGS_DIRECT) -nostdlib --fatal-warnings -N -T vmxassist.tmp $(OBJECTS)
    4.14  	nm -n vmxassist > vmxassist.sym
    4.15 -	$(OBJCOPY) vmxassist vmxassist.tmp
    4.16 +	$(OBJCOPY) -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0 vmxassist vmxassist.tmp
    4.17  	dd if=vmxassist.tmp of=vmxassist.bin ibs=512 conv=sync
    4.18  	rm -f vmxassist.tmp
    4.19  
     5.1 --- a/tools/tests/blowfish.mk	Fri Nov 02 09:53:28 2007 +0000
     5.2 +++ b/tools/tests/blowfish.mk	Fri Nov 02 10:16:37 2007 +0000
     5.3 @@ -9,7 +9,6 @@ CFLAGS  += $(call cc-option,$(CC),-nopie
     5.4  CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector,)
     5.5  CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector-all,)
     5.6  
     5.7 -OBJCOPY  = objcopy
     5.8  CFLAGS  += -fno-builtin -O2 -msoft-float
     5.9  LDFLAGS  = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0x100000
    5.10