commit a96fc003bd347fc85d0eff0e9bf5839e73385c7b
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Jul 13 17:30:15 2003 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Jul 13 17:30:15 2003 +0000
tree 6b81eaeb087a4592560e256446fe5886b0eff317
parent d44b29c21e28ca2045c19122d69f7565544dd58b

sparc fix


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

Makefile

diff --git a/Makefile b/Makefile
index 1db299e..ab8e377 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,8 @@
 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)

dyngen-exec.h

diff --git a/dyngen-exec.h b/dyngen-exec.h
index e5b5e5f..46f4042 100644
--- a/dyngen-exec.h
+++ b/dyngen-exec.h
@@ -172,7 +172,7 @@
 #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__