Linux/ppc64: Remove assumption on contents of r11 in closure

diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c
index 33f24b327b687291a10a9b3a22ef2aa47614d38a..b087af8c607b4812c1f6466db5603a0d5f01c45c 100644 (file)
--- a/src/powerpc/ffi_linux64.c
+++ b/src/powerpc/ffi_linux64.c
@@ -697,7 +697,8 @@ ffi_prep_closure_loc_linux64 (ffi_closure *closure,
 
   /* Copy function address and TOC from ffi_closure_LINUX64.  */
   memcpy (tramp, (char *) ffi_closure_LINUX64, 16);
-  tramp[2] = codeloc;
+  tramp[2] = tramp[1];
+  tramp[1] = codeloc;
 #endif
 
   closure->cif = cif;

diff --git a/src/powerpc/linux64_closure.S b/src/powerpc/linux64_closure.S
index 46a9ddfcd6b0129e9a17bf25b6934d25545fd008..bc61b5ed946bea5f1899d5481c38c0efe2142669 100644 (file)
--- a/src/powerpc/linux64_closure.S
+++ b/src/powerpc/linux64_closure.S
@@ -100,6 +100,10 @@ ffi_closure_LINUX64:
        # load up the pointer to the parm save area
        mr      %r5, %r12
 # else
+       # copy r2 to r11 and load TOC into r2
+       mr      %r11, %r2
+       ld      %r2, 16(%r11)
+
        mflr    %r0
        # Save general regs into parm save area
        # This is the parameter save area set up by our caller.