diff options
author | Anthony Green <green@gcc.gnu.org> | 2009-12-31 17:44:32 +0000 |
---|---|---|
committer | Anthony Green <green@gcc.gnu.org> | 2009-12-31 17:44:32 +0000 |
commit | a761df3da467bf2f7fcd5730379d0576b8fa9910 (patch) | |
tree | 413bf962b43b4c0fe1180b5401b187f3dcb74d07 | |
parent | 0d6f2a8037b2040d04556fe3c07dc506defba5bf (diff) | |
download | gcc-a761df3da467bf2f7fcd5730379d0576b8fa9910.zip gcc-a761df3da467bf2f7fcd5730379d0576b8fa9910.tar.gz gcc-a761df3da467bf2f7fcd5730379d0576b8fa9910.tar.bz2 |
Windows patch
From-SVN: r155540
-rw-r--r-- | libffi/ChangeLog | 13 | ||||
-rw-r--r-- | libffi/Makefile.am | 2 | ||||
-rw-r--r-- | libffi/Makefile.in | 3 | ||||
-rwxr-xr-x | libffi/configure | 28 | ||||
-rw-r--r-- | libffi/configure.ac | 5 | ||||
-rw-r--r-- | libffi/include/Makefile.in | 1 | ||||
-rw-r--r-- | libffi/man/Makefile.in | 1 | ||||
-rw-r--r-- | libffi/testsuite/Makefile.in | 1 | ||||
-rw-r--r-- | libffi/testsuite/libffi.call/ffitest.h | 6 | ||||
-rw-r--r-- | libffi/testsuite/libffi.special/ffitestcxx.h | 6 |
10 files changed, 45 insertions, 21 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 10a74d5..0dc5de4 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,16 @@ +2009-12-31 Kay Tietz <ktietz70@googlemail.com> + + * testsuite/libffi.call/ffitest.h, + testsuite/libffi.special/ffitestcxx.h (PRIdLL, PRuLL): Fix + definitions. + +2009-12-31 Carlo Bramini <carlo.bramix@libero.it> + + * configure.ac (AM_LTLDFLAGS): Define for windows hosts. + * Makefile.am (libffi_la_LDFLAGS): Add AM_LTLDFLAGS. + * configure: Rebuilt. + * Makefile.in: Rebuilt. + 2009-12-31 Anthony Green <green@redhat.com> Blake Chaffin. diff --git a/libffi/Makefile.am b/libffi/Makefile.am index 98b34ac..6e414de 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -168,7 +168,7 @@ AM_CFLAGS = -Wall -g -fexceptions LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) -libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) +libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) diff --git a/libffi/Makefile.in b/libffi/Makefile.in index e5ef541..a719613 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -262,6 +262,7 @@ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_LTLDFLAGS = @AM_LTLDFLAGS@ AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -472,7 +473,7 @@ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) AM_CFLAGS = -Wall -g -fexceptions LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) -libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) +libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) all: fficonfig.h diff --git a/libffi/configure b/libffi/configure index aa40a01..b849fe3 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.64 for libffi 3.0.8. +# Generated by GNU Autoconf 2.64 for libffi 3.0.9. # # Report bugs to <http://gcc.gnu.org/bugs.html>. # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.8' -PACKAGE_STRING='libffi 3.0.8' +PACKAGE_VERSION='3.0.9' +PACKAGE_STRING='libffi 3.0.9' PACKAGE_BUGREPORT='http://gcc.gnu.org/bugs.html' PACKAGE_URL='' @@ -662,6 +662,7 @@ SPARC_FALSE SPARC_TRUE MIPS_FALSE MIPS_TRUE +AM_LTLDFLAGS AM_RUNTESTFLAGS TESTSUBDIR_FALSE TESTSUBDIR_TRUE @@ -1347,7 +1348,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.8 to adapt to many kinds of systems. +\`configure' configures libffi 3.0.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1418,7 +1419,7 @@ fi 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.9:";; esac cat <<\_ACEOF @@ -1526,7 +1527,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.8 +libffi configure 3.0.9 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2075,7 +2076,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.8, which was +It was created by libffi $as_me 3.0.9, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3042,7 +3043,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.8' + VERSION='3.0.9' cat >>confdefs.h <<_ACEOF @@ -10773,7 +10774,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10776 "configure" +#line 10777 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10879,7 +10880,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10882 "configure" +#line 10883 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11358,6 +11359,8 @@ case "$host" in ;; i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*) TARGET=X86_WIN32; TARGETDIR=x86 + # All mingw/cygwin/win32 builds require this for sharedlib + AM_LTLDFLAGS="-no-undefined" ;; i?86-*-darwin*) TARGET=X86_DARWIN; TARGETDIR=x86 @@ -11437,6 +11440,7 @@ esac + if test $TARGETDIR = unknown; then as_fn_error "\"libffi has not been ported to $host.\"" "$LINENO" 5 fi @@ -13194,7 +13198,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.8, which was +This file was extended by libffi $as_me 3.0.9, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13262,7 +13266,7 @@ Report bugs to <http://gcc.gnu.org/bugs.html>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libffi config.status 3.0.8 +libffi config.status 3.0.9 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/libffi/configure.ac b/libffi/configure.ac index f101f49..a398839 100644 --- a/libffi/configure.ac +++ b/libffi/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.64) -AC_INIT([libffi], [3.0.8], [http://gcc.gnu.org/bugs.html]) +AC_INIT([libffi], [3.0.9], [http://gcc.gnu.org/bugs.html]) AC_CONFIG_HEADERS([fficonfig.h]) AM_ENABLE_MULTILIB(, ..) @@ -82,6 +82,8 @@ case "$host" in ;; i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*) TARGET=X86_WIN32; TARGETDIR=x86 + # All mingw/cygwin/win32 builds require this for sharedlib + AM_LTLDFLAGS="-no-undefined" ;; i?86-*-darwin*) TARGET=X86_DARWIN; TARGETDIR=x86 @@ -160,6 +162,7 @@ case "$host" in esac AC_SUBST(AM_RUNTESTFLAGS) +AC_SUBST(AM_LTLDFLAGS) if test $TARGETDIR = unknown; then AC_MSG_ERROR(["libffi has not been ported to $host."]) diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in index 4593e48..0953e52 100644 --- a/libffi/include/Makefile.in +++ b/libffi/include/Makefile.in @@ -84,6 +84,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_LTLDFLAGS = @AM_LTLDFLAGS@ AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ diff --git a/libffi/man/Makefile.in b/libffi/man/Makefile.in index 12593d0..265189f 100644 --- a/libffi/man/Makefile.in +++ b/libffi/man/Makefile.in @@ -82,6 +82,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_LTLDFLAGS = @AM_LTLDFLAGS@ AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ diff --git a/libffi/testsuite/Makefile.in b/libffi/testsuite/Makefile.in index 0c81695..97295f0 100644 --- a/libffi/testsuite/Makefile.in +++ b/libffi/testsuite/Makefile.in @@ -59,6 +59,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AM_LTLDFLAGS = @AM_LTLDFLAGS@ AM_RUNTESTFLAGS = AR = @AR@ AUTOCONF = @AUTOCONF@ diff --git a/libffi/testsuite/libffi.call/ffitest.h b/libffi/testsuite/libffi.call/ffitest.h index 52220a3..a54b214 100644 --- a/libffi/testsuite/libffi.call/ffitest.h +++ b/libffi/testsuite/libffi.call/ffitest.h @@ -46,9 +46,9 @@ #endif /* MinGW kludge. */ -#ifdef WIN64 -#define PRIdLL "PRId64" -#define PRIuLL "PRIu64" +#ifdef _WIN64 +#define PRIdLL "I64d" +#define PRIuLL "I64u" #else #define PRIdLL "lld" #define PRIuLL "llu" diff --git a/libffi/testsuite/libffi.special/ffitestcxx.h b/libffi/testsuite/libffi.special/ffitestcxx.h index 92fb656..e300cce 100644 --- a/libffi/testsuite/libffi.special/ffitestcxx.h +++ b/libffi/testsuite/libffi.special/ffitestcxx.h @@ -45,9 +45,9 @@ /* MinGW kludge. */ -#ifdef WIN64 -#define PRIdLL "PRId64" -#define PRIuLL "PRIu64" +#ifdef _WIN64 +#define PRIdLL "I64d" +#define PRIuLL "I64u" #else #define PRIdLL "lld" #define PRIuLL "llu" |