* man/ffi_prep_closure.3: Delete. * man/Makefile.am (EXTRA_DIST): Remove ffi_prep_closure.3. (man_MANS): Ditto. * man/Makefile.in: Rebuilt. * configure.ac: Bump version to 2.99.8. * configure, doc/stamp-vti, doc/version.texi: Rebuilt.
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 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354
diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi
index 14ea5a1..a9027f7 100644
--- a/libffi/ChangeLog.libffi
+++ b/libffi/ChangeLog.libffi
@@ -1,3 +1,12 @@
+2008-02-15 Anthony Green <green@redhat.com>
+
+ * man/ffi_prep_closure.3: Delete.
+ * man/Makefile.am (EXTRA_DIST): Remove ffi_prep_closure.3.
+ (man_MANS): Ditto.
+ * man/Makefile.in: Rebuilt.
+ * configure.ac: Bump version to 2.99.8.
+ * configure, doc/stamp-vti, doc/version.texi: Rebuilt.
+
2008-02-14 Anthony Green <green@redhat.com>
* configure.ac: Bump version to 2.99.7.
diff --git a/libffi/README b/libffi/README
index 1f46e6d..372dfcf 100644
--- a/libffi/README
+++ b/libffi/README
@@ -1,7 +1,7 @@
Status
======
-libffi-2.99.6 was released on February 14, 2008. Check the libffi web
+libffi-2.99.7 was released on February 14, 2008. Check the libffi web
page for updates: <URL:http://sourceware.org/libffi/>.
@@ -151,7 +151,7 @@ arguments' test).
History
=======
-3.00 Feb-XX-08
+2.99.7 Feb-XX-08
Many changes, mostly thanks to the GCC project.
Cygnus Solutions is now Red Hat.
diff --git a/libffi/configure b/libffi/configure
index 527387b..f41a878 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libffi 2.99.7.
+# Generated by GNU Autoconf 2.61 for libffi 2.99.8.
#
# Report bugs to <http://gcc.gnu.org/bugs.html>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libffi'
PACKAGE_TARNAME='libffi'
-PACKAGE_VERSION='2.99.7'
-PACKAGE_STRING='libffi 2.99.7'
+PACKAGE_VERSION='2.99.8'
+PACKAGE_STRING='libffi 2.99.8'
PACKAGE_BUGREPORT='http://gcc.gnu.org/bugs.html'
# Factoring default headers for most tests.
@@ -1457,7 +1457,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 2.99.7 to adapt to many kinds of systems.
+\`configure' configures libffi 2.99.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1528,7 +1528,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libffi 2.99.7:";;
+ short | recursive ) echo "Configuration of libffi 2.99.8:";;
esac
cat <<\_ACEOF
@@ -1638,7 +1638,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libffi configure 2.99.7
+libffi configure 2.99.8
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1652,7 +1652,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 2.99.7, which was
+It was created by libffi $as_me 2.99.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2475,7 +2475,7 @@ fi
# Define the identity of the package.
PACKAGE='libffi'
- VERSION='2.99.7'
+ VERSION='2.99.8'
cat >>confdefs.h <<_ACEOF
@@ -23297,7 +23297,7 @@ exec 6>&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 2.99.7, which was
+This file was extended by libffi $as_me 2.99.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23354,7 +23354,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libffi config.status 2.99.7
+libffi config.status 2.99.8
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/libffi/configure.ac b/libffi/configure.ac
index ed362a4..0ac9b28 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure
AC_PREREQ(2.59)
-AC_INIT([libffi], [2.99.7], [http://gcc.gnu.org/bugs.html])
+AC_INIT([libffi], [2.99.8], [http://gcc.gnu.org/bugs.html])
AC_CONFIG_HEADERS([fficonfig.h])
AC_CANONICAL_SYSTEM
diff --git a/libffi/doc/stamp-vti b/libffi/doc/stamp-vti
index 531877c..fcb6996 100644
--- a/libffi/doc/stamp-vti
+++ b/libffi/doc/stamp-vti
@@ -1,4 +1,4 @@
@set UPDATED 14 February 2008
@set UPDATED-MONTH February 2008
-@set EDITION 2.99.7
-@set VERSION 2.99.7
+@set EDITION 2.99.8
+@set VERSION 2.99.8
diff --git a/libffi/doc/version.texi b/libffi/doc/version.texi
index 531877c..fcb6996 100644
--- a/libffi/doc/version.texi
+++ b/libffi/doc/version.texi
@@ -1,4 +1,4 @@
@set UPDATED 14 February 2008
@set UPDATED-MONTH February 2008
-@set EDITION 2.99.7
-@set VERSION 2.99.7
+@set EDITION 2.99.8
+@set VERSION 2.99.8
diff --git a/libffi/man/Makefile.am b/libffi/man/Makefile.am
index cd9e984..2519277 100644
--- a/libffi/man/Makefile.am
+++ b/libffi/man/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS=foreign
-EXTRA_DIST = ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_closure.3
+EXTRA_DIST = ffi.3 ffi_call.3 ffi_prep_cif.3
-man_MANS = ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_closure.3
+man_MANS = ffi.3 ffi_call.3 ffi_prep_cif.3
diff --git a/libffi/man/Makefile.in b/libffi/man/Makefile.in
index 66a6fa8..ab672a3 100644
--- a/libffi/man/Makefile.in
+++ b/libffi/man/Makefile.in
@@ -171,8 +171,8 @@ toolexeclibdir = @toolexeclibdir@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_closure.3
-man_MANS = ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_closure.3
+EXTRA_DIST = ffi.3 ffi_call.3 ffi_prep_cif.3
+man_MANS = ffi.3 ffi_call.3 ffi_prep_cif.3
all: all-am
.SUFFIXES:
diff --git a/libffi/man/ffi_prep_closure.3 b/libffi/man/ffi_prep_closure.3
deleted file mode 100644
index 186a8d7..0000000
--- a/libffi/man/ffi_prep_closure.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.Dd July 20, 2007
-.Dt ffi_prep_closure 3
-.Sh NAME
-.Nm ffi_prep_closure
-.Nd Prepare a
-.Nm ffi_closure
-for execution.
-.Sh SYNOPSIS
-.In ffi.h
-.Ft ffi_status
-.Fo ffi_prep_closure
-.Fa "ffi_closure *closure"
-.Fa "ffi_cif *cif"
-.Fa "void (*fun)(ffi_cif*,void*,void**,void*)"
-.Fa "void *user_data"
-.Fc
-.Sh DESCRIPTION
-.Fa closure
-is prepared to execute
-.Fa fun .
-.Fa cif
-contains information describing the data types, sizes and alignments of the
-arguments to and return value from the function that will be called from
-.Fa fun ,
-and must be initialized with
-.Nm ffi_prep_cif
-before it is used with
-.Nm ffi_prep_closure .
-.Fa user_data
-may point to additional data to be used in
-.Fa fun .
-If no additional data is needed,
-.Fa user_data
-may be
-.Nm NULL .
-When
-.Fa closure
-is invoked,
-.Fa fun
-is called with
-.Fa cif ,
-an array of pointers to arguments, a pointer to a return value, and
-.Fa user_data .
-.Pp
-Some architectures do not allow the execution of data by default. In such cases,
-it is necessary to manually alter the permissions of the page that contains
-.Fa closure
-prior to its execution.
-.Sh RETURN VALUES
-Upon successful completion,
-.Nm ffi_prep_closure
-returns
-.Nm FFI_OK .
-If the ABI specified in
-.Fa cif
-does not refer to a valid ABI,
-.Nm FFI_BAD_ABI
-will be returned. Available ABIs are
-defined in
-.Nm <ffi/ppc-ffitarget.h>
-and
-.Nm <ffi/x86-ffitarget.h> .
-.Sh EXAMPLES
-.Bd -literal
-#include <ffi/ffi.h>
-#include <sys/mman.h> // for mmap()
-
-unsigned char
-foo(unsigned int, float);
-
-static void
-foo_closure(ffi_cif*, void*, void**, void*);
-
-int
-main(int argc, const char **argv)
-{
- ffi_cif cif;
- ffi_closure *closure;
- ffi_type *arg_types[2];
- ffi_arg result;
- ffi_status status;
-
- // Specify the data type of each argument. Available types are defined
- // in <ffi/ffi.h>.
- arg_types[0] = &ffi_type_uint;
- arg_types[1] = &ffi_type_float;
-
- // Allocate a page to hold the closure with read and write permissions.
- if ((closure = mmap(NULL, sizeof(ffi_closure), PROT_READ | PROT_WRITE,
- MAP_ANON | MAP_PRIVATE, -1, 0)) == (void*)-1)
- {
- // Check errno and handle the error.
- }
-
- // Prepare the ffi_cif structure.
- if ((status = ffi_prep_cif(&cif, FFI_DEFAULT_ABI,
- 2, &ffi_type_uint8, arg_types)) != FFI_OK)
- {
- // Handle the ffi_status error.
- }
-
- // Prepare the ffi_closure structure.
- if ((status = ffi_prep_closure(closure, &cif, foo_closure, NULL)) != FFI_OK)
- {
- // Handle the ffi_status error.
- }
-
- // Ensure that the closure will execute on all architectures.
- if (mprotect(closure, sizeof(closure), PROT_READ | PROT_EXEC) == -1)
- {
- // Check errno and handle the error.
- }
-
- // The closure is now ready to be executed, and can be saved for later
- // execution if desired.
-
- // Invoke the closure.
- result = ((unsigned char(*)(float, unsigned int))closure)(42, 5.1);
-
- // Free the memory associated with the closure.
- if (munmap(closure, sizeof(closure)) == -1)
- {
- // Check errno and handle the error.
- }
-
- return 0;
-}
-
-// Invoking the closure transfers control to this function.
-static void
-foo_closure(ffi_cif* cif, void* result, void** args, void* userdata)
-{
- // Access the arguments to be sent to foo().
- float arg1 = *(float*)args[0];
- unsigned int arg2 = *(unsigned int*)args[1];
-
- // Call foo() and save its return value.
- unsigned char ret_val = foo(arg1, arg2);
-
- // Copy the returned value into result. Because the return value of foo()
- // is smaller than sizeof(long), typecast it to ffi_arg. Use ffi_sarg
- // instead for signed types.
- *(ffi_arg*)result = (ffi_arg)ret_val;
-}
-
-// The closed-over function.
-unsigned char
-foo(unsigned int x, float y)
-{
- unsigned char result = x - y;
- return result;
-}
-.Ed
-.Sh SEE ALSO
-.Xr ffi 3 ,
-.Xr ffi_prep_cif 3 ,
-.Xr mmap 2 ,
-.Xr munmap 2 ,
-.Xr mprotect 2