[XenPPC] [xenppc-unstable] merge

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

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID 3dfeb3e4a03f0f1eb6b015b89e7d7cc2f2d50207
# Parent  9372353e3b095cfaf82d09c8b891d9a2b58ca735
# Parent  ff3ab3fc802484087ecf24521f66c4f7ab44849a
merge
---
 xen/arch/powerpc/Makefile |    6 ++----
 xen/common/gdbstub.c      |    1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff -r 9372353e3b09 -r 3dfeb3e4a03f xen/arch/powerpc/Makefile
--- a/xen/arch/powerpc/Makefile Thu Oct 12 17:09:19 2006 -0400
+++ b/xen/arch/powerpc/Makefile Fri Oct 13 11:00:32 2006 -0400
@@ -120,11 +120,9 @@ xen-syms.o: xen-syms.S
        $(CC) $(CFLAGS) $(TARGET_OPTS) xen-syms.o -o $@
 
 # our firmware only loads 32-bit ELF files
+OCPYFLAGS := --input-target=elf64-powerpc --output-target=elf32-powerpc
 $(TARGET): $(TARGET)-syms
-       $(CROSS_COMPILE)objcopy \
-               --input-target=elf64-powerpc \
-               --output-target=elf32-powerpc \
-               $^ $@
+       $(CROSS_COMPILE)objcopy $(OCPYFLAGS) $^ $@
 
 asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(HDRS)
        $(CC) $(CFLAGS) -S -o $@ $<
diff -r 9372353e3b09 -r 3dfeb3e4a03f xen/common/gdbstub.c
--- a/xen/common/gdbstub.c      Thu Oct 12 17:09:19 2006 -0400
+++ b/xen/common/gdbstub.c      Fri Oct 13 11:00:32 2006 -0400
@@ -42,6 +42,7 @@
 #include <xen/init.h>
 #include <xen/smp.h>
 #include <xen/console.h>
+#include <xen/errno.h>
 
 /* Printk isn't particularly safe just after we've trapped to the
    debugger. so avoid it. */

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