Fix botched sparc patch. Update version.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163
diff --git a/ChangeLog b/ChangeLog
index bf2c179..1b09d91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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.
* configure.in: Rebuild.
diff --git a/configure b/configure
index a94399a..2908c45 100755
--- 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 acf13b2..1d1eed2 100644
--- 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 a187361..38f07d7 100644
--- 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 a187361..38f07d7 100644
--- 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 027c363..4faf3bd 100644
--- 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: