This commit is contained in:
Anthony Green
2009-12-26 10:05:18 -05:00
parent 7086846465
commit 01c78756af
136 changed files with 18774 additions and 8709 deletions

76
patches/amd64-openbsd Normal file
View File

@@ -0,0 +1,76 @@
Index: libffi/ChangeLog.libffi
===================================================================
--- libffi.orig/ChangeLog.libffi
+++ libffi/ChangeLog.libffi
@@ -1,3 +1,10 @@
+2009-12-26 Andreas Tobler <a.tobler@schweiz.org>
+
+ * configure.ac: Add amd64-*-openbsd*.
+ * configure: Rebuilt.
+ * testsuite/lib/libffi-dg.exp (libffi_target_compile): Link
+ openbsd programs with -lpthread.
+
2009-12-26 Anthony Green <green@redhat.com>
* testsuite/libffi.call/cls_double_va.c,
Index: libffi/configure
===================================================================
--- libffi.orig/configure
+++ libffi/configure
@@ -12151,14 +12151,10 @@ case "$host" in
TARGET=ARM; TARGETDIR=arm
;;
- amd64-*-freebsd*)
+ amd64-*-freebsd* | amd64-*-openbsd*)
TARGET=X86_64; TARGETDIR=x86
;;
- amd64-*-freebsd*)
- TARGET=X86_64; TARGETDIR=x86
- ;;
-
avr32*-*-*)
TARGET=AVR32; TARGETDIR=avr32
;;
Index: libffi/configure.ac
===================================================================
--- libffi.orig/configure.ac
+++ libffi/configure.ac
@@ -51,14 +51,10 @@ case "$host" in
TARGET=ARM; TARGETDIR=arm
;;
- amd64-*-freebsd*)
+ amd64-*-freebsd* | amd64-*-openbsd*)
TARGET=X86_64; TARGETDIR=x86
;;
- amd64-*-freebsd*)
- TARGET=X86_64; TARGETDIR=x86
- ;;
-
avr32*-*-*)
TARGET=AVR32; TARGETDIR=avr32
;;
Index: libffi/testsuite/lib/libffi-dg.exp
===================================================================
--- libffi.orig/testsuite/lib/libffi-dg.exp
+++ libffi/testsuite/lib/libffi-dg.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2008, 2009 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -197,6 +197,10 @@ proc libffi_target_compile { source dest
lappend options "libs= -shared-libgcc"
}
+ if { [string match "*-*-openbsd*" $target_triplet] } {
+ lappend options "libs= -lpthread"
+ }
+
lappend options "libs= -lffi"
verbose "options: $options"

View File

@@ -8,7 +8,7 @@ Index: libffi/ChangeLog.libffi
+
+ * testsuite/libffi.call/huge_struct.c (test_large_fn): Replace
+ format code %p with %#lx because %p does not add a leading 0x on
+ Solaris. Also case relevant arguments to unsigned long.
+ Solaris. Also change relevant arguments to unsigned long.
+
2009-12-26 Andreas Schwab <schwab@linux-m68k.org>

View File

@@ -6,3 +6,4 @@ undefine_AC_ARG_VAR_PRECIOUS
powerpc-fixes
fix-huge_struct-on-solaris
xpass
amd64-openbsd

View File

@@ -12507,7 +12507,7 @@ Index: libffi/configure
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for libffi 3.0.8.
+# Generated by GNU Autoconf 2.63 for libffi 3.0.9rc8.
+# Generated by GNU Autoconf 2.63 for libffi 3.0.9rc9.
#
# Report bugs to <http://gcc.gnu.org/bugs.html>.
#
@@ -13463,8 +13463,8 @@ Index: libffi/configure
PACKAGE_TARNAME='libffi'
-PACKAGE_VERSION='3.0.8'
-PACKAGE_STRING='libffi 3.0.8'
+PACKAGE_VERSION='3.0.9rc8'
+PACKAGE_STRING='libffi 3.0.9rc8'
+PACKAGE_VERSION='3.0.9rc9'
+PACKAGE_STRING='libffi 3.0.9rc9'
PACKAGE_BUGREPORT='http://gcc.gnu.org/bugs.html'
-PACKAGE_URL=''
@@ -13629,7 +13629,7 @@ Index: libffi/configure
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libffi 3.0.8 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.9rc8 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.9rc9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -13638,7 +13638,7 @@ Index: libffi/configure
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libffi 3.0.8:";;
+ short | recursive ) echo "Configuration of libffi 3.0.9rc8:";;
+ short | recursive ) echo "Configuration of libffi 3.0.9rc9:";;
esac
cat <<\_ACEOF
@@ -13656,7 +13656,7 @@ Index: libffi/configure
cat <<\_ACEOF
-libffi configure 3.0.8
-generated by GNU Autoconf 2.64
+libffi configure 3.0.9rc8
+libffi configure 3.0.9rc9
+generated by GNU Autoconf 2.63
-Copyright (C) 2009 Free Software Foundation, Inc.
@@ -13756,7 +13756,7 @@ Index: libffi/configure
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+It was created by libffi $as_me 3.0.9rc8, which was
+It was created by libffi $as_me 3.0.9rc9, which was
+generated by GNU Autoconf 2.63. Invocation command line was
-} # ac_fn_c_try_link
@@ -15029,7 +15029,7 @@ Index: libffi/configure
# Define the identity of the package.
PACKAGE='libffi'
- VERSION='3.0.8'
+ VERSION='3.0.9rc8'
+ VERSION='3.0.9rc9'
cat >>confdefs.h <<_ACEOF
@@ -24438,7 +24438,7 @@ Index: libffi/configure
ac_log="
-This file was extended by libffi $as_me 3.0.8, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+This file was extended by libffi $as_me 3.0.9rc8, which was
+This file was extended by libffi $as_me 3.0.9rc9, which was
+generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24470,7 +24470,7 @@ Index: libffi/configure
ac_cs_version="\\
-libffi config.status 3.0.8
-configured by $0, generated by GNU Autoconf 2.64,
+libffi config.status 3.0.9rc8
+libffi config.status 3.0.9rc9
+configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -25430,7 +25430,7 @@ Index: libffi/configure.ac
+AC_PREREQ(2.63)
-AC_INIT([libffi], [3.0.8], [http://gcc.gnu.org/bugs.html])
+AC_INIT([libffi], [3.0.9rc8], [http://gcc.gnu.org/bugs.html])
+AC_INIT([libffi], [3.0.9rc9], [http://gcc.gnu.org/bugs.html])
AC_CONFIG_HEADERS([fficonfig.h])
-AM_ENABLE_MULTILIB(, ..)