diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch')
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch | 1425 |
1 files changed, 712 insertions, 713 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch index 8550df0cb0..f0c4d251bd 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch @@ -1,4 +1,4 @@ -From 11f6d2889725ad592ab789534ca9b858073df4d1 Mon Sep 17 00:00:00 2001 +From 418527a2971d4e77a87085400397090d89fc5c94 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 14 Feb 2016 17:04:07 +0000 Subject: [PATCH 06/15] Use libtool 2.4 @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> bfd/configure.ac | 2 +- binutils/configure | 1320 ++++++++++++++----- gas/configure | 1320 ++++++++++++++----- - gprof/configure | 1327 ++++++++++++++----- + gprof/configure | 1321 ++++++++++++++----- ld/configure | 1695 ++++++++++++++++++------ libtool.m4 | 1080 +++++++++++----- ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- @@ -23,12 +23,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> opcodes/configure | 1322 ++++++++++++++----- opcodes/configure.ac | 2 +- zlib/configure | 1320 ++++++++++++++----- - 14 files changed, 9948 insertions(+), 3703 deletions(-) + 14 files changed, 9940 insertions(+), 3705 deletions(-) -Index: git/bfd/configure -=================================================================== ---- git.orig/bfd/configure -+++ git/bfd/configure +diff --git a/bfd/configure b/bfd/configure +index 17960684f8..925fb401f2 100755 +--- a/bfd/configure ++++ b/bfd/configure @@ -704,6 +704,9 @@ OTOOL LIPO NMEDIT @@ -76,7 +76,7 @@ Index: git/bfd/configure test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u +@@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -212,7 +212,7 @@ Index: git/bfd/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli +@@ -6821,11 +6922,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -226,6 +226,8 @@ Index: git/bfd/configure + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -447,7 +449,7 @@ Index: git/bfd/configure + + + - ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -456,7 +458,7 @@ Index: git/bfd/configure + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ++ +int +main () +{ @@ -489,11 +491,11 @@ Index: git/bfd/configure +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else @@ -549,7 +551,7 @@ Index: git/bfd/configure const char *name; void *address; } -@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() +@@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -571,7 +573,7 @@ Index: git/bfd/configure else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7426,6 +7757,20 @@ else +@@ -7426,6 +7757,16 @@ else $as_echo "ok" >&6; } fi @@ -585,17 +587,20 @@ Index: git/bfd/configure + + + -+ -+ -+ -+ -@@ -7445,6 +7790,41 @@ fi +@@ -7442,6 +7783,45 @@ fi ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -628,12 +633,9 @@ Index: git/bfd/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ - # Check whether --enable-libtool-lock was given. + @@ -7653,6 +8033,123 @@ esac need_locks="$enable_libtool_lock" @@ -795,7 +797,7 @@ Index: git/bfd/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio +@@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -808,7 +810,7 @@ Index: git/bfd/configure pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio +@@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -969,7 +971,7 @@ Index: git/bfd/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -1027,7 +1029,7 @@ Index: git/bfd/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -1105,7 +1107,7 @@ Index: git/bfd/configure ;; darwin* | rhapsody*) -@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -1114,7 +1116,7 @@ Index: git/bfd/configure hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -1123,7 +1125,7 @@ Index: git/bfd/configure else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -1132,7 +1134,7 @@ Index: git/bfd/configure else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -1190,7 +1192,7 @@ Index: git/bfd/configure else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -1199,7 +1201,7 @@ Index: git/bfd/configure hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -1358,7 +1360,7 @@ Index: git/bfd/configure fi # More hacks to build DLLs on Windows. -@@ -17139,13 +17794,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -17142,13 +17797,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 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"`' @@ -1379,7 +1381,7 @@ Index: git/bfd/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"`' -@@ -17160,14 +17822,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -17163,14 +17825,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 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"`' @@ -1398,7 +1400,7 @@ Index: git/bfd/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"`' -@@ -17200,12 +17865,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -17203,12 +17868,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 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"`' @@ -1412,7 +1414,7 @@ Index: git/bfd/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"`' -@@ -17260,8 +17925,13 @@ reload_flag \ +@@ -17263,8 +17928,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -1426,7 +1428,7 @@ Index: git/bfd/configure STRIP \ RANLIB \ CC \ -@@ -17271,12 +17941,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -17274,12 +17944,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 \ @@ -1442,7 +1444,7 @@ Index: git/bfd/configure DSYMUTIL \ NMEDIT \ LIPO \ -@@ -17292,7 +17964,6 @@ no_undefined_flag \ +@@ -17295,7 +17967,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -1450,7 +1452,7 @@ Index: git/bfd/configure exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -17328,6 +17999,7 @@ module_cmds \ +@@ -17331,6 +18002,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -1458,7 +1460,7 @@ Index: git/bfd/configure postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -18116,7 +18788,8 @@ $as_echo X"$file" | +@@ -18119,7 +18791,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, @@ -1468,7 +1470,7 @@ Index: git/bfd/configure # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -18219,19 +18892,42 @@ SP2NL=$lt_lt_SP2NL +@@ -18222,19 +18895,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -1512,7 +1514,7 @@ Index: git/bfd/configure # A symbol stripping program. STRIP=$lt_STRIP -@@ -18261,6 +18957,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -18264,6 +18960,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # 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 @@ -1525,7 +1527,7 @@ Index: git/bfd/configure # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -18270,6 +18972,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -18273,6 +18975,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -1535,7 +1537,7 @@ Index: git/bfd/configure # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -18384,12 +19089,12 @@ with_gcc=$GCC +@@ -18387,12 +19092,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -1551,7 +1553,7 @@ Index: git/bfd/configure # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -18476,9 +19181,6 @@ inherit_rpath=$inherit_rpath +@@ -18479,9 +19184,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -1561,7 +1563,7 @@ Index: git/bfd/configure # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -18494,6 +19196,9 @@ include_expsyms=$lt_include_expsyms +@@ -18497,6 +19199,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -1571,7 +1573,7 @@ Index: git/bfd/configure # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -18526,210 +19231,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -18529,210 +19234,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? @@ -1773,9 +1775,15 @@ Index: git/bfd/configure -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -1933,19 +1941,16 @@ Index: git/bfd/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -Index: git/bfd/configure.ac -=================================================================== ---- git.orig/bfd/configure.ac -+++ git/bfd/configure.ac +diff --git a/bfd/configure.ac b/bfd/configure.ac +index eda38ea086..7cdf9c8146 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac @@ -293,7 +293,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl @@ -1955,11 +1960,11 @@ Index: git/bfd/configure.ac fi # More hacks to build DLLs on Windows. -Index: git/binutils/configure -=================================================================== ---- git.orig/binutils/configure -+++ git/binutils/configure -@@ -688,8 +688,11 @@ OTOOL +diff --git a/binutils/configure b/binutils/configure +index 38128e146d..c74f797996 100755 +--- a/binutils/configure ++++ b/binutils/configure +@@ -689,8 +689,11 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -1971,7 +1976,7 @@ Index: git/binutils/configure OBJDUMP LN_S NM -@@ -806,6 +809,7 @@ enable_static +@@ -807,6 +810,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -1979,7 +1984,7 @@ Index: git/binutils/configure enable_libtool_lock enable_plugins enable_largefile -@@ -1482,6 +1486,8 @@ Optional Packages: +@@ -1483,6 +1487,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -1988,7 +1993,7 @@ Index: git/binutils/configure --with-system-zlib use installed libz --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib -@@ -5453,8 +5459,8 @@ esac +@@ -5457,8 +5463,8 @@ esac @@ -1999,7 +2004,7 @@ Index: git/binutils/configure -@@ -5494,7 +5500,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -2008,7 +2013,7 @@ Index: git/binutils/configure test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6180,8 +6186,8 @@ $as_echo_n "checking whether the shell u +@@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -2019,7 +2024,7 @@ Index: git/binutils/configure && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6230,6 +6236,80 @@ esac +@@ -6234,6 +6240,80 @@ esac @@ -2100,7 +2105,7 @@ Index: git/binutils/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6246,6 +6326,11 @@ case $reload_flag in +@@ -6250,6 +6330,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -2112,7 +2117,7 @@ Index: git/binutils/configure darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6414,7 +6499,8 @@ mingw* | pw32*) +@@ -6418,7 +6503,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -2122,7 +2127,7 @@ Index: git/binutils/configure lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6568,6 +6654,21 @@ esac +@@ -6572,6 +6658,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -2144,7 +2149,7 @@ Index: git/binutils/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6583,9 +6684,162 @@ test -z "$deplibs_check_method" && depli +@@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -2309,7 +2314,7 @@ Index: git/binutils/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6601,7 +6855,7 @@ do +@@ -6605,7 +6859,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2318,7 +2323,7 @@ Index: git/binutils/configure $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6621,11 +6875,15 @@ $as_echo "no" >&6; } +@@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } fi @@ -2337,7 +2342,7 @@ Index: git/binutils/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6641,7 +6899,7 @@ do +@@ -6645,7 +6903,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -2346,7 +2351,7 @@ Index: git/binutils/configure $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6660,6 +6918,10 @@ else +@@ -6664,6 +6922,10 @@ else $as_echo "no" >&6; } fi @@ -2357,7 +2362,7 @@ Index: git/binutils/configure if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6671,12 +6933,10 @@ ac_tool_warned=yes ;; +@@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -2372,7 +2377,7 @@ Index: git/binutils/configure -@@ -6688,6 +6948,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -2437,7 +2442,7 @@ Index: git/binutils/configure if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -7022,8 +7340,8 @@ esac +@@ -7026,8 +7344,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -2448,7 +2453,7 @@ Index: git/binutils/configure # Handle CRLF in mingw tool chain opt_cr= -@@ -7059,6 +7377,7 @@ for ac_symprfx in "" "_"; do +@@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -2456,7 +2461,7 @@ Index: git/binutils/configure # Check to see that the pipe works correctly. pipe_works=no -@@ -7100,6 +7419,18 @@ _LT_EOF +@@ -7104,6 +7423,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -2475,7 +2480,7 @@ Index: git/binutils/configure #ifdef __cplusplus extern "C" { #endif -@@ -7111,7 +7442,7 @@ _LT_EOF +@@ -7115,7 +7446,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -2484,7 +2489,7 @@ Index: git/binutils/configure const char *name; void *address; } -@@ -7137,8 +7468,8 @@ static const void *lt_preloaded_setup() +@@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -2495,7 +2500,7 @@ Index: git/binutils/configure LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7148,8 +7479,8 @@ _LT_EOF +@@ -7152,8 +7483,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -2506,7 +2511,7 @@ Index: git/binutils/configure else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7186,6 +7517,18 @@ else +@@ -7190,6 +7521,21 @@ else $as_echo "ok" >&6; } fi @@ -2522,13 +2527,18 @@ Index: git/binutils/configure + + + ++ ++ ++ -@@ -7207,6 +7550,43 @@ fi +@@ -7206,6 +7552,40 @@ fi ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -2561,15 +2571,10 @@ Index: git/binutils/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7413,6 +7793,123 @@ esac + + + +@@ -7417,6 +7797,123 @@ esac need_locks="$enable_libtool_lock" @@ -2693,7 +2698,7 @@ Index: git/binutils/configure case $host_os in rhapsody* | darwin*) -@@ -7976,6 +8473,8 @@ _LT_EOF +@@ -7980,6 +8477,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -2702,7 +2707,7 @@ Index: git/binutils/configure cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8171,7 +8670,8 @@ fi +@@ -8175,7 +8674,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -2712,7 +2717,7 @@ Index: git/binutils/configure -@@ -8260,7 +8760,7 @@ aix3*) +@@ -8264,7 +8764,7 @@ aix3*) esac # Global variables: @@ -2721,7 +2726,7 @@ Index: git/binutils/configure can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8558,8 +9058,6 @@ fi +@@ -8562,8 +9062,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -2730,7 +2735,7 @@ Index: git/binutils/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8725,6 +9223,12 @@ $as_echo_n "checking for $compiler optio +@@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -2743,7 +2748,7 @@ Index: git/binutils/configure pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8787,7 +9291,7 @@ $as_echo_n "checking for $compiler optio +@@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -2752,7 +2757,7 @@ Index: git/binutils/configure lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8844,13 +9348,17 @@ case $host_os in +@@ -8848,13 +9352,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -2776,7 +2781,7 @@ Index: git/binutils/configure # # Check to make sure the PIC flag actually works. -@@ -8911,6 +9419,11 @@ fi +@@ -8915,6 +9423,11 @@ fi @@ -2788,7 +2793,7 @@ Index: git/binutils/configure # # Check to make sure the static flag actually works. # -@@ -9261,7 +9774,8 @@ _LT_EOF +@@ -9265,7 +9778,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -2798,7 +2803,7 @@ Index: git/binutils/configure if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9360,12 +9874,12 @@ _LT_EOF +@@ -9364,12 +9878,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -2813,7 +2818,7 @@ Index: git/binutils/configure fi ;; esac -@@ -9379,8 +9893,8 @@ _LT_EOF +@@ -9383,8 +9897,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -2824,7 +2829,7 @@ Index: git/binutils/configure fi ;; -@@ -9398,8 +9912,8 @@ _LT_EOF +@@ -9402,8 +9916,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2835,7 +2840,7 @@ Index: git/binutils/configure else ld_shlibs=no fi -@@ -9445,8 +9959,8 @@ _LT_EOF +@@ -9449,8 +9963,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -2846,7 +2851,7 @@ Index: git/binutils/configure else ld_shlibs=no fi -@@ -9576,7 +10090,13 @@ _LT_EOF +@@ -9580,7 +10094,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -2861,7 +2866,7 @@ Index: git/binutils/configure /* end confdefs.h. */ int -@@ -9589,22 +10109,29 @@ main () +@@ -9593,22 +10113,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2904,7 +2909,7 @@ Index: git/binutils/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9616,7 +10143,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -2919,7 +2924,7 @@ Index: git/binutils/configure /* end confdefs.h. */ int -@@ -9629,22 +10162,29 @@ main () +@@ -9633,22 +10166,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -2962,7 +2967,7 @@ Index: git/binutils/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9689,20 +10229,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -3040,7 +3045,7 @@ Index: git/binutils/configure ;; darwin* | rhapsody*) -@@ -9763,7 +10346,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -3049,7 +3054,7 @@ Index: git/binutils/configure hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9771,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -3058,7 +3063,7 @@ Index: git/binutils/configure else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9787,7 +10370,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -3067,7 +3072,7 @@ Index: git/binutils/configure else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9811,10 +10394,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -3080,7 +3085,7 @@ Index: git/binutils/configure ;; esac else -@@ -9893,23 +10476,36 @@ fi +@@ -9897,23 +10480,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -3125,7 +3130,7 @@ Index: git/binutils/configure else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9994,7 +10590,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -3134,7 +3139,7 @@ Index: git/binutils/configure hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10013,9 +10609,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -3146,7 +3151,7 @@ Index: git/binutils/configure else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10591,8 +11187,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -3158,7 +3163,7 @@ Index: git/binutils/configure library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10625,13 +11222,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -3231,7 +3236,7 @@ Index: git/binutils/configure # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10723,7 +11378,7 @@ haiku*) +@@ -10727,7 +11382,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -3240,16 +3245,16 @@ Index: git/binutils/configure hardcode_into_libs=yes ;; -@@ -11519,7 +12174,7 @@ else +@@ -11523,7 +12178,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11522 "configure" +-#line 11526 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11563,10 +12218,10 @@ else +@@ -11567,10 +12222,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3262,16 +3267,16 @@ Index: git/binutils/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11625,7 +12280,7 @@ else +@@ -11629,7 +12284,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11628 "configure" +-#line 11632 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11669,10 +12324,10 @@ else +@@ -11673,10 +12328,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -3284,7 +3289,7 @@ Index: git/binutils/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15731,13 +16386,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 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"`' @@ -3305,7 +3310,7 @@ Index: git/binutils/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"`' -@@ -15752,14 +16414,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 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"`' @@ -3324,7 +3329,7 @@ Index: git/binutils/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"`' -@@ -15792,12 +16457,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 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"`' @@ -3338,7 +3343,7 @@ Index: git/binutils/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"`' -@@ -15852,8 +16517,13 @@ reload_flag \ +@@ -16057,8 +16722,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -3352,7 +3357,7 @@ Index: git/binutils/configure STRIP \ RANLIB \ CC \ -@@ -15863,12 +16533,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16068,12 +16738,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 \ @@ -3368,7 +3373,7 @@ Index: git/binutils/configure DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15884,7 +16556,6 @@ no_undefined_flag \ +@@ -16089,7 +16761,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -3376,7 +3381,7 @@ Index: git/binutils/configure exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15920,6 +16591,7 @@ module_cmds \ +@@ -16125,6 +16796,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -3384,7 +3389,7 @@ Index: git/binutils/configure postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16686,7 +17358,8 @@ $as_echo X"$file" | +@@ -16891,7 +17563,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, @@ -3394,7 +3399,7 @@ Index: git/binutils/configure # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16789,19 +17462,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -3438,7 +3443,7 @@ Index: git/binutils/configure # A symbol stripping program. STRIP=$lt_STRIP -@@ -16831,6 +17527,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # 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 @@ -3451,7 +3456,7 @@ Index: git/binutils/configure # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16840,6 +17542,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -3461,7 +3466,7 @@ Index: git/binutils/configure # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -16954,12 +17659,12 @@ with_gcc=$GCC +@@ -17159,12 +17864,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -3477,7 +3482,7 @@ Index: git/binutils/configure # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17046,9 +17751,6 @@ inherit_rpath=$inherit_rpath +@@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -3487,7 +3492,7 @@ Index: git/binutils/configure # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17064,6 +17766,9 @@ include_expsyms=$lt_include_expsyms +@@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -3497,7 +3502,7 @@ Index: git/binutils/configure # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17096,210 +17801,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17301,210 +18006,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? @@ -3699,9 +3704,15 @@ Index: git/binutils/configure -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -3859,19 +3870,16 @@ Index: git/binutils/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -Index: git/gas/configure -=================================================================== ---- git.orig/gas/configure -+++ git/gas/configure +diff --git a/gas/configure b/gas/configure +index 64de9f19da..a82fde7fa8 100755 +--- a/gas/configure ++++ b/gas/configure @@ -681,8 +681,11 @@ OTOOL LIPO NMEDIT @@ -3892,7 +3900,7 @@ Index: git/gas/configure enable_libtool_lock enable_plugins enable_largefile -@@ -1482,6 +1486,8 @@ Optional Packages: +@@ -1487,6 +1491,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -3901,7 +3909,7 @@ Index: git/gas/configure --with-cpu=CPU default cpu variant is CPU (currently only supported on ARC) --with-system-zlib use installed libz -@@ -5269,8 +5275,8 @@ esac +@@ -5274,8 +5280,8 @@ esac @@ -3912,7 +3920,7 @@ Index: git/gas/configure -@@ -5310,7 +5316,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5315,7 +5321,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -3921,7 +3929,7 @@ Index: git/gas/configure test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5996,8 +6002,8 @@ $as_echo_n "checking whether the shell u +@@ -6001,8 +6007,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -3932,7 +3940,7 @@ Index: git/gas/configure && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6046,6 +6052,80 @@ esac +@@ -6051,6 +6057,80 @@ esac @@ -4013,7 +4021,7 @@ Index: git/gas/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6062,6 +6142,11 @@ case $reload_flag in +@@ -6067,6 +6147,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -4025,7 +4033,7 @@ Index: git/gas/configure darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6230,7 +6315,8 @@ mingw* | pw32*) +@@ -6235,7 +6320,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -4035,7 +4043,7 @@ Index: git/gas/configure lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6384,6 +6470,21 @@ esac +@@ -6389,6 +6475,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -4057,7 +4065,7 @@ Index: git/gas/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6399,9 +6500,162 @@ test -z "$deplibs_check_method" && depli +@@ -6404,9 +6505,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4071,9 +4079,7 @@ Index: git/gas/configure + + + - if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 ++if test -n "$ac_tool_prefix"; then + # 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 @@ -4214,7 +4220,9 @@ Index: git/gas/configure + + + -+if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -4222,7 +4230,7 @@ Index: git/gas/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6417,7 +6671,7 @@ do +@@ -6422,7 +6676,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -4231,7 +4239,7 @@ Index: git/gas/configure $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6437,11 +6691,15 @@ $as_echo "no" >&6; } +@@ -6442,11 +6696,15 @@ $as_echo "no" >&6; } fi @@ -4250,7 +4258,7 @@ Index: git/gas/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6457,7 +6715,7 @@ do +@@ -6462,7 +6720,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -4259,7 +4267,7 @@ Index: git/gas/configure $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6476,6 +6734,10 @@ else +@@ -6481,6 +6739,10 @@ else $as_echo "no" >&6; } fi @@ -4270,7 +4278,7 @@ Index: git/gas/configure if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6487,12 +6749,10 @@ ac_tool_warned=yes ;; +@@ -6492,12 +6754,10 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -4285,7 +4293,7 @@ Index: git/gas/configure -@@ -6504,6 +6764,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -6509,6 +6769,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -4350,7 +4358,7 @@ Index: git/gas/configure if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -@@ -6838,8 +7156,8 @@ esac +@@ -6843,8 +7161,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -4361,7 +4369,7 @@ Index: git/gas/configure # Handle CRLF in mingw tool chain opt_cr= -@@ -6875,6 +7193,7 @@ for ac_symprfx in "" "_"; do +@@ -6880,6 +7198,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -4369,7 +4377,7 @@ Index: git/gas/configure # Check to see that the pipe works correctly. pipe_works=no -@@ -6916,6 +7235,18 @@ _LT_EOF +@@ -6921,6 +7240,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -4388,7 +4396,7 @@ Index: git/gas/configure #ifdef __cplusplus extern "C" { #endif -@@ -6927,7 +7258,7 @@ _LT_EOF +@@ -6932,7 +7263,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -4397,7 +4405,7 @@ Index: git/gas/configure const char *name; void *address; } -@@ -6953,8 +7284,8 @@ static const void *lt_preloaded_setup() +@@ -6958,8 +7289,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -4408,7 +4416,7 @@ Index: git/gas/configure LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -6964,8 +7295,8 @@ _LT_EOF +@@ -6969,8 +7300,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -4419,7 +4427,7 @@ Index: git/gas/configure else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7002,6 +7333,19 @@ else +@@ -7007,6 +7338,21 @@ else $as_echo "ok" >&6; } fi @@ -4436,13 +4444,17 @@ Index: git/gas/configure + + + ++ ++ -@@ -7022,6 +7366,42 @@ fi +@@ -7023,6 +7369,40 @@ fi ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -4475,14 +4487,10 @@ Index: git/gas/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : -@@ -7229,6 +7609,123 @@ esac + + +@@ -7234,6 +7614,123 @@ esac need_locks="$enable_libtool_lock" @@ -4606,7 +4614,7 @@ Index: git/gas/configure case $host_os in rhapsody* | darwin*) -@@ -7792,6 +8289,8 @@ _LT_EOF +@@ -7797,6 +8294,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -4615,7 +4623,7 @@ Index: git/gas/configure cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -7987,7 +8486,8 @@ fi +@@ -7992,7 +8491,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -4625,7 +4633,7 @@ Index: git/gas/configure -@@ -8076,7 +8576,7 @@ aix3*) +@@ -8081,7 +8581,7 @@ aix3*) esac # Global variables: @@ -4634,7 +4642,7 @@ Index: git/gas/configure can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8374,8 +8874,6 @@ fi +@@ -8379,8 +8879,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -4643,7 +4651,7 @@ Index: git/gas/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8541,6 +9039,12 @@ $as_echo_n "checking for $compiler optio +@@ -8546,6 +9044,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -4656,7 +4664,7 @@ Index: git/gas/configure pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8603,7 +9107,7 @@ $as_echo_n "checking for $compiler optio +@@ -8608,7 +9112,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -4665,7 +4673,7 @@ Index: git/gas/configure lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8660,13 +9164,17 @@ case $host_os in +@@ -8665,13 +9169,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -4689,7 +4697,7 @@ Index: git/gas/configure # # Check to make sure the PIC flag actually works. -@@ -8727,6 +9235,11 @@ fi +@@ -8732,6 +9240,11 @@ fi @@ -4701,7 +4709,7 @@ Index: git/gas/configure # # Check to make sure the static flag actually works. # -@@ -9077,7 +9590,8 @@ _LT_EOF +@@ -9082,7 +9595,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -4711,7 +4719,7 @@ Index: git/gas/configure if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9176,12 +9690,12 @@ _LT_EOF +@@ -9181,12 +9695,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -4726,7 +4734,7 @@ Index: git/gas/configure fi ;; esac -@@ -9195,8 +9709,8 @@ _LT_EOF +@@ -9200,8 +9714,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -4737,7 +4745,7 @@ Index: git/gas/configure fi ;; -@@ -9214,8 +9728,8 @@ _LT_EOF +@@ -9219,8 +9733,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4748,7 +4756,7 @@ Index: git/gas/configure else ld_shlibs=no fi -@@ -9261,8 +9775,8 @@ _LT_EOF +@@ -9266,8 +9780,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -4759,7 +4767,7 @@ Index: git/gas/configure else ld_shlibs=no fi -@@ -9392,7 +9906,13 @@ _LT_EOF +@@ -9397,7 +9911,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -4774,7 +4782,7 @@ Index: git/gas/configure /* end confdefs.h. */ int -@@ -9405,22 +9925,29 @@ main () +@@ -9410,22 +9930,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4817,7 +4825,7 @@ Index: git/gas/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9432,7 +9959,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9437,7 +9964,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -4832,7 +4840,7 @@ Index: git/gas/configure /* end confdefs.h. */ int -@@ -9445,22 +9978,29 @@ main () +@@ -9450,22 +9983,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4875,7 +4883,7 @@ Index: git/gas/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9505,20 +10045,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9510,20 +10050,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -4953,7 +4961,7 @@ Index: git/gas/configure ;; darwin* | rhapsody*) -@@ -9579,7 +10162,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9584,7 +10167,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -4962,7 +4970,7 @@ Index: git/gas/configure hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9592,7 +10175,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -4971,7 +4979,7 @@ Index: git/gas/configure else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9603,7 +10186,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9608,7 +10191,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -4980,7 +4988,7 @@ Index: git/gas/configure else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9627,10 +10210,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9632,10 +10215,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -4993,7 +5001,7 @@ Index: git/gas/configure ;; esac else -@@ -9709,23 +10292,36 @@ fi +@@ -9714,23 +10297,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -5038,7 +5046,7 @@ Index: git/gas/configure else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9810,7 +10406,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9815,7 +10411,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -5047,7 +5055,7 @@ Index: git/gas/configure hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9829,9 +10425,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9834,9 +10430,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -5059,7 +5067,7 @@ Index: git/gas/configure else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10407,8 +11003,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10412,8 +11008,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -5071,7 +5079,7 @@ Index: git/gas/configure library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10441,13 +11038,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10446,13 +11043,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -5144,7 +5152,7 @@ Index: git/gas/configure # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10539,7 +11194,7 @@ haiku*) +@@ -10544,7 +11199,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -5153,16 +5161,16 @@ Index: git/gas/configure hardcode_into_libs=yes ;; -@@ -11335,7 +11990,7 @@ else +@@ -11340,7 +11995,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11338 "configure" +-#line 11343 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11379,10 +12034,10 @@ else +@@ -11384,10 +12039,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -5175,16 +5183,16 @@ Index: git/gas/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11441,7 +12096,7 @@ else +@@ -11446,7 +12101,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11444 "configure" +-#line 11449 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11485,10 +12140,10 @@ else +@@ -11490,10 +12145,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -5197,7 +5205,7 @@ Index: git/gas/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -15803,13 +16458,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -15896,13 +16551,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 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"`' @@ -5218,7 +5226,7 @@ Index: git/gas/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"`' -@@ -15824,14 +16486,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -15917,14 +16579,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 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"`' @@ -5237,7 +5245,7 @@ Index: git/gas/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"`' -@@ -15864,12 +16529,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -15957,12 +16622,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 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"`' @@ -5251,7 +5259,7 @@ Index: git/gas/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"`' -@@ -15924,8 +16589,13 @@ reload_flag \ +@@ -16017,8 +16682,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -5265,7 +5273,7 @@ Index: git/gas/configure STRIP \ RANLIB \ CC \ -@@ -15935,12 +16605,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -16028,12 +16698,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 \ @@ -5281,7 +5289,7 @@ Index: git/gas/configure DSYMUTIL \ NMEDIT \ LIPO \ -@@ -15956,7 +16628,6 @@ no_undefined_flag \ +@@ -16049,7 +16721,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -5289,7 +5297,7 @@ Index: git/gas/configure exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -15992,6 +16663,7 @@ module_cmds \ +@@ -16085,6 +16756,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -5297,7 +5305,7 @@ Index: git/gas/configure postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -16765,7 +17437,8 @@ $as_echo X"$file" | +@@ -16858,7 +17530,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, @@ -5307,7 +5315,7 @@ Index: git/gas/configure # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -16868,19 +17541,42 @@ SP2NL=$lt_lt_SP2NL +@@ -16961,19 +17634,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -5351,7 +5359,7 @@ Index: git/gas/configure # A symbol stripping program. STRIP=$lt_STRIP -@@ -16910,6 +17606,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -17003,6 +17699,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # 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 @@ -5364,7 +5372,7 @@ Index: git/gas/configure # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -16919,6 +17621,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -17012,6 +17714,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -5374,7 +5382,7 @@ Index: git/gas/configure # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -17033,12 +17738,12 @@ with_gcc=$GCC +@@ -17126,12 +17831,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -5390,7 +5398,7 @@ Index: git/gas/configure # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -17125,9 +17830,6 @@ inherit_rpath=$inherit_rpath +@@ -17218,9 +17923,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -5400,7 +5408,7 @@ Index: git/gas/configure # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -17143,6 +17845,9 @@ include_expsyms=$lt_include_expsyms +@@ -17236,6 +17938,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -5410,7 +5418,7 @@ Index: git/gas/configure # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -17175,210 +17880,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -17268,210 +17973,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? @@ -5612,9 +5620,15 @@ Index: git/gas/configure -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -5772,19 +5786,16 @@ Index: git/gas/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -Index: git/gprof/configure -=================================================================== ---- git.orig/gprof/configure -+++ git/gprof/configure +diff --git a/gprof/configure b/gprof/configure +index ab32bab2b6..5119c6019f 100755 +--- a/gprof/configure ++++ b/gprof/configure @@ -662,8 +662,11 @@ OTOOL LIPO NMEDIT @@ -5834,7 +5845,7 @@ Index: git/gprof/configure test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u +@@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -5851,7 +5862,7 @@ Index: git/gprof/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -+if ${lt_cv_to_host_file_cmd+:} false; then : ++if test "${lt_cv_to_host_file_cmd+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $host in @@ -5898,7 +5909,7 @@ Index: git/gprof/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -+if ${lt_cv_to_tool_file_cmd+:} false; then : ++if test "${lt_cv_to_tool_file_cmd+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. @@ -5982,7 +5993,7 @@ Index: git/gprof/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli +@@ -6257,11 +6353,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5996,6 +6007,8 @@ Index: git/gprof/configure + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -6003,7 +6016,7 @@ Index: git/gprof/configure +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 ${ac_cv_prog_DLLTOOL+:} false; then : ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then @@ -6015,7 +6028,7 @@ Index: git/gprof/configure + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -6043,7 +6056,7 @@ Index: git/gprof/configure +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; } -+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then @@ -6055,7 +6068,7 @@ Index: git/gprof/configure + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -6103,7 +6116,7 @@ Index: git/gprof/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : ++if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' @@ -6147,11 +6160,13 @@ Index: git/gprof/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6277,7 +6526,7 @@ do +@@ -6276,8 +6525,8 @@ do + IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6175,15 +6190,6 @@ Index: git/gprof/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6317,7 +6570,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_AR="ar" -+ ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi @@ -6336,6 +6589,10 @@ else $as_echo "no" >&6; } fi @@ -6220,7 +6226,7 @@ Index: git/gprof/configure + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } -+if ${lt_cv_ar_at_file+:} false; then : ++if test "${lt_cv_ar_at_file+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no @@ -6319,7 +6325,7 @@ Index: git/gprof/configure const char *name; void *address; } -@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() +@@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -6341,7 +6347,7 @@ Index: git/gprof/configure else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6862,6 +7188,17 @@ else +@@ -6862,6 +7188,18 @@ else $as_echo "ok" >&6; } fi @@ -6356,14 +6362,19 @@ Index: git/gprof/configure + + + ++ -@@ -6883,6 +7220,44 @@ fi +@@ -6878,6 +7216,43 @@ fi + ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -6390,20 +6401,15 @@ Index: git/gprof/configure + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 +$as_echo "${with_libtool_sysroot}" >&6; } -+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ++ as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; + + + @@ -7089,6 +7464,123 @@ esac need_locks="$enable_libtool_lock" @@ -6413,7 +6419,7 @@ Index: git/gprof/configure +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : ++if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then @@ -6425,7 +6431,7 @@ Index: git/gprof/configure + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -6453,7 +6459,7 @@ Index: git/gprof/configure +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : ++if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then @@ -6465,7 +6471,7 @@ Index: git/gprof/configure + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -6503,7 +6509,7 @@ Index: git/gprof/configure +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if ${lt_cv_path_mainfest_tool+:} false; then : ++if test "${lt_cv_path_mainfest_tool+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no @@ -6565,7 +6571,7 @@ Index: git/gprof/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio +@@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -6578,7 +6584,7 @@ Index: git/gprof/configure pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio +@@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -6600,7 +6606,7 @@ Index: git/gprof/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if ${lt_cv_prog_compiler_pic+:} false; then : ++if test "${lt_cv_prog_compiler_pic+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic @@ -6689,7 +6695,7 @@ Index: git/gprof/configure + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if ${lt_cv_aix_libpath_+:} false; then : ++ if test "${lt_cv_aix_libpath_+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6739,7 +6745,7 @@ Index: git/gprof/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -6747,7 +6753,7 @@ Index: git/gprof/configure + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else -+ if ${lt_cv_aix_libpath_+:} false; then : ++ if test "${lt_cv_aix_libpath_+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6797,7 +6803,7 @@ Index: git/gprof/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -6875,7 +6881,7 @@ Index: git/gprof/configure ;; darwin* | rhapsody*) -@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -6884,7 +6890,7 @@ Index: git/gprof/configure hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -6893,7 +6899,7 @@ Index: git/gprof/configure else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -6902,7 +6908,7 @@ Index: git/gprof/configure else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -6930,7 +6936,7 @@ Index: git/gprof/configure + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -+if ${lt_cv_irix_exported_symbol+:} false; then : ++if test "${lt_cv_irix_exported_symbol+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" @@ -6960,7 +6966,7 @@ Index: git/gprof/configure else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -6969,7 +6975,7 @@ Index: git/gprof/configure hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -7075,15 +7081,6 @@ Index: git/gprof/configure hardcode_into_libs=yes ;; -@@ -11195,7 +11845,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11193 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H @@ -11239,10 +11889,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ @@ -7097,15 +7094,6 @@ Index: git/gprof/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11301,7 +11951,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11299 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H @@ -11345,10 +11995,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ @@ -7119,7 +7107,7 @@ Index: git/gprof/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 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"`' @@ -7140,7 +7128,7 @@ Index: git/gprof/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"`' -@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 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"`' @@ -7159,7 +7147,7 @@ Index: git/gprof/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"`' -@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 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"`' @@ -7273,7 +7261,7 @@ Index: git/gprof/configure # A symbol stripping program. STRIP=$lt_STRIP -@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # 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 @@ -7534,9 +7522,15 @@ Index: git/gprof/configure -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -7694,19 +7688,16 @@ Index: git/gprof/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -Index: git/ld/configure -=================================================================== ---- git.orig/ld/configure -+++ git/ld/configure +diff --git a/ld/configure b/ld/configure +index bc09e7ef81..43c391c2b3 100755 +--- a/ld/configure ++++ b/ld/configure @@ -687,8 +687,11 @@ OTOOL LIPO NMEDIT @@ -7756,7 +7747,7 @@ Index: git/ld/configure test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6686,8 +6692,8 @@ $as_echo_n "checking whether the shell u +@@ -6686,8 +6692,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -7892,7 +7883,7 @@ Index: git/ld/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7089,9 +7190,162 @@ test -z "$deplibs_check_method" && depli +@@ -7089,9 +7190,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -8105,7 +8096,7 @@ Index: git/ld/configure if test "x$ac_ct_AR" = x; then AR="false" else -@@ -7177,12 +7439,11 @@ ac_tool_warned=yes ;; +@@ -7177,12 +7439,12 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -8118,10 +8109,11 @@ Index: git/ld/configure +: ${AR=ar} +: ${AR_FLAGS=cru} + ++ -@@ -7193,6 +7454,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -7192,6 +7454,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -8181,10 +8173,9 @@ Index: git/ld/configure + + + -+ + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -7528,8 +7846,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -8232,7 +8223,7 @@ Index: git/ld/configure const char *name; void *address; } -@@ -7643,8 +7974,8 @@ static const void *lt_preloaded_setup() +@@ -7643,8 +7974,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -8254,7 +8245,7 @@ Index: git/ld/configure else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7692,6 +8023,13 @@ else +@@ -7692,6 +8023,19 @@ else $as_echo "ok" >&6; } fi @@ -8265,10 +8256,16 @@ Index: git/ld/configure + nm_file_list_spec='@' +fi + ++ ++ ++ ++ ++ ++ -@@ -7713,6 +8051,48 @@ fi +@@ -7708,6 +8052,42 @@ fi @@ -8276,7 +8273,6 @@ Index: git/ld/configure + + + -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -8309,14 +8305,9 @@ Index: git/ld/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; + + + @@ -7919,6 +8299,123 @@ esac need_locks="$enable_libtool_lock" @@ -8495,7 +8486,7 @@ Index: git/ld/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -9232,6 +9740,12 @@ $as_echo_n "checking for $compiler optio +@@ -9232,6 +9740,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -8508,7 +8499,7 @@ Index: git/ld/configure pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -9294,7 +9808,7 @@ $as_echo_n "checking for $compiler optio +@@ -9294,7 +9808,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -8669,7 +8660,7 @@ Index: git/ld/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -10123,7 +10660,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10123,7 +10660,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -8727,10 +8718,11 @@ Index: git/ld/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -10196,20 +10746,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10195,21 +10745,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. +- # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. @@ -8745,6 +8737,7 @@ Index: git/ld/configure - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes ++ # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC @@ -8805,7 +8798,7 @@ Index: git/ld/configure ;; darwin* | rhapsody*) -@@ -10270,7 +10863,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10270,7 +10863,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -8814,7 +8807,7 @@ Index: git/ld/configure hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -10278,7 +10871,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10278,7 +10871,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -8823,7 +8816,7 @@ Index: git/ld/configure else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -10294,7 +10887,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10294,7 +10887,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -8832,7 +8825,7 @@ Index: git/ld/configure else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -10318,10 +10911,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10318,10 +10911,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -8890,7 +8883,7 @@ Index: git/ld/configure else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -10501,7 +11107,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10501,7 +11107,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -8899,7 +8892,7 @@ Index: git/ld/configure hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -10520,9 +11126,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10520,9 +11126,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -9065,7 +9058,7 @@ Index: git/ld/configure compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do -@@ -12870,7 +13537,13 @@ $as_echo_n "checking whether the $compil +@@ -12870,7 +13537,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -9123,7 +9116,7 @@ Index: git/ld/configure hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -12911,7 +13591,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -12911,7 +13591,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -9181,7 +9174,7 @@ Index: git/ld/configure hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -12982,29 +13675,75 @@ if test -z "$aix_libpath"; then aix_libp +@@ -12982,29 +13675,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; cygwin* | mingw* | pw32* | cegcc*) @@ -9280,7 +9273,7 @@ Index: git/ld/configure darwin* | rhapsody*) -@@ -13110,7 +13849,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13110,7 +13849,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; *) if test "$GXX" = yes; then @@ -9289,7 +9282,7 @@ Index: git/ld/configure else # FIXME: insert proper C++ library support ld_shlibs_CXX=no -@@ -13181,10 +13920,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13181,10 +13920,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -9302,7 +9295,7 @@ Index: git/ld/configure ;; esac fi -@@ -13225,9 +13964,9 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13225,9 +13964,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -9314,7 +9307,7 @@ Index: git/ld/configure fi fi link_all_deplibs_CXX=yes -@@ -13297,20 +14036,20 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13297,20 +14036,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -9339,7 +9332,7 @@ Index: git/ld/configure ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -13505,7 +14244,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13505,7 +14244,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -9348,7 +9341,7 @@ Index: git/ld/configure ;; esac -@@ -13551,7 +14290,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13551,7 +14290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in @@ -9357,7 +9350,7 @@ Index: git/ld/configure # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' -@@ -13592,9 +14331,9 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13592,9 +14331,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -9383,7 +9376,7 @@ Index: git/ld/configure if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -13742,7 +14488,7 @@ if { { eval echo "\"\$as_me\":${as_linen +@@ -13742,7 +14488,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do @@ -9392,7 +9385,7 @@ Index: git/ld/configure -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. -@@ -13751,13 +14497,22 @@ if { { eval echo "\"\$as_me\":${as_linen +@@ -13751,13 +14497,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue @@ -9419,7 +9412,7 @@ Index: git/ld/configure # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. -@@ -13777,8 +14532,10 @@ if { { eval echo "\"\$as_me\":${as_linen +@@ -13777,8 +14532,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi @@ -9456,7 +9449,7 @@ Index: git/ld/configure # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -14020,6 +14776,11 @@ $as_echo_n "checking for $compiler optio +@@ -14020,6 +14776,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; @@ -9468,7 +9461,7 @@ Index: git/ld/configure dgux*) case $cc_basename in ec++*) -@@ -14172,7 +14933,7 @@ $as_echo_n "checking for $compiler optio +@@ -14172,7 +14933,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in @@ -9515,7 +9508,7 @@ Index: git/ld/configure case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. -@@ -14489,15 +15260,20 @@ $as_echo_n "checking whether the $compil +@@ -14489,15 +15260,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" @@ -9643,7 +9636,7 @@ Index: git/ld/configure LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC -@@ -18444,13 +19280,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -18444,13 +19280,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 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"`' @@ -9664,7 +9657,7 @@ Index: git/ld/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"`' -@@ -18465,14 +19308,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -18465,14 +19308,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 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"`' @@ -9683,7 +9676,7 @@ Index: git/ld/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"`' -@@ -18505,12 +19351,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -18505,12 +19351,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 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"`' @@ -9697,7 +9690,7 @@ Index: git/ld/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"`' -@@ -18549,8 +19395,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi +@@ -18549,8 +19395,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' @@ -9707,7 +9700,7 @@ Index: git/ld/configure lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -@@ -18577,12 +19423,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har +@@ -18577,12 +19423,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' @@ -9849,7 +9842,7 @@ Index: git/ld/configure # A symbol stripping program. STRIP=$lt_STRIP -@@ -19684,6 +20561,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -19684,6 +20561,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # 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 @@ -10110,9 +10103,15 @@ Index: git/ld/configure -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -10270,11 +10269,8 @@ Index: git/ld/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -10315,10 +10311,10 @@ Index: git/ld/configure # Specify filename containing input files. file_list_spec=$lt_file_list_spec_CXX -Index: git/libtool.m4 -=================================================================== ---- git.orig/libtool.m4 -+++ git/libtool.m4 +diff --git a/libtool.m4 b/libtool.m4 +index 434530059f..e45fdc6998 100644 +--- a/libtool.m4 ++++ b/libtool.m4 @@ -1,7 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # @@ -10358,7 +10354,7 @@ Index: git/libtool.m4 AC_SUBST(LIBTOOL)dnl _LT_SETUP -@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable +@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl @@ -10381,7 +10377,7 @@ Index: git/libtool.m4 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ +@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. @@ -10486,7 +10482,7 @@ Index: git/libtool.m4 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr +@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH @@ -10739,7 +10735,7 @@ Index: git/libtool.m4 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli +@@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], @@ -10867,7 +10863,7 @@ Index: git/libtool.m4 const char *name; void *address; } -@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() +@@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -10901,7 +10897,7 @@ Index: git/libtool.m4 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres +@@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) @@ -10986,7 +10982,7 @@ Index: git/libtool.m4 # # Check to make sure the static flag actually works. # -@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog +@@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl @@ -11308,7 +11304,7 @@ Index: git/libtool.m4 if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then -@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -11316,7 +11312,7 @@ Index: git/libtool.m4 lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX -@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} @@ -11324,7 +11320,7 @@ Index: git/libtool.m4 compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) -@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. @@ -11333,7 +11329,7 @@ Index: git/libtool.m4 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then else # Determine the default libpath from the value encoded in an # empty executable. @@ -11342,7 +11338,7 @@ Index: git/libtool.m4 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. -@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then ;; cygwin* | mingw* | pw32* | cegcc*) @@ -11441,7 +11437,7 @@ Index: git/libtool.m4 darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; -@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then ;; *) if test "$GXX" = yes; then @@ -11450,7 +11446,7 @@ Index: git/libtool.m4 else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) @@ -11463,7 +11459,7 @@ Index: git/libtool.m4 ;; esac fi -@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then @@ -11475,7 +11471,7 @@ Index: git/libtool.m4 fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ @@ -11500,7 +11496,7 @@ Index: git/libtool.m4 ;; *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) @@ -11509,7 +11505,7 @@ Index: git/libtool.m4 ;; esac -@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in @@ -11518,7 +11514,7 @@ Index: git/libtool.m4 # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -11530,7 +11526,7 @@ Index: git/libtool.m4 # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; +@@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then fi # test -n "$compiler" CC=$lt_save_CC @@ -11738,7 +11734,7 @@ Index: git/libtool.m4 ])# _LT_LANG_RC_CONFIG -@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object +@@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) AC_SUBST([OBJDUMP]) ]) @@ -11765,7 +11761,7 @@ Index: git/libtool.m4 && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn +@@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES @@ -11863,31 +11859,6 @@ Index: git/libtool.m4 -{ - func_len_result=${#1} -} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and @@ -11904,22 +11875,23 @@ Index: git/libtool.m4 +test 0 -eq $? || _lt_function_replace_fail=: +]) --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () -{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi -} +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- @@ -11943,24 +11915,45 @@ Index: git/libtool.m4 + esac + func_basename_result="${1##*/}"]) --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) -+ + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) -+ + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -+ + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; @@ -12008,7 +12001,9 @@ Index: git/libtool.m4 + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -+ + +-_LT_EOF +-esac + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ @@ -12022,17 +12017,14 @@ Index: git/libtool.m4 + test 0 -eq $? || _lt_function_replace_fail=: +fi --_LT_EOF --esac +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () @@ -12118,10 +12110,10 @@ Index: git/libtool.m4 +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS -Index: git/ltmain.sh -=================================================================== ---- git.orig/ltmain.sh -+++ git/ltmain.sh +diff --git a/ltmain.sh b/ltmain.sh +index 9503ec85d7..70e856e065 100644 +--- a/ltmain.sh ++++ b/ltmain.sh @@ -1,10 +1,9 @@ -# Generated from ltmain.m4sh. @@ -12551,7 +12543,31 @@ Index: git/ltmain.sh +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi -+ + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift +- ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift +- ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift +- ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift +- ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift +- ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift +- ;; +- esac + exit $EXIT_MISMATCH + fi +} @@ -12581,7 +12597,9 @@ Index: git/ltmain.sh + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac -+ + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do + + +# Option defaults: @@ -12597,34 +12615,8 @@ Index: git/ltmain.sh +opt_verbose=: +opt_silent=false +opt_verbose=false - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do ++ ++ +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ @@ -12868,13 +12860,13 @@ Index: git/ltmain.sh - fi -} - -- --## ----------- ## --## Main. ## --## ----------- ## + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" +-## ----------- ## +-## Main. ## +-## ----------- ## +- -$opt_help || { - # Sanity checks first: - func_check_version_match @@ -13595,7 +13587,7 @@ Index: git/ltmain.sh "") # Generic help is extracted from the usage comments # at the start of this file. -@@ -1659,8 +2327,8 @@ This mode accepts the following addition +@@ -1659,8 +2327,8 @@ This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes @@ -13606,7 +13598,7 @@ Index: git/ltmain.sh -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u +@@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." ;; *) @@ -13708,7 +13700,7 @@ Index: git/ltmain.sh + do + if test -d "$opt"; then + func_append libdirs " $opt" -+ + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" @@ -13728,7 +13720,7 @@ Index: git/ltmain.sh + else + sysroot_cmd= + fi - ++ + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do @@ -14140,7 +14132,7 @@ Index: git/ltmain.sh lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," -@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() +@@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; @@ -14669,7 +14661,7 @@ Index: git/ltmain.sh */ EOF cat <<"EOF" -@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, +@@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); if (stale) { free ((void *) stale); stale = 0; } \ } while (0) @@ -14696,7 +14688,7 @@ Index: git/ltmain.sh void *xmalloc (size_t num); char *xstrdup (const char *string); -@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp +@@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); @@ -15024,7 +15016,7 @@ Index: git/ltmain.sh vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); -@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch +@@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, } void @@ -15062,7 +15054,7 @@ Index: git/ltmain.sh { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c +@@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) void lt_update_exe_path (const char *name, const char *value) { @@ -15075,7 +15067,7 @@ Index: git/ltmain.sh if (name && *name && value && *value) { -@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co +@@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) void lt_update_lib_path (const char *name, const char *value) { @@ -17348,10 +17340,10 @@ Index: git/ltmain.sh if test -n "$exec_cmd"; then eval exec "$exec_cmd" -Index: git/ltoptions.m4 -=================================================================== ---- git.orig/ltoptions.m4 -+++ git/ltoptions.m4 +diff --git a/ltoptions.m4 b/ltoptions.m4 +index 5ef12ced2a..17cfd51c0b 100644 +--- a/ltoptions.m4 ++++ b/ltoptions.m4 @@ -8,7 +8,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. @@ -17361,10 +17353,10 @@ Index: git/ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -Index: git/ltversion.m4 -=================================================================== ---- git.orig/ltversion.m4 -+++ git/ltversion.m4 +diff --git a/ltversion.m4 b/ltversion.m4 +index bf87f77132..9c7b5d4118 100644 +--- a/ltversion.m4 ++++ b/ltversion.m4 @@ -7,17 +7,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. @@ -17389,10 +17381,10 @@ Index: git/ltversion.m4 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) -Index: git/lt~obsolete.m4 -=================================================================== ---- git.orig/lt~obsolete.m4 -+++ git/lt~obsolete.m4 +diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 +index bf92b5e079..c573da90c5 100644 +--- a/lt~obsolete.m4 ++++ b/lt~obsolete.m4 @@ -7,7 +7,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. @@ -17402,11 +17394,11 @@ Index: git/lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # -Index: git/opcodes/configure -=================================================================== ---- git.orig/opcodes/configure -+++ git/opcodes/configure -@@ -681,6 +681,9 @@ OTOOL +diff --git a/opcodes/configure b/opcodes/configure +index 853849ee58..5f74ecf7da 100755 +--- a/opcodes/configure ++++ b/opcodes/configure +@@ -680,6 +680,9 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -17416,7 +17408,7 @@ Index: git/opcodes/configure OBJDUMP LN_S NM -@@ -799,6 +802,7 @@ enable_static +@@ -798,6 +801,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -17424,7 +17416,7 @@ Index: git/opcodes/configure enable_libtool_lock enable_targets enable_werror -@@ -1463,6 +1467,8 @@ Optional Packages: +@@ -1462,6 +1466,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -17433,7 +17425,7 @@ Index: git/opcodes/configure Some influential environment variables: CC C compiler command -@@ -5404,8 +5410,8 @@ esac +@@ -5403,8 +5409,8 @@ esac @@ -17444,7 +17436,7 @@ Index: git/opcodes/configure -@@ -5445,7 +5451,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +@@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. @@ -17453,7 +17445,7 @@ Index: git/opcodes/configure test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -6131,8 +6137,8 @@ $as_echo_n "checking whether the shell u +@@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -17464,7 +17456,7 @@ Index: git/opcodes/configure && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -@@ -6181,6 +6187,80 @@ esac +@@ -6180,6 +6186,80 @@ esac @@ -17545,7 +17537,7 @@ Index: git/opcodes/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : -@@ -6197,6 +6277,11 @@ case $reload_flag in +@@ -6196,6 +6276,11 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in @@ -17557,7 +17549,7 @@ Index: git/opcodes/configure darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -@@ -6365,7 +6450,8 @@ mingw* | pw32*) +@@ -6364,7 +6449,8 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -17567,7 +17559,7 @@ Index: git/opcodes/configure lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -@@ -6519,6 +6605,21 @@ esac +@@ -6518,6 +6604,21 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } @@ -17589,7 +17581,7 @@ Index: git/opcodes/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -6534,9 +6635,162 @@ test -z "$deplibs_check_method" && depli +@@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -17603,6 +17595,8 @@ Index: git/opcodes/configure + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -17754,7 +17748,7 @@ Index: git/opcodes/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : -@@ -6552,7 +6806,7 @@ do +@@ -6551,7 +6805,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -17763,7 +17757,7 @@ Index: git/opcodes/configure $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6572,11 +6826,15 @@ $as_echo "no" >&6; } +@@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } fi @@ -17782,7 +17776,7 @@ Index: git/opcodes/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : -@@ -6592,7 +6850,7 @@ do +@@ -6591,7 +6849,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then @@ -17791,7 +17785,7 @@ Index: git/opcodes/configure $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6611,6 +6869,10 @@ else +@@ -6610,6 +6868,10 @@ else $as_echo "no" >&6; } fi @@ -17802,7 +17796,7 @@ Index: git/opcodes/configure if test "x$ac_ct_AR" = x; then AR="false" else -@@ -6622,12 +6884,11 @@ ac_tool_warned=yes ;; +@@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -17815,13 +17809,16 @@ Index: git/opcodes/configure +: ${AR=ar} +: ${AR_FLAGS=cru} + - - - -@@ -6638,6 +6899,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -17834,7 +17831,7 @@ Index: git/opcodes/configure +int +main () +{ -+ + + ; + return 0; +} @@ -17860,29 +17857,23 @@ Index: git/opcodes/configure + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -@@ -6973,8 +7291,8 @@ esac + + +@@ -6972,8 +7290,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address @@ -17893,7 +17884,7 @@ Index: git/opcodes/configure # Handle CRLF in mingw tool chain opt_cr= -@@ -7010,6 +7328,7 @@ for ac_symprfx in "" "_"; do +@@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi @@ -17901,7 +17892,7 @@ Index: git/opcodes/configure # Check to see that the pipe works correctly. pipe_works=no -@@ -7051,6 +7370,18 @@ _LT_EOF +@@ -7050,6 +7369,18 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext @@ -17920,7 +17911,7 @@ Index: git/opcodes/configure #ifdef __cplusplus extern "C" { #endif -@@ -7062,7 +7393,7 @@ _LT_EOF +@@ -7061,7 +7392,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ @@ -17929,7 +17920,7 @@ Index: git/opcodes/configure const char *name; void *address; } -@@ -7088,8 +7419,8 @@ static const void *lt_preloaded_setup() +@@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -17940,7 +17931,7 @@ Index: git/opcodes/configure LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 -@@ -7099,8 +7430,8 @@ _LT_EOF +@@ -7098,8 +7429,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -17951,7 +17942,7 @@ Index: git/opcodes/configure else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -7137,6 +7468,14 @@ else +@@ -7136,6 +7467,16 @@ else $as_echo "ok" >&6; } fi @@ -17963,10 +17954,12 @@ Index: git/opcodes/configure +fi + + ++ ++ -@@ -7158,6 +7497,47 @@ fi +@@ -7152,6 +7493,45 @@ fi @@ -17974,6 +17967,9 @@ Index: git/opcodes/configure + + + ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -18006,15 +18002,10 @@ Index: git/opcodes/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -@@ -7364,6 +7744,123 @@ esac + + + +@@ -7363,6 +7743,123 @@ esac need_locks="$enable_libtool_lock" @@ -18138,7 +18129,7 @@ Index: git/opcodes/configure case $host_os in rhapsody* | darwin*) -@@ -7927,6 +8424,8 @@ _LT_EOF +@@ -7926,6 +8423,8 @@ _LT_EOF $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 echo "$AR cru libconftest.a conftest.o" >&5 $AR cru libconftest.a conftest.o 2>&5 @@ -18147,7 +18138,7 @@ Index: git/opcodes/configure cat > conftest.c << _LT_EOF int main() { return 0;} _LT_EOF -@@ -8092,7 +8591,8 @@ fi +@@ -8091,7 +8590,8 @@ fi LIBTOOL_DEPS="$ltmain" # Always use our own libtool. @@ -18157,7 +18148,7 @@ Index: git/opcodes/configure -@@ -8181,7 +8681,7 @@ aix3*) +@@ -8180,7 +8680,7 @@ aix3*) esac # Global variables: @@ -18166,7 +18157,7 @@ Index: git/opcodes/configure can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -@@ -8479,8 +8979,6 @@ fi +@@ -8478,8 +8978,6 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -18175,7 +18166,7 @@ Index: git/opcodes/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8646,6 +9144,12 @@ $as_echo_n "checking for $compiler optio +@@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -18188,7 +18179,7 @@ Index: git/opcodes/configure pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -8708,7 +9212,7 @@ $as_echo_n "checking for $compiler optio +@@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -18197,7 +18188,7 @@ Index: git/opcodes/configure lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; -@@ -8765,13 +9269,17 @@ case $host_os in +@@ -8764,13 +9268,17 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -18221,7 +18212,7 @@ Index: git/opcodes/configure # # Check to make sure the PIC flag actually works. -@@ -8832,6 +9340,11 @@ fi +@@ -8831,6 +9339,11 @@ fi @@ -18233,7 +18224,7 @@ Index: git/opcodes/configure # # Check to make sure the static flag actually works. # -@@ -9182,7 +9695,8 @@ _LT_EOF +@@ -9181,7 +9694,8 @@ _LT_EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -18243,7 +18234,7 @@ Index: git/opcodes/configure if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -9281,12 +9795,12 @@ _LT_EOF +@@ -9280,12 +9794,12 @@ _LT_EOF whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' @@ -18258,7 +18249,7 @@ Index: git/opcodes/configure fi ;; esac -@@ -9300,8 +9814,8 @@ _LT_EOF +@@ -9299,8 +9813,8 @@ _LT_EOF archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -18269,7 +18260,7 @@ Index: git/opcodes/configure fi ;; -@@ -9319,8 +9833,8 @@ _LT_EOF +@@ -9318,8 +9832,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18280,7 +18271,7 @@ Index: git/opcodes/configure else ld_shlibs=no fi -@@ -9366,8 +9880,8 @@ _LT_EOF +@@ -9365,8 +9879,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -18291,7 +18282,7 @@ Index: git/opcodes/configure else ld_shlibs=no fi -@@ -9497,7 +10011,13 @@ _LT_EOF +@@ -9496,7 +10010,13 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -18306,7 +18297,7 @@ Index: git/opcodes/configure /* end confdefs.h. */ int -@@ -9510,22 +10030,29 @@ main () +@@ -9509,22 +10029,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18349,7 +18340,7 @@ Index: git/opcodes/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -9537,7 +10064,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -18364,7 +18355,7 @@ Index: git/opcodes/configure /* end confdefs.h. */ int -@@ -9550,22 +10083,29 @@ main () +@@ -9549,22 +10082,29 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -18407,7 +18398,7 @@ Index: git/opcodes/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -9610,20 +10150,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -18485,7 +18476,7 @@ Index: git/opcodes/configure ;; darwin* | rhapsody*) -@@ -9684,7 +10267,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -18494,7 +18485,7 @@ Index: git/opcodes/configure hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -9692,7 +10275,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -18503,7 +18494,7 @@ Index: git/opcodes/configure else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -9708,7 +10291,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -18512,7 +18503,7 @@ Index: git/opcodes/configure else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -9732,10 +10315,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -18525,7 +18516,7 @@ Index: git/opcodes/configure ;; esac else -@@ -9814,23 +10397,36 @@ fi +@@ -9813,23 +10396,36 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -18570,7 +18561,7 @@ Index: git/opcodes/configure else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9915,7 +10511,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -18579,7 +18570,7 @@ Index: git/opcodes/configure hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9934,9 +10530,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -18591,7 +18582,7 @@ Index: git/opcodes/configure else case `$CC -V 2>&1` in *"Compilers 5.0"*) -@@ -10512,8 +11108,9 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no @@ -18603,7 +18594,7 @@ Index: git/opcodes/configure library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ -@@ -10546,13 +11143,71 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac @@ -18676,7 +18667,7 @@ Index: git/opcodes/configure # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; -@@ -10644,7 +11299,7 @@ haiku*) +@@ -10643,7 +11298,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -18685,16 +18676,16 @@ Index: git/opcodes/configure hardcode_into_libs=yes ;; -@@ -11440,7 +12095,7 @@ else +@@ -11439,7 +12094,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11443 "configure" +-#line 11442 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11484,10 +12139,10 @@ else +@@ -11483,10 +12138,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -18707,16 +18698,16 @@ Index: git/opcodes/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -11546,7 +12201,7 @@ else +@@ -11545,7 +12200,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11549 "configure" +-#line 11548 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11590,10 +12245,10 @@ else +@@ -11589,10 +12244,10 @@ else /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) @@ -18729,7 +18720,7 @@ Index: git/opcodes/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12831,7 +13486,7 @@ if test "$enable_shared" = "yes"; then +@@ -12779,7 +13434,7 @@ if test "$enable_shared" = "yes"; then # since libbfd may not pull in the entirety of libiberty. x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` if test -n "$x"; then @@ -18738,7 +18729,7 @@ Index: git/opcodes/configure fi case "${host}" in -@@ -13807,13 +14462,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -13756,13 +14411,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 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"`' @@ -18759,7 +18750,7 @@ Index: git/opcodes/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"`' -@@ -13828,14 +14490,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -13777,14 +14439,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 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"`' @@ -18778,7 +18769,7 @@ Index: git/opcodes/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"`' -@@ -13868,12 +14533,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -13817,12 +14482,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 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"`' @@ -18792,7 +18783,7 @@ Index: git/opcodes/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"`' -@@ -13928,8 +14593,13 @@ reload_flag \ +@@ -13877,8 +14542,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -18806,7 +18797,7 @@ Index: git/opcodes/configure STRIP \ RANLIB \ CC \ -@@ -13939,12 +14609,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13888,12 +14558,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 \ @@ -18822,7 +18813,7 @@ Index: git/opcodes/configure DSYMUTIL \ NMEDIT \ LIPO \ -@@ -13960,7 +14632,6 @@ no_undefined_flag \ +@@ -13909,7 +14581,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -18830,7 +18821,7 @@ Index: git/opcodes/configure exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -13996,6 +14667,7 @@ module_cmds \ +@@ -13945,6 +14616,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -18838,7 +18829,7 @@ Index: git/opcodes/configure postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -14761,7 +15433,8 @@ $as_echo X"$file" | +@@ -14710,7 +15382,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, @@ -18848,7 +18839,7 @@ Index: git/opcodes/configure # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14864,19 +15537,42 @@ SP2NL=$lt_lt_SP2NL +@@ -14813,19 +15486,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -18892,7 +18883,7 @@ Index: git/opcodes/configure # A symbol stripping program. STRIP=$lt_STRIP -@@ -14906,6 +15602,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -14855,6 +15551,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # 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 @@ -18905,7 +18896,7 @@ Index: git/opcodes/configure # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -14915,6 +15617,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -14864,6 +15566,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -18915,7 +18906,7 @@ Index: git/opcodes/configure # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -15029,12 +15734,12 @@ with_gcc=$GCC +@@ -14978,12 +15683,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -18931,7 +18922,7 @@ Index: git/opcodes/configure # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -15121,9 +15826,6 @@ inherit_rpath=$inherit_rpath +@@ -15070,9 +15775,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -18941,7 +18932,7 @@ Index: git/opcodes/configure # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -15139,6 +15841,9 @@ include_expsyms=$lt_include_expsyms +@@ -15088,6 +15790,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -18951,7 +18942,7 @@ Index: git/opcodes/configure # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -15171,210 +15876,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -15120,210 +15825,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? @@ -19153,9 +19144,15 @@ Index: git/opcodes/configure -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -19313,20 +19310,17 @@ Index: git/opcodes/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" -Index: git/opcodes/configure.ac -=================================================================== ---- git.orig/opcodes/configure.ac -+++ git/opcodes/configure.ac -@@ -166,7 +166,7 @@ changequote(,)dnl +diff --git a/opcodes/configure.ac b/opcodes/configure.ac +index 4eb19005e8..19a57608b9 100644 +--- a/opcodes/configure.ac ++++ b/opcodes/configure.ac +@@ -170,7 +170,7 @@ changequote(,)dnl x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` changequote([,])dnl if test -n "$x"; then @@ -19335,10 +19329,10 @@ Index: git/opcodes/configure.ac fi case "${host}" in -Index: git/zlib/configure -=================================================================== ---- git.orig/zlib/configure -+++ git/zlib/configure +diff --git a/zlib/configure b/zlib/configure +index 041cbdbf71..19d605fc85 100755 +--- a/zlib/configure ++++ b/zlib/configure @@ -646,8 +646,11 @@ OTOOL LIPO NMEDIT @@ -19388,7 +19382,7 @@ Index: git/zlib/configure test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u +@@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -19524,7 +19518,7 @@ Index: git/zlib/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli +@@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -19538,6 +19532,8 @@ Index: git/zlib/configure + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -19738,7 +19734,7 @@ Index: git/zlib/configure if test "x$ac_ct_AR" = x; then AR="false" else -@@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; +@@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; esac AR=$ac_ct_AR fi @@ -19750,13 +19746,17 @@ Index: git/zlib/configure -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} - - - -@@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru - - - ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : @@ -19769,7 +19769,7 @@ Index: git/zlib/configure +int +main () +{ -+ + + ; + return 0; +} @@ -19795,29 +19795,22 @@ Index: git/zlib/configure + fi + fi + rm -f conftest.* libconftest.a -+ + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } -+ + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 + + + @@ -5846,8 +6165,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -19865,7 +19858,7 @@ Index: git/zlib/configure const char *name; void *address; } -@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() +@@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext @@ -19887,7 +19880,7 @@ Index: git/zlib/configure else echo "cannot find nm_test_func in $nlist" >&5 fi -@@ -6010,6 +6342,18 @@ else +@@ -6010,6 +6342,19 @@ else $as_echo "ok" >&6; } fi @@ -19903,13 +19896,17 @@ Index: git/zlib/configure + + + ++ -@@ -6031,6 +6375,42 @@ fi +@@ -6027,6 +6372,41 @@ fi ++ ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + @@ -19942,13 +19939,9 @@ Index: git/zlib/configure + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } -+ -+ -+ -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : + + @@ -6241,6 +6621,123 @@ esac need_locks="$enable_libtool_lock" @@ -20110,7 +20103,7 @@ Index: git/zlib/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio +@@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -20123,7 +20116,7 @@ Index: git/zlib/configure pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) -@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio +@@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in @@ -20284,7 +20277,7 @@ Index: git/zlib/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi else # Determine the default libpath from the value encoded in an # empty executable. @@ -20342,7 +20335,7 @@ Index: git/zlib/configure hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, -@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. @@ -20420,7 +20413,7 @@ Index: git/zlib/configure ;; darwin* | rhapsody*) -@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) @@ -20429,7 +20422,7 @@ Index: git/zlib/configure hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux9*) if test "$GCC" = yes; then @@ -20438,7 +20431,7 @@ Index: git/zlib/configure else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi -@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then @@ -20447,7 +20440,7 @@ Index: git/zlib/configure else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) @@ -20508,7 +20501,7 @@ Index: git/zlib/configure else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -20517,7 +20510,7 @@ Index: git/zlib/configure hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' @@ -20667,7 +20660,7 @@ Index: git/zlib/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12266,13 +12921,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ +@@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' 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"`' @@ -20688,7 +20681,7 @@ Index: git/zlib/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"`' -@@ -12287,14 +12949,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l +@@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de 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"`' @@ -20707,7 +20700,7 @@ Index: git/zlib/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"`' -@@ -12327,12 +12992,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod +@@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q 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"`' @@ -20721,7 +20714,7 @@ Index: git/zlib/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"`' -@@ -12387,8 +13052,13 @@ reload_flag \ +@@ -12388,8 +13053,13 @@ reload_flag \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -20735,7 +20728,7 @@ Index: git/zlib/configure STRIP \ RANLIB \ CC \ -@@ -12398,12 +13068,14 @@ lt_cv_sys_global_symbol_pipe \ +@@ -12399,12 +13069,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 \ @@ -20751,7 +20744,7 @@ Index: git/zlib/configure DSYMUTIL \ NMEDIT \ LIPO \ -@@ -12419,7 +13091,6 @@ no_undefined_flag \ +@@ -12420,7 +13092,6 @@ no_undefined_flag \ hardcode_libdir_flag_spec \ hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ @@ -20759,7 +20752,7 @@ Index: git/zlib/configure exclude_expsyms \ include_expsyms \ file_list_spec \ -@@ -12455,6 +13126,7 @@ module_cmds \ +@@ -12456,6 +13127,7 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ @@ -20767,7 +20760,7 @@ Index: git/zlib/configure postinstall_cmds \ postuninstall_cmds \ finish_cmds \ -@@ -13053,7 +13725,8 @@ $as_echo X"$file" | +@@ -13054,7 +13726,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, @@ -20777,7 +20770,7 @@ Index: git/zlib/configure # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -13156,19 +13829,42 @@ SP2NL=$lt_lt_SP2NL +@@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -20821,7 +20814,7 @@ Index: git/zlib/configure # A symbol stripping program. STRIP=$lt_STRIP -@@ -13198,6 +13894,12 @@ global_symbol_to_c_name_address=$lt_lt_c +@@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # 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 @@ -20834,7 +20827,7 @@ Index: git/zlib/configure # The name of the directory that contains temporary libtool files. objdir=$objdir -@@ -13207,6 +13909,9 @@ MAGIC_CMD=$MAGIC_CMD +@@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks @@ -20844,7 +20837,7 @@ Index: git/zlib/configure # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL -@@ -13321,12 +14026,12 @@ with_gcc=$GCC +@@ -13322,12 +14027,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag @@ -20860,7 +20853,7 @@ Index: git/zlib/configure # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static -@@ -13413,9 +14118,6 @@ inherit_rpath=$inherit_rpath +@@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs @@ -20870,7 +20863,7 @@ Index: git/zlib/configure # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols -@@ -13431,6 +14133,9 @@ include_expsyms=$lt_include_expsyms +@@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds @@ -20880,7 +20873,7 @@ Index: git/zlib/configure # Specify filename containing input files. file_list_spec=$lt_file_list_spec -@@ -13463,210 +14168,169 @@ ltmain="$ac_aux_dir/ltmain.sh" +@@ -13464,210 +14169,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? @@ -21082,9 +21075,15 @@ Index: git/zlib/configure -_LT_EOF - ;; - esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - ++ + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ @@ -21242,12 +21241,12 @@ Index: git/zlib/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || ++ ++ + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" +-- +2.20.1 + |