ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Another non-GCC configury fix

Browse Source
This commit is contained in:
Anthony Green
2011-02-17 20:39:21 -05:00
parent 8cf8878425
commit cbb062cc35
26 changed files with 561 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

241
patches/stand-alone
View File

@@ -4059,7 +4059,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.9.
+# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc5.
+# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc6.
+#
+# Report bugs to <http://sourceware.org/libffi.html>.
#
@@ -4169,8 +4169,8 @@ Index: libffi/configure
-PACKAGE_VERSION='3.0.9'
-PACKAGE_STRING='libffi 3.0.9'
-PACKAGE_BUGREPORT='http://gcc.gnu.org/bugs.html'
+PACKAGE_VERSION='3.0.10rc5'
+PACKAGE_STRING='libffi 3.0.10rc5'
+PACKAGE_VERSION='3.0.10rc6'
+PACKAGE_STRING='libffi 3.0.10rc6'
+PACKAGE_BUGREPORT='http://sourceware.org/libffi.html'
PACKAGE_URL=''
@@ -4363,7 +4363,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.9 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.10rc5 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.10rc6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -4381,7 +4381,7 @@ Index: libffi/configure
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libffi 3.0.9:";;
+ short | recursive ) echo "Configuration of libffi 3.0.10rc5:";;
+ short | recursive ) echo "Configuration of libffi 3.0.10rc6:";;
esac
cat <<\_ACEOF
@@ -4426,7 +4426,7 @@ Index: libffi/configure
cat <<\_ACEOF
-libffi configure 3.0.9
-generated by GNU Autoconf 2.64
+libffi configure 3.0.10rc5
+libffi configure 3.0.10rc6
+generated by GNU Autoconf 2.68
-Copyright (C) 2009 Free Software Foundation, Inc.
@@ -4649,7 +4649,7 @@ Index: libffi/configure
-It was created by libffi $as_me 3.0.9, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+It was created by libffi $as_me 3.0.10rc5, which was
+It was created by libffi $as_me 3.0.10rc6, which was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -5048,7 +5048,7 @@ Index: libffi/configure
# Define the identity of the package.
PACKAGE='libffi'
- VERSION='3.0.9'
+ VERSION='3.0.10rc5'
+ VERSION='3.0.10rc6'
cat >>confdefs.h <<_ACEOF
@@ -5720,9 +5720,8 @@ Index: libffi/configure
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
@@ -5761,8 +5760,9 @@ Index: libffi/configure
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
@@ -6115,7 +6115,7 @@ Index: libffi/configure
else
echo "cannot find nm_test_func in $nlist" >&5
fi
@@ -6178,6 +6565,16 @@ else
@@ -6178,6 +6565,18 @@ else
$as_echo "ok" >&6; }
fi
@@ -6129,14 +6129,15 @@ Index: libffi/configure
+
+
+
@@ -6200,6 +6597,44 @@ fi
+
+
@@ -6199,6 +6598,42 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
@@ -6173,10 +6174,9 @@ Index: libffi/configure
+
+
+
+
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
@@ -6325,7 +6760,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
@@ -7659,7 +7659,46 @@ Index: libffi/configure
$as_echo_n "(cached) " >&6
else
@@ -12662,7 +13391,7 @@ ac_config_commands="$ac_config_commands
@@ -12632,21 +13361,25 @@ $as_echo "#define USING_PURIFY 1" >>conf
fi
-if test -n "$with_cross_host" &&
- test x"$with_cross_host" != x"no"; then
- toolexecdir='$(exec_prefix)/$(target_alias)'
- toolexeclibdir='$(toolexecdir)/lib'
-else
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
- toolexeclibdir='$(libdir)'
-fi
-multi_os_directory=`$CC -print-multi-os-directory`
-case $multi_os_directory in
- .) ;; # Avoid trailing /.
- *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
-esac
+# These variables are only ever used when we cross-build to X86_WIN32.
+# And we only support this with GCC, so...
+if test x"$GCC" != x"no"; then
+ if test -n "$with_cross_host" &&
+ test x"$with_cross_host" != x"no"; then
+ toolexecdir='$(exec_prefix)/$(target_alias)'
+ toolexeclibdir='$(toolexecdir)/lib'
+ else
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+ toolexeclibdir='$(libdir)'
+ fi
+ multi_os_directory=`$CC -print-multi-os-directory`
+ case $multi_os_directory in
+ .) ;; # Avoid trailing /.
+ *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+ esac
+fi
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
@@ -12662,7 +13395,7 @@ ac_config_commands="$ac_config_commands
ac_config_links="$ac_config_links include/ffitarget.h:src/$TARGETDIR/ffitarget.h"
@@ -7668,7 +7707,7 @@ Index: libffi/configure
cat >confcache <<\_ACEOF
@@ -12729,10 +13458,21 @@ $as_echo "$as_me: WARNING: cache variabl
@@ -12729,10 +13462,21 @@ $as_echo "$as_me: WARNING: cache variabl
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
@@ -7692,7 +7731,7 @@ Index: libffi/configure
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -12748,6 +13488,7 @@ DEFS=-DHAVE_CONFIG_H
@@ -12748,6 +13492,7 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
@@ -7700,7 +7739,7 @@ Index: libffi/configure
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -12771,132 +13512,136 @@ else
@@ -12771,132 +13516,136 @@ else
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -7869,7 +7908,7 @@ Index: libffi/configure
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -12997,6 +13742,7 @@ fi
@@ -12997,6 +13746,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -7877,7 +7916,7 @@ Index: libffi/configure
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -13042,19 +13788,19 @@ export LANGUAGE
@@ -13042,19 +13792,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -7905,7 +7944,7 @@ Index: libffi/configure
as_fn_exit $as_status
} # as_fn_error
@@ -13250,7 +13996,7 @@ $as_echo X"$as_dir" |
@@ -13250,7 +14000,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -7914,18 +7953,18 @@ Index: libffi/configure
} # as_fn_mkdir_p
@@ -13303,8 +14049,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
@@ -13303,8 +14053,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# 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.9, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+This file was extended by libffi $as_me 3.0.10rc5, which was
+This file was extended by libffi $as_me 3.0.10rc6, which was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -13345,6 +14091,7 @@ Usage: $0 [OPTION]... [TAG]...
@@ -13345,6 +14095,7 @@ Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
@@ -7933,7 +7972,7 @@ Index: libffi/configure
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -13366,16 +14113,17 @@ $config_links
@@ -13366,16 +14117,17 @@ $config_links
Configuration commands:
$config_commands
@@ -7947,7 +7986,7 @@ Index: libffi/configure
-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'`\\"
+libffi config.status 3.0.10rc5
+libffi config.status 3.0.10rc6
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
@@ -7956,7 +7995,7 @@ Index: libffi/configure
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -13393,11 +14141,16 @@ ac_need_defaults=:
@@ -13393,11 +14145,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
@@ -7974,7 +8013,7 @@ Index: libffi/configure
*)
ac_option=$1
ac_optarg=$2
@@ -13411,12 +14164,15 @@ do
@@ -13411,12 +14168,15 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -7990,7 +8029,7 @@ Index: libffi/configure
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -13429,7 +14185,7 @@ do
@@ -13429,7 +14189,7 @@ do
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
@@ -7999,7 +8038,7 @@ Index: libffi/configure
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -13438,7 +14194,7 @@ Try \`$0 --help' for more information.";
@@ -13438,7 +14198,7 @@ Try \`$0 --help' for more information.";
ac_cs_silent=: ;;
# This is an error.
@@ -8008,7 +8047,7 @@ Index: libffi/configure
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -13482,20 +14238,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
@@ -13482,20 +14242,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
#
# INIT-COMMANDS
#
@@ -8029,7 +8068,7 @@ Index: libffi/configure
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -13534,13 +14276,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
@@ -13534,13 +14280,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -8050,7 +8089,7 @@ Index: libffi/configure
STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
@@ -13555,14 +14304,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
@@ -13555,14 +14308,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -8069,7 +8108,7 @@ Index: libffi/configure
DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
@@ -13595,12 +14347,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
@@ -13595,12 +14351,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -8083,7 +8122,7 @@ Index: libffi/configure
file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -13655,8 +14407,13 @@ reload_flag \
@@ -13655,8 +14411,13 @@ reload_flag \
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
@@ -8097,7 +8136,7 @@ Index: libffi/configure
STRIP \
RANLIB \
CC \
@@ -13666,12 +14423,14 @@ lt_cv_sys_global_symbol_pipe \
@@ -13666,12 +14427,14 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -8113,7 +8152,7 @@ Index: libffi/configure
DSYMUTIL \
NMEDIT \
LIPO \
@@ -13687,7 +14446,6 @@ no_undefined_flag \
@@ -13687,7 +14450,6 @@ no_undefined_flag \
hardcode_libdir_flag_spec \
hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
@@ -8121,7 +8160,7 @@ Index: libffi/configure
exclude_expsyms \
include_expsyms \
file_list_spec \
@@ -13723,6 +14481,7 @@ module_cmds \
@@ -13723,6 +14485,7 @@ module_cmds \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
@@ -8129,7 +8168,7 @@ Index: libffi/configure
postinstall_cmds \
postuninstall_cmds \
finish_cmds \
@@ -13768,7 +14527,6 @@ for ac_config_target in $ac_config_targe
@@ -13768,7 +14531,6 @@ for ac_config_target in $ac_config_targe
do
case $ac_config_target in
"fficonfig.h") CONFIG_HEADERS="$CONFIG_HEADERS fficonfig.h" ;;
@@ -8137,7 +8176,7 @@ Index: libffi/configure
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"include") CONFIG_COMMANDS="$CONFIG_COMMANDS include" ;;
@@ -13779,8 +14537,9 @@ do
@@ -13779,8 +14541,9 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
@@ -8148,7 +8187,7 @@ Index: libffi/configure
esac
done
@@ -13804,9 +14563,10 @@ fi
@@ -13804,9 +14567,10 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
@@ -8161,7 +8200,7 @@ Index: libffi/configure
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -13814,12 +14574,13 @@ $debug ||
@@ -13814,12 +14578,13 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
@@ -8177,7 +8216,7 @@ Index: libffi/configure
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -13836,12 +14597,12 @@ if test "x$ac_cr" = x; then
@@ -13836,12 +14601,12 @@ if test "x$ac_cr" = x; then
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
@@ -8192,7 +8231,7 @@ Index: libffi/configure
_ACEOF
@@ -13850,18 +14611,18 @@ _ACEOF
@@ -13850,18 +14615,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -8215,7 +8254,7 @@ Index: libffi/configure
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -13869,7 +14630,7 @@ done
@@ -13869,7 +14634,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -8224,7 +8263,7 @@ Index: libffi/configure
_ACEOF
sed -n '
h
@@ -13883,7 +14644,7 @@ s/'"$ac_delim"'$//
@@ -13883,7 +14648,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
@@ -8233,7 +8272,7 @@ Index: libffi/configure
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -13897,7 +14658,7 @@ s/.\{148\}//
@@ -13897,7 +14662,7 @@ s/.\{148\}//
t nl
:delim
h
@@ -8242,7 +8281,7 @@ Index: libffi/configure
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -13917,7 +14678,7 @@ t delim
@@ -13917,7 +14682,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
@@ -8251,7 +8290,7 @@ Index: libffi/configure
for (key in S) S_is_set[key] = 1
FS = ""
@@ -13949,21 +14710,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
@@ -13949,21 +14714,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
@@ -8290,7 +8329,7 @@ Index: libffi/configure
s/^[^=]*=[ ]*$//
}'
fi
@@ -13975,7 +14744,7 @@ fi # test -n "$CONFIG_FILES"
@@ -13975,7 +14748,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
@@ -8299,7 +8338,7 @@ Index: libffi/configure
BEGIN {
_ACEOF
@@ -13987,11 +14756,11 @@ _ACEOF
@@ -13987,11 +14760,11 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
@@ -8314,7 +8353,7 @@ Index: libffi/configure
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -14076,7 +14845,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
@@ -14076,7 +14849,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -8323,7 +8362,7 @@ Index: libffi/configure
fi # test -n "$CONFIG_HEADERS"
@@ -14089,7 +14858,7 @@ do
@@ -14089,7 +14862,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -8332,7 +8371,7 @@ Index: libffi/configure
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -14108,7 +14877,7 @@ do
@@ -14108,7 +14881,7 @@ do
for ac_f
do
case $ac_f in
@@ -8341,7 +8380,7 @@ Index: libffi/configure
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -14117,7 +14886,7 @@ do
@@ -14117,7 +14890,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -8350,7 +8389,7 @@ Index: libffi/configure
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -14143,8 +14912,8 @@ $as_echo "$as_me: creating $ac_file" >&6
@@ -14143,8 +14916,8 @@ $as_echo "$as_me: creating $ac_file" >&6
esac
case $ac_tag in
@@ -8361,7 +8400,7 @@ Index: libffi/configure
esac
;;
esac
@@ -14280,23 +15049,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
@@ -14280,23 +15053,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
@@ -8396,7 +8435,7 @@ Index: libffi/configure
;;
:H)
#
@@ -14305,21 +15075,21 @@ which seems to be undefined. Please mak
@@ -14305,21 +15079,21 @@ which seems to be undefined. Please mak
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
@@ -8426,7 +8465,7 @@ Index: libffi/configure
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -14373,19 +15143,19 @@ $as_echo X"$_am_arg" |
@@ -14373,19 +15147,19 @@ $as_echo X"$_am_arg" |
$as_echo "$as_me: linking $ac_source to $ac_file" >&6;}
if test ! -r "$ac_source"; then
@@ -8449,7 +8488,7 @@ Index: libffi/configure
fi
;;
:C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
@@ -14395,14 +15165,6 @@ $as_echo "$as_me: executing $ac_file com
@@ -14395,14 +15169,6 @@ $as_echo "$as_me: executing $ac_file com
case $ac_file$ac_mode in
@@ -8464,7 +8503,7 @@ Index: libffi/configure
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
# Autoconf 2.62 quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
@@ -14519,7 +15281,8 @@ $as_echo X"$file" |
@@ -14519,7 +15285,8 @@ $as_echo X"$file" |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -8474,7 +8513,7 @@ Index: libffi/configure
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -14622,19 +15385,42 @@ SP2NL=$lt_lt_SP2NL
@@ -14622,19 +15389,42 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -8518,7 +8557,7 @@ Index: libffi/configure
# A symbol stripping program.
STRIP=$lt_STRIP
@@ -14664,6 +15450,12 @@ global_symbol_to_c_name_address=$lt_lt_c
@@ -14664,6 +15454,12 @@ global_symbol_to_c_name_address=$lt_lt_c
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
@@ -8531,7 +8570,7 @@ Index: libffi/configure
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -14673,6 +15465,9 @@ MAGIC_CMD=$MAGIC_CMD
@@ -14673,6 +15469,9 @@ MAGIC_CMD=$MAGIC_CMD
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
@@ -8541,7 +8580,7 @@ Index: libffi/configure
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
@@ -14787,12 +15582,12 @@ with_gcc=$GCC
@@ -14787,12 +15586,12 @@ with_gcc=$GCC
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
@@ -8557,7 +8596,7 @@ Index: libffi/configure
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
@@ -14879,9 +15674,6 @@ inherit_rpath=$inherit_rpath
@@ -14879,9 +15678,6 @@ inherit_rpath=$inherit_rpath
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
@@ -8567,7 +8606,7 @@ Index: libffi/configure
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
@@ -14897,6 +15689,9 @@ include_expsyms=$lt_include_expsyms
@@ -14897,6 +15693,9 @@ include_expsyms=$lt_include_expsyms
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
@@ -8577,7 +8616,7 @@ Index: libffi/configure
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
@@ -14929,210 +15724,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
@@ -14929,210 +15728,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
@@ -8948,7 +8987,7 @@ Index: libffi/configure
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -15152,7 +15906,7 @@ _ACEOF
@@ -15152,7 +15910,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
@@ -8957,7 +8996,7 @@ Index: libffi/configure
# configure is writing to config.log, and then calls config.status.
@@ -15173,7 +15927,7 @@ if test "$no_create" != yes; then
@@ -15173,7 +15931,7 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -8977,7 +9016,7 @@ Index: libffi/configure.ac
+AC_PREREQ(2.63)
-AC_INIT([libffi], [3.0.9], [http://gcc.gnu.org/bugs.html])
+AC_INIT([libffi], [3.0.10rc5], [http://sourceware.org/libffi.html])
+AC_INIT([libffi], [3.0.10rc6], [http://sourceware.org/libffi.html])
AC_CONFIG_HEADERS([fficonfig.h])
-AM_ENABLE_MULTILIB(, ..)
@@ -9021,7 +9060,47 @@ Index: libffi/configure.ac
AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
AM_CONDITIONAL(POWERPC_AIX, test x$TARGET = xPOWERPC_AIX)
AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN)
@@ -450,6 +455,6 @@ test -d src/$TARGETDIR || mkdir src/$TAR
@@ -420,21 +425,25 @@ AC_ARG_ENABLE(purify-safety,
AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.])
fi)
-if test -n "$with_cross_host" &&
- test x"$with_cross_host" != x"no"; then
- toolexecdir='$(exec_prefix)/$(target_alias)'
- toolexeclibdir='$(toolexecdir)/lib'
-else
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
- toolexeclibdir='$(libdir)'
+# These variables are only ever used when we cross-build to X86_WIN32.
+# And we only support this with GCC, so...
+if test x"$GCC" != x"no"; then
+ if test -n "$with_cross_host" &&
+ test x"$with_cross_host" != x"no"; then
+ toolexecdir='$(exec_prefix)/$(target_alias)'
+ toolexeclibdir='$(toolexecdir)/lib'
+ else
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+ toolexeclibdir='$(libdir)'
+ fi
+ multi_os_directory=`$CC -print-multi-os-directory`
+ case $multi_os_directory in
+ .) ;; # Avoid trailing /.
+ *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+ esac
+ AC_SUBST(toolexecdir)
+ AC_SUBST(toolexeclibdir)
fi
-multi_os_directory=`$CC -print-multi-os-directory`
-case $multi_os_directory in
- .) ;; # Avoid trailing /.
- *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
-esac
-AC_SUBST(toolexecdir)
-AC_SUBST(toolexeclibdir)
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
@@ -450,6 +459,6 @@ test -d src/$TARGETDIR || mkdir src/$TAR
AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)