# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1193998597 0
# Node ID 055d98aa2dd08211928e6497fe72703b5531046c
# Parent d7d40acebdc1791252b1f3882148392824e11487
solaris: Fix Solaris tools build.
Signed-off-by: John Levon <john.levon@xxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/firmware/hvmloader/Makefile | 4 +---
tools/firmware/hvmloader/acpi/acpi2_0.h | 15 +--------------
tools/firmware/hvmloader/mp_tables.c | 16 +---------------
tools/firmware/vmxassist/Makefile | 3 +--
tools/tests/blowfish.mk | 1 -
5 files changed, 4 insertions(+), 35 deletions(-)
diff -r d7d40acebdc1 -r 055d98aa2dd0 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Fri Nov 02 09:53:28 2007 +0000
+++ b/tools/firmware/hvmloader/Makefile Fri Nov 02 10:16:37 2007 +0000
@@ -31,9 +31,7 @@ CFLAGS += $(call cc-option,$(CC),-fno-s
CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
-OBJCOPY = objcopy
CFLAGS += -fno-builtin -O2 -msoft-float
-LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR)
SRCS = hvmloader.c mp_tables.c util.c smbios.c 32bitbios_support.c
OBJS = $(patsubst %.c,%.o,$(SRCS))
@@ -43,7 +41,7 @@ all: hvmloader
hvmloader: roms.h acpi/acpi.a $(SRCS)
$(CC) $(CFLAGS) -c $(SRCS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o hvmloader.tmp $(OBJS) acpi/acpi.a
+ $(LD) $(LDFLAGS_DIRECT) -nostdlib -N -Ttext $(LOADADDR) -o
hvmloader.tmp $(OBJS) acpi/acpi.a
$(OBJCOPY) hvmloader.tmp hvmloader
rm -f hvmloader.tmp
diff -r d7d40acebdc1 -r 055d98aa2dd0 tools/firmware/hvmloader/acpi/acpi2_0.h
--- a/tools/firmware/hvmloader/acpi/acpi2_0.h Fri Nov 02 09:53:28 2007 +0000
+++ b/tools/firmware/hvmloader/acpi/acpi2_0.h Fri Nov 02 10:16:37 2007 +0000
@@ -18,20 +18,7 @@
#ifndef _ACPI_2_0_H_
#define _ACPI_2_0_H_
-typedef unsigned char uint8_t;
-typedef signed char int8_t;
-typedef unsigned short uint16_t;
-typedef signed short int16_t;
-typedef unsigned int uint32_t;
-typedef signed int int32_t;
-#ifdef __i386__
-typedef unsigned long long uint64_t;
-typedef signed long long int64_t;
-#else
-typedef unsigned long uint64_t;
-typedef signed long int64_t;
-#endif
-
+#include <stdint.h>
#include <xen/xen.h>
#define ASCII32(a,b,c,d) \
diff -r d7d40acebdc1 -r 055d98aa2dd0 tools/firmware/hvmloader/mp_tables.c
--- a/tools/firmware/hvmloader/mp_tables.c Fri Nov 02 09:53:28 2007 +0000
+++ b/tools/firmware/hvmloader/mp_tables.c Fri Nov 02 10:16:37 2007 +0000
@@ -28,22 +28,8 @@
* Place - Suite 330, Boston, MA 02111-1307 USA.
*/
+#include <stdint.h>
#include "config.h"
-
-/* FIXME find a header that already has types defined!!! */
-typedef unsigned char uint8_t;
-typedef signed char int8_t;
-typedef unsigned short uint16_t;
-typedef signed short int16_t;
-typedef unsigned int uint32_t;
-typedef signed int int32_t;
-#ifdef __i386__
-typedef unsigned long long uint64_t;
-typedef signed long long int64_t;
-#else
-typedef unsigned long uint64_t;
-typedef signed long int64_t;
-#endif
/* number of non-processor MP table entries */
#define NR_NONPROC_ENTRIES 18
diff -r d7d40acebdc1 -r 055d98aa2dd0 tools/firmware/vmxassist/Makefile
--- a/tools/firmware/vmxassist/Makefile Fri Nov 02 09:53:28 2007 +0000
+++ b/tools/firmware/vmxassist/Makefile Fri Nov 02 10:16:37 2007 +0000
@@ -37,7 +37,6 @@ CFLAGS += $(call cc-option,$(CC),-fno-s
CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
CPP = cpp -P
-OBJCOPY = objcopy -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0
CFLAGS += $(DEFINES) -I. $(XENINC) -fno-builtin -O2 -msoft-float
OBJECTS = head.o trap.o vm86.o setup.o util.o
@@ -49,7 +48,7 @@ vmxassist.bin: vmxassist.ld $(OBJECTS)
$(CPP) $(DEFINES) vmxassist.ld > vmxassist.tmp
$(LD) -o vmxassist $(LDFLAGS_DIRECT) -nostdlib --fatal-warnings -N -T
vmxassist.tmp $(OBJECTS)
nm -n vmxassist > vmxassist.sym
- $(OBJCOPY) vmxassist vmxassist.tmp
+ $(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
rm -f vmxassist.tmp
diff -r d7d40acebdc1 -r 055d98aa2dd0 tools/tests/blowfish.mk
--- a/tools/tests/blowfish.mk Fri Nov 02 09:53:28 2007 +0000
+++ b/tools/tests/blowfish.mk Fri Nov 02 10:16:37 2007 +0000
@@ -9,7 +9,6 @@ CFLAGS += $(call cc-option,$(CC),-fno-s
CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
-OBJCOPY = objcopy
CFLAGS += -fno-builtin -O2 -msoft-float
LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0x100000
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home