sparc fix

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@325 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile b/Makefile
index 1db299e8c32681a7b5bb0811f2153e9eb347ad12..ab8e377f5571f3562d27e4349eff54cee1998342 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,8 @@ CFLAGS+=-m32 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6
 LDFLAGS+=-m32
 OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
 HELPER_CFLAGS=$(CFLAGS) -ffixed-i0 -mflat
-LDFLAGS+=-Wl,-T,sparc.ld
+# -static is used to avoid g1/g3 usage by the dynamic linker
+LDFLAGS+=-Wl,-T,sparc.ld -static
 endif
 
 ifeq ($(ARCH),sparc64)

diff --git a/dyngen-exec.h b/dyngen-exec.h
index e5b5e5fde8962d9cb7dd5ee63111907f0677ed78..46f4042f68664c3a5da65c6ae0c922807fed9160 100644 (file)
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -172,7 +172,7 @@ extern int __op_jmp0, __op_jmp1;
 #define EXIT_TB() asm volatile ("br.ret.sptk.many b0;;")
 #endif
 #ifdef __sparc__
-#define EXIT_TB() asm volatile ("jmpl %i0 + 8, %g0\n"
+#define EXIT_TB() asm volatile ("jmpl %i0 + 8, %g0\n" \
                                 "nop")
 #endif
 #ifdef __arm__