From dfadfb19853c57c8623c436d0ef2bdafab24b433 Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Wed, 31 Oct 2012 06:46:41 -0400 Subject: [PATCH] Rebase for ppc64 fix --- .pc/aarch64/ChangeLog | 5 + .pc/aix-fix/ChangeLog | 5 + .pc/apple-fixes/ChangeLog | 5 + .pc/bfin/ChangeLog | 5 + .pc/darwin-missing-semi/ChangeLog | 5 + .pc/darwin12/ChangeLog | 5 + .pc/dist-tests/ChangeLog | 5 + .pc/emutramp/ChangeLog | 5 + .pc/emutramp/fficonfig.h.in | 196 ---------------------------- .pc/icc128/ChangeLog | 5 + .pc/ios-fix/ChangeLog | 5 + .pc/mint/ChangeLog | 5 + .pc/msvc-changes/ChangeLog | 5 + .pc/tile/ChangeLog | 5 + .pc/update-disty/ChangeLog | 5 + .pc/vararg_float_test_fix/ChangeLog | 5 + .pc/vfp-eabi/ChangeLog | 5 + .pc/whitespace-fix/ChangeLog | 5 + .pc/win32-return-sign/ChangeLog | 5 + .pc/win32/ChangeLog | 5 + .pc/win32_tests/ChangeLog | 5 + .pc/x32libtool/ChangeLog | 5 + .pc/xcode-improvements/ChangeLog | 5 + .pc/xcode/ChangeLog | 5 + ChangeLog | 5 + patches/aarch64 | 5 +- patches/aix-fix | 2 +- patches/apple-fixes | 2 +- patches/bfin | 2 +- patches/darwin-missing-semi | 2 +- patches/darwin12 | 5 +- patches/dist-tests | 2 +- patches/emutramp | 5 +- patches/icc128 | 2 +- patches/ios-fix | 2 +- patches/mint | 4 +- patches/msvc-changes | 4 +- patches/tile | 5 +- patches/update-disty | 2 +- patches/vararg_float_test_fix | 2 +- patches/vfp-eabi | 2 +- patches/whitespace-fix | 5 +- patches/win32 | 2 +- patches/win32-return-sign | 2 +- patches/win32_tests | 2 +- patches/x32libtool | 2 +- patches/xcode | 2 +- patches/xcode-improvements | 2 +- src/powerpc/linux64.S | 21 ++- src/powerpc/linux64_closure.S | 20 ++- 50 files changed, 197 insertions(+), 225 deletions(-) delete mode 100644 .pc/emutramp/fficonfig.h.in diff --git a/.pc/aarch64/ChangeLog b/.pc/aarch64/ChangeLog index 596609cf..51ac025f 100644 --- a/.pc/aarch64/ChangeLog +++ b/.pc/aarch64/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-10-12 Walter Lee * Makefile.am: Add TILE-Gx/TILEPro support. diff --git a/.pc/aix-fix/ChangeLog b/.pc/aix-fix/ChangeLog index 9d31a064..56d77254 100644 --- a/.pc/aix-fix/ChangeLog +++ b/.pc/aix-fix/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/apple-fixes/ChangeLog b/.pc/apple-fixes/ChangeLog index 54d1e6c8..08a516d5 100644 --- a/.pc/apple-fixes/ChangeLog +++ b/.pc/apple-fixes/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/bfin/ChangeLog b/.pc/bfin/ChangeLog index 7a57f0b3..84d15806 100644 --- a/.pc/bfin/ChangeLog +++ b/.pc/bfin/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/darwin-missing-semi/ChangeLog b/.pc/darwin-missing-semi/ChangeLog index 27bc6803..d6c8f025 100644 --- a/.pc/darwin-missing-semi/ChangeLog +++ b/.pc/darwin-missing-semi/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/darwin12/ChangeLog b/.pc/darwin12/ChangeLog index 3c972c10..f1624db5 100644 --- a/.pc/darwin12/ChangeLog +++ b/.pc/darwin12/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-10-30 James Greenhalgh Marcus Shawcroft diff --git a/.pc/dist-tests/ChangeLog b/.pc/dist-tests/ChangeLog index 3103d482..f35bba3e 100644 --- a/.pc/dist-tests/ChangeLog +++ b/.pc/dist-tests/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/emutramp/ChangeLog b/.pc/emutramp/ChangeLog index 56464841..fcb7c97c 100644 --- a/.pc/emutramp/ChangeLog +++ b/.pc/emutramp/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-10-30 Frederick Cheung * configure.ac: Enable FFI_MAP_EXEC_WRIT for Darwin 12 (mountain diff --git a/.pc/emutramp/fficonfig.h.in b/.pc/emutramp/fficonfig.h.in deleted file mode 100644 index b54b273f..00000000 --- a/.pc/emutramp/fficonfig.h.in +++ /dev/null @@ -1,196 +0,0 @@ -/* fficonfig.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define to 1 if using `alloca.c'. */ -#undef C_ALLOCA - -/* Define to the flags needed for the .section .eh_frame directive. */ -#undef EH_FRAME_FLAGS - -/* Define this if you want extra debugging. */ -#undef FFI_DEBUG - -/* Cannot use PROT_EXEC on this target, so, we revert to alternative means */ -#undef FFI_EXEC_TRAMPOLINE_TABLE - -/* Cannot use malloc on this target, so, we revert to alternative means */ -#undef FFI_MMAP_EXEC_WRIT - -/* Define this is you do not want support for the raw API. */ -#undef FFI_NO_RAW_API - -/* Define this is you do not want support for aggregate types. */ -#undef FFI_NO_STRUCTS - -/* Define to 1 if you have `alloca', as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -#undef HAVE_ALLOCA_H - -/* Define if your assembler supports .ascii. */ -#undef HAVE_AS_ASCII_PSEUDO_OP - -/* Define if your assembler supports .cfi_* directives. */ -#undef HAVE_AS_CFI_PSEUDO_OP - -/* Define if your assembler supports .register. */ -#undef HAVE_AS_REGISTER_PSEUDO_OP - -/* Define if your assembler and linker support unaligned PC relative relocs. - */ -#undef HAVE_AS_SPARC_UA_PCREL - -/* Define if your assembler supports .string. */ -#undef HAVE_AS_STRING_PSEUDO_OP - -/* Define if your assembler supports unwind section type. */ -#undef HAVE_AS_X86_64_UNWIND_SECTION_TYPE - -/* Define if your assembler supports PC relative relocs. */ -#undef HAVE_AS_X86_PCREL - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define if __attribute__((visibility("hidden"))) is supported. */ -#undef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define if you have the long double type and it is bigger than a double */ -#undef HAVE_LONG_DOUBLE - -/* Define to 1 if you have the `memcpy' function. */ -#undef HAVE_MEMCPY - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `mmap' function. */ -#undef HAVE_MMAP - -/* Define if mmap with MAP_ANON(YMOUS) works. */ -#undef HAVE_MMAP_ANON - -/* Define if mmap of /dev/zero works. */ -#undef HAVE_MMAP_DEV_ZERO - -/* Define if read-only mmap of a plain file works. */ -#undef HAVE_MMAP_FILE - -/* Define if .eh_frame sections should be read-only. */ -#undef HAVE_RO_EH_FRAME - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_MMAN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* The size of `double', as computed by sizeof. */ -#undef SIZEOF_DOUBLE - -/* The size of `long double', as computed by sizeof. */ -#undef SIZEOF_LONG_DOUBLE - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#undef STACK_DIRECTION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define this if you are using Purify and want to suppress spurious messages. - */ -#undef USING_PURIFY - -/* Version number of package */ -#undef VERSION - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif - - -#ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE -#ifdef LIBFFI_ASM -#define FFI_HIDDEN(name) .hidden name -#else -#define FFI_HIDDEN __attribute__ ((visibility ("hidden"))) -#endif -#else -#ifdef LIBFFI_ASM -#define FFI_HIDDEN(name) -#else -#define FFI_HIDDEN -#endif -#endif - diff --git a/.pc/icc128/ChangeLog b/.pc/icc128/ChangeLog index af657c69..9ff9d6f0 100644 --- a/.pc/icc128/ChangeLog +++ b/.pc/icc128/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/ios-fix/ChangeLog b/.pc/ios-fix/ChangeLog index 1209bcb2..1ac51587 100644 --- a/.pc/ios-fix/ChangeLog +++ b/.pc/ios-fix/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/mint/ChangeLog b/.pc/mint/ChangeLog index ef326b2a..7fabdab8 100644 --- a/.pc/mint/ChangeLog +++ b/.pc/mint/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/msvc-changes/ChangeLog b/.pc/msvc-changes/ChangeLog index 12a4ff2d..56ce4805 100644 --- a/.pc/msvc-changes/ChangeLog +++ b/.pc/msvc-changes/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/tile/ChangeLog b/.pc/tile/ChangeLog index e3535bdd..96b0952a 100644 --- a/.pc/tile/ChangeLog +++ b/.pc/tile/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-10-12 Matthias Klose * generate-osx-source-and-headers.py: Normalize whitespace. diff --git a/.pc/update-disty/ChangeLog b/.pc/update-disty/ChangeLog index 329e7edd..ad74009b 100644 --- a/.pc/update-disty/ChangeLog +++ b/.pc/update-disty/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/vararg_float_test_fix/ChangeLog b/.pc/vararg_float_test_fix/ChangeLog index b58ca5a5..76c469f3 100644 --- a/.pc/vararg_float_test_fix/ChangeLog +++ b/.pc/vararg_float_test_fix/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/vfp-eabi/ChangeLog b/.pc/vfp-eabi/ChangeLog index 0033179b..5e8f8929 100644 --- a/.pc/vfp-eabi/ChangeLog +++ b/.pc/vfp-eabi/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/whitespace-fix/ChangeLog b/.pc/whitespace-fix/ChangeLog index 6984b0a8..2d7d98a2 100644 --- a/.pc/whitespace-fix/ChangeLog +++ b/.pc/whitespace-fix/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/win32-return-sign/ChangeLog b/.pc/win32-return-sign/ChangeLog index f68982b0..4e4fd7a1 100644 --- a/.pc/win32-return-sign/ChangeLog +++ b/.pc/win32-return-sign/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/win32/ChangeLog b/.pc/win32/ChangeLog index 9b188bfb..1f682179 100644 --- a/.pc/win32/ChangeLog +++ b/.pc/win32/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/win32_tests/ChangeLog b/.pc/win32_tests/ChangeLog index 00161a0d..2008d86a 100644 --- a/.pc/win32_tests/ChangeLog +++ b/.pc/win32_tests/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/x32libtool/ChangeLog b/.pc/x32libtool/ChangeLog index e0e3f975..f93ca072 100644 --- a/.pc/x32libtool/ChangeLog +++ b/.pc/x32libtool/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/xcode-improvements/ChangeLog b/.pc/xcode-improvements/ChangeLog index 8087dfc5..98b1864d 100644 --- a/.pc/xcode-improvements/ChangeLog +++ b/.pc/xcode-improvements/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/.pc/xcode/ChangeLog b/.pc/xcode/ChangeLog index 29c74023..0c60f669 100644 --- a/.pc/xcode/ChangeLog +++ b/.pc/xcode/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-09-14 David Edelsohn * configure: Regenerated. diff --git a/ChangeLog b/ChangeLog index 176b51bd..ccbd9eec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-10-31 Alan Modra + + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + 2012-10-30 Magnus Granberg Pavel Labushev diff --git a/patches/aarch64 b/patches/aarch64 index daada517..50d0ba7f 100644 --- a/patches/aarch64 +++ b/patches/aarch64 @@ -2596,7 +2596,10 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -1,3 +1,27 @@ +@@ -3,6 +3,30 @@ + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + +2012-10-30 James Greenhalgh + Marcus Shawcroft + diff --git a/patches/aix-fix b/patches/aix-fix index 4659597b..7f2a090d 100644 --- a/patches/aix-fix +++ b/patches/aix-fix @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -32,6 +32,11 @@ +@@ -37,6 +37,11 @@ (ffi_call): Silence possibly undefined warning. (ffi_closure_helper_SYSV): Declare variable type. diff --git a/patches/apple-fixes b/patches/apple-fixes index ac936de3..eff6b601 100644 --- a/patches/apple-fixes +++ b/patches/apple-fixes @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,13 @@ +@@ -29,6 +29,13 @@ * configure: Regenerated. diff --git a/patches/bfin b/patches/bfin index 1b573be2..3c5f3ace 100644 --- a/patches/bfin +++ b/patches/bfin @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,13 @@ +@@ -29,6 +29,13 @@ * configure: Regenerated. diff --git a/patches/darwin-missing-semi b/patches/darwin-missing-semi index 471947e3..c043af5d 100644 --- a/patches/darwin-missing-semi +++ b/patches/darwin-missing-semi @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,10 @@ +@@ -29,6 +29,10 @@ * configure: Regenerated. diff --git a/patches/darwin12 b/patches/darwin12 index aadc1e71..7655733e 100644 --- a/patches/darwin12 +++ b/patches/darwin12 @@ -2,7 +2,10 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -1,3 +1,9 @@ +@@ -3,6 +3,12 @@ + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + +2012-10-30 Frederick Cheung + + * configure.ac: Enable FFI_MAP_EXEC_WRIT for Darwin 12 (mountain diff --git a/patches/dist-tests b/patches/dist-tests index f7bd9974..0acf85ee 100644 --- a/patches/dist-tests +++ b/patches/dist-tests @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,11 @@ +@@ -29,6 +29,11 @@ * configure: Regenerated. diff --git a/patches/emutramp b/patches/emutramp index c9dc8346..6203a4bb 100644 --- a/patches/emutramp +++ b/patches/emutramp @@ -2,7 +2,10 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -1,3 +1,11 @@ +@@ -3,6 +3,14 @@ + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + +2012-10-30 Magnus Granberg + Pavel Labushev + diff --git a/patches/icc128 b/patches/icc128 index 5c2bda78..05980c7f 100644 --- a/patches/icc128 +++ b/patches/icc128 @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -26,6 +26,11 @@ +@@ -31,6 +31,11 @@ 2012-04-06 Anthony Green diff --git a/patches/ios-fix b/patches/ios-fix index 5aaa183b..02aadef0 100644 --- a/patches/ios-fix +++ b/patches/ios-fix @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,11 @@ +@@ -29,6 +29,11 @@ * configure: Regenerated. diff --git a/patches/mint b/patches/mint index 42a02bcf..85cf859a 100644 --- a/patches/mint +++ b/patches/mint @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,16 @@ +@@ -29,6 +29,16 @@ * configure: Regenerated. @@ -19,7 +19,7 @@ Index: libffi/ChangeLog 2012-04-02 Peter Bergner * src/powerpc/ffi.c (ffi_prep_args_SYSV): Declare double_tmp. -@@ -32,11 +42,6 @@ +@@ -37,11 +47,6 @@ (ffi_call): Silence possibly undefined warning. (ffi_closure_helper_SYSV): Declare variable type. diff --git a/patches/msvc-changes b/patches/msvc-changes index 7d397629..f59bcf4f 100644 --- a/patches/msvc-changes +++ b/patches/msvc-changes @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,143 @@ +@@ -29,6 +29,143 @@ * configure: Regenerated. @@ -163,7 +163,7 @@ Index: libffi/Makefile.in =================================================================== --- libffi.orig/Makefile.in +++ libffi/Makefile.in -@@ -530,7 +530,7 @@ libffi_convenience_la_SOURCES = $(libffi +@@ -543,7 +543,7 @@ libffi_convenience_la_SOURCES = $(libffi nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) AM_CFLAGS = -g $(am__append_29) libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) diff --git a/patches/tile b/patches/tile index 37210212..b433dd1e 100644 --- a/patches/tile +++ b/patches/tile @@ -2,7 +2,10 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -1,3 +1,15 @@ +@@ -3,6 +3,18 @@ + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + +2012-10-12 Walter Lee + + * Makefile.am: Add TILE-Gx/TILEPro support. diff --git a/patches/update-disty b/patches/update-disty index e4f6f43a..adcff3db 100644 --- a/patches/update-disty +++ b/patches/update-disty @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,11 @@ +@@ -29,6 +29,11 @@ * configure: Regenerated. diff --git a/patches/vararg_float_test_fix b/patches/vararg_float_test_fix index 4af0f235..adc63312 100644 --- a/patches/vararg_float_test_fix +++ b/patches/vararg_float_test_fix @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,12 @@ +@@ -29,6 +29,12 @@ * configure: Regenerated. diff --git a/patches/vfp-eabi b/patches/vfp-eabi index 5cb75432..e2db2808 100644 --- a/patches/vfp-eabi +++ b/patches/vfp-eabi @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -59,6 +59,14 @@ +@@ -64,6 +64,14 @@ * src/powerpc/ffi_darwin.c (ffi_prep_closure_loc): Fix AIX closure support. diff --git a/patches/whitespace-fix b/patches/whitespace-fix index f325b600..6a661c1c 100644 --- a/patches/whitespace-fix +++ b/patches/whitespace-fix @@ -2,7 +2,10 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -1,3 +1,7 @@ +@@ -3,6 +3,10 @@ + * src/powerpc/linux64_closure.S: Add new ABI support. + * src/powerpc/linux64.S: Likewise. + +2012-10-12 Matthias Klose + + * generate-osx-source-and-headers.py: Normalize whitespace. diff --git a/patches/win32 b/patches/win32 index b3bdcbdc..9a346e1a 100644 --- a/patches/win32 +++ b/patches/win32 @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,18 @@ +@@ -29,6 +29,18 @@ * configure: Regenerated. diff --git a/patches/win32-return-sign b/patches/win32-return-sign index 7814c55b..59f9ab61 100644 --- a/patches/win32-return-sign +++ b/patches/win32-return-sign @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -212,6 +212,14 @@ +@@ -217,6 +217,14 @@ (ffi_call): Silence possibly undefined warning. (ffi_closure_helper_SYSV): Declare variable type. diff --git a/patches/win32_tests b/patches/win32_tests index 87dad708..7b62a41b 100644 --- a/patches/win32_tests +++ b/patches/win32_tests @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,13 @@ +@@ -29,6 +29,13 @@ * configure: Regenerated. diff --git a/patches/x32libtool b/patches/x32libtool index dc844a6d..b9256b16 100644 --- a/patches/x32libtool +++ b/patches/x32libtool @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -29,6 +29,10 @@ +@@ -34,6 +34,10 @@ * src/x86/ffi64.c (UINT128): Define differently for Intel and GNU compilers, then use it. diff --git a/patches/xcode b/patches/xcode index 7d6070bc..1d3ac801 100644 --- a/patches/xcode +++ b/patches/xcode @@ -602,7 +602,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -26,6 +26,18 @@ +@@ -31,6 +31,18 @@ 2012-04-06 Anthony Green diff --git a/patches/xcode-improvements b/patches/xcode-improvements index 43e0f226..2b643715 100644 --- a/patches/xcode-improvements +++ b/patches/xcode-improvements @@ -14,7 +14,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -24,6 +24,14 @@ +@@ -29,6 +29,14 @@ * configure: Regenerated. diff --git a/src/powerpc/linux64.S b/src/powerpc/linux64.S index 57b56cbb..f28da812 100644 --- a/src/powerpc/linux64.S +++ b/src/powerpc/linux64.S @@ -30,16 +30,25 @@ #include #ifdef __powerpc64__ - .hidden ffi_call_LINUX64, .ffi_call_LINUX64 - .globl ffi_call_LINUX64, .ffi_call_LINUX64 + .hidden ffi_call_LINUX64 + .globl ffi_call_LINUX64 .section ".opd","aw" .align 3 ffi_call_LINUX64: +#ifdef _CALL_LINUX + .quad .L.ffi_call_LINUX64,.TOC.@tocbase,0 + .type ffi_call_LINUX64,@function + .text +.L.ffi_call_LINUX64: +#else + .hidden .ffi_call_LINUX64 + .globl .ffi_call_LINUX64 .quad .ffi_call_LINUX64,.TOC.@tocbase,0 .size ffi_call_LINUX64,24 .type .ffi_call_LINUX64,@function .text .ffi_call_LINUX64: +#endif .LFB1: mflr %r0 std %r28, -32(%r1) @@ -58,7 +67,11 @@ ffi_call_LINUX64: /* Call ffi_prep_args64. */ mr %r4, %r1 +#ifdef _CALL_LINUX + bl ffi_prep_args64 +#else bl .ffi_prep_args64 +#endif ld %r0, 0(%r29) ld %r2, 8(%r29) @@ -137,7 +150,11 @@ ffi_call_LINUX64: .LFE1: .long 0 .byte 0,12,0,1,128,4,0,0 +#ifdef _CALL_LINUX + .size ffi_call_LINUX64,.-.L.ffi_call_LINUX64 +#else .size .ffi_call_LINUX64,.-.ffi_call_LINUX64 +#endif .section .eh_frame,EH_FRAME_FLAGS,@progbits .Lframe1: diff --git a/src/powerpc/linux64_closure.S b/src/powerpc/linux64_closure.S index f7aa2c98..b1e12197 100644 --- a/src/powerpc/linux64_closure.S +++ b/src/powerpc/linux64_closure.S @@ -32,16 +32,24 @@ #ifdef __powerpc64__ FFI_HIDDEN (ffi_closure_LINUX64) - FFI_HIDDEN (.ffi_closure_LINUX64) - .globl ffi_closure_LINUX64, .ffi_closure_LINUX64 + .globl ffi_closure_LINUX64 .section ".opd","aw" .align 3 ffi_closure_LINUX64: +#ifdef _CALL_LINUX + .quad .L.ffi_closure_LINUX64,.TOC.@tocbase,0 + .type ffi_closure_LINUX64,@function + .text +.L.ffi_closure_LINUX64: +#else + FFI_HIDDEN (.ffi_closure_LINUX64) + .globl .ffi_closure_LINUX64 .quad .ffi_closure_LINUX64,.TOC.@tocbase,0 .size ffi_closure_LINUX64,24 .type .ffi_closure_LINUX64,@function .text .ffi_closure_LINUX64: +#endif .LFB1: # save general regs into parm save area std %r3, 48(%r1) @@ -91,7 +99,11 @@ ffi_closure_LINUX64: addi %r6, %r1, 128 # make the call +#ifdef _CALL_LINUX + bl ffi_closure_helper_LINUX64 +#else bl .ffi_closure_helper_LINUX64 +#endif .Lret: # now r3 contains the return type @@ -194,7 +206,11 @@ ffi_closure_LINUX64: .LFE1: .long 0 .byte 0,12,0,1,128,0,0,0 +#ifdef _CALL_LINUX + .size ffi_closure_LINUX64,.-.L.ffi_closure_LINUX64 +#else .size .ffi_closure_LINUX64,.-.ffi_closure_LINUX64 +#endif .section .eh_frame,EH_FRAME_FLAGS,@progbits .Lframe1: