Rebase for ppc64 fix

diff --git a/.pc/aarch64/ChangeLog b/.pc/aarch64/ChangeLog
index 596609cf95528051500c862c5294421a89e507b2..51ac025f55cd71f4ab6cf141dcba0065c9800873 100644 (file)
--- a/.pc/aarch64/ChangeLog
+++ b/.pc/aarch64/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-10-12  Walter Lee  <walt@tilera.com>
 
         * Makefile.am: Add TILE-Gx/TILEPro support.

diff --git a/.pc/aix-fix/ChangeLog b/.pc/aix-fix/ChangeLog
index 9d31a06493064235a640155e964e94f689d2aeb0..56d772542996e15d513b8e75d41986f63338249f 100644 (file)
--- a/.pc/aix-fix/ChangeLog
+++ b/.pc/aix-fix/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/apple-fixes/ChangeLog b/.pc/apple-fixes/ChangeLog
index 54d1e6c841dcf2153bbab59b147b4bdda2431a71..08a516d5ce6d432f616efcafe9c69f5469b12ba3 100644 (file)
--- a/.pc/apple-fixes/ChangeLog
+++ b/.pc/apple-fixes/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/bfin/ChangeLog b/.pc/bfin/ChangeLog
index 7a57f0b3ac784832277966649fb28acdee40e9b4..84d15806e2989677844f392b2260bb09983a38c7 100644 (file)
--- a/.pc/bfin/ChangeLog
+++ b/.pc/bfin/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/darwin-missing-semi/ChangeLog b/.pc/darwin-missing-semi/ChangeLog
index 27bc6803e838696fa01f3535e6817213ae0f5eaa..d6c8f0252f9fcaef2163ffccf94e46626762a8cd 100644 (file)
--- a/.pc/darwin-missing-semi/ChangeLog
+++ b/.pc/darwin-missing-semi/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/darwin12/ChangeLog b/.pc/darwin12/ChangeLog
index 3c972c103287e0a9b029406832bdb310caf28656..f1624db5471354dc688a1d3b311a480e2b37997c 100644 (file)
--- a/.pc/darwin12/ChangeLog
+++ b/.pc/darwin12/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-10-30  James Greenhalgh  <james.greenhalgh at arm.com>
             Marcus Shawcroft  <marcus.shawcroft at arm.com>
 

diff --git a/.pc/dist-tests/ChangeLog b/.pc/dist-tests/ChangeLog
index 3103d48212234bd41df1e3e8bdf28360c602f2db..f35bba3edaa510202a305691982f97a1b86d1348 100644 (file)
--- a/.pc/dist-tests/ChangeLog
+++ b/.pc/dist-tests/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/emutramp/ChangeLog b/.pc/emutramp/ChangeLog
index 564648413496a5569618a3c0f64a32125c7ae6e3..fcb7c97cefb8cfe352aa8b036eb8282b5e33d22a 100644 (file)
--- a/.pc/emutramp/ChangeLog
+++ b/.pc/emutramp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-10-30  Frederick Cheung  <frederick.cheung@gmail.com>
 
        * 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 (file)
index b54b273..0000000
--- 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 <alloca.h> 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 <dlfcn.h> 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 <inttypes.h> 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 <memory.h> 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 <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#undef HAVE_SYS_MMAN_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> 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 af657c697c9dc5eba78d197bd3f7ddf884b34f01..9ff9d6f0ba94633427fb4eb8d928b965eb9fb704 100644 (file)
--- a/.pc/icc128/ChangeLog
+++ b/.pc/icc128/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/ios-fix/ChangeLog b/.pc/ios-fix/ChangeLog
index 1209bcb276e84dae85b17a9527fb4bb33be5f539..1ac515872e484c1a37b2d4b144353c7099ec6f45 100644 (file)
--- a/.pc/ios-fix/ChangeLog
+++ b/.pc/ios-fix/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/mint/ChangeLog b/.pc/mint/ChangeLog
index ef326b2a6b5b5007be6ed9e653161d524953ef1f..7fabdab88f2f1646b6e2042eb8071091323e23c0 100644 (file)
--- a/.pc/mint/ChangeLog
+++ b/.pc/mint/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/msvc-changes/ChangeLog b/.pc/msvc-changes/ChangeLog
index 12a4ff2d986eadde5e712c27c98afa8ae68b9545..56ce480513e545ebb06a628823341f04d8d136a9 100644 (file)
--- a/.pc/msvc-changes/ChangeLog
+++ b/.pc/msvc-changes/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/tile/ChangeLog b/.pc/tile/ChangeLog
index e3535bdda2d7a1cf7aa99af5946fde0c4486e927..96b0952a22babff339136a8e9272aca47302c2a7 100644 (file)
--- a/.pc/tile/ChangeLog
+++ b/.pc/tile/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-10-12  Matthias Klose  <doko@ubuntu.com>
 
        * generate-osx-source-and-headers.py: Normalize whitespace.

