From 7316f4b7f070cc564f64c9a34d7fd2947823a328 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Wed, 1 Jun 2005 05:11:47 +0000 Subject: [PATCH] catching up with another libffi update svn: r36 --- src/foreign/gcc/libffi/ChangeLog | 6 ++++++ src/foreign/gcc/libffi/src/powerpc/darwin_closure.S | 1 + src/foreign/gcc/libffi/src/powerpc/ppc_closure.S | 2 +- src/foreign/gcc/libffi/src/powerpc/sysv.S | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/foreign/gcc/libffi/ChangeLog b/src/foreign/gcc/libffi/ChangeLog index d1f580e3c7..fb1e67b39f 100644 --- a/src/foreign/gcc/libffi/ChangeLog +++ b/src/foreign/gcc/libffi/ChangeLog @@ -1,3 +1,9 @@ +2005-06-01 Alan Modra + + * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Don't use JUMPTARGET + to call ffi_closure_helper_SYSV. Append @local instead. + * src/powerpc/sysv.S (ffi_call_SYSV): Likewise for ffi_prep_args_SYSV. + 2005-05-17 Kelley Cook * configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS. diff --git a/src/foreign/gcc/libffi/src/powerpc/darwin_closure.S b/src/foreign/gcc/libffi/src/powerpc/darwin_closure.S index 6d9a364095..eb910df96d 100644 --- a/src/foreign/gcc/libffi/src/powerpc/darwin_closure.S +++ b/src/foreign/gcc/libffi/src/powerpc/darwin_closure.S @@ -246,6 +246,7 @@ Lfinish: /* END(ffi_closure_ASM) */ .data +/* ELI: removed live_support attribute, doesn't work on current OSXs */ .section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms EH_frame1: .set L$set$0,LECIE1-LSCIE1 diff --git a/src/foreign/gcc/libffi/src/powerpc/ppc_closure.S b/src/foreign/gcc/libffi/src/powerpc/ppc_closure.S index ba13fa467e..c71a7ff3b3 100644 --- a/src/foreign/gcc/libffi/src/powerpc/ppc_closure.S +++ b/src/foreign/gcc/libffi/src/powerpc/ppc_closure.S @@ -57,7 +57,7 @@ ENTRY(ffi_closure_SYSV) addi %r7,%r1,152 # make the call - bl JUMPTARGET(ffi_closure_helper_SYSV) + bl ffi_closure_helper_SYSV@local # now r3 contains the return type # so use it to look up in a table diff --git a/src/foreign/gcc/libffi/src/powerpc/sysv.S b/src/foreign/gcc/libffi/src/powerpc/sysv.S index 1689d292d8..6d8b60155b 100644 --- a/src/foreign/gcc/libffi/src/powerpc/sysv.S +++ b/src/foreign/gcc/libffi/src/powerpc/sysv.S @@ -60,7 +60,7 @@ ENTRY(ffi_call_SYSV) /* Call ffi_prep_args_SYSV. */ mr %r4,%r1 - bl JUMPTARGET(ffi_prep_args_SYSV) + bl ffi_prep_args_SYSV@local /* Now do the call. */ /* Set up cr1 with bits 4-7 of the flags. */