kc3-lang/libffi

diff --git a/ChangeLog b/ChangeLog
index becf7d4..57e72b8 100644
--- 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
index ca5eb5d..8a03bf9 100644
--- 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
index 3467bb6..b34455b 100644
--- 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
index 87dee8a..7a8890e 100644
--- 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
index 5c12421..e03bbf9 100644
--- 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
index 940a8d1..268d9eb 100644
--- 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
index e9a7352..50231c3 100644
--- 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
old mode 100644
new mode 100755
diff --git a/patches/stand-alone b/patches/stand-alone
index 5ee06a9..d9cb162 100644
--- a/patches/stand-alone
+++ b/patches/stand-alone
@@ -43662,7 +43662,24 @@ 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          |
@@ -43670,6 +43687,17 @@ Index: libffi/README
  |--------------+------------------|
  
  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
index 9fe0cef..73d3ab0 100644
--- 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
index 4b9320d..718a35c 100644
--- 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
index 4d27602..98336cb 100644
--- 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
index 09260e3..dc6a653 100644
--- 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
index 22751cd..08e01ae 100644
--- 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
index ab444db..890d507 100644
--- 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
index 231654c..a551f3c 100644
--- 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
index d5a5a21..4dc3d23 100644
--- 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
index bfe6335..5279d2f 100644
--- 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
index 0bb6e00..2fb38f8 100644
--- 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
index 81e81bc..ae23094 100644
--- 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
diff --git a/src/mips/n32.S b/src/mips/n32.S
index 81e81bc..ae23094 100644
--- a/src/mips/n32.S
+++ b/src/mips/n32.S
@@ -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
diff --git a/src/pa/.svn/entries b/src/pa/.svn/entries
index f25231e..16b331a 100644
--- a/src/pa/.svn/entries
+++ b/src/pa/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/pa
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/powerpc/.svn/entries b/src/powerpc/.svn/entries
index d3bcaba..ede4ce9 100644
--- a/src/powerpc/.svn/entries
+++ b/src/powerpc/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/powerpc
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/s390/.svn/entries b/src/s390/.svn/entries
index c8d9ece..0606dc9 100644
--- a/src/s390/.svn/entries
+++ b/src/s390/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/s390
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/sh/.svn/entries b/src/sh/.svn/entries
index 72df275..7ab41a9 100644
--- a/src/sh/.svn/entries
+++ b/src/sh/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/sh
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/sh64/.svn/entries b/src/sh64/.svn/entries
index 1a84138..a7162e7 100644
--- a/src/sh64/.svn/entries
+++ b/src/sh64/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/sh64
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/sparc/.svn/entries b/src/sparc/.svn/entries
index a46b3cd..c1561ad 100644
--- a/src/sparc/.svn/entries
+++ b/src/sparc/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/sparc
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/src/x86/.svn/entries b/src/x86/.svn/entries
index 3348048..2209f66 100644
--- a/src/x86/.svn/entries
+++ b/src/x86/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/x86
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/testsuite/.svn/entries b/testsuite/.svn/entries
index 99b9fba..97aae8c 100644
--- a/testsuite/.svn/entries
+++ b/testsuite/.svn/entries
@@ -1,15 +1,15 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
 
 
-2009-12-15T23:55:56.203674Z
-155277
-danglin
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -28,7 +28,7 @@ danglin
 
 Makefile.in
 file
-155540
+
 
 
 
diff --git a/testsuite/config/.svn/entries b/testsuite/config/.svn/entries
index 77f61ac..07f9344 100644
--- a/testsuite/config/.svn/entries
+++ b/testsuite/config/.svn/entries
@@ -1,7 +1,7 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite/config
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
diff --git a/testsuite/lib/.svn/entries b/testsuite/lib/.svn/entries
index 53ccb4f..5a2d687 100644
--- a/testsuite/lib/.svn/entries
+++ b/testsuite/lib/.svn/entries
@@ -1,15 +1,15 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite/lib
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
 
 
-2009-07-11T06:10:49.813211Z
-149508
-rsandifo
+2010-01-01T12:32:24.799527Z
+155549
+green
 
 
 
@@ -28,7 +28,7 @@ rsandifo
 
 libffi-dg.exp
 file
-155549
+
 
 
 
diff --git a/testsuite/libffi.call/.svn/entries b/testsuite/libffi.call/.svn/entries
index 9557869..d05d934 100644
--- a/testsuite/libffi.call/.svn/entries
+++ b/testsuite/libffi.call/.svn/entries
@@ -1,15 +1,15 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite/libffi.call
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
 
 
-2009-12-15T23:55:56.203674Z
-155277
-danglin
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -96,7 +96,7 @@ aph
 
 stret_medium.c
 file
-155548
+
 
 
 
@@ -130,7 +130,7 @@ green
 
 cls_align_longdouble_split2.c
 file
-155548
+
 
 
 
@@ -708,7 +708,7 @@ aph
 
 cls_pointer.c
 file
-155548
+
 
 
 
@@ -882,11 +882,11 @@ file
 
 
 
-2009-12-20T06:01:57.937806Z
-1d647c48703602a6f43399507dea040b
-2009-06-16T10:15:31.432585Z
-148521
-aph
+2010-01-12T13:53:13.725804Z
+11ecc6aca1f00fa662a97100ae0415a3
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -908,7 +908,7 @@ aph
 
 
 
-2571
+2633
 
 many.c
 file
@@ -1048,7 +1048,7 @@ aph
 
 stret_large.c
 file
-155548
+
 
 
 
@@ -1252,7 +1252,7 @@ aph
 
 cls_align_longdouble_split.c
 file
-155548
+
 
 
 
@@ -1800,11 +1800,11 @@ file
 
 
 
-2009-12-20T06:01:57.943803Z
-4464c6fa615810685c3fa04a8f9be7a3
-2009-06-16T10:15:31.432585Z
-148521
-aph
+2010-01-12T13:53:13.727013Z
+675d8bc6e828c9d48fcea15ef768bba6
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -1826,7 +1826,7 @@ aph
 
 
 
-995
+1057
 
 cls_4byte.c
 file
@@ -1932,7 +1932,7 @@ aph
 
 cls_longdouble.c
 file
-155548
+
 
 
 
@@ -1966,7 +1966,7 @@ green
 
 huge_struct.c
 file
-155538
+
 
 
 
@@ -2136,7 +2136,7 @@ aph
 
 cls_double_va.c
 file
-155551
+
 
 
 
@@ -2238,7 +2238,7 @@ andreast
 
 cls_pointer_stack.c
 file
-155548
+
 
 
 
@@ -2986,7 +2986,7 @@ aph
 
 stret_large2.c
 file
-155548
+
 
 
 
@@ -3126,11 +3126,11 @@ file
 
 
 
-2009-12-20T06:01:57.951813Z
-0975f1a6228b3fa9cb4aa9ad0971df85
-2009-06-16T10:15:31.432585Z
-148521
-aph
+2010-01-12T13:53:13.744999Z
+94ddbe50a41192f72cce1a94e88f327f
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -3152,7 +3152,7 @@ aph
 
 
 
-2574
+2636
 
 cls_align_longdouble.c
 file
@@ -3228,11 +3228,11 @@ file
 
 
 
-2009-12-20T06:01:57.951813Z
-157a65bbf1f2ffea80bf4657214771cf
-2009-06-16T10:15:31.432585Z
-148521
-aph
+2010-01-12T13:53:13.746013Z
+e2793918ba20624ce732ad88c3d61093
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -3254,7 +3254,7 @@ aph
 
 
 
-1382
+1444
 
 return_ll.c
 file
@@ -3462,15 +3462,15 @@ aph
 
 ffitest.h
 file
-155550
 
 
 
-2010-01-01T12:32:57.612320Z
-91d3eace525dd3fdece89ebb069dd8a5
-2010-01-01T12:36:07.805985Z
-155550
-green
+
+2010-01-12T13:53:13.747013Z
+14775c89efa8ec6961cb5cc6e4e18b9c
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -3492,7 +3492,7 @@ green
 
 
 
-2171
+2447
 
 cls_16byte.c
 file
@@ -3632,7 +3632,7 @@ aph
 
 cls_longdouble_va.c
 file
-155551
+
 
 
 
@@ -3836,15 +3836,15 @@ aph
 
 stret_medium2.c
 file
-155548
 
 
 
-2009-12-31T17:54:32.267337Z
-db952271eda288e8fd1e9b7c2addf6ab
-2010-01-01T12:26:49.969276Z
-155548
-green
+
+2010-01-12T13:53:13.747013Z
+9e86da993ed48e9e5e4b8abd4cded2b2
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -3866,7 +3866,7 @@ green
 
 
 
-3827
+3889
 
 negint.c
 file
diff --git a/testsuite/libffi.call/.svn/text-base/cls_align_sint64.c.svn-base b/testsuite/libffi.call/.svn/text-base/cls_align_sint64.c.svn-base
index 2b15c98..31d53af 100644
--- a/testsuite/libffi.call/.svn/text-base/cls_align_sint64.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/cls_align_sint64.c.svn-base
@@ -5,6 +5,7 @@
    Originator:	<hos@tamanegi.org> 20031203	 */
 
 /* { dg-do run } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 
 typedef struct cls_struct_align {
diff --git a/testsuite/libffi.call/.svn/text-base/cls_align_uint64.c.svn-base b/testsuite/libffi.call/.svn/text-base/cls_align_uint64.c.svn-base
index 215584f..495c79f 100644
--- a/testsuite/libffi.call/.svn/text-base/cls_align_uint64.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/cls_align_uint64.c.svn-base
@@ -6,6 +6,7 @@
 
 
 /* { dg-do run } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 
 typedef struct cls_struct_align {
diff --git a/testsuite/libffi.call/.svn/text-base/cls_ulonglong.c.svn-base b/testsuite/libffi.call/.svn/text-base/cls_ulonglong.c.svn-base
index c3cf0d6..235ab44 100644
--- a/testsuite/libffi.call/.svn/text-base/cls_ulonglong.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/cls_ulonglong.c.svn-base
@@ -5,6 +5,7 @@
    Originator:	<andreast@gcc.gnu.org> 20030828	 */
 
 /* { dg-do run } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 
 static void cls_ret_ulonglong_fn(ffi_cif* cif __UNUSED__, void* resp,
diff --git a/testsuite/libffi.call/.svn/text-base/ffitest.h.svn-base b/testsuite/libffi.call/.svn/text-base/ffitest.h.svn-base
index 7b1c5ef..2cb9849 100644
--- a/testsuite/libffi.call/.svn/text-base/ffitest.h.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/ffitest.h.svn-base
@@ -60,6 +60,18 @@
 #define PRIuLL "llu"
 #endif
 
+/* Tru64 UNIX kludge.  */
+#if defined(__alpha__) && defined(__osf__)
+/* Tru64 UNIX V4.0 doesn't support %lld/%lld, but long is 64-bit.  */
+#undef PRIdLL
+#define PRIdLL "ld"
+#undef PRIuLL
+#define PRIuLL "lu"
+#define PRId64 "ld"
+#define PRIu64 "lu"
+#define PRIuPTR "lu"
+#endif
+
 /* PA HP-UX kludge.  */
 #if defined(__hppa__) && defined(__hpux__) && !defined(PRIuPTR)
 #define PRIuPTR "lu"
diff --git a/testsuite/libffi.call/.svn/text-base/return_ll1.c.svn-base b/testsuite/libffi.call/.svn/text-base/return_ll1.c.svn-base
index dad90c1..593e8a3 100644
--- a/testsuite/libffi.call/.svn/text-base/return_ll1.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/return_ll1.c.svn-base
@@ -5,6 +5,7 @@
    Originator:	<andreast@gcc.gnu.org> 20050222  */
 
 /* { dg-do run } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 static long long return_ll(int ll0, long long ll1, int ll2)
 {
diff --git a/testsuite/libffi.call/.svn/text-base/stret_medium2.c.svn-base b/testsuite/libffi.call/.svn/text-base/stret_medium2.c.svn-base
index 1692c2d..cb2f2fb 100644
--- a/testsuite/libffi.call/.svn/text-base/stret_medium2.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/stret_medium2.c.svn-base
@@ -7,6 +7,7 @@
    Originator:	Blake Chaffin	6/21/2007	*/
 
 /* { dg-do run { xfail strongarm*-*-* xscale*-*-*  } } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 
 typedef struct struct_72byte {
diff --git a/testsuite/libffi.call/cls_align_sint64.c b/testsuite/libffi.call/cls_align_sint64.c
index 2b15c98..31d53af 100644
--- a/testsuite/libffi.call/cls_align_sint64.c
+++ b/testsuite/libffi.call/cls_align_sint64.c
@@ -5,6 +5,7 @@
    Originator:	<hos@tamanegi.org> 20031203	 */
 
 /* { dg-do run } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 
 typedef struct cls_struct_align {
diff --git a/testsuite/libffi.call/cls_align_uint64.c b/testsuite/libffi.call/cls_align_uint64.c
index 215584f..495c79f 100644
--- a/testsuite/libffi.call/cls_align_uint64.c
+++ b/testsuite/libffi.call/cls_align_uint64.c
@@ -6,6 +6,7 @@
 
 
 /* { dg-do run } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 
 typedef struct cls_struct_align {
diff --git a/testsuite/libffi.call/cls_ulonglong.c b/testsuite/libffi.call/cls_ulonglong.c
index c3cf0d6..235ab44 100644
--- a/testsuite/libffi.call/cls_ulonglong.c
+++ b/testsuite/libffi.call/cls_ulonglong.c
@@ -5,6 +5,7 @@
    Originator:	<andreast@gcc.gnu.org> 20030828	 */
 
 /* { dg-do run } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 
 static void cls_ret_ulonglong_fn(ffi_cif* cif __UNUSED__, void* resp,
diff --git a/testsuite/libffi.call/ffitest.h b/testsuite/libffi.call/ffitest.h
index 7b1c5ef..2cb9849 100644
--- a/testsuite/libffi.call/ffitest.h
+++ b/testsuite/libffi.call/ffitest.h
@@ -60,6 +60,18 @@
 #define PRIuLL "llu"
 #endif
 
+/* Tru64 UNIX kludge.  */
+#if defined(__alpha__) && defined(__osf__)
+/* Tru64 UNIX V4.0 doesn't support %lld/%lld, but long is 64-bit.  */
+#undef PRIdLL
+#define PRIdLL "ld"
+#undef PRIuLL
+#define PRIuLL "lu"
+#define PRId64 "ld"
+#define PRIu64 "lu"
+#define PRIuPTR "lu"
+#endif
+
 /* PA HP-UX kludge.  */
 #if defined(__hppa__) && defined(__hpux__) && !defined(PRIuPTR)
 #define PRIuPTR "lu"
diff --git a/testsuite/libffi.call/return_ll1.c b/testsuite/libffi.call/return_ll1.c
index dad90c1..593e8a3 100644
--- a/testsuite/libffi.call/return_ll1.c
+++ b/testsuite/libffi.call/return_ll1.c
@@ -5,6 +5,7 @@
    Originator:	<andreast@gcc.gnu.org> 20050222  */
 
 /* { dg-do run } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 static long long return_ll(int ll0, long long ll1, int ll2)
 {
diff --git a/testsuite/libffi.call/stret_medium2.c b/testsuite/libffi.call/stret_medium2.c
index 1692c2d..cb2f2fb 100644
--- a/testsuite/libffi.call/stret_medium2.c
+++ b/testsuite/libffi.call/stret_medium2.c
@@ -7,6 +7,7 @@
    Originator:	Blake Chaffin	6/21/2007	*/
 
 /* { dg-do run { xfail strongarm*-*-* xscale*-*-*  } } */
+/* { dg-options "-Wno-format" { target alpha*-dec-osf* } } */
 #include "ffitest.h"
 
 typedef struct struct_72byte {
diff --git a/testsuite/libffi.special/.svn/entries b/testsuite/libffi.special/.svn/entries
index 0cab844..3436b9f 100644
--- a/testsuite/libffi.special/.svn/entries
+++ b/testsuite/libffi.special/.svn/entries
@@ -1,15 +1,15 @@
 10
 
 dir
-155537
+155837
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite/libffi.special
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
 
 
-2009-06-16T10:15:31.432585Z
-148521
-aph
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -62,7 +62,7 @@ daney
 
 unwindtest.cc
 file
-155550
+
 
 
 
@@ -130,15 +130,15 @@ jakub
 
 ffitestcxx.h
 file
-155540
 
 
 
-2009-12-31T17:36:45.977318Z
-c6b374a7b78e1a90bd6e5d1386c4d57a
-2009-12-31T17:44:32.724697Z
-155540
-green
+
+2010-01-12T13:53:13.773035Z
+d47c79b281339983862a8e52d8c73f0f
+2010-01-07T20:35:33.358709Z
+155710
+ro
 
 
 
@@ -160,5 +160,5 @@ green
 
 
 
-1722
+1731
 
diff --git a/testsuite/libffi.special/.svn/text-base/ffitestcxx.h.svn-base b/testsuite/libffi.special/.svn/text-base/ffitestcxx.h.svn-base
index e300cce..83f5442 100644
--- a/testsuite/libffi.special/.svn/text-base/ffitestcxx.h.svn-base
+++ b/testsuite/libffi.special/.svn/text-base/ffitestcxx.h.svn-base
@@ -84,7 +84,7 @@ allocate_mmap (size_t size)
 	       MAP_PRIVATE, dev_zero_fd, 0);
 #endif
 
-  if (page == MAP_FAILED)
+  if (page == (char *) MAP_FAILED)
     {
       perror ("virtual memory exhausted");
       exit (1);
diff --git a/testsuite/libffi.special/ffitestcxx.h b/testsuite/libffi.special/ffitestcxx.h
index e300cce..83f5442 100644
--- a/testsuite/libffi.special/ffitestcxx.h
+++ b/testsuite/libffi.special/ffitestcxx.h
@@ -84,7 +84,7 @@ allocate_mmap (size_t size)
 	       MAP_PRIVATE, dev_zero_fd, 0);
 #endif
 
-  if (page == MAP_FAILED)
+  if (page == (char *) MAP_FAILED)
     {
       perror ("virtual memory exhausted");
       exit (1);