Rebase from GCC

atgreen · Jan 12, 2010 · 7b7a42f · 7b7a42f
1 parent 4b18d1f
commit 7b7a42f
Show file tree

Hide file tree

Showing 47 changed files with 230 additions and 142 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,21 @@
+2010-01-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR libffi/40701
+	* testsuite/libffi.call/ffitest.h [__alpha__ && __osf__] (PRIdLL,
+	PRIuLL, PRId64, PRIu64, PRIuPTR): Define.
+	* testsuite/libffi.call/cls_align_sint64.c: Add -Wno-format on
+	alpha*-dec-osf*.
+	* testsuite/libffi.call/cls_align_uint64.c: Likewise.
+	* testsuite/libffi.call/cls_ulonglong.c: Likewise.
+	* testsuite/libffi.call/return_ll1.c: Likewise.
+	* testsuite/libffi.call/stret_medium2.c: Likewise.
+	* testsuite/libffi.special/ffitestcxx.h (allocate_mmap): Cast
+	MAP_FAILED to char *.
+
+2010-01-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* src/mips/n32.S: Use .abicalls and .eh_frame with __GNUC__.
+
 2009-12-31  Anthony Green  <green@redhat.com>
 
 	* README: Update for libffi 3.0.9.

diff --git a/README b/README
@@ -43,7 +43,7 @@ Libffi has been ported to many different platforms.
 For specific configuration details and testing status, please
 refer to the wiki page here:
 
- http://www.moxielogic.org/wiki/index.php?title=Libffi_3.0.9
+ http://www.moxielogic.org/wiki/index.php?title=Libffi_3.0.10
 
 At the time of release, the following basic configurations have been
 tested:
@@ -52,6 +52,7 @@ tested:
 | Architecture | Operating System |
 |--------------+------------------|
 | Alpha        | Linux            |
+| Alpha        | Tru64            |
 | ARM          | Linux            |
 | AVR32        | Linux            |
 | HPPA         | HPUX             |
@@ -124,6 +125,10 @@ History
 
 See the ChangeLog files for details.
 
+3.0.10 ???-??-??
+        Fix the N64 build on mips-sgi-irix6.5.
+	Testsuite fixes for Tru64 Unix.
+
 3.0.9 Dec-31-09
         Add AVR32 and win64 ports.  Add ARM softfp support.
 	Many fixes for AIX, Solaris, HP-UX, *BSD.

diff --git a/doc/.svn/entries b/doc/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/doc
 svn+ssh://green@gcc.gnu.org/svn/gcc
 

diff --git a/doc/libffi.info b/doc/libffi.info
@@ -1,5 +1,5 @@
-This is doc/libffi.info, produced by makeinfo version 4.12 from
-./doc/libffi.texi.
+This is ../libffi/doc/libffi.info, produced by makeinfo version 4.13
+from ../libffi/doc/libffi.texi.
 
 This manual is for Libffi, a portable foreign-function interface
 library.
@@ -13,7 +13,7 @@ library.
      included in the section entitled "GNU General Public License".
 
 
-INFO-DIR-SECTION
+INFO-DIR-SECTION Development
 START-INFO-DIR-ENTRY
 * libffi: (libffi).             Portable foreign-function interface library.
 END-INFO-DIR-ENTRY
@@ -516,18 +516,18 @@ Index
 
 
 Tag Table:
-Node: Top670
-Node: Introduction1406
-Node: Using libffi3042
-Node: The Basics3477
-Node: Simple Example6084
-Node: Types7111
-Node: Primitive Types7394
-Node: Structures9214
-Node: Type Example10074
-Node: Multiple ABIs11297
-Node: The Closure API11668
-Node: Missing Features14588
-Node: Index15081
+Node: Top700
+Node: Introduction1436
+Node: Using libffi3072
+Node: The Basics3507
+Node: Simple Example6114
+Node: Types7141
+Node: Primitive Types7424
+Node: Structures9244
+Node: Type Example10104
+Node: Multiple ABIs11327
+Node: The Closure API11698
+Node: Missing Features14618
+Node: Index15111
 
 End Tag Table