diff --git a/.pc/update-disty/ChangeLog b/.pc/update-disty/ChangeLog
index 329e7eddab19d184ef03c3b944908c6b8454a06d..ad74009b9395276377bdb4dd382969f8d446f7e5 100644 (file)
--- a/.pc/update-disty/ChangeLog
+++ b/.pc/update-disty/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/vararg_float_test_fix/ChangeLog b/.pc/vararg_float_test_fix/ChangeLog
index b58ca5a55e9513f9e22bf130af3455b72a7f0440..76c469f37eb8384e8705692b2457cf8b1afabc41 100644 (file)
--- a/.pc/vararg_float_test_fix/ChangeLog
+++ b/.pc/vararg_float_test_fix/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/vfp-eabi/ChangeLog b/.pc/vfp-eabi/ChangeLog
index 0033179b3dc75d07cf2fc6048ea2ea85b0988f54..5e8f892995080ad0ad50e7459c60501bdef3332f 100644 (file)
--- a/.pc/vfp-eabi/ChangeLog
+++ b/.pc/vfp-eabi/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/whitespace-fix/ChangeLog b/.pc/whitespace-fix/ChangeLog
index 6984b0a8884918d0ae168bf1aa8f4d6033c4f031..2d7d98a2cb4449a042cfc2a4f327f4f27bd34d85 100644 (file)
--- a/.pc/whitespace-fix/ChangeLog
+++ b/.pc/whitespace-fix/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/win32-return-sign/ChangeLog b/.pc/win32-return-sign/ChangeLog
index f68982b0ab0db5af8544cd45c529458c43dfbab6..4e4fd7a127b22254d5dde0cc25ccf5229499fed4 100644 (file)
--- a/.pc/win32-return-sign/ChangeLog
+++ b/.pc/win32-return-sign/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/win32/ChangeLog b/.pc/win32/ChangeLog
index 9b188bfbd822d0ae8a6505642174602263bdcc09..1f68217997bdaf7379e6f00e71a5d9e8418a2983 100644 (file)
--- a/.pc/win32/ChangeLog
+++ b/.pc/win32/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/win32_tests/ChangeLog b/.pc/win32_tests/ChangeLog
index 00161a0de9097248eb2ca62a010a7ada7977958b..2008d86a491e05b437d0cc6921b5ab26e7e17d44 100644 (file)
--- a/.pc/win32_tests/ChangeLog
+++ b/.pc/win32_tests/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/x32libtool/ChangeLog b/.pc/x32libtool/ChangeLog
index e0e3f975250ae9458f0e1d13b3d76cfa8ab79310..f93ca07278ee96e4a44e24514e9c68077529ebd0 100644 (file)
--- a/.pc/x32libtool/ChangeLog
+++ b/.pc/x32libtool/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/xcode-improvements/ChangeLog b/.pc/xcode-improvements/ChangeLog
index 8087dfc5564a45b75ae6c0e5b84b25e80bf1b26b..98b1864d89de178a02c900bcd4375e86b0c0330b 100644 (file)
--- a/.pc/xcode-improvements/ChangeLog
+++ b/.pc/xcode-improvements/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/.pc/xcode/ChangeLog b/.pc/xcode/ChangeLog
index 29c740234ed12829d9705936cd0a633be7b922ff..0c60f6692d99b88811dcd25350bf322a2e4faa9c 100644 (file)
--- a/.pc/xcode/ChangeLog
+++ b/.pc/xcode/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerated.

diff --git a/ChangeLog b/ChangeLog
index 176b51bd86b91875d17320302e4d8435a3fa0b12..ccbd9eecf0787ddc4b923c8d5ff8f638e10595e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31  Alan Modra  <amodra@gmail.com>
+
+       * src/powerpc/linux64_closure.S: Add new ABI support.
+       * src/powerpc/linux64.S: Likewise.
+
 2012-10-30  Magnus Granberg  <zorry@gentoo.org>
            Pavel Labushev  <pavel.labushev@runbox.ru>
 

diff --git a/patches/aarch64 b/patches/aarch64
index daada517df69c713c7283c2d4ec144cc7d7a0c4d..50d0ba7f36f77f5258acffef5984aafce3606163 100644 (file)
--- 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  <james.greenhalgh at arm.com>
 +            Marcus Shawcroft  <marcus.shawcroft at arm.com>
 +

