diff -r 53eb98b6170d libgo/runtime/go-go.c
--- a/libgo/runtime/go-go.c	Mon Jul 26 05:48:18 2010 -0700
+++ b/libgo/runtime/go-go.c	Wed Jul 28 06:31:26 2010 -0700
@@ -35,11 +35,7 @@
   #define SAVE_REGS asm ("" : : : "esi", "edi")
  #endif
 #elif defined(__x86_64__)
- #ifndef __PIC__
-  #define SAVE_REGS asm ("" : : : "r12", "r13", "r14", "r15", "rbp", "rbx")
- #else
-  #define SAVE_REGS asm ("" : : : "r12", "r13", "r14", "r15", "rbp")
- #endif
+ #define SAVE_REGS asm ("" : : : "r12", "r13", "r14", "r15", "rbp", "rbx")
 #else
  #error must define SAVE_REGS
 #endif