diff --git a/fficonfig.h.in b/fficonfig.h.in
@@ -125,6 +125,9 @@
 /* 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
 

diff --git a/include/.svn/entries b/include/.svn/entries
@@ -1,14 +1,14 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/include
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
 
 
-2009-12-26T04:59:25.888276Z
-155470
+2009-12-31T17:44:32.724697Z
+155540
 green
 
 
@@ -62,7 +62,7 @@ green
 
 Makefile.in
 file
-155540
+
 
 
 

diff --git a/man/.svn/entries b/man/.svn/entries
@@ -1,14 +1,14 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/man
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
 
 
-2009-12-26T05:01:43.471937Z
-155471
+2009-12-31T17:44:32.724697Z
+155540
 green
 
 
@@ -62,7 +62,7 @@ green
 
 Makefile.in
 file
-155540
+
 
 
 

diff --git a/mdate-sh b/mdate-sh
diff --git a/patches/stand-alone b/patches/stand-alone
@@ -43662,14 +43662,42 @@ Index: libffi/README
  page for updates: <URL:http://sourceware.org/libffi/>.
 
 
-@@ -83,6 +80,7 @@ tested:
+@@ -46,7 +43,7 @@ Libffi has been ported to many different
+ For specific configuration details and testing status, please
+ refer to the wiki page here:
+
+- http://www.moxielogic.org/wiki/index.php?title=Libffi_3.0.9
++ http://www.moxielogic.org/wiki/index.php?title=Libffi_3.0.10
+
+ At the time of release, the following basic configurations have been
+ tested:
+@@ -55,6 +52,7 @@ tested:
+ | Architecture | Operating System |
+ |--------------+------------------|
+ | Alpha        | Linux            |
++| Alpha        | Tru64            |
+ | ARM          | Linux            |
+ | AVR32        | Linux            |
+ | HPPA         | HPUX             |
+@@ -83,6 +81,7 @@ tested:
  | X86-64       | FreeBSD          |
  | X86-64       | Linux            |
  | X86-64       | OpenBSD          |
 +| X86-64       | Windows/MingW    |
  |--------------+------------------|
 
  Please send additional platform test results to
+@@ -126,6 +125,10 @@ History
+
+ See the ChangeLog files for details.
+
++3.0.10 ???-??-??
++        Fix the N64 build on mips-sgi-irix6.5.
++	Testsuite fixes for Tru64 Unix.
++
+ 3.0.9 Dec-31-09
+         Add AVR32 and win64 ports.  Add ARM softfp support.
+ 	Many fixes for AIX, Solaris, HP-UX, *BSD.
 Index: libffi/testsuite/Makefile.am
 ===================================================================
 --- libffi.orig/testsuite/Makefile.am

diff --git a/src/.svn/entries b/src/.svn/entries
@@ -1,15 +1,15 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
 
 
-2009-12-28T18:19:18.861565Z
-155492
-dje
+2010-01-06T14:22:26.213598Z
+155674
+ro
 
 
 

diff --git a/src/alpha/.svn/entries b/src/alpha/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/alpha
 svn+ssh://green@gcc.gnu.org/svn/gcc
 

diff --git a/src/arm/.svn/entries b/src/arm/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/arm
 svn+ssh://green@gcc.gnu.org/svn/gcc
 

diff --git a/src/avr32/.svn/entries b/src/avr32/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/avr32
 svn+ssh://green@gcc.gnu.org/svn/gcc
 

diff --git a/src/cris/.svn/entries b/src/cris/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/cris
 svn+ssh://green@gcc.gnu.org/svn/gcc
 

diff --git a/src/frv/.svn/entries b/src/frv/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/frv
 svn+ssh://green@gcc.gnu.org/svn/gcc
 

diff --git a/src/ia64/.svn/entries b/src/ia64/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/ia64
 svn+ssh://green@gcc.gnu.org/svn/gcc
 

diff --git a/src/m32r/.svn/entries b/src/m32r/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/m32r
 svn+ssh://green@gcc.gnu.org/svn/gcc
 

diff --git a/src/m68k/.svn/entries b/src/m68k/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/m68k
 svn+ssh://green@gcc.gnu.org/svn/gcc
 

diff --git a/src/mips/.svn/entries b/src/mips/.svn/entries
@@ -1,15 +1,15 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/mips
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
 
 
-2009-12-26T04:59:25.888276Z
-155470
-green
+2010-01-06T14:22:26.213598Z
+155674
+ro
 
 
 
@@ -66,11 +66,11 @@ file
 
 
 
-2009-12-26T04:53:55.605975Z
-673e7f68577075b8b9f6a9da7fc13913
-2009-12-26T04:59:25.888276Z
-155470
-green
+2010-01-12T13:53:13.607017Z
+4c056027b348911ad47c503c6c3b3f17
+2010-01-06T14:22:26.213598Z
+155674
+ro
 
 
 
@@ -92,7 +92,7 @@ green
 
 
 
-14490
+14517
 
 o32.S
 file

diff --git a/src/mips/.svn/text-base/n32.S.svn-base b/src/mips/.svn/text-base/n32.S.svn-base
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------
-   n32.S - Copyright (c) 1996, 1998, 2005  Red Hat, Inc.
+   n32.S - Copyright (c) 1996, 1998, 2005, 2007, 2009, 2010  Red Hat, Inc.
 
    MIPS Foreign Function Interface 
 
@@ -40,7 +40,7 @@
 
 #define SIZEOF_FRAME	( 8 * FFI_SIZEOF_ARG )
 
-#ifdef linux
+#ifdef __GNUC__
 	.abicalls
 #endif
 	.text
@@ -529,7 +529,7 @@ cls_epilogue:
 .LFE2:	
 	.end	ffi_closure_N32
 
-#ifdef linux
+#ifdef __GNUC__
         .section        .eh_frame,"aw",@progbits
 .Lframe1:
         .4byte  .LECIE1-.LSCIE1		# length
@@ -586,6 +586,6 @@ cls_epilogue:
 	.uleb128 (SIZEOF_FRAME2 - RA_OFF2)/4
 	.align	EH_FRAME_ALIGN
 .LEFDE3:
-#endif /* linux */	
+#endif /* __GNUC__ */	
 
 #endif