diff --git a/patches/aix-fix b/patches/aix-fix
index 4659597b9687a68fe8c68b4af729cf9b71b307f0..7f2a090dec63634c0e770eb48c61ebf62378b775 100644 (file)
--- 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 ac936de372948abbbef56c5b6c09a4e276243d27..eff6b601ac2d487c20220ea8a91390e3e899393e 100644 (file)
--- 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 1b573be2f958f982fbe1087ea970a2e2be473414..3c5f3ace193347d242f525f907f79872e7f881c1 100644 (file)
--- 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 471947e317a972a69546a139de53727bb11967ef..c043af5dfbc66313b9133f065ece9e75a5d7688f 100644 (file)
--- 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 aadc1e7125edb262cbab67fd5ca627f6279f714e..7655733e1b345b6bb8d1b091c59f88bfea9ecf4a 100644 (file)
--- 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  <frederick.cheung@gmail.com>
 +
 +      * configure.ac: Enable FFI_MAP_EXEC_WRIT for Darwin 12 (mountain

diff --git a/patches/dist-tests b/patches/dist-tests
index f7bd9974910bd066b7929008c898db3650e62b43..0acf85ee62de561b82c9e3117d58bdd473397077 100644 (file)
--- 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 c9dc83464090a237651147d9c28f02c82425530b..6203a4bba02019f29546e6554a09b27a302f67ae 100644 (file)
--- 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  <zorry@gentoo.org>
 +          Pavel Labushev  <pavel.labushev@runbox.ru>
 +

diff --git a/patches/icc128 b/patches/icc128
index 5c2bda78a4ef94e73aea0f1e4a70037d77532ca6..05980c7faf2dac1779e524baddf4e518422e4496 100644 (file)
--- 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  <green@moxielogic.com>
  

diff --git a/patches/ios-fix b/patches/ios-fix
index 5aaa183b21d8a2a7f6dbd926d6cde4f731579045..02aadef0114296e040cff8ff35ba8bc66ba1d709 100644 (file)
--- 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 42a02bcfef0387c3cfa18be299e220a1a3bf8aca..85cf859a9f145c514b7c68db9aa36520f2b6dce6 100644 (file)
--- 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  <bergner@vnet.ibm.com>
  
        * 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 7d39762969bc5ccc004534c2423ed33a5869bb70..f59bcf4f077dd2b5390ab2ff7d68dce93b57d5db 100644 (file)
--- 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 3721021228a1f3c322aa4959f235996cb13477c1..b433dd1e8f0ceadd44af9c48a1292d49211e67e4 100644 (file)
--- 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  <walt@tilera.com>
 +
 +        * Makefile.am: Add TILE-Gx/TILEPro support.

diff --git a/patches/update-disty b/patches/update-disty
index e4f6f43a80ad3ed62d89ac7ba244706e85207fc1..adcff3db181315720338116eba4b5d33b2064ca3 100644 (file)
--- 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 4af0f235a7e489ebc76fa19f3a14c85751ec726a..adc633120bad66eb6f439a6586fc46c93e8a6831 100644 (file)
--- 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 5cb75432e0549f434ac0794107eb7c88737ee561..e2db2808117dd4cd6c5afa92561adcc4bf267aec 100644 (file)
--- 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 f325b600e4c4197f3c41482390a35c38ab839e44..6a661c1c3f10a7fad73084c50323afe4919c92a7 100644 (file)
--- 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  <doko@ubuntu.com>
 +
 +      * generate-osx-source-and-headers.py: Normalize whitespace.

diff --git a/patches/win32 b/patches/win32
index b3bdcbdca737578201cfa76c6d961aec9c8384b2..9a346e1aa3dce0244962b41ec44a140614b4d3f8 100644 (file)
--- 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 7814c55bd595038aac17d1325a15573f171859f3..59f9ab61961dbdcf0d67b4726f392756971a73d4 100644 (file)
--- 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 87dad7088963aeb2fe51212b798b9e66f6726025..7b62a41b7130c8f3d13ecbb9b054907e5711c84c 100644 (file)
--- 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 dc844a6d6c2287d5e070769eebe1e5f99576610f..b9256b16d17d862b8d4f3417f1805b3a0f5dc20a 100644 (file)
--- 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 7d6070bc6aba1224ebf10ce1f7cfb3c10b597271..1d3ac801a74c66a495474f90d20f751a5c9b60d1 100644 (file)
--- 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  <green@moxielogic.com>
  

diff --git a/patches/xcode-improvements b/patches/xcode-improvements
index 43e0f226c2cd6d2e63f3d86012277465b48b3b4b..2b64371543b1076e5a40b607936d876b80dd7feb 100644 (file)
--- 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 57b56cbb26618bbe9e018fbd36bf9a69aa63d2cc..f28da8120b7841ed3545fa0b09e1d4a849e3c691 100644 (file)
--- a/src/powerpc/linux64.S
+++ b/src/powerpc/linux64.S
@@ -30,16 +30,25 @@
 #include <ffi.h>
 
 #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 f7aa2c98efcd0d0aadb5c023899ab838a93550d0..b1e12197a2b2c5fe439f020dc63cfb57d72fc82b 100644 (file)
--- 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: