Fix botched sparc patch. Update version.

diff --git a/ChangeLog b/ChangeLog
index bf2c1790bdce1c4aa34695b6a775d1360f4b7379..1b09d91143df5cca788d2b237efe52b487a77172 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-07  Anthony Green <green@moxielogic.com>
+
+       * src/sparc/v8.S (ffi_call_v8): Fix typo from last patch
+       (effectively hiding ffi_call_v8).
+
 2013-02-07  Anthony Green <green@moxielogic.com>
 
        * configure.ac: Update bug reporting address.

diff --git a/configure b/configure
index a94399aa1a89912450d49e05fd61c725fef0589c..2908c45aed67565e626ab00e70e64c813ec969e4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libffi 3.0.12-rc2.
+# Generated by GNU Autoconf 2.69 for libffi 3.0.12-rc3.
 #
 # Report bugs to <http://github.com/atgreen/libffi/issues>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libffi'
 PACKAGE_TARNAME='libffi'
-PACKAGE_VERSION='3.0.12-rc2'
-PACKAGE_STRING='libffi 3.0.12-rc2'
+PACKAGE_VERSION='3.0.12-rc3'
+PACKAGE_STRING='libffi 3.0.12-rc3'
 PACKAGE_BUGREPORT='http://github.com/atgreen/libffi/issues'
 PACKAGE_URL=''
 
@@ -1405,7 +1405,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libffi 3.0.12-rc2 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.12-rc3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libffi 3.0.12-rc2:";;
+     short | recursive ) echo "Configuration of libffi 3.0.12-rc3:";;
    esac
   cat <<\_ACEOF
 
@@ -1596,7 +1596,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libffi configure 3.0.12-rc2
+libffi configure 3.0.12-rc3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2202,7 +2202,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libffi $as_me 3.0.12-rc2, which was
+It was created by libffi $as_me 3.0.12-rc3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3245,7 +3245,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libffi'
- VERSION='3.0.12-rc2'
+ VERSION='3.0.12-rc3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15527,7 +15527,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libffi $as_me 3.0.12-rc2, which was
+This file was extended by libffi $as_me 3.0.12-rc3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15597,7 +15597,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libffi config.status 3.0.12-rc2
+libffi config.status 3.0.12-rc3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index acf13b2b97329b4b8b1ed18418bfb2a19dc67b4d..1d1eed2eba1910e290839ecd59fc261f751a1392 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure
 
 AC_PREREQ(2.68)
 
-AC_INIT([libffi], [3.0.12-rc2], [http://github.com/atgreen/libffi/issues])
+AC_INIT([libffi], [3.0.12-rc3], [http://github.com/atgreen/libffi/issues])
 AC_CONFIG_HEADERS([fficonfig.h])
 
 AC_CANONICAL_SYSTEM

diff --git a/doc/stamp-vti b/doc/stamp-vti
index a187361283ca12e238d80e7debd09df8cf07b45e..38f07d713b992b8e300ea696493aefb5729ff3b7 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 6 February 2013
 @set UPDATED-MONTH February 2013
-@set EDITION 3.0.12-rc1
-@set VERSION 3.0.12-rc1
+@set EDITION 3.0.12-rc2
+@set VERSION 3.0.12-rc2

diff --git a/doc/version.texi b/doc/version.texi
index a187361283ca12e238d80e7debd09df8cf07b45e..38f07d713b992b8e300ea696493aefb5729ff3b7 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 6 February 2013
 @set UPDATED-MONTH February 2013
-@set EDITION 3.0.12-rc1
-@set VERSION 3.0.12-rc1
+@set EDITION 3.0.12-rc2
+@set VERSION 3.0.12-rc2

diff --git a/src/sparc/v8.S b/src/sparc/v8.S
index 027c3638ef70382d2c12e1e5156ce2205a901b0c..4faf3bd3e2ffef94e70eda143694252d0655d5c4 100644 (file)
--- a/src/sparc/v8.S
+++ b/src/sparc/v8.S
@@ -33,7 +33,7 @@
 #define ARGS (64+4)            /* Offset of register area in frame */
 
 #ifndef __GNUC__       
-.text
+       .text
         .align 8
 .globl ffi_flush_icache
 .globl _ffi_flush_icache
@@ -54,12 +54,12 @@ _ffi_flush_icache:
        nop
 .ffi_flush_icache_end:
        .size   ffi_flush_icache,.ffi_flush_icache_end-ffi_flush_icache
+#endif
 
        .text
         .align 8
 .globl ffi_call_v8
 .globl _ffi_call_v8
-#endif
        
 ffi_call_v8:
 _ffi_call_v8: