diff options
author | Scott Garman <scott.a.garman@intel.com> | 2011-01-17 15:24:58 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-21 01:36:15 -0800 |
commit | 68a9d3dd5a40dd1a3d664e4a99cc9da18686f2e1 (patch) | |
tree | 79ab731d7f3cbe9bb6831bb53486abae44cc6c38 /meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch | |
parent | ce175a948e296c7c5fe6249723e799db47e97932 (diff) | |
download | poky-68a9d3dd5a40dd1a3d664e4a99cc9da18686f2e1.tar.gz |
binutils: Fix QA staging errors for target binutils
* The spurious paths were caused by a -L on commandline which pointed to
build dir. So we dont use -L <wordir> -liberty instead use the
libiberty.a directly on commandline effects are same but .la does not
have the workdir path in deplibs
Patch obtained from OpenEmbedded, written by Khem Raj.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch | 1648 |
1 files changed, 846 insertions, 802 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch b/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch index 7b4d3903dc..52c4928c8b 100644 --- a/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch +++ b/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Index: binutils-2.21/libtool.m4 | 1 | Index: binutils-2.21/libtool.m4 |
2 | =================================================================== | 2 | =================================================================== |
3 | --- binutils-2.21.orig/libtool.m4 | 3 | --- binutils-2.21.orig/libtool.m4 2010-01-09 13:11:31.000000000 -0800 |
4 | +++ binutils-2.21/libtool.m4 | 4 | +++ binutils-2.21/libtool.m4 2011-01-07 10:49:16.396101000 -0800 |
5 | @@ -1,7 +1,8 @@ | 5 | @@ -1,7 +1,8 @@ |
6 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 6 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
7 | # | 7 | # |
@@ -22,7 +22,7 @@ Index: binutils-2.21/libtool.m4 | |||
22 | # Written by Gordon Matzigkeit, 1996 | 22 | # Written by Gordon Matzigkeit, 1996 |
23 | # | 23 | # |
24 | # This file is part of GNU Libtool. | 24 | # This file is part of GNU Libtool. |
25 | @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl | 25 | @@ -37,7 +39,7 @@ |
26 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 26 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
27 | ]) | 27 | ]) |
28 | 28 | ||
@@ -31,7 +31,7 @@ Index: binutils-2.21/libtool.m4 | |||
31 | 31 | ||
32 | 32 | ||
33 | # LT_PREREQ(VERSION) | 33 | # LT_PREREQ(VERSION) |
34 | @@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) | 34 | @@ -92,7 +94,8 @@ |
35 | LIBTOOL_DEPS="$ltmain" | 35 | LIBTOOL_DEPS="$ltmain" |
36 | 36 | ||
37 | # Always use our own libtool. | 37 | # Always use our own libtool. |
@@ -41,7 +41,7 @@ Index: binutils-2.21/libtool.m4 | |||
41 | AC_SUBST(LIBTOOL)dnl | 41 | AC_SUBST(LIBTOOL)dnl |
42 | 42 | ||
43 | _LT_SETUP | 43 | _LT_SETUP |
44 | @@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable | 44 | @@ -166,10 +169,13 @@ |
45 | dnl | 45 | dnl |
46 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 46 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
47 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | 47 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
@@ -55,7 +55,7 @@ Index: binutils-2.21/libtool.m4 | |||
55 | 55 | ||
56 | _LT_CONFIG_LIBTOOL_INIT([ | 56 | _LT_CONFIG_LIBTOOL_INIT([ |
57 | # See if we are running on zsh, and set the options which allow our | 57 | # See if we are running on zsh, and set the options which allow our |
58 | @@ -199,7 +205,7 @@ aix3*) | 58 | @@ -199,7 +205,7 @@ |
59 | esac | 59 | esac |
60 | 60 | ||
61 | # Global variables: | 61 | # Global variables: |
@@ -64,7 +64,7 @@ Index: binutils-2.21/libtool.m4 | |||
64 | can_build_shared=yes | 64 | can_build_shared=yes |
65 | 65 | ||
66 | # All known linkers require a `.a' archive for static linking (except MSVC, | 66 | # All known linkers require a `.a' archive for static linking (except MSVC, |
67 | @@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ | 67 | @@ -632,7 +638,7 @@ |
68 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 68 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
69 | configured by $[0], generated by m4_PACKAGE_STRING. | 69 | configured by $[0], generated by m4_PACKAGE_STRING. |
70 | 70 | ||
@@ -73,7 +73,7 @@ Index: binutils-2.21/libtool.m4 | |||
73 | This config.lt script is free software; the Free Software Foundation | 73 | This config.lt script is free software; the Free Software Foundation |
74 | gives unlimited permision to copy, distribute and modify it." | 74 | gives unlimited permision to copy, distribute and modify it." |
75 | 75 | ||
76 | @@ -746,15 +752,12 @@ _LT_EOF | 76 | @@ -746,15 +752,12 @@ |
77 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 77 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
78 | # text mode, it properly converts lines to CR/LF. This bash problem | 78 | # text mode, it properly converts lines to CR/LF. This bash problem |
79 | # is reportedly fixed, but why not run on old versions too? | 79 | # is reportedly fixed, but why not run on old versions too? |
@@ -93,7 +93,7 @@ Index: binutils-2.21/libtool.m4 | |||
93 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 93 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
94 | chmod +x "$ofile" | 94 | chmod +x "$ofile" |
95 | ], | 95 | ], |
96 | @@ -980,6 +983,8 @@ _LT_EOF | 96 | @@ -980,6 +983,8 @@ |
97 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD | 97 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
98 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | 98 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
99 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | 99 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
@@ -102,7 +102,7 @@ Index: binutils-2.21/libtool.m4 | |||
102 | cat > conftest.c << _LT_EOF | 102 | cat > conftest.c << _LT_EOF |
103 | int main() { return 0;} | 103 | int main() { return 0;} |
104 | _LT_EOF | 104 | _LT_EOF |
105 | @@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], | 105 | @@ -1069,30 +1074,41 @@ |
106 | fi | 106 | fi |
107 | ]) | 107 | ]) |
108 | 108 | ||
@@ -160,7 +160,7 @@ Index: binutils-2.21/libtool.m4 | |||
160 | ])# _LT_SYS_MODULE_PATH_AIX | 160 | ])# _LT_SYS_MODULE_PATH_AIX |
161 | 161 | ||
162 | 162 | ||
163 | @@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 163 | @@ -1117,7 +1133,7 @@ |
164 | 164 | ||
165 | AC_MSG_CHECKING([how to print strings]) | 165 | AC_MSG_CHECKING([how to print strings]) |
166 | # Test print first, because it will be a builtin if present. | 166 | # Test print first, because it will be a builtin if present. |
@@ -169,7 +169,7 @@ Index: binutils-2.21/libtool.m4 | |||
169 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 169 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
170 | ECHO='print -r --' | 170 | ECHO='print -r --' |
171 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 171 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
172 | @@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr | 172 | @@ -1161,6 +1177,39 @@ |
173 | ])# _LT_PROG_ECHO_BACKSLASH | 173 | ])# _LT_PROG_ECHO_BACKSLASH |
174 | 174 | ||
175 | 175 | ||
@@ -209,7 +209,7 @@ Index: binutils-2.21/libtool.m4 | |||
209 | # _LT_ENABLE_LOCK | 209 | # _LT_ENABLE_LOCK |
210 | # --------------- | 210 | # --------------- |
211 | m4_defun([_LT_ENABLE_LOCK], | 211 | m4_defun([_LT_ENABLE_LOCK], |
212 | @@ -1307,14 +1356,47 @@ need_locks="$enable_libtool_lock" | 212 | @@ -1307,14 +1356,47 @@ |
213 | ])# _LT_ENABLE_LOCK | 213 | ])# _LT_ENABLE_LOCK |
214 | 214 | ||
215 | 215 | ||
@@ -262,7 +262,7 @@ Index: binutils-2.21/libtool.m4 | |||
262 | 262 | ||
263 | AC_CHECK_TOOL(STRIP, strip, :) | 263 | AC_CHECK_TOOL(STRIP, strip, :) |
264 | test -z "$STRIP" && STRIP=: | 264 | test -z "$STRIP" && STRIP=: |
265 | @@ -1610,7 +1692,7 @@ else | 265 | @@ -1610,7 +1692,7 @@ |
266 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 266 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
267 | lt_status=$lt_dlunknown | 267 | lt_status=$lt_dlunknown |
268 | cat > conftest.$ac_ext <<_LT_EOF | 268 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -271,7 +271,7 @@ Index: binutils-2.21/libtool.m4 | |||
271 | #include "confdefs.h" | 271 | #include "confdefs.h" |
272 | 272 | ||
273 | #if HAVE_DLFCN_H | 273 | #if HAVE_DLFCN_H |
274 | @@ -1654,10 +1736,10 @@ else | 274 | @@ -1654,10 +1736,10 @@ |
275 | /* When -fvisbility=hidden is used, assume the code has been annotated | 275 | /* When -fvisbility=hidden is used, assume the code has been annotated |
276 | correspondingly for the symbols needed. */ | 276 | correspondingly for the symbols needed. */ |
277 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 277 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -284,7 +284,7 @@ Index: binutils-2.21/libtool.m4 | |||
284 | int main () | 284 | int main () |
285 | { | 285 | { |
286 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 286 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
287 | @@ -2197,8 +2279,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 287 | @@ -2197,8 +2279,9 @@ |
288 | need_version=no | 288 | need_version=no |
289 | need_lib_prefix=no | 289 | need_lib_prefix=no |
290 | 290 | ||
@@ -296,7 +296,7 @@ Index: binutils-2.21/libtool.m4 | |||
296 | library_names_spec='$libname.dll.a' | 296 | library_names_spec='$libname.dll.a' |
297 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 297 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
298 | postinstall_cmds='base_file=`basename \${file}`~ | 298 | postinstall_cmds='base_file=`basename \${file}`~ |
299 | @@ -2231,13 +2314,71 @@ m4_if([$1], [],[ | 299 | @@ -2231,13 +2314,71 @@ |
300 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 300 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
301 | ;; | 301 | ;; |
302 | esac | 302 | esac |
@@ -369,7 +369,7 @@ Index: binutils-2.21/libtool.m4 | |||
369 | # FIXME: first we should search . and the directory the executable is in | 369 | # FIXME: first we should search . and the directory the executable is in |
370 | shlibpath_var=PATH | 370 | shlibpath_var=PATH |
371 | ;; | 371 | ;; |
372 | @@ -2333,7 +2474,7 @@ haiku*) | 372 | @@ -2333,7 +2474,7 @@ |
373 | soname_spec='${libname}${release}${shared_ext}$major' | 373 | soname_spec='${libname}${release}${shared_ext}$major' |
374 | shlibpath_var=LIBRARY_PATH | 374 | shlibpath_var=LIBRARY_PATH |
375 | shlibpath_overrides_runpath=yes | 375 | shlibpath_overrides_runpath=yes |
@@ -378,7 +378,7 @@ Index: binutils-2.21/libtool.m4 | |||
378 | hardcode_into_libs=yes | 378 | hardcode_into_libs=yes |
379 | ;; | 379 | ;; |
380 | 380 | ||
381 | @@ -2941,6 +3082,11 @@ case $reload_flag in | 381 | @@ -2941,6 +3082,11 @@ |
382 | esac | 382 | esac |
383 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 383 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
384 | case $host_os in | 384 | case $host_os in |
@@ -390,7 +390,7 @@ Index: binutils-2.21/libtool.m4 | |||
390 | darwin*) | 390 | darwin*) |
391 | if test "$GCC" = yes; then | 391 | if test "$GCC" = yes; then |
392 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 392 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
393 | @@ -3007,7 +3153,8 @@ mingw* | pw32*) | 393 | @@ -3007,7 +3153,8 @@ |
394 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 394 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
395 | lt_cv_file_magic_cmd='func_win32_libid' | 395 | lt_cv_file_magic_cmd='func_win32_libid' |
396 | else | 396 | else |
@@ -400,7 +400,7 @@ Index: binutils-2.21/libtool.m4 | |||
400 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 400 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
401 | fi | 401 | fi |
402 | ;; | 402 | ;; |
403 | @@ -3158,6 +3305,21 @@ tpf*) | 403 | @@ -3158,6 +3305,21 @@ |
404 | ;; | 404 | ;; |
405 | esac | 405 | esac |
406 | ]) | 406 | ]) |
@@ -422,7 +422,7 @@ Index: binutils-2.21/libtool.m4 | |||
422 | file_magic_cmd=$lt_cv_file_magic_cmd | 422 | file_magic_cmd=$lt_cv_file_magic_cmd |
423 | deplibs_check_method=$lt_cv_deplibs_check_method | 423 | deplibs_check_method=$lt_cv_deplibs_check_method |
424 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 424 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
425 | @@ -3165,7 +3327,11 @@ test -z "$deplibs_check_method" && depli | 425 | @@ -3165,7 +3327,11 @@ |
426 | _LT_DECL([], [deplibs_check_method], [1], | 426 | _LT_DECL([], [deplibs_check_method], [1], |
427 | [Method to check whether dependent libraries are shared objects]) | 427 | [Method to check whether dependent libraries are shared objects]) |
428 | _LT_DECL([], [file_magic_cmd], [1], | 428 | _LT_DECL([], [file_magic_cmd], [1], |
@@ -435,7 +435,7 @@ Index: binutils-2.21/libtool.m4 | |||
435 | ])# _LT_CHECK_MAGIC_METHOD | 435 | ])# _LT_CHECK_MAGIC_METHOD |
436 | 436 | ||
437 | 437 | ||
438 | @@ -3268,6 +3434,67 @@ dnl aclocal-1.4 backwards compatibility: | 438 | @@ -3268,6 +3434,67 @@ |
439 | dnl AC_DEFUN([AM_PROG_NM], []) | 439 | dnl AC_DEFUN([AM_PROG_NM], []) |
440 | dnl AC_DEFUN([AC_PROG_NM], []) | 440 | dnl AC_DEFUN([AC_PROG_NM], []) |
441 | 441 | ||
@@ -503,7 +503,7 @@ Index: binutils-2.21/libtool.m4 | |||
503 | 503 | ||
504 | # LT_LIB_M | 504 | # LT_LIB_M |
505 | # -------- | 505 | # -------- |
506 | @@ -3394,8 +3621,8 @@ esac | 506 | @@ -3394,8 +3621,8 @@ |
507 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 507 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
508 | 508 | ||
509 | # Transform an extracted symbol line into symbol name and symbol address | 509 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -514,7 +514,7 @@ Index: binutils-2.21/libtool.m4 | |||
514 | 514 | ||
515 | # Handle CRLF in mingw tool chain | 515 | # Handle CRLF in mingw tool chain |
516 | opt_cr= | 516 | opt_cr= |
517 | @@ -3431,6 +3658,7 @@ for ac_symprfx in "" "_"; do | 517 | @@ -3431,6 +3658,7 @@ |
518 | else | 518 | else |
519 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 519 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
520 | fi | 520 | fi |
@@ -522,7 +522,7 @@ Index: binutils-2.21/libtool.m4 | |||
522 | 522 | ||
523 | # Check to see that the pipe works correctly. | 523 | # Check to see that the pipe works correctly. |
524 | pipe_works=no | 524 | pipe_works=no |
525 | @@ -3464,6 +3692,18 @@ _LT_EOF | 525 | @@ -3464,6 +3692,18 @@ |
526 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 526 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
527 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 527 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
528 | cat <<_LT_EOF > conftest.$ac_ext | 528 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -541,7 +541,7 @@ Index: binutils-2.21/libtool.m4 | |||
541 | #ifdef __cplusplus | 541 | #ifdef __cplusplus |
542 | extern "C" { | 542 | extern "C" { |
543 | #endif | 543 | #endif |
544 | @@ -3475,7 +3715,7 @@ _LT_EOF | 544 | @@ -3475,7 +3715,7 @@ |
545 | cat <<_LT_EOF >> conftest.$ac_ext | 545 | cat <<_LT_EOF >> conftest.$ac_ext |
546 | 546 | ||
547 | /* The mapping between symbol names and symbols. */ | 547 | /* The mapping between symbol names and symbols. */ |
@@ -550,7 +550,7 @@ Index: binutils-2.21/libtool.m4 | |||
550 | const char *name; | 550 | const char *name; |
551 | void *address; | 551 | void *address; |
552 | } | 552 | } |
553 | @@ -3501,15 +3741,15 @@ static const void *lt_preloaded_setup() | 553 | @@ -3501,15 +3741,15 @@ |
554 | _LT_EOF | 554 | _LT_EOF |
555 | # Now try linking the two files. | 555 | # Now try linking the two files. |
556 | mv conftest.$ac_objext conftstm.$ac_objext | 556 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -570,7 +570,7 @@ Index: binutils-2.21/libtool.m4 | |||
570 | else | 570 | else |
571 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD | 571 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
572 | fi | 572 | fi |
573 | @@ -3542,6 +3782,13 @@ else | 573 | @@ -3542,6 +3782,13 @@ |
574 | AC_MSG_RESULT(ok) | 574 | AC_MSG_RESULT(ok) |
575 | fi | 575 | fi |
576 | 576 | ||
@@ -584,7 +584,7 @@ Index: binutils-2.21/libtool.m4 | |||
584 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], | 584 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
585 | [Take the output of nm and produce a listing of raw symbols and C names]) | 585 | [Take the output of nm and produce a listing of raw symbols and C names]) |
586 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], | 586 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
587 | @@ -3552,6 +3799,8 @@ _LT_DECL([global_symbol_to_c_name_addres | 587 | @@ -3552,6 +3799,8 @@ |
588 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], | 588 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
589 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], | 589 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
590 | [Transform the output of nm in a C name address pair when lib prefix is needed]) | 590 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
@@ -593,7 +593,7 @@ Index: binutils-2.21/libtool.m4 | |||
593 | ]) # _LT_CMD_GLOBAL_SYMBOLS | 593 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
594 | 594 | ||
595 | 595 | ||
596 | @@ -3563,7 +3812,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= | 596 | @@ -3563,7 +3812,6 @@ |
597 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 597 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
598 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | 598 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
599 | 599 | ||
@@ -601,7 +601,7 @@ Index: binutils-2.21/libtool.m4 | |||
601 | m4_if([$1], [CXX], [ | 601 | m4_if([$1], [CXX], [ |
602 | # C++ specific cases for pic, static, wl, etc. | 602 | # C++ specific cases for pic, static, wl, etc. |
603 | if test "$GXX" = yes; then | 603 | if test "$GXX" = yes; then |
604 | @@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [ | 604 | @@ -3668,6 +3916,12 @@ |
605 | ;; | 605 | ;; |
606 | esac | 606 | esac |
607 | ;; | 607 | ;; |
@@ -614,7 +614,7 @@ Index: binutils-2.21/libtool.m4 | |||
614 | dgux*) | 614 | dgux*) |
615 | case $cc_basename in | 615 | case $cc_basename in |
616 | ec++*) | 616 | ec++*) |
617 | @@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [ | 617 | @@ -3820,7 +4074,7 @@ |
618 | ;; | 618 | ;; |
619 | solaris*) | 619 | solaris*) |
620 | case $cc_basename in | 620 | case $cc_basename in |
@@ -623,7 +623,7 @@ Index: binutils-2.21/libtool.m4 | |||
623 | # Sun C++ 4.2, 5.x and Centerline C++ | 623 | # Sun C++ 4.2, 5.x and Centerline C++ |
624 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 624 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
625 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 625 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
626 | @@ -4042,6 +4296,12 @@ m4_if([$1], [CXX], [ | 626 | @@ -4042,6 +4296,12 @@ |
627 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' | 627 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
628 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' | 628 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
629 | ;; | 629 | ;; |
@@ -636,7 +636,7 @@ Index: binutils-2.21/libtool.m4 | |||
636 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 636 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
637 | # Portland Group compilers (*not* the Pentium gcc compiler, | 637 | # Portland Group compilers (*not* the Pentium gcc compiler, |
638 | # which looks to be a dead project) | 638 | # which looks to be a dead project) |
639 | @@ -4104,7 +4364,7 @@ m4_if([$1], [CXX], [ | 639 | @@ -4104,7 +4364,7 @@ |
640 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 640 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
641 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 641 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
642 | case $cc_basename in | 642 | case $cc_basename in |
@@ -645,7 +645,7 @@ Index: binutils-2.21/libtool.m4 | |||
645 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; | 645 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
646 | *) | 646 | *) |
647 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; | 647 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
648 | @@ -4161,9 +4421,11 @@ case $host_os in | 648 | @@ -4161,9 +4421,11 @@ |
649 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" | 649 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
650 | ;; | 650 | ;; |
651 | esac | 651 | esac |
@@ -660,7 +660,7 @@ Index: binutils-2.21/libtool.m4 | |||
660 | 660 | ||
661 | # | 661 | # |
662 | # Check to make sure the PIC flag actually works. | 662 | # Check to make sure the PIC flag actually works. |
663 | @@ -4182,6 +4444,8 @@ fi | 663 | @@ -4182,6 +4444,8 @@ |
664 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], | 664 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
665 | [Additional compiler flags for building library objects]) | 665 | [Additional compiler flags for building library objects]) |
666 | 666 | ||
@@ -669,7 +669,7 @@ Index: binutils-2.21/libtool.m4 | |||
669 | # | 669 | # |
670 | # Check to make sure the static flag actually works. | 670 | # Check to make sure the static flag actually works. |
671 | # | 671 | # |
672 | @@ -4202,6 +4466,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog | 672 | @@ -4202,6 +4466,7 @@ |
673 | m4_defun([_LT_LINKER_SHLIBS], | 673 | m4_defun([_LT_LINKER_SHLIBS], |
674 | [AC_REQUIRE([LT_PATH_LD])dnl | 674 | [AC_REQUIRE([LT_PATH_LD])dnl |
675 | AC_REQUIRE([LT_PATH_NM])dnl | 675 | AC_REQUIRE([LT_PATH_NM])dnl |
@@ -677,7 +677,7 @@ Index: binutils-2.21/libtool.m4 | |||
677 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 677 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
678 | m4_require([_LT_DECL_EGREP])dnl | 678 | m4_require([_LT_DECL_EGREP])dnl |
679 | m4_require([_LT_DECL_SED])dnl | 679 | m4_require([_LT_DECL_SED])dnl |
680 | @@ -4210,6 +4475,7 @@ m4_require([_LT_TAG_COMPILER])dnl | 680 | @@ -4210,6 +4475,7 @@ |
681 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | 681 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
682 | m4_if([$1], [CXX], [ | 682 | m4_if([$1], [CXX], [ |
683 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 683 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
@@ -685,7 +685,7 @@ Index: binutils-2.21/libtool.m4 | |||
685 | case $host_os in | 685 | case $host_os in |
686 | aix[[4-9]]*) | 686 | aix[[4-9]]*) |
687 | # If we're using GNU nm, then we don't want the "-C" option. | 687 | # If we're using GNU nm, then we don't want the "-C" option. |
688 | @@ -4224,15 +4490,20 @@ m4_if([$1], [CXX], [ | 688 | @@ -4224,15 +4490,20 @@ |
689 | ;; | 689 | ;; |
690 | pw32*) | 690 | pw32*) |
691 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | 691 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
@@ -711,7 +711,7 @@ Index: binutils-2.21/libtool.m4 | |||
711 | ], [ | 711 | ], [ |
712 | runpath_var= | 712 | runpath_var= |
713 | _LT_TAGVAR(allow_undefined_flag, $1)= | 713 | _LT_TAGVAR(allow_undefined_flag, $1)= |
714 | @@ -4400,7 +4671,8 @@ _LT_EOF | 714 | @@ -4400,7 +4671,8 @@ |
715 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 715 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
716 | _LT_TAGVAR(always_export_symbols, $1)=no | 716 | _LT_TAGVAR(always_export_symbols, $1)=no |
717 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 717 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
@@ -721,7 +721,7 @@ Index: binutils-2.21/libtool.m4 | |||
721 | 721 | ||
722 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 722 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
723 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 723 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
724 | @@ -4448,7 +4720,7 @@ _LT_EOF | 724 | @@ -4448,7 +4720,7 @@ |
725 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 725 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
726 | && test "$tmp_diet" = no | 726 | && test "$tmp_diet" = no |
727 | then | 727 | then |
@@ -730,7 +730,7 @@ Index: binutils-2.21/libtool.m4 | |||
730 | tmp_sharedflag='-shared' | 730 | tmp_sharedflag='-shared' |
731 | case $cc_basename,$host_cpu in | 731 | case $cc_basename,$host_cpu in |
732 | pgcc*) # Portland Group C compiler | 732 | pgcc*) # Portland Group C compiler |
733 | @@ -4499,12 +4771,12 @@ _LT_EOF | 733 | @@ -4499,12 +4771,12 @@ |
734 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | 734 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
735 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 735 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
736 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | 736 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
@@ -745,7 +745,7 @@ Index: binutils-2.21/libtool.m4 | |||
745 | fi | 745 | fi |
746 | ;; | 746 | ;; |
747 | esac | 747 | esac |
748 | @@ -4518,8 +4790,8 @@ _LT_EOF | 748 | @@ -4518,8 +4790,8 @@ |
749 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 749 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
750 | wlarc= | 750 | wlarc= |
751 | else | 751 | else |
@@ -756,7 +756,7 @@ Index: binutils-2.21/libtool.m4 | |||
756 | fi | 756 | fi |
757 | ;; | 757 | ;; |
758 | 758 | ||
759 | @@ -4537,8 +4809,8 @@ _LT_EOF | 759 | @@ -4537,8 +4809,8 @@ |
760 | 760 | ||
761 | _LT_EOF | 761 | _LT_EOF |
762 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 762 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -767,7 +767,7 @@ Index: binutils-2.21/libtool.m4 | |||
767 | else | 767 | else |
768 | _LT_TAGVAR(ld_shlibs, $1)=no | 768 | _LT_TAGVAR(ld_shlibs, $1)=no |
769 | fi | 769 | fi |
770 | @@ -4584,8 +4856,8 @@ _LT_EOF | 770 | @@ -4584,8 +4856,8 @@ |
771 | 771 | ||
772 | *) | 772 | *) |
773 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 773 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -778,7 +778,7 @@ Index: binutils-2.21/libtool.m4 | |||
778 | else | 778 | else |
779 | _LT_TAGVAR(ld_shlibs, $1)=no | 779 | _LT_TAGVAR(ld_shlibs, $1)=no |
780 | fi | 780 | fi |
781 | @@ -4715,7 +4987,7 @@ _LT_EOF | 781 | @@ -4715,7 +4987,7 @@ |
782 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 782 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
783 | # Determine the default libpath from the value encoded in an | 783 | # Determine the default libpath from the value encoded in an |
784 | # empty executable. | 784 | # empty executable. |
@@ -787,7 +787,7 @@ Index: binutils-2.21/libtool.m4 | |||
787 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 787 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
788 | _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" | 788 | _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" |
789 | else | 789 | else |
790 | @@ -4726,7 +4998,7 @@ _LT_EOF | 790 | @@ -4726,7 +4998,7 @@ |
791 | else | 791 | else |
792 | # Determine the default libpath from the value encoded in an | 792 | # Determine the default libpath from the value encoded in an |
793 | # empty executable. | 793 | # empty executable. |
@@ -796,7 +796,7 @@ Index: binutils-2.21/libtool.m4 | |||
796 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 796 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
797 | # Warning - without using the other run time loading flags, | 797 | # Warning - without using the other run time loading flags, |
798 | # -berok will link without error, but may produce a broken library. | 798 | # -berok will link without error, but may produce a broken library. |
799 | @@ -4770,20 +5042,63 @@ _LT_EOF | 799 | @@ -4770,20 +5042,63 @@ |
800 | # Microsoft Visual C++. | 800 | # Microsoft Visual C++. |
801 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 801 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
802 | # no search path for DLLs. | 802 | # no search path for DLLs. |
@@ -874,7 +874,7 @@ Index: binutils-2.21/libtool.m4 | |||
874 | ;; | 874 | ;; |
875 | 875 | ||
876 | darwin* | rhapsody*) | 876 | darwin* | rhapsody*) |
877 | @@ -4821,7 +5136,7 @@ _LT_EOF | 877 | @@ -4821,7 +5136,7 @@ |
878 | 878 | ||
879 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 879 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
880 | freebsd* | dragonfly*) | 880 | freebsd* | dragonfly*) |
@@ -883,7 +883,7 @@ Index: binutils-2.21/libtool.m4 | |||
883 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 883 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
884 | _LT_TAGVAR(hardcode_direct, $1)=yes | 884 | _LT_TAGVAR(hardcode_direct, $1)=yes |
885 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 885 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
886 | @@ -4829,7 +5144,7 @@ _LT_EOF | 886 | @@ -4829,7 +5144,7 @@ |
887 | 887 | ||
888 | hpux9*) | 888 | hpux9*) |
889 | if test "$GCC" = yes; then | 889 | if test "$GCC" = yes; then |
@@ -892,7 +892,7 @@ Index: binutils-2.21/libtool.m4 | |||
892 | else | 892 | else |
893 | _LT_TAGVAR(archive_cmds, $1)='$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' | 893 | _LT_TAGVAR(archive_cmds, $1)='$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' |
894 | fi | 894 | fi |
895 | @@ -4845,7 +5160,7 @@ _LT_EOF | 895 | @@ -4845,7 +5160,7 @@ |
896 | 896 | ||
897 | hpux10*) | 897 | hpux10*) |
898 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 898 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -901,7 +901,7 @@ Index: binutils-2.21/libtool.m4 | |||
901 | else | 901 | else |
902 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 902 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
903 | fi | 903 | fi |
904 | @@ -4869,10 +5184,10 @@ _LT_EOF | 904 | @@ -4869,10 +5184,10 @@ |
905 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 905 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
906 | ;; | 906 | ;; |
907 | ia64*) | 907 | ia64*) |
@@ -914,7 +914,7 @@ Index: binutils-2.21/libtool.m4 | |||
914 | ;; | 914 | ;; |
915 | esac | 915 | esac |
916 | else | 916 | else |
917 | @@ -4919,16 +5234,31 @@ _LT_EOF | 917 | @@ -4919,16 +5234,31 @@ |
918 | 918 | ||
919 | irix5* | irix6* | nonstopux*) | 919 | irix5* | irix6* | nonstopux*) |
920 | if test "$GCC" = yes; then | 920 | if test "$GCC" = yes; then |
@@ -953,7 +953,7 @@ Index: binutils-2.21/libtool.m4 | |||
953 | else | 953 | else |
954 | _LT_TAGVAR(archive_cmds, $1)='$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' | 954 | _LT_TAGVAR(archive_cmds, $1)='$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' |
955 | _LT_TAGVAR(archive_expsym_cmds, $1)='$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' | 955 | _LT_TAGVAR(archive_expsym_cmds, $1)='$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' |
956 | @@ -5013,7 +5343,7 @@ _LT_EOF | 956 | @@ -5013,7 +5343,7 @@ |
957 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 957 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
958 | if test "$GCC" = yes; then | 958 | if test "$GCC" = yes; then |
959 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 959 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
@@ -962,7 +962,7 @@ Index: binutils-2.21/libtool.m4 | |||
962 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 962 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
963 | else | 963 | else |
964 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 964 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
965 | @@ -5032,9 +5362,9 @@ _LT_EOF | 965 | @@ -5032,9 +5362,9 @@ |
966 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' | 966 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
967 | if test "$GCC" = yes; then | 967 | if test "$GCC" = yes; then |
968 | wlarc='${wl}' | 968 | wlarc='${wl}' |
@@ -974,7 +974,7 @@ Index: binutils-2.21/libtool.m4 | |||
974 | else | 974 | else |
975 | case `$CC -V 2>&1` in | 975 | case `$CC -V 2>&1` in |
976 | *"Compilers 5.0"*) | 976 | *"Compilers 5.0"*) |
977 | @@ -5306,8 +5636,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], | 977 | @@ -5306,8 +5636,6 @@ |
978 | to runtime path list]) | 978 | to runtime path list]) |
979 | _LT_TAGDECL([], [link_all_deplibs], [0], | 979 | _LT_TAGDECL([], [link_all_deplibs], [0], |
980 | [Whether libtool must link a program against all its dependency libraries]) | 980 | [Whether libtool must link a program against all its dependency libraries]) |
@@ -983,7 +983,7 @@ Index: binutils-2.21/libtool.m4 | |||
983 | _LT_TAGDECL([], [always_export_symbols], [0], | 983 | _LT_TAGDECL([], [always_export_symbols], [0], |
984 | [Set to "yes" if exported symbols are required]) | 984 | [Set to "yes" if exported symbols are required]) |
985 | _LT_TAGDECL([], [export_symbols_cmds], [2], | 985 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
986 | @@ -5318,6 +5646,8 @@ _LT_TAGDECL([], [include_expsyms], [1], | 986 | @@ -5318,6 +5646,8 @@ |
987 | [Symbols that must always be exported]) | 987 | [Symbols that must always be exported]) |
988 | _LT_TAGDECL([], [prelink_cmds], [2], | 988 | _LT_TAGDECL([], [prelink_cmds], [2], |
989 | [Commands necessary for linking programs (against libraries) with templates]) | 989 | [Commands necessary for linking programs (against libraries) with templates]) |
@@ -992,7 +992,7 @@ Index: binutils-2.21/libtool.m4 | |||
992 | _LT_TAGDECL([], [file_list_spec], [1], | 992 | _LT_TAGDECL([], [file_list_spec], [1], |
993 | [Specify filename containing input files]) | 993 | [Specify filename containing input files]) |
994 | dnl FIXME: Not yet implemented | 994 | dnl FIXME: Not yet implemented |
995 | @@ -5419,6 +5749,7 @@ CC="$lt_save_CC" | 995 | @@ -5419,6 +5749,7 @@ |
996 | m4_defun([_LT_LANG_CXX_CONFIG], | 996 | m4_defun([_LT_LANG_CXX_CONFIG], |
997 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 997 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
998 | m4_require([_LT_DECL_EGREP])dnl | 998 | m4_require([_LT_DECL_EGREP])dnl |
@@ -1000,7 +1000,7 @@ Index: binutils-2.21/libtool.m4 | |||
1000 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 1000 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
1001 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 1001 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
1002 | (test "X$CXX" != "Xg++"))) ; then | 1002 | (test "X$CXX" != "Xg++"))) ; then |
1003 | @@ -5480,6 +5811,7 @@ if test "$_lt_caught_CXX_error" != yes; | 1003 | @@ -5480,6 +5811,7 @@ |
1004 | 1004 | ||
1005 | # Allow CC to be a program name with arguments. | 1005 | # Allow CC to be a program name with arguments. |
1006 | lt_save_CC=$CC | 1006 | lt_save_CC=$CC |
@@ -1008,7 +1008,7 @@ Index: binutils-2.21/libtool.m4 | |||
1008 | lt_save_LD=$LD | 1008 | lt_save_LD=$LD |
1009 | lt_save_GCC=$GCC | 1009 | lt_save_GCC=$GCC |
1010 | GCC=$GXX | 1010 | GCC=$GXX |
1011 | @@ -5497,6 +5829,7 @@ if test "$_lt_caught_CXX_error" != yes; | 1011 | @@ -5497,6 +5829,7 @@ |
1012 | fi | 1012 | fi |
1013 | test -z "${LDCXX+set}" || LD=$LDCXX | 1013 | test -z "${LDCXX+set}" || LD=$LDCXX |
1014 | CC=${CXX-"c++"} | 1014 | CC=${CXX-"c++"} |
@@ -1016,7 +1016,7 @@ Index: binutils-2.21/libtool.m4 | |||
1016 | compiler=$CC | 1016 | compiler=$CC |
1017 | _LT_TAGVAR(compiler, $1)=$CC | 1017 | _LT_TAGVAR(compiler, $1)=$CC |
1018 | _LT_CC_BASENAME([$compiler]) | 1018 | _LT_CC_BASENAME([$compiler]) |
1019 | @@ -5518,8 +5851,8 @@ if test "$_lt_caught_CXX_error" != yes; | 1019 | @@ -5518,8 +5851,8 @@ |
1020 | # Check if GNU C++ uses GNU ld as the underlying linker, since the | 1020 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
1021 | # archiving commands below assume that GNU ld is being used. | 1021 | # archiving commands below assume that GNU ld is being used. |
1022 | if test "$with_gnu_ld" = yes; then | 1022 | if test "$with_gnu_ld" = yes; then |
@@ -1027,7 +1027,7 @@ Index: binutils-2.21/libtool.m4 | |||
1027 | 1027 | ||
1028 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 1028 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
1029 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 1029 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
1030 | @@ -5660,7 +5993,7 @@ if test "$_lt_caught_CXX_error" != yes; | 1030 | @@ -5660,7 +5993,7 @@ |
1031 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 1031 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
1032 | # Determine the default libpath from the value encoded in an empty | 1032 | # Determine the default libpath from the value encoded in an empty |
1033 | # executable. | 1033 | # executable. |
@@ -1036,7 +1036,7 @@ Index: binutils-2.21/libtool.m4 | |||
1036 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 1036 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
1037 | 1037 | ||
1038 | _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" | 1038 | _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" |
1039 | @@ -5672,7 +6005,7 @@ if test "$_lt_caught_CXX_error" != yes; | 1039 | @@ -5672,7 +6005,7 @@ |
1040 | else | 1040 | else |
1041 | # Determine the default libpath from the value encoded in an | 1041 | # Determine the default libpath from the value encoded in an |
1042 | # empty executable. | 1042 | # empty executable. |
@@ -1045,7 +1045,7 @@ Index: binutils-2.21/libtool.m4 | |||
1045 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 1045 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
1046 | # Warning - without using the other run time loading flags, | 1046 | # Warning - without using the other run time loading flags, |
1047 | # -berok will link without error, but may produce a broken library. | 1047 | # -berok will link without error, but may produce a broken library. |
1048 | @@ -5714,29 +6047,75 @@ if test "$_lt_caught_CXX_error" != yes; | 1048 | @@ -5714,29 +6047,75 @@ |
1049 | ;; | 1049 | ;; |
1050 | 1050 | ||
1051 | cygwin* | mingw* | pw32* | cegcc*) | 1051 | cygwin* | mingw* | pw32* | cegcc*) |
@@ -1144,7 +1144,7 @@ Index: binutils-2.21/libtool.m4 | |||
1144 | darwin* | rhapsody*) | 1144 | darwin* | rhapsody*) |
1145 | _LT_DARWIN_LINKER_FEATURES($1) | 1145 | _LT_DARWIN_LINKER_FEATURES($1) |
1146 | ;; | 1146 | ;; |
1147 | @@ -5811,7 +6190,7 @@ if test "$_lt_caught_CXX_error" != yes; | 1147 | @@ -5811,7 +6190,7 @@ |
1148 | ;; | 1148 | ;; |
1149 | *) | 1149 | *) |
1150 | if test "$GXX" = yes; then | 1150 | if test "$GXX" = yes; then |
@@ -1153,7 +1153,7 @@ Index: binutils-2.21/libtool.m4 | |||
1153 | else | 1153 | else |
1154 | # FIXME: insert proper C++ library support | 1154 | # FIXME: insert proper C++ library support |
1155 | _LT_TAGVAR(ld_shlibs, $1)=no | 1155 | _LT_TAGVAR(ld_shlibs, $1)=no |
1156 | @@ -5882,10 +6261,10 @@ if test "$_lt_caught_CXX_error" != yes; | 1156 | @@ -5882,10 +6261,10 @@ |
1157 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 1157 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
1158 | ;; | 1158 | ;; |
1159 | ia64*) | 1159 | ia64*) |
@@ -1166,7 +1166,7 @@ Index: binutils-2.21/libtool.m4 | |||
1166 | ;; | 1166 | ;; |
1167 | esac | 1167 | esac |
1168 | fi | 1168 | fi |
1169 | @@ -5926,9 +6305,9 @@ if test "$_lt_caught_CXX_error" != yes; | 1169 | @@ -5926,9 +6305,9 @@ |
1170 | *) | 1170 | *) |
1171 | if test "$GXX" = yes; then | 1171 | if test "$GXX" = yes; then |
1172 | if test "$with_gnu_ld" = no; then | 1172 | if test "$with_gnu_ld" = no; then |
@@ -1178,7 +1178,7 @@ Index: binutils-2.21/libtool.m4 | |||
1178 | fi | 1178 | fi |
1179 | fi | 1179 | fi |
1180 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 1180 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
1181 | @@ -5998,20 +6377,20 @@ if test "$_lt_caught_CXX_error" != yes; | 1181 | @@ -5998,20 +6377,20 @@ |
1182 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ | 1182 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
1183 | rm -rf $tpldir~ | 1183 | rm -rf $tpldir~ |
1184 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 1184 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
@@ -1203,7 +1203,7 @@ Index: binutils-2.21/libtool.m4 | |||
1203 | ;; | 1203 | ;; |
1204 | *) # Version 6 and above use weak symbols | 1204 | *) # Version 6 and above use weak symbols |
1205 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 1205 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
1206 | @@ -6206,7 +6585,7 @@ if test "$_lt_caught_CXX_error" != yes; | 1206 | @@ -6206,7 +6585,7 @@ |
1207 | _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' | 1207 | _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' |
1208 | ;; | 1208 | ;; |
1209 | *) | 1209 | *) |
@@ -1212,7 +1212,7 @@ Index: binutils-2.21/libtool.m4 | |||
1212 | ;; | 1212 | ;; |
1213 | esac | 1213 | esac |
1214 | 1214 | ||
1215 | @@ -6252,7 +6631,7 @@ if test "$_lt_caught_CXX_error" != yes; | 1215 | @@ -6252,7 +6631,7 @@ |
1216 | 1216 | ||
1217 | solaris*) | 1217 | solaris*) |
1218 | case $cc_basename in | 1218 | case $cc_basename in |
@@ -1221,7 +1221,7 @@ Index: binutils-2.21/libtool.m4 | |||
1221 | # Sun C++ 4.2, 5.x and Centerline C++ | 1221 | # Sun C++ 4.2, 5.x and Centerline C++ |
1222 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes | 1222 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
1223 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' | 1223 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
1224 | @@ -6293,9 +6672,9 @@ if test "$_lt_caught_CXX_error" != yes; | 1224 | @@ -6293,9 +6672,9 @@ |
1225 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 1225 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
1226 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' | 1226 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
1227 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 1227 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
@@ -1233,7 +1233,7 @@ Index: binutils-2.21/libtool.m4 | |||
1233 | 1233 | ||
1234 | # Commands to make compiler produce verbose output that lists | 1234 | # Commands to make compiler produce verbose output that lists |
1235 | # what "hidden" libraries, object files and flags are used when | 1235 | # what "hidden" libraries, object files and flags are used when |
1236 | @@ -6424,6 +6803,7 @@ if test "$_lt_caught_CXX_error" != yes; | 1236 | @@ -6424,6 +6803,7 @@ |
1237 | fi # test -n "$compiler" | 1237 | fi # test -n "$compiler" |
1238 | 1238 | ||
1239 | CC=$lt_save_CC | 1239 | CC=$lt_save_CC |
@@ -1241,7 +1241,7 @@ Index: binutils-2.21/libtool.m4 | |||
1241 | LDCXX=$LD | 1241 | LDCXX=$LD |
1242 | LD=$lt_save_LD | 1242 | LD=$lt_save_LD |
1243 | GCC=$lt_save_GCC | 1243 | GCC=$lt_save_GCC |
1244 | @@ -6438,6 +6818,29 @@ AC_LANG_POP | 1244 | @@ -6438,6 +6818,29 @@ |
1245 | ])# _LT_LANG_CXX_CONFIG | 1245 | ])# _LT_LANG_CXX_CONFIG |
1246 | 1246 | ||
1247 | 1247 | ||
@@ -1271,7 +1271,7 @@ Index: binutils-2.21/libtool.m4 | |||
1271 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) | 1271 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
1272 | # --------------------------------- | 1272 | # --------------------------------- |
1273 | # Figure out "hidden" library dependencies from verbose | 1273 | # Figure out "hidden" library dependencies from verbose |
1274 | @@ -6446,6 +6849,7 @@ AC_LANG_POP | 1274 | @@ -6446,6 +6849,7 @@ |
1275 | # objects, libraries and library flags. | 1275 | # objects, libraries and library flags. |
1276 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], | 1276 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
1277 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 1277 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
@@ -1279,7 +1279,7 @@ Index: binutils-2.21/libtool.m4 | |||
1279 | # Dependencies to place before and after the object being linked: | 1279 | # Dependencies to place before and after the object being linked: |
1280 | _LT_TAGVAR(predep_objects, $1)= | 1280 | _LT_TAGVAR(predep_objects, $1)= |
1281 | _LT_TAGVAR(postdep_objects, $1)= | 1281 | _LT_TAGVAR(postdep_objects, $1)= |
1282 | @@ -6496,6 +6900,13 @@ public class foo { | 1282 | @@ -6496,6 +6900,13 @@ |
1283 | }; | 1283 | }; |
1284 | _LT_EOF | 1284 | _LT_EOF |
1285 | ]) | 1285 | ]) |
@@ -1293,7 +1293,7 @@ Index: binutils-2.21/libtool.m4 | |||
1293 | dnl Parse the compiler output and extract the necessary | 1293 | dnl Parse the compiler output and extract the necessary |
1294 | dnl objects, libraries and library flags. | 1294 | dnl objects, libraries and library flags. |
1295 | if AC_TRY_EVAL(ac_compile); then | 1295 | if AC_TRY_EVAL(ac_compile); then |
1296 | @@ -6507,7 +6918,7 @@ if AC_TRY_EVAL(ac_compile); then | 1296 | @@ -6507,7 +6918,7 @@ |
1297 | pre_test_object_deps_done=no | 1297 | pre_test_object_deps_done=no |
1298 | 1298 | ||
1299 | for p in `eval "$output_verbose_link_cmd"`; do | 1299 | for p in `eval "$output_verbose_link_cmd"`; do |
@@ -1302,7 +1302,7 @@ Index: binutils-2.21/libtool.m4 | |||
1302 | 1302 | ||
1303 | -L* | -R* | -l*) | 1303 | -L* | -R* | -l*) |
1304 | # Some compilers place space between "-{L,R}" and the path. | 1304 | # Some compilers place space between "-{L,R}" and the path. |
1305 | @@ -6516,13 +6927,22 @@ if AC_TRY_EVAL(ac_compile); then | 1305 | @@ -6516,13 +6927,22 @@ |
1306 | test $p = "-R"; then | 1306 | test $p = "-R"; then |
1307 | prev=$p | 1307 | prev=$p |
1308 | continue | 1308 | continue |
@@ -1329,7 +1329,7 @@ Index: binutils-2.21/libtool.m4 | |||
1329 | # Internal compiler library paths should come after those | 1329 | # Internal compiler library paths should come after those |
1330 | # provided the user. The postdeps already come after the | 1330 | # provided the user. The postdeps already come after the |
1331 | # user supplied libs so there is no need to process them. | 1331 | # user supplied libs so there is no need to process them. |
1332 | @@ -6542,8 +6962,10 @@ if AC_TRY_EVAL(ac_compile); then | 1332 | @@ -6542,8 +6962,10 @@ |
1333 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" | 1333 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
1334 | fi | 1334 | fi |
1335 | fi | 1335 | fi |
@@ -1340,7 +1340,7 @@ Index: binutils-2.21/libtool.m4 | |||
1340 | *.$objext) | 1340 | *.$objext) |
1341 | # This assumes that the test object file only shows up | 1341 | # This assumes that the test object file only shows up |
1342 | # once in the compiler output. | 1342 | # once in the compiler output. |
1343 | @@ -6579,6 +7001,7 @@ else | 1343 | @@ -6579,6 +7001,7 @@ |
1344 | fi | 1344 | fi |
1345 | 1345 | ||
1346 | $RM -f confest.$objext | 1346 | $RM -f confest.$objext |
@@ -1348,7 +1348,7 @@ Index: binutils-2.21/libtool.m4 | |||
1348 | 1348 | ||
1349 | # PORTME: override above test on systems where it is broken | 1349 | # PORTME: override above test on systems where it is broken |
1350 | m4_if([$1], [CXX], | 1350 | m4_if([$1], [CXX], |
1351 | @@ -6615,7 +7038,7 @@ linux*) | 1351 | @@ -6615,7 +7038,7 @@ |
1352 | 1352 | ||
1353 | solaris*) | 1353 | solaris*) |
1354 | case $cc_basename in | 1354 | case $cc_basename in |
@@ -1357,7 +1357,7 @@ Index: binutils-2.21/libtool.m4 | |||
1357 | # The more standards-conforming stlport4 library is | 1357 | # The more standards-conforming stlport4 library is |
1358 | # incompatible with the Cstd library. Avoid specifying | 1358 | # incompatible with the Cstd library. Avoid specifying |
1359 | # it if it's in CXXFLAGS. Ignore libCrun as | 1359 | # it if it's in CXXFLAGS. Ignore libCrun as |
1360 | @@ -6728,7 +7151,9 @@ if test "$_lt_disable_F77" != yes; then | 1360 | @@ -6728,7 +7151,9 @@ |
1361 | # Allow CC to be a program name with arguments. | 1361 | # Allow CC to be a program name with arguments. |
1362 | lt_save_CC="$CC" | 1362 | lt_save_CC="$CC" |
1363 | lt_save_GCC=$GCC | 1363 | lt_save_GCC=$GCC |
@@ -1367,7 +1367,7 @@ Index: binutils-2.21/libtool.m4 | |||
1367 | compiler=$CC | 1367 | compiler=$CC |
1368 | _LT_TAGVAR(compiler, $1)=$CC | 1368 | _LT_TAGVAR(compiler, $1)=$CC |
1369 | _LT_CC_BASENAME([$compiler]) | 1369 | _LT_CC_BASENAME([$compiler]) |
1370 | @@ -6782,6 +7207,7 @@ if test "$_lt_disable_F77" != yes; then | 1370 | @@ -6782,6 +7207,7 @@ |
1371 | 1371 | ||
1372 | GCC=$lt_save_GCC | 1372 | GCC=$lt_save_GCC |
1373 | CC="$lt_save_CC" | 1373 | CC="$lt_save_CC" |
@@ -1375,7 +1375,7 @@ Index: binutils-2.21/libtool.m4 | |||
1375 | fi # test "$_lt_disable_F77" != yes | 1375 | fi # test "$_lt_disable_F77" != yes |
1376 | 1376 | ||
1377 | AC_LANG_POP | 1377 | AC_LANG_POP |
1378 | @@ -6858,7 +7284,9 @@ if test "$_lt_disable_FC" != yes; then | 1378 | @@ -6858,7 +7284,9 @@ |
1379 | # Allow CC to be a program name with arguments. | 1379 | # Allow CC to be a program name with arguments. |
1380 | lt_save_CC="$CC" | 1380 | lt_save_CC="$CC" |
1381 | lt_save_GCC=$GCC | 1381 | lt_save_GCC=$GCC |
@@ -1385,7 +1385,7 @@ Index: binutils-2.21/libtool.m4 | |||
1385 | compiler=$CC | 1385 | compiler=$CC |
1386 | GCC=$ac_cv_fc_compiler_gnu | 1386 | GCC=$ac_cv_fc_compiler_gnu |
1387 | 1387 | ||
1388 | @@ -6914,7 +7342,8 @@ if test "$_lt_disable_FC" != yes; then | 1388 | @@ -6914,7 +7342,8 @@ |
1389 | fi # test -n "$compiler" | 1389 | fi # test -n "$compiler" |
1390 | 1390 | ||
1391 | GCC=$lt_save_GCC | 1391 | GCC=$lt_save_GCC |
@@ -1395,7 +1395,7 @@ Index: binutils-2.21/libtool.m4 | |||
1395 | fi # test "$_lt_disable_FC" != yes | 1395 | fi # test "$_lt_disable_FC" != yes |
1396 | 1396 | ||
1397 | AC_LANG_POP | 1397 | AC_LANG_POP |
1398 | @@ -6951,10 +7380,12 @@ _LT_COMPILER_BOILERPLATE | 1398 | @@ -6951,10 +7380,12 @@ |
1399 | _LT_LINKER_BOILERPLATE | 1399 | _LT_LINKER_BOILERPLATE |
1400 | 1400 | ||
1401 | # Allow CC to be a program name with arguments. | 1401 | # Allow CC to be a program name with arguments. |
@@ -1409,7 +1409,7 @@ Index: binutils-2.21/libtool.m4 | |||
1409 | compiler=$CC | 1409 | compiler=$CC |
1410 | _LT_TAGVAR(compiler, $1)=$CC | 1410 | _LT_TAGVAR(compiler, $1)=$CC |
1411 | _LT_TAGVAR(LD, $1)="$LD" | 1411 | _LT_TAGVAR(LD, $1)="$LD" |
1412 | @@ -6985,7 +7416,8 @@ fi | 1412 | @@ -6985,7 +7416,8 @@ |
1413 | AC_LANG_RESTORE | 1413 | AC_LANG_RESTORE |
1414 | 1414 | ||
1415 | GCC=$lt_save_GCC | 1415 | GCC=$lt_save_GCC |
@@ -1419,7 +1419,7 @@ Index: binutils-2.21/libtool.m4 | |||
1419 | ])# _LT_LANG_GCJ_CONFIG | 1419 | ])# _LT_LANG_GCJ_CONFIG |
1420 | 1420 | ||
1421 | 1421 | ||
1422 | @@ -7020,9 +7452,11 @@ _LT_LINKER_BOILERPLATE | 1422 | @@ -7020,9 +7452,11 @@ |
1423 | 1423 | ||
1424 | # Allow CC to be a program name with arguments. | 1424 | # Allow CC to be a program name with arguments. |
1425 | lt_save_CC="$CC" | 1425 | lt_save_CC="$CC" |
@@ -1431,7 +1431,7 @@ Index: binutils-2.21/libtool.m4 | |||
1431 | compiler=$CC | 1431 | compiler=$CC |
1432 | _LT_TAGVAR(compiler, $1)=$CC | 1432 | _LT_TAGVAR(compiler, $1)=$CC |
1433 | _LT_CC_BASENAME([$compiler]) | 1433 | _LT_CC_BASENAME([$compiler]) |
1434 | @@ -7035,7 +7469,8 @@ fi | 1434 | @@ -7035,7 +7469,8 @@ |
1435 | 1435 | ||
1436 | GCC=$lt_save_GCC | 1436 | GCC=$lt_save_GCC |
1437 | AC_LANG_RESTORE | 1437 | AC_LANG_RESTORE |
@@ -1441,7 +1441,7 @@ Index: binutils-2.21/libtool.m4 | |||
1441 | ])# _LT_LANG_RC_CONFIG | 1441 | ])# _LT_LANG_RC_CONFIG |
1442 | 1442 | ||
1443 | 1443 | ||
1444 | @@ -7094,6 +7529,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object | 1444 | @@ -7094,6 +7529,15 @@ |
1445 | AC_SUBST([OBJDUMP]) | 1445 | AC_SUBST([OBJDUMP]) |
1446 | ]) | 1446 | ]) |
1447 | 1447 | ||
@@ -1457,7 +1457,7 @@ Index: binutils-2.21/libtool.m4 | |||
1457 | 1457 | ||
1458 | # _LT_DECL_SED | 1458 | # _LT_DECL_SED |
1459 | # ------------ | 1459 | # ------------ |
1460 | @@ -7187,8 +7631,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], | 1460 | @@ -7187,8 +7631,8 @@ |
1461 | # Try some XSI features | 1461 | # Try some XSI features |
1462 | xsi_shell=no | 1462 | xsi_shell=no |
1463 | ( _lt_dummy="a/b/c" | 1463 | ( _lt_dummy="a/b/c" |
@@ -1468,7 +1468,7 @@ Index: binutils-2.21/libtool.m4 | |||
1468 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 1468 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
1469 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 1469 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
1470 | && xsi_shell=yes | 1470 | && xsi_shell=yes |
1471 | @@ -7227,206 +7671,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn | 1471 | @@ -7227,206 +7671,162 @@ |
1472 | ])# _LT_CHECK_SHELL_FEATURES | 1472 | ])# _LT_CHECK_SHELL_FEATURES |
1473 | 1473 | ||
1474 | 1474 | ||
@@ -1823,8 +1823,8 @@ Index: binutils-2.21/libtool.m4 | |||
1823 | +])# _LT_PATH_CONVERSION_FUNCTIONS | 1823 | +])# _LT_PATH_CONVERSION_FUNCTIONS |
1824 | Index: binutils-2.21/ltmain.sh | 1824 | Index: binutils-2.21/ltmain.sh |
1825 | =================================================================== | 1825 | =================================================================== |
1826 | --- binutils-2.21.orig/ltmain.sh | 1826 | --- binutils-2.21.orig/ltmain.sh 2010-01-09 13:11:32.000000000 -0800 |
1827 | +++ binutils-2.21/ltmain.sh | 1827 | +++ binutils-2.21/ltmain.sh 2011-01-07 10:49:16.406101000 -0800 |
1828 | @@ -1,10 +1,9 @@ | 1828 | @@ -1,10 +1,9 @@ |
1829 | -# Generated from ltmain.m4sh. | 1829 | -# Generated from ltmain.m4sh. |
1830 | 1830 | ||
@@ -1870,7 +1870,7 @@ Index: binutils-2.21/ltmain.sh | |||
1870 | 1870 | ||
1871 | # Be Bourne compatible | 1871 | # Be Bourne compatible |
1872 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | 1872 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
1873 | @@ -106,9 +106,6 @@ _LTECHO_EOF' | 1873 | @@ -106,9 +106,6 @@ |
1874 | } | 1874 | } |
1875 | 1875 | ||
1876 | # NLS nuisances: We save the old values to restore during execute mode. | 1876 | # NLS nuisances: We save the old values to restore during execute mode. |
@@ -1880,7 +1880,7 @@ Index: binutils-2.21/ltmain.sh | |||
1880 | lt_user_locale= | 1880 | lt_user_locale= |
1881 | lt_safe_locale= | 1881 | lt_safe_locale= |
1882 | for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES | 1882 | for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES |
1883 | @@ -121,15 +118,13 @@ do | 1883 | @@ -121,15 +118,13 @@ |
1884 | lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" | 1884 | lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" |
1885 | fi" | 1885 | fi" |
1886 | done | 1886 | done |
@@ -1899,7 +1899,7 @@ Index: binutils-2.21/ltmain.sh | |||
1899 | # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh | 1899 | # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh |
1900 | # is ksh but when the shell is invoked as "sh" and the current value of | 1900 | # is ksh but when the shell is invoked as "sh" and the current value of |
1901 | # the _XPG environment variable is not equal to 1 (one), the special | 1901 | # the _XPG environment variable is not equal to 1 (one), the special |
1902 | @@ -140,7 +135,7 @@ progpath="$0" | 1902 | @@ -140,7 +135,7 @@ |
1903 | 1903 | ||
1904 | 1904 | ||
1905 | : ${CP="cp -f"} | 1905 | : ${CP="cp -f"} |
@@ -1908,7 +1908,7 @@ Index: binutils-2.21/ltmain.sh | |||
1908 | : ${EGREP="/bin/grep -E"} | 1908 | : ${EGREP="/bin/grep -E"} |
1909 | : ${FGREP="/bin/grep -F"} | 1909 | : ${FGREP="/bin/grep -F"} |
1910 | : ${GREP="/bin/grep"} | 1910 | : ${GREP="/bin/grep"} |
1911 | @@ -149,7 +144,7 @@ progpath="$0" | 1911 | @@ -149,7 +144,7 @@ |
1912 | : ${MKDIR="mkdir"} | 1912 | : ${MKDIR="mkdir"} |
1913 | : ${MV="mv -f"} | 1913 | : ${MV="mv -f"} |
1914 | : ${RM="rm -f"} | 1914 | : ${RM="rm -f"} |
@@ -1917,7 +1917,7 @@ Index: binutils-2.21/ltmain.sh | |||
1917 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} | 1917 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
1918 | : ${Xsed="$SED -e 1s/^X//"} | 1918 | : ${Xsed="$SED -e 1s/^X//"} |
1919 | 1919 | ||
1920 | @@ -169,6 +164,27 @@ IFS=" $lt_nl" | 1920 | @@ -169,6 +164,27 @@ |
1921 | dirname="s,/[^/]*$,," | 1921 | dirname="s,/[^/]*$,," |
1922 | basename="s,^.*/,," | 1922 | basename="s,^.*/,," |
1923 | 1923 | ||
@@ -1945,7 +1945,7 @@ Index: binutils-2.21/ltmain.sh | |||
1945 | # func_dirname_and_basename file append nondir_replacement | 1945 | # func_dirname_and_basename file append nondir_replacement |
1946 | # perform func_basename and func_dirname in a single function | 1946 | # perform func_basename and func_dirname in a single function |
1947 | # call: | 1947 | # call: |
1948 | @@ -183,17 +199,31 @@ basename="s,^.*/,," | 1948 | @@ -183,17 +199,31 @@ |
1949 | # those functions but instead duplicate the functionality here. | 1949 | # those functions but instead duplicate the functionality here. |
1950 | func_dirname_and_basename () | 1950 | func_dirname_and_basename () |
1951 | { | 1951 | { |
@@ -1987,7 +1987,7 @@ Index: binutils-2.21/ltmain.sh | |||
1987 | 1987 | ||
1988 | # These SED scripts presuppose an absolute path with a trailing slash. | 1988 | # These SED scripts presuppose an absolute path with a trailing slash. |
1989 | pathcar='s,^/\([^/]*\).*$,\1,' | 1989 | pathcar='s,^/\([^/]*\).*$,\1,' |
1990 | @@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' | 1990 | @@ -376,6 +406,15 @@ |
1991 | # Same as above, but do not quote variable references. | 1991 | # Same as above, but do not quote variable references. |
1992 | double_quote_subst='s/\(["`\\]\)/\\\1/g' | 1992 | double_quote_subst='s/\(["`\\]\)/\\\1/g' |
1993 | 1993 | ||
@@ -2003,7 +2003,7 @@ Index: binutils-2.21/ltmain.sh | |||
2003 | # Re-`\' parameter expansions in output of double_quote_subst that were | 2003 | # Re-`\' parameter expansions in output of double_quote_subst that were |
2004 | # `\'-ed in input to the same. If an odd number of `\' preceded a '$' | 2004 | # `\'-ed in input to the same. If an odd number of `\' preceded a '$' |
2005 | # in input to double_quote_subst, that '$' was protected from expansion. | 2005 | # in input to double_quote_subst, that '$' was protected from expansion. |
2006 | @@ -404,7 +443,7 @@ opt_warning=: | 2006 | @@ -404,7 +443,7 @@ |
2007 | # name if it has been set yet. | 2007 | # name if it has been set yet. |
2008 | func_echo () | 2008 | func_echo () |
2009 | { | 2009 | { |
@@ -2012,7 +2012,7 @@ Index: binutils-2.21/ltmain.sh | |||
2012 | } | 2012 | } |
2013 | 2013 | ||
2014 | # func_verbose arg... | 2014 | # func_verbose arg... |
2015 | @@ -430,14 +469,14 @@ func_echo_all () | 2015 | @@ -430,14 +469,14 @@ |
2016 | # Echo program name prefixed message to standard error. | 2016 | # Echo program name prefixed message to standard error. |
2017 | func_error () | 2017 | func_error () |
2018 | { | 2018 | { |
@@ -2029,7 +2029,7 @@ Index: binutils-2.21/ltmain.sh | |||
2029 | 2029 | ||
2030 | # bash bug again: | 2030 | # bash bug again: |
2031 | : | 2031 | : |
2032 | @@ -656,19 +695,35 @@ func_show_eval_locale () | 2032 | @@ -656,19 +695,35 @@ |
2033 | fi | 2033 | fi |
2034 | } | 2034 | } |
2035 | 2035 | ||
@@ -2068,7 +2068,7 @@ Index: binutils-2.21/ltmain.sh | |||
2068 | b more | 2068 | b more |
2069 | } | 2069 | } |
2070 | :go | 2070 | :go |
2071 | @@ -685,7 +740,9 @@ func_version () | 2071 | @@ -685,7 +740,9 @@ |
2072 | # Echo short help message to standard output and exit. | 2072 | # Echo short help message to standard output and exit. |
2073 | func_usage () | 2073 | func_usage () |
2074 | { | 2074 | { |
@@ -2079,7 +2079,7 @@ Index: binutils-2.21/ltmain.sh | |||
2079 | s/^# // | 2079 | s/^# // |
2080 | s/^# *$// | 2080 | s/^# *$// |
2081 | s/\$progname/'$progname'/ | 2081 | s/\$progname/'$progname'/ |
2082 | @@ -701,7 +758,10 @@ func_usage () | 2082 | @@ -701,7 +758,10 @@ |
2083 | # unless 'noexit' is passed as argument. | 2083 | # unless 'noexit' is passed as argument. |
2084 | func_help () | 2084 | func_help () |
2085 | { | 2085 | { |
@@ -2090,7 +2090,7 @@ Index: binutils-2.21/ltmain.sh | |||
2090 | s/^# // | 2090 | s/^# // |
2091 | s/^# *$// | 2091 | s/^# *$// |
2092 | s*\$progname*'$progname'* | 2092 | s*\$progname*'$progname'* |
2093 | @@ -714,7 +774,11 @@ func_help () | 2093 | @@ -714,7 +774,11 @@ |
2094 | s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ | 2094 | s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ |
2095 | s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ | 2095 | s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ |
2096 | p | 2096 | p |
@@ -2103,7 +2103,7 @@ Index: binutils-2.21/ltmain.sh | |||
2103 | ret=$? | 2103 | ret=$? |
2104 | if test -z "$1"; then | 2104 | if test -z "$1"; then |
2105 | exit $ret | 2105 | exit $ret |
2106 | @@ -726,12 +790,39 @@ func_help () | 2106 | @@ -726,12 +790,39 @@ |
2107 | # exit_cmd. | 2107 | # exit_cmd. |
2108 | func_missing_arg () | 2108 | func_missing_arg () |
2109 | { | 2109 | { |
@@ -2145,7 +2145,7 @@ Index: binutils-2.21/ltmain.sh | |||
2145 | 2145 | ||
2146 | 2146 | ||
2147 | 2147 | ||
2148 | @@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" | 2148 | @@ -741,26 +832,64 @@ |
2149 | magic_exe="%%%MAGIC EXE variable%%%" | 2149 | magic_exe="%%%MAGIC EXE variable%%%" |
2150 | 2150 | ||
2151 | # Global variables. | 2151 | # Global variables. |
@@ -2218,7 +2218,7 @@ Index: binutils-2.21/ltmain.sh | |||
2218 | # func_fatal_configuration arg... | 2218 | # func_fatal_configuration arg... |
2219 | # Echo program name prefixed message to standard error, followed by | 2219 | # Echo program name prefixed message to standard error, followed by |
2220 | # a configuration failure hint, and exit. | 2220 | # a configuration failure hint, and exit. |
2221 | @@ -850,130 +979,204 @@ func_enable_tag () | 2221 | @@ -850,130 +979,204 @@ |
2222 | esac | 2222 | esac |
2223 | } | 2223 | } |
2224 | 2224 | ||
@@ -2517,7 +2517,7 @@ Index: binutils-2.21/ltmain.sh | |||
2517 | 2517 | ||
2518 | case $host in | 2518 | case $host in |
2519 | *cygwin* | *mingw* | *pw32* | *cegcc*) | 2519 | *cygwin* | *mingw* | *pw32* | *cegcc*) |
2520 | @@ -981,82 +1184,44 @@ func_enable_tag () | 2520 | @@ -981,82 +1184,44 @@ |
2521 | opt_duplicate_compiler_generated_deps=: | 2521 | opt_duplicate_compiler_generated_deps=: |
2522 | ;; | 2522 | ;; |
2523 | *) | 2523 | *) |
@@ -2624,7 +2624,7 @@ Index: binutils-2.21/ltmain.sh | |||
2624 | 2624 | ||
2625 | # func_lalib_p file | 2625 | # func_lalib_p file |
2626 | # True iff FILE is a libtool `.la' library or `.lo' object file. | 2626 | # True iff FILE is a libtool `.la' library or `.lo' object file. |
2627 | @@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () | 2627 | @@ -1121,12 +1286,9 @@ |
2628 | # temporary ltwrapper_script. | 2628 | # temporary ltwrapper_script. |
2629 | func_ltwrapper_scriptname () | 2629 | func_ltwrapper_scriptname () |
2630 | { | 2630 | { |
@@ -2640,7 +2640,7 @@ Index: binutils-2.21/ltmain.sh | |||
2640 | } | 2640 | } |
2641 | 2641 | ||
2642 | # func_ltwrapper_p file | 2642 | # func_ltwrapper_p file |
2643 | @@ -1149,7 +1311,7 @@ func_execute_cmds () | 2643 | @@ -1149,7 +1311,7 @@ |
2644 | save_ifs=$IFS; IFS='~' | 2644 | save_ifs=$IFS; IFS='~' |
2645 | for cmd in $1; do | 2645 | for cmd in $1; do |
2646 | IFS=$save_ifs | 2646 | IFS=$save_ifs |
@@ -2649,7 +2649,7 @@ Index: binutils-2.21/ltmain.sh | |||
2649 | func_show_eval "$cmd" "${2-:}" | 2649 | func_show_eval "$cmd" "${2-:}" |
2650 | done | 2650 | done |
2651 | IFS=$save_ifs | 2651 | IFS=$save_ifs |
2652 | @@ -1172,6 +1334,37 @@ func_source () | 2652 | @@ -1172,6 +1334,37 @@ |
2653 | } | 2653 | } |
2654 | 2654 | ||
2655 | 2655 | ||
@@ -2687,7 +2687,7 @@ Index: binutils-2.21/ltmain.sh | |||
2687 | # func_infer_tag arg | 2687 | # func_infer_tag arg |
2688 | # Infer tagged configuration to use if any are available and | 2688 | # Infer tagged configuration to use if any are available and |
2689 | # if one wasn't chosen via the "--tag" command line option. | 2689 | # if one wasn't chosen via the "--tag" command line option. |
2690 | @@ -1184,8 +1377,7 @@ func_infer_tag () | 2690 | @@ -1184,8 +1377,7 @@ |
2691 | if test -n "$available_tags" && test -z "$tagname"; then | 2691 | if test -n "$available_tags" && test -z "$tagname"; then |
2692 | CC_quoted= | 2692 | CC_quoted= |
2693 | for arg in $CC; do | 2693 | for arg in $CC; do |
@@ -2697,7 +2697,7 @@ Index: binutils-2.21/ltmain.sh | |||
2697 | done | 2697 | done |
2698 | CC_expanded=`func_echo_all $CC` | 2698 | CC_expanded=`func_echo_all $CC` |
2699 | CC_quoted_expanded=`func_echo_all $CC_quoted` | 2699 | CC_quoted_expanded=`func_echo_all $CC_quoted` |
2700 | @@ -1204,8 +1396,7 @@ func_infer_tag () | 2700 | @@ -1204,8 +1396,7 @@ |
2701 | CC_quoted= | 2701 | CC_quoted= |
2702 | for arg in $CC; do | 2702 | for arg in $CC; do |
2703 | # Double-quote args containing other shell metacharacters. | 2703 | # Double-quote args containing other shell metacharacters. |
@@ -2707,7 +2707,7 @@ Index: binutils-2.21/ltmain.sh | |||
2707 | done | 2707 | done |
2708 | CC_expanded=`func_echo_all $CC` | 2708 | CC_expanded=`func_echo_all $CC` |
2709 | CC_quoted_expanded=`func_echo_all $CC_quoted` | 2709 | CC_quoted_expanded=`func_echo_all $CC_quoted` |
2710 | @@ -1274,6 +1465,486 @@ EOF | 2710 | @@ -1274,6 +1465,486 @@ |
2711 | } | 2711 | } |
2712 | } | 2712 | } |
2713 | 2713 | ||
@@ -3194,7 +3194,7 @@ Index: binutils-2.21/ltmain.sh | |||
3194 | # func_mode_compile arg... | 3194 | # func_mode_compile arg... |
3195 | func_mode_compile () | 3195 | func_mode_compile () |
3196 | { | 3196 | { |
3197 | @@ -1314,12 +1985,12 @@ func_mode_compile () | 3197 | @@ -1314,12 +1985,12 @@ |
3198 | ;; | 3198 | ;; |
3199 | 3199 | ||
3200 | -pie | -fpie | -fPIE) | 3200 | -pie | -fpie | -fPIE) |
@@ -3209,7 +3209,7 @@ Index: binutils-2.21/ltmain.sh | |||
3209 | continue | 3209 | continue |
3210 | ;; | 3210 | ;; |
3211 | 3211 | ||
3212 | @@ -1340,15 +2011,14 @@ func_mode_compile () | 3212 | @@ -1340,15 +2011,14 @@ |
3213 | save_ifs="$IFS"; IFS=',' | 3213 | save_ifs="$IFS"; IFS=',' |
3214 | for arg in $args; do | 3214 | for arg in $args; do |
3215 | IFS="$save_ifs" | 3215 | IFS="$save_ifs" |
@@ -3227,7 +3227,7 @@ Index: binutils-2.21/ltmain.sh | |||
3227 | continue | 3227 | continue |
3228 | ;; | 3228 | ;; |
3229 | 3229 | ||
3230 | @@ -1364,8 +2034,7 @@ func_mode_compile () | 3230 | @@ -1364,8 +2034,7 @@ |
3231 | esac # case $arg_mode | 3231 | esac # case $arg_mode |
3232 | 3232 | ||
3233 | # Aesthetically quote the previous argument. | 3233 | # Aesthetically quote the previous argument. |
@@ -3237,7 +3237,7 @@ Index: binutils-2.21/ltmain.sh | |||
3237 | done # for arg | 3237 | done # for arg |
3238 | 3238 | ||
3239 | case $arg_mode in | 3239 | case $arg_mode in |
3240 | @@ -1496,17 +2165,16 @@ compiler." | 3240 | @@ -1496,17 +2165,16 @@ |
3241 | $opt_dry_run || $RM $removelist | 3241 | $opt_dry_run || $RM $removelist |
3242 | exit $EXIT_FAILURE | 3242 | exit $EXIT_FAILURE |
3243 | fi | 3243 | fi |
@@ -3259,7 +3259,7 @@ Index: binutils-2.21/ltmain.sh | |||
3259 | func_quote_for_eval "$srcfile" | 3259 | func_quote_for_eval "$srcfile" |
3260 | qsrcfile=$func_quote_for_eval_result | 3260 | qsrcfile=$func_quote_for_eval_result |
3261 | 3261 | ||
3262 | @@ -1526,7 +2194,7 @@ compiler." | 3262 | @@ -1526,7 +2194,7 @@ |
3263 | 3263 | ||
3264 | if test -z "$output_obj"; then | 3264 | if test -z "$output_obj"; then |
3265 | # Place PIC objects in $objdir | 3265 | # Place PIC objects in $objdir |
@@ -3268,7 +3268,7 @@ Index: binutils-2.21/ltmain.sh | |||
3268 | fi | 3268 | fi |
3269 | 3269 | ||
3270 | func_show_eval_locale "$command" \ | 3270 | func_show_eval_locale "$command" \ |
3271 | @@ -1573,11 +2241,11 @@ compiler." | 3271 | @@ -1573,11 +2241,11 @@ |
3272 | command="$base_compile $qsrcfile $pic_flag" | 3272 | command="$base_compile $qsrcfile $pic_flag" |
3273 | fi | 3273 | fi |
3274 | if test "$compiler_c_o" = yes; then | 3274 | if test "$compiler_c_o" = yes; then |
@@ -3282,7 +3282,7 @@ Index: binutils-2.21/ltmain.sh | |||
3282 | func_show_eval_locale "$command" \ | 3282 | func_show_eval_locale "$command" \ |
3283 | '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' | 3283 | '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' |
3284 | 3284 | ||
3285 | @@ -1622,13 +2290,13 @@ compiler." | 3285 | @@ -1622,13 +2290,13 @@ |
3286 | } | 3286 | } |
3287 | 3287 | ||
3288 | $opt_help || { | 3288 | $opt_help || { |
@@ -3298,7 +3298,7 @@ Index: binutils-2.21/ltmain.sh | |||
3298 | "") | 3298 | "") |
3299 | # Generic help is extracted from the usage comments | 3299 | # Generic help is extracted from the usage comments |
3300 | # at the start of this file. | 3300 | # at the start of this file. |
3301 | @@ -1659,8 +2327,8 @@ This mode accepts the following addition | 3301 | @@ -1659,8 +2327,8 @@ |
3302 | 3302 | ||
3303 | -o OUTPUT-FILE set the output file name to OUTPUT-FILE | 3303 | -o OUTPUT-FILE set the output file name to OUTPUT-FILE |
3304 | -no-suppress do not suppress compiler output for multiple passes | 3304 | -no-suppress do not suppress compiler output for multiple passes |
@@ -3309,7 +3309,7 @@ Index: binutils-2.21/ltmain.sh | |||
3309 | -shared do not build a \`.o' file suitable for static linking | 3309 | -shared do not build a \`.o' file suitable for static linking |
3310 | -static only build a \`.o' file suitable for static linking | 3310 | -static only build a \`.o' file suitable for static linking |
3311 | -Wc,FLAG pass FLAG directly to the compiler | 3311 | -Wc,FLAG pass FLAG directly to the compiler |
3312 | @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u | 3312 | @@ -1804,7 +2472,7 @@ |
3313 | ;; | 3313 | ;; |
3314 | 3314 | ||
3315 | *) | 3315 | *) |
@@ -3318,7 +3318,7 @@ Index: binutils-2.21/ltmain.sh | |||
3318 | ;; | 3318 | ;; |
3319 | esac | 3319 | esac |
3320 | 3320 | ||
3321 | @@ -1819,13 +2487,13 @@ if $opt_help; then | 3321 | @@ -1819,13 +2487,13 @@ |
3322 | else | 3322 | else |
3323 | { | 3323 | { |
3324 | func_help noexit | 3324 | func_help noexit |
@@ -3334,7 +3334,7 @@ Index: binutils-2.21/ltmain.sh | |||
3334 | echo | 3334 | echo |
3335 | func_mode_help | 3335 | func_mode_help |
3336 | done | 3336 | done |
3337 | @@ -1854,13 +2522,16 @@ func_mode_execute () | 3337 | @@ -1854,13 +2522,16 @@ |
3338 | func_fatal_help "you must specify a COMMAND" | 3338 | func_fatal_help "you must specify a COMMAND" |
3339 | 3339 | ||
3340 | # Handle -dlopen flags immediately. | 3340 | # Handle -dlopen flags immediately. |
@@ -3352,7 +3352,7 @@ Index: binutils-2.21/ltmain.sh | |||
3352 | # Check to see that this really is a libtool archive. | 3352 | # Check to see that this really is a libtool archive. |
3353 | func_lalib_unsafe_p "$file" \ | 3353 | func_lalib_unsafe_p "$file" \ |
3354 | || func_fatal_help "\`$lib' is not a valid libtool archive" | 3354 | || func_fatal_help "\`$lib' is not a valid libtool archive" |
3355 | @@ -1882,7 +2553,7 @@ func_mode_execute () | 3355 | @@ -1882,7 +2553,7 @@ |
3356 | dir="$func_dirname_result" | 3356 | dir="$func_dirname_result" |
3357 | 3357 | ||
3358 | if test -f "$dir/$objdir/$dlname"; then | 3358 | if test -f "$dir/$objdir/$dlname"; then |
@@ -3361,7 +3361,7 @@ Index: binutils-2.21/ltmain.sh | |||
3361 | else | 3361 | else |
3362 | if test ! -f "$dir/$dlname"; then | 3362 | if test ! -f "$dir/$dlname"; then |
3363 | func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" | 3363 | func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" |
3364 | @@ -1907,10 +2578,10 @@ func_mode_execute () | 3364 | @@ -1907,10 +2578,10 @@ |
3365 | test -n "$absdir" && dir="$absdir" | 3365 | test -n "$absdir" && dir="$absdir" |
3366 | 3366 | ||
3367 | # Now add the directory to shlibpath_var. | 3367 | # Now add the directory to shlibpath_var. |
@@ -3375,7 +3375,7 @@ Index: binutils-2.21/ltmain.sh | |||
3375 | fi | 3375 | fi |
3376 | done | 3376 | done |
3377 | 3377 | ||
3378 | @@ -1939,8 +2610,7 @@ func_mode_execute () | 3378 | @@ -1939,8 +2610,7 @@ |
3379 | ;; | 3379 | ;; |
3380 | esac | 3380 | esac |
3381 | # Quote arguments (to preserve shell metacharacters). | 3381 | # Quote arguments (to preserve shell metacharacters). |
@@ -3385,7 +3385,7 @@ Index: binutils-2.21/ltmain.sh | |||
3385 | done | 3385 | done |
3386 | 3386 | ||
3387 | if test "X$opt_dry_run" = Xfalse; then | 3387 | if test "X$opt_dry_run" = Xfalse; then |
3388 | @@ -1972,22 +2642,59 @@ func_mode_execute () | 3388 | @@ -1972,22 +2642,59 @@ |
3389 | fi | 3389 | fi |
3390 | } | 3390 | } |
3391 | 3391 | ||
@@ -3452,7 +3452,7 @@ Index: binutils-2.21/ltmain.sh | |||
3452 | for libdir in $libdirs; do | 3452 | for libdir in $libdirs; do |
3453 | if test -n "$finish_cmds"; then | 3453 | if test -n "$finish_cmds"; then |
3454 | # Do each command in the finish commands. | 3454 | # Do each command in the finish commands. |
3455 | @@ -1997,7 +2704,7 @@ func_mode_finish () | 3455 | @@ -1997,7 +2704,7 @@ |
3456 | if test -n "$finish_eval"; then | 3456 | if test -n "$finish_eval"; then |
3457 | # Do the single finish_eval. | 3457 | # Do the single finish_eval. |
3458 | eval cmds=\"$finish_eval\" | 3458 | eval cmds=\"$finish_eval\" |
@@ -3461,7 +3461,7 @@ Index: binutils-2.21/ltmain.sh | |||
3461 | $cmds" | 3461 | $cmds" |
3462 | fi | 3462 | fi |
3463 | done | 3463 | done |
3464 | @@ -2006,53 +2713,55 @@ func_mode_finish () | 3464 | @@ -2006,53 +2713,55 @@ |
3465 | # Exit here if they wanted silent mode. | 3465 | # Exit here if they wanted silent mode. |
3466 | $opt_silent && exit $EXIT_SUCCESS | 3466 | $opt_silent && exit $EXIT_SUCCESS |
3467 | 3467 | ||
@@ -3559,7 +3559,7 @@ Index: binutils-2.21/ltmain.sh | |||
3559 | 3559 | ||
3560 | 3560 | ||
3561 | # func_mode_install arg... | 3561 | # func_mode_install arg... |
3562 | @@ -2077,7 +2786,7 @@ func_mode_install () | 3562 | @@ -2077,7 +2786,7 @@ |
3563 | # The real first argument should be the name of the installation program. | 3563 | # The real first argument should be the name of the installation program. |
3564 | # Aesthetically quote it. | 3564 | # Aesthetically quote it. |
3565 | func_quote_for_eval "$arg" | 3565 | func_quote_for_eval "$arg" |
@@ -3568,7 +3568,7 @@ Index: binutils-2.21/ltmain.sh | |||
3568 | install_shared_prog=$install_prog | 3568 | install_shared_prog=$install_prog |
3569 | case " $install_prog " in | 3569 | case " $install_prog " in |
3570 | *[\\\ /]cp\ *) install_cp=: ;; | 3570 | *[\\\ /]cp\ *) install_cp=: ;; |
3571 | @@ -2097,7 +2806,7 @@ func_mode_install () | 3571 | @@ -2097,7 +2806,7 @@ |
3572 | do | 3572 | do |
3573 | arg2= | 3573 | arg2= |
3574 | if test -n "$dest"; then | 3574 | if test -n "$dest"; then |
@@ -3577,7 +3577,7 @@ Index: binutils-2.21/ltmain.sh | |||
3577 | dest=$arg | 3577 | dest=$arg |
3578 | continue | 3578 | continue |
3579 | fi | 3579 | fi |
3580 | @@ -2135,11 +2844,11 @@ func_mode_install () | 3580 | @@ -2135,11 +2844,11 @@ |
3581 | 3581 | ||
3582 | # Aesthetically quote the argument. | 3582 | # Aesthetically quote the argument. |
3583 | func_quote_for_eval "$arg" | 3583 | func_quote_for_eval "$arg" |
@@ -3591,7 +3591,7 @@ Index: binutils-2.21/ltmain.sh | |||
3591 | done | 3591 | done |
3592 | 3592 | ||
3593 | test -z "$install_prog" && \ | 3593 | test -z "$install_prog" && \ |
3594 | @@ -2151,7 +2860,7 @@ func_mode_install () | 3594 | @@ -2151,7 +2860,7 @@ |
3595 | if test -n "$install_override_mode" && $no_mode; then | 3595 | if test -n "$install_override_mode" && $no_mode; then |
3596 | if $install_cp; then :; else | 3596 | if $install_cp; then :; else |
3597 | func_quote_for_eval "$install_override_mode" | 3597 | func_quote_for_eval "$install_override_mode" |
@@ -3600,7 +3600,7 @@ Index: binutils-2.21/ltmain.sh | |||
3600 | fi | 3600 | fi |
3601 | fi | 3601 | fi |
3602 | 3602 | ||
3603 | @@ -2209,10 +2918,13 @@ func_mode_install () | 3603 | @@ -2209,10 +2918,13 @@ |
3604 | case $file in | 3604 | case $file in |
3605 | *.$libext) | 3605 | *.$libext) |
3606 | # Do the static libraries later. | 3606 | # Do the static libraries later. |
@@ -3615,7 +3615,7 @@ Index: binutils-2.21/ltmain.sh | |||
3615 | # Check to see that this really is a libtool archive. | 3615 | # Check to see that this really is a libtool archive. |
3616 | func_lalib_unsafe_p "$file" \ | 3616 | func_lalib_unsafe_p "$file" \ |
3617 | || func_fatal_help "\`$file' is not a valid libtool archive" | 3617 | || func_fatal_help "\`$file' is not a valid libtool archive" |
3618 | @@ -2226,23 +2938,30 @@ func_mode_install () | 3618 | @@ -2226,23 +2938,30 @@ |
3619 | if test "X$destdir" = "X$libdir"; then | 3619 | if test "X$destdir" = "X$libdir"; then |
3620 | case "$current_libdirs " in | 3620 | case "$current_libdirs " in |
3621 | *" $libdir "*) ;; | 3621 | *" $libdir "*) ;; |
@@ -3650,7 +3650,7 @@ Index: binutils-2.21/ltmain.sh | |||
3650 | 3650 | ||
3651 | # Don't allow the user to place us outside of our expected | 3651 | # Don't allow the user to place us outside of our expected |
3652 | # location b/c this prevents finding dependent libraries that | 3652 | # location b/c this prevents finding dependent libraries that |
3653 | @@ -2315,7 +3034,7 @@ func_mode_install () | 3653 | @@ -2315,7 +3034,7 @@ |
3654 | func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' | 3654 | func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' |
3655 | 3655 | ||
3656 | # Maybe install the static library, too. | 3656 | # Maybe install the static library, too. |
@@ -3659,7 +3659,7 @@ Index: binutils-2.21/ltmain.sh | |||
3659 | ;; | 3659 | ;; |
3660 | 3660 | ||
3661 | *.lo) | 3661 | *.lo) |
3662 | @@ -2503,7 +3222,7 @@ func_mode_install () | 3662 | @@ -2503,7 +3222,7 @@ |
3663 | test -n "$future_libdirs" && \ | 3663 | test -n "$future_libdirs" && \ |
3664 | func_warning "remember to run \`$progname --finish$future_libdirs'" | 3664 | func_warning "remember to run \`$progname --finish$future_libdirs'" |
3665 | 3665 | ||
@@ -3668,7 +3668,7 @@ Index: binutils-2.21/ltmain.sh | |||
3668 | # Maybe just do a dry run. | 3668 | # Maybe just do a dry run. |
3669 | $opt_dry_run && current_libdirs=" -n$current_libdirs" | 3669 | $opt_dry_run && current_libdirs=" -n$current_libdirs" |
3670 | exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' | 3670 | exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' |
3671 | @@ -2512,7 +3231,7 @@ func_mode_install () | 3671 | @@ -2512,7 +3231,7 @@ |
3672 | fi | 3672 | fi |
3673 | } | 3673 | } |
3674 | 3674 | ||
@@ -3677,7 +3677,7 @@ Index: binutils-2.21/ltmain.sh | |||
3677 | 3677 | ||
3678 | 3678 | ||
3679 | # func_generate_dlsyms outputname originator pic_p | 3679 | # func_generate_dlsyms outputname originator pic_p |
3680 | @@ -2559,6 +3278,18 @@ extern \"C\" { | 3680 | @@ -2559,6 +3278,18 @@ |
3681 | #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" | 3681 | #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" |
3682 | #endif | 3682 | #endif |
3683 | 3683 | ||
@@ -3696,7 +3696,7 @@ Index: binutils-2.21/ltmain.sh | |||
3696 | /* External symbol declarations for the compiler. */\ | 3696 | /* External symbol declarations for the compiler. */\ |
3697 | " | 3697 | " |
3698 | 3698 | ||
3699 | @@ -2570,21 +3301,22 @@ extern \"C\" { | 3699 | @@ -2570,21 +3301,22 @@ |
3700 | # Add our own program objects to the symbol list. | 3700 | # Add our own program objects to the symbol list. |
3701 | progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` | 3701 | progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` |
3702 | for progfile in $progfiles; do | 3702 | for progfile in $progfiles; do |
@@ -3725,7 +3725,7 @@ Index: binutils-2.21/ltmain.sh | |||
3725 | } | 3725 | } |
3726 | fi | 3726 | fi |
3727 | 3727 | ||
3728 | @@ -2593,23 +3325,23 @@ extern \"C\" { | 3728 | @@ -2593,23 +3325,23 @@ |
3729 | export_symbols="$output_objdir/$outputname.exp" | 3729 | export_symbols="$output_objdir/$outputname.exp" |
3730 | $opt_dry_run || { | 3730 | $opt_dry_run || { |
3731 | $RM $export_symbols | 3731 | $RM $export_symbols |
@@ -3757,7 +3757,7 @@ Index: binutils-2.21/ltmain.sh | |||
3757 | ;; | 3757 | ;; |
3758 | esac | 3758 | esac |
3759 | } | 3759 | } |
3760 | @@ -2620,10 +3352,52 @@ extern \"C\" { | 3760 | @@ -2620,10 +3352,52 @@ |
3761 | func_verbose "extracting global C symbols from \`$dlprefile'" | 3761 | func_verbose "extracting global C symbols from \`$dlprefile'" |
3762 | func_basename "$dlprefile" | 3762 | func_basename "$dlprefile" |
3763 | name="$func_basename_result" | 3763 | name="$func_basename_result" |
@@ -3814,7 +3814,7 @@ Index: binutils-2.21/ltmain.sh | |||
3814 | done | 3814 | done |
3815 | 3815 | ||
3816 | $opt_dry_run || { | 3816 | $opt_dry_run || { |
3817 | @@ -2661,26 +3435,9 @@ typedef struct { | 3817 | @@ -2661,26 +3435,9 @@ |
3818 | const char *name; | 3818 | const char *name; |
3819 | void *address; | 3819 | void *address; |
3820 | } lt_dlsymlist; | 3820 | } lt_dlsymlist; |
@@ -3843,7 +3843,7 @@ Index: binutils-2.21/ltmain.sh | |||
3843 | lt_${my_prefix}_LTX_preloaded_symbols[] = | 3843 | lt_${my_prefix}_LTX_preloaded_symbols[] = |
3844 | {\ | 3844 | {\ |
3845 | { \"$my_originator\", (void *) 0 }," | 3845 | { \"$my_originator\", (void *) 0 }," |
3846 | @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() | 3846 | @@ -2736,7 +3493,7 @@ |
3847 | for arg in $LTCFLAGS; do | 3847 | for arg in $LTCFLAGS; do |
3848 | case $arg in | 3848 | case $arg in |
3849 | -pie | -fpie | -fPIE) ;; | 3849 | -pie | -fpie | -fPIE) ;; |
@@ -3852,7 +3852,7 @@ Index: binutils-2.21/ltmain.sh | |||
3852 | esac | 3852 | esac |
3853 | done | 3853 | done |
3854 | 3854 | ||
3855 | @@ -2796,9 +3553,11 @@ func_win32_libid () | 3855 | @@ -2796,9 +3553,11 @@ |
3856 | win32_libid_type="x86 archive import" | 3856 | win32_libid_type="x86 archive import" |
3857 | ;; | 3857 | ;; |
3858 | *ar\ archive*) # could be an import, or static | 3858 | *ar\ archive*) # could be an import, or static |
@@ -3867,7 +3867,7 @@ Index: binutils-2.21/ltmain.sh | |||
3867 | $SED -n -e ' | 3867 | $SED -n -e ' |
3868 | 1,100{ | 3868 | 1,100{ |
3869 | / I /{ | 3869 | / I /{ |
3870 | @@ -2827,6 +3586,131 @@ func_win32_libid () | 3870 | @@ -2827,6 +3586,131 @@ |
3871 | $ECHO "$win32_libid_type" | 3871 | $ECHO "$win32_libid_type" |
3872 | } | 3872 | } |
3873 | 3873 | ||
@@ -3999,7 +3999,7 @@ Index: binutils-2.21/ltmain.sh | |||
3999 | 3999 | ||
4000 | 4000 | ||
4001 | # func_extract_an_archive dir oldlib | 4001 | # func_extract_an_archive dir oldlib |
4002 | @@ -2917,7 +3801,7 @@ func_extract_archives () | 4002 | @@ -2917,7 +3801,7 @@ |
4003 | darwin_file= | 4003 | darwin_file= |
4004 | darwin_files= | 4004 | darwin_files= |
4005 | for darwin_file in $darwin_filelist; do | 4005 | for darwin_file in $darwin_filelist; do |
@@ -4008,7 +4008,7 @@ Index: binutils-2.21/ltmain.sh | |||
4008 | $LIPO -create -output "$darwin_file" $darwin_files | 4008 | $LIPO -create -output "$darwin_file" $darwin_files |
4009 | done # $darwin_filelist | 4009 | done # $darwin_filelist |
4010 | $RM -rf unfat-$$ | 4010 | $RM -rf unfat-$$ |
4011 | @@ -2932,7 +3816,7 @@ func_extract_archives () | 4011 | @@ -2932,7 +3816,7 @@ |
4012 | func_extract_an_archive "$my_xdir" "$my_xabs" | 4012 | func_extract_an_archive "$my_xdir" "$my_xabs" |
4013 | ;; | 4013 | ;; |
4014 | esac | 4014 | esac |
@@ -4017,7 +4017,7 @@ Index: binutils-2.21/ltmain.sh | |||
4017 | done | 4017 | done |
4018 | 4018 | ||
4019 | func_extract_archives_result="$my_oldobjs" | 4019 | func_extract_archives_result="$my_oldobjs" |
4020 | @@ -3014,7 +3898,110 @@ func_fallback_echo () | 4020 | @@ -3014,7 +3898,110 @@ |
4021 | _LTECHO_EOF' | 4021 | _LTECHO_EOF' |
4022 | } | 4022 | } |
4023 | ECHO=\"$qECHO\" | 4023 | ECHO=\"$qECHO\" |
@@ -4129,7 +4129,7 @@ Index: binutils-2.21/ltmain.sh | |||
4129 | 4129 | ||
4130 | # Find the directory that this script lives in. | 4130 | # Find the directory that this script lives in. |
4131 | thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` | 4131 | thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` |
4132 | @@ -3078,7 +4065,7 @@ _LTECHO_EOF' | 4132 | @@ -3078,7 +4065,7 @@ |
4133 | 4133 | ||
4134 | # relink executable if necessary | 4134 | # relink executable if necessary |
4135 | if test -n \"\$relink_command\"; then | 4135 | if test -n \"\$relink_command\"; then |
@@ -4138,7 +4138,7 @@ Index: binutils-2.21/ltmain.sh | |||
4138 | else | 4138 | else |
4139 | $ECHO \"\$relink_command_output\" >&2 | 4139 | $ECHO \"\$relink_command_output\" >&2 |
4140 | $RM \"\$progdir/\$file\" | 4140 | $RM \"\$progdir/\$file\" |
4141 | @@ -3102,6 +4089,18 @@ _LTECHO_EOF' | 4141 | @@ -3102,6 +4089,18 @@ |
4142 | 4142 | ||
4143 | if test -f \"\$progdir/\$program\"; then" | 4143 | if test -f \"\$progdir/\$program\"; then" |
4144 | 4144 | ||
@@ -4157,7 +4157,7 @@ Index: binutils-2.21/ltmain.sh | |||
4157 | # Export our shlibpath_var if we have one. | 4157 | # Export our shlibpath_var if we have one. |
4158 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then | 4158 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then |
4159 | $ECHO "\ | 4159 | $ECHO "\ |
4160 | @@ -3116,35 +4115,10 @@ _LTECHO_EOF' | 4160 | @@ -3116,35 +4115,10 @@ |
4161 | " | 4161 | " |
4162 | fi | 4162 | fi |
4163 | 4163 | ||
@@ -4194,7 +4194,7 @@ Index: binutils-2.21/ltmain.sh | |||
4194 | fi | 4194 | fi |
4195 | else | 4195 | else |
4196 | # The program doesn't exist. | 4196 | # The program doesn't exist. |
4197 | @@ -3158,166 +4132,6 @@ fi\ | 4197 | @@ -3158,166 +4132,6 @@ |
4198 | } | 4198 | } |
4199 | 4199 | ||
4200 | 4200 | ||
@@ -4361,7 +4361,7 @@ Index: binutils-2.21/ltmain.sh | |||
4361 | # func_emit_cwrapperexe_src | 4361 | # func_emit_cwrapperexe_src |
4362 | # emit the source code for a wrapper executable on stdout | 4362 | # emit the source code for a wrapper executable on stdout |
4363 | # Must ONLY be called from within func_mode_link because | 4363 | # Must ONLY be called from within func_mode_link because |
4364 | @@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () | 4364 | @@ -3334,10 +4148,6 @@ |
4365 | 4365 | ||
4366 | This wrapper executable should never be moved out of the build directory. | 4366 | This wrapper executable should never be moved out of the build directory. |
4367 | If it is, it will not operate correctly. | 4367 | If it is, it will not operate correctly. |
@@ -4372,7 +4372,7 @@ Index: binutils-2.21/ltmain.sh | |||
4372 | */ | 4372 | */ |
4373 | EOF | 4373 | EOF |
4374 | cat <<"EOF" | 4374 | cat <<"EOF" |
4375 | @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, | 4375 | @@ -3462,22 +4272,13 @@ |
4376 | if (stale) { free ((void *) stale); stale = 0; } \ | 4376 | if (stale) { free ((void *) stale); stale = 0; } \ |
4377 | } while (0) | 4377 | } while (0) |
4378 | 4378 | ||
@@ -4399,7 +4399,7 @@ Index: binutils-2.21/ltmain.sh | |||
4399 | 4399 | ||
4400 | void *xmalloc (size_t num); | 4400 | void *xmalloc (size_t num); |
4401 | char *xstrdup (const char *string); | 4401 | char *xstrdup (const char *string); |
4402 | @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp | 4402 | @@ -3487,7 +4288,10 @@ |
4403 | int make_executable (const char *path); | 4403 | int make_executable (const char *path); |
4404 | int check_executable (const char *path); | 4404 | int check_executable (const char *path); |
4405 | char *strendzap (char *str, const char *pat); | 4405 | char *strendzap (char *str, const char *pat); |
@@ -4411,7 +4411,7 @@ Index: binutils-2.21/ltmain.sh | |||
4411 | void lt_setenv (const char *name, const char *value); | 4411 | void lt_setenv (const char *name, const char *value); |
4412 | char *lt_extend_str (const char *orig_value, const char *add, int to_end); | 4412 | char *lt_extend_str (const char *orig_value, const char *add, int to_end); |
4413 | void lt_update_exe_path (const char *name, const char *value); | 4413 | void lt_update_exe_path (const char *name, const char *value); |
4414 | @@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); | 4414 | @@ -3497,14 +4301,14 @@ |
4415 | EOF | 4415 | EOF |
4416 | 4416 | ||
4417 | cat <<EOF | 4417 | cat <<EOF |
@@ -4429,7 +4429,7 @@ Index: binutils-2.21/ltmain.sh | |||
4429 | EOF | 4429 | EOF |
4430 | else | 4430 | else |
4431 | cat <<"EOF" | 4431 | cat <<"EOF" |
4432 | @@ -3513,10 +4317,10 @@ EOF | 4432 | @@ -3513,10 +4317,10 @@ |
4433 | fi | 4433 | fi |
4434 | 4434 | ||
4435 | if test -n "$dllsearchpath"; then | 4435 | if test -n "$dllsearchpath"; then |
@@ -4442,7 +4442,7 @@ Index: binutils-2.21/ltmain.sh | |||
4442 | EOF | 4442 | EOF |
4443 | else | 4443 | else |
4444 | cat <<"EOF" | 4444 | cat <<"EOF" |
4445 | @@ -3539,12 +4343,10 @@ EOF | 4445 | @@ -3539,12 +4343,10 @@ |
4446 | cat <<"EOF" | 4446 | cat <<"EOF" |
4447 | 4447 | ||
4448 | #define LTWRAPPER_OPTION_PREFIX "--lt-" | 4448 | #define LTWRAPPER_OPTION_PREFIX "--lt-" |
@@ -4456,7 +4456,7 @@ Index: binutils-2.21/ltmain.sh | |||
4456 | 4456 | ||
4457 | int | 4457 | int |
4458 | main (int argc, char *argv[]) | 4458 | main (int argc, char *argv[]) |
4459 | @@ -3561,10 +4363,13 @@ main (int argc, char *argv[]) | 4459 | @@ -3561,10 +4363,13 @@ |
4460 | int i; | 4460 | int i; |
4461 | 4461 | ||
4462 | program_name = (char *) xstrdup (base_name (argv[0])); | 4462 | program_name = (char *) xstrdup (base_name (argv[0])); |
@@ -4473,7 +4473,7 @@ Index: binutils-2.21/ltmain.sh | |||
4473 | for (i = 1; i < argc; i++) | 4473 | for (i = 1; i < argc; i++) |
4474 | { | 4474 | { |
4475 | if (strcmp (argv[i], dumpscript_opt) == 0) | 4475 | if (strcmp (argv[i], dumpscript_opt) == 0) |
4476 | @@ -3581,21 +4386,54 @@ EOF | 4476 | @@ -3581,21 +4386,54 @@ |
4477 | lt_dump_script (stdout); | 4477 | lt_dump_script (stdout); |
4478 | return 0; | 4478 | return 0; |
4479 | } | 4479 | } |
@@ -4535,7 +4535,7 @@ Index: binutils-2.21/ltmain.sh | |||
4535 | strendzap (actual_cwrapper_path, actual_cwrapper_name); | 4535 | strendzap (actual_cwrapper_path, actual_cwrapper_name); |
4536 | 4536 | ||
4537 | /* wrapper name transforms */ | 4537 | /* wrapper name transforms */ |
4538 | @@ -3613,8 +4451,9 @@ EOF | 4538 | @@ -3613,8 +4451,9 @@ |
4539 | target_name = tmp_pathspec; | 4539 | target_name = tmp_pathspec; |
4540 | tmp_pathspec = 0; | 4540 | tmp_pathspec = 0; |
4541 | 4541 | ||
@@ -4547,7 +4547,7 @@ Index: binutils-2.21/ltmain.sh | |||
4547 | EOF | 4547 | EOF |
4548 | 4548 | ||
4549 | cat <<EOF | 4549 | cat <<EOF |
4550 | @@ -3664,35 +4503,19 @@ EOF | 4550 | @@ -3664,35 +4503,19 @@ |
4551 | 4551 | ||
4552 | lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ | 4552 | lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ |
4553 | lt_setenv ("DUALCASE", "1"); /* for MSK sh */ | 4553 | lt_setenv ("DUALCASE", "1"); /* for MSK sh */ |
@@ -4592,7 +4592,7 @@ Index: binutils-2.21/ltmain.sh | |||
4592 | } | 4592 | } |
4593 | 4593 | ||
4594 | EOF | 4594 | EOF |
4595 | @@ -3706,7 +4529,9 @@ EOF | 4595 | @@ -3706,7 +4529,9 @@ |
4596 | if (rval == -1) | 4596 | if (rval == -1) |
4597 | { | 4597 | { |
4598 | /* failed to start process */ | 4598 | /* failed to start process */ |
@@ -4603,7 +4603,7 @@ Index: binutils-2.21/ltmain.sh | |||
4603 | return 127; | 4603 | return 127; |
4604 | } | 4604 | } |
4605 | return rval; | 4605 | return rval; |
4606 | @@ -3728,7 +4553,7 @@ xmalloc (size_t num) | 4606 | @@ -3728,7 +4553,7 @@ |
4607 | { | 4607 | { |
4608 | void *p = (void *) malloc (num); | 4608 | void *p = (void *) malloc (num); |
4609 | if (!p) | 4609 | if (!p) |
@@ -4612,7 +4612,7 @@ Index: binutils-2.21/ltmain.sh | |||
4612 | 4612 | ||
4613 | return p; | 4613 | return p; |
4614 | } | 4614 | } |
4615 | @@ -3762,8 +4587,8 @@ check_executable (const char *path) | 4615 | @@ -3762,8 +4587,8 @@ |
4616 | { | 4616 | { |
4617 | struct stat st; | 4617 | struct stat st; |
4618 | 4618 | ||
@@ -4623,7 +4623,7 @@ Index: binutils-2.21/ltmain.sh | |||
4623 | if ((!path) || (!*path)) | 4623 | if ((!path) || (!*path)) |
4624 | return 0; | 4624 | return 0; |
4625 | 4625 | ||
4626 | @@ -3780,8 +4605,8 @@ make_executable (const char *path) | 4626 | @@ -3780,8 +4605,8 @@ |
4627 | int rval = 0; | 4627 | int rval = 0; |
4628 | struct stat st; | 4628 | struct stat st; |
4629 | 4629 | ||
@@ -4634,7 +4634,7 @@ Index: binutils-2.21/ltmain.sh | |||
4634 | if ((!path) || (!*path)) | 4634 | if ((!path) || (!*path)) |
4635 | return 0; | 4635 | return 0; |
4636 | 4636 | ||
4637 | @@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) | 4637 | @@ -3807,8 +4632,8 @@ |
4638 | int tmp_len; | 4638 | int tmp_len; |
4639 | char *concat_name; | 4639 | char *concat_name; |
4640 | 4640 | ||
@@ -4645,7 +4645,7 @@ Index: binutils-2.21/ltmain.sh | |||
4645 | 4645 | ||
4646 | if ((wrapper == NULL) || (*wrapper == '\0')) | 4646 | if ((wrapper == NULL) || (*wrapper == '\0')) |
4647 | return NULL; | 4647 | return NULL; |
4648 | @@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) | 4648 | @@ -3861,7 +4686,8 @@ |
4649 | { | 4649 | { |
4650 | /* empty path: current directory */ | 4650 | /* empty path: current directory */ |
4651 | if (getcwd (tmp, LT_PATHMAX) == NULL) | 4651 | if (getcwd (tmp, LT_PATHMAX) == NULL) |
@@ -4655,7 +4655,7 @@ Index: binutils-2.21/ltmain.sh | |||
4655 | tmp_len = strlen (tmp); | 4655 | tmp_len = strlen (tmp); |
4656 | concat_name = | 4656 | concat_name = |
4657 | XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); | 4657 | XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); |
4658 | @@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) | 4658 | @@ -3886,7 +4712,8 @@ |
4659 | } | 4659 | } |
4660 | /* Relative path | not found in path: prepend cwd */ | 4660 | /* Relative path | not found in path: prepend cwd */ |
4661 | if (getcwd (tmp, LT_PATHMAX) == NULL) | 4661 | if (getcwd (tmp, LT_PATHMAX) == NULL) |
@@ -4665,7 +4665,7 @@ Index: binutils-2.21/ltmain.sh | |||
4665 | tmp_len = strlen (tmp); | 4665 | tmp_len = strlen (tmp); |
4666 | concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); | 4666 | concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); |
4667 | memcpy (concat_name, tmp, tmp_len); | 4667 | memcpy (concat_name, tmp, tmp_len); |
4668 | @@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) | 4668 | @@ -3912,8 +4739,9 @@ |
4669 | int has_symlinks = 0; | 4669 | int has_symlinks = 0; |
4670 | while (strlen (tmp_pathspec) && !has_symlinks) | 4670 | while (strlen (tmp_pathspec) && !has_symlinks) |
4671 | { | 4671 | { |
@@ -4677,7 +4677,7 @@ Index: binutils-2.21/ltmain.sh | |||
4677 | if (lstat (tmp_pathspec, &s) == 0) | 4677 | if (lstat (tmp_pathspec, &s) == 0) |
4678 | { | 4678 | { |
4679 | if (S_ISLNK (s.st_mode) != 0) | 4679 | if (S_ISLNK (s.st_mode) != 0) |
4680 | @@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) | 4680 | @@ -3935,8 +4763,9 @@ |
4681 | } | 4681 | } |
4682 | else | 4682 | else |
4683 | { | 4683 | { |
@@ -4689,7 +4689,7 @@ Index: binutils-2.21/ltmain.sh | |||
4689 | } | 4689 | } |
4690 | } | 4690 | } |
4691 | XFREE (tmp_pathspec); | 4691 | XFREE (tmp_pathspec); |
4692 | @@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) | 4692 | @@ -3949,7 +4778,8 @@ |
4693 | tmp_pathspec = realpath (pathspec, buf); | 4693 | tmp_pathspec = realpath (pathspec, buf); |
4694 | if (tmp_pathspec == 0) | 4694 | if (tmp_pathspec == 0) |
4695 | { | 4695 | { |
@@ -4699,7 +4699,7 @@ Index: binutils-2.21/ltmain.sh | |||
4699 | } | 4699 | } |
4700 | return xstrdup (tmp_pathspec); | 4700 | return xstrdup (tmp_pathspec); |
4701 | #endif | 4701 | #endif |
4702 | @@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) | 4702 | @@ -3975,11 +4805,25 @@ |
4703 | return str; | 4703 | return str; |
4704 | } | 4704 | } |
4705 | 4705 | ||
@@ -4727,7 +4727,7 @@ Index: binutils-2.21/ltmain.sh | |||
4727 | vfprintf (stderr, message, ap); | 4727 | vfprintf (stderr, message, ap); |
4728 | fprintf (stderr, ".\n"); | 4728 | fprintf (stderr, ".\n"); |
4729 | 4729 | ||
4730 | @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch | 4730 | @@ -3988,20 +4832,32 @@ |
4731 | } | 4731 | } |
4732 | 4732 | ||
4733 | void | 4733 | void |
@@ -4765,7 +4765,7 @@ Index: binutils-2.21/ltmain.sh | |||
4765 | { | 4765 | { |
4766 | #ifdef HAVE_SETENV | 4766 | #ifdef HAVE_SETENV |
4767 | /* always make a copy, for consistency with !HAVE_SETENV */ | 4767 | /* always make a copy, for consistency with !HAVE_SETENV */ |
4768 | @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c | 4768 | @@ -4049,9 +4905,9 @@ |
4769 | void | 4769 | void |
4770 | lt_update_exe_path (const char *name, const char *value) | 4770 | lt_update_exe_path (const char *name, const char *value) |
4771 | { | 4771 | { |
@@ -4778,7 +4778,7 @@ Index: binutils-2.21/ltmain.sh | |||
4778 | 4778 | ||
4779 | if (name && *name && value && *value) | 4779 | if (name && *name && value && *value) |
4780 | { | 4780 | { |
4781 | @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co | 4781 | @@ -4070,9 +4926,9 @@ |
4782 | void | 4782 | void |
4783 | lt_update_lib_path (const char *name, const char *value) | 4783 | lt_update_lib_path (const char *name, const char *value) |
4784 | { | 4784 | { |
@@ -4791,7 +4791,7 @@ Index: binutils-2.21/ltmain.sh | |||
4791 | 4791 | ||
4792 | if (name && *name && value && *value) | 4792 | if (name && *name && value && *value) |
4793 | { | 4793 | { |
4794 | @@ -4222,7 +5078,7 @@ EOF | 4794 | @@ -4222,7 +5078,7 @@ |
4795 | func_win32_import_lib_p () | 4795 | func_win32_import_lib_p () |
4796 | { | 4796 | { |
4797 | $opt_debug | 4797 | $opt_debug |
@@ -4800,7 +4800,7 @@ Index: binutils-2.21/ltmain.sh | |||
4800 | *import*) : ;; | 4800 | *import*) : ;; |
4801 | *) false ;; | 4801 | *) false ;; |
4802 | esac | 4802 | esac |
4803 | @@ -4401,9 +5257,9 @@ func_mode_link () | 4803 | @@ -4401,9 +5257,9 @@ |
4804 | ;; | 4804 | ;; |
4805 | *) | 4805 | *) |
4806 | if test "$prev" = dlfiles; then | 4806 | if test "$prev" = dlfiles; then |
@@ -4812,7 +4812,7 @@ Index: binutils-2.21/ltmain.sh | |||
4812 | fi | 4812 | fi |
4813 | prev= | 4813 | prev= |
4814 | continue | 4814 | continue |
4815 | @@ -4427,7 +5283,7 @@ func_mode_link () | 4815 | @@ -4427,7 +5283,7 @@ |
4816 | *-*-darwin*) | 4816 | *-*-darwin*) |
4817 | case "$deplibs " in | 4817 | case "$deplibs " in |
4818 | *" $qarg.ltframework "*) ;; | 4818 | *" $qarg.ltframework "*) ;; |
@@ -4821,7 +4821,7 @@ Index: binutils-2.21/ltmain.sh | |||
4821 | ;; | 4821 | ;; |
4822 | esac | 4822 | esac |
4823 | ;; | 4823 | ;; |
4824 | @@ -4446,7 +5302,7 @@ func_mode_link () | 4824 | @@ -4446,7 +5302,7 @@ |
4825 | moreargs= | 4825 | moreargs= |
4826 | for fil in `cat "$save_arg"` | 4826 | for fil in `cat "$save_arg"` |
4827 | do | 4827 | do |
@@ -4830,7 +4830,7 @@ Index: binutils-2.21/ltmain.sh | |||
4830 | arg=$fil | 4830 | arg=$fil |
4831 | # A libtool-controlled object. | 4831 | # A libtool-controlled object. |
4832 | 4832 | ||
4833 | @@ -4475,7 +5331,7 @@ func_mode_link () | 4833 | @@ -4475,7 +5331,7 @@ |
4834 | 4834 | ||
4835 | if test "$prev" = dlfiles; then | 4835 | if test "$prev" = dlfiles; then |
4836 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then | 4836 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then |
@@ -4839,7 +4839,7 @@ Index: binutils-2.21/ltmain.sh | |||
4839 | prev= | 4839 | prev= |
4840 | continue | 4840 | continue |
4841 | else | 4841 | else |
4842 | @@ -4487,7 +5343,7 @@ func_mode_link () | 4842 | @@ -4487,7 +5343,7 @@ |
4843 | # CHECK ME: I think I busted this. -Ossama | 4843 | # CHECK ME: I think I busted this. -Ossama |
4844 | if test "$prev" = dlprefiles; then | 4844 | if test "$prev" = dlprefiles; then |
4845 | # Preload the old-style object. | 4845 | # Preload the old-style object. |
@@ -4848,7 +4848,7 @@ Index: binutils-2.21/ltmain.sh | |||
4848 | prev= | 4848 | prev= |
4849 | fi | 4849 | fi |
4850 | 4850 | ||
4851 | @@ -4557,12 +5413,12 @@ func_mode_link () | 4851 | @@ -4557,12 +5413,12 @@ |
4852 | if test "$prev" = rpath; then | 4852 | if test "$prev" = rpath; then |
4853 | case "$rpath " in | 4853 | case "$rpath " in |
4854 | *" $arg "*) ;; | 4854 | *" $arg "*) ;; |
@@ -4863,7 +4863,7 @@ Index: binutils-2.21/ltmain.sh | |||
4863 | esac | 4863 | esac |
4864 | fi | 4864 | fi |
4865 | prev= | 4865 | prev= |
4866 | @@ -4574,28 +5430,28 @@ func_mode_link () | 4866 | @@ -4574,28 +5430,28 @@ |
4867 | continue | 4867 | continue |
4868 | ;; | 4868 | ;; |
4869 | weak) | 4869 | weak) |
@@ -4898,7 +4898,7 @@ Index: binutils-2.21/ltmain.sh | |||
4898 | prev= | 4898 | prev= |
4899 | func_append compile_command " $wl$qarg" | 4899 | func_append compile_command " $wl$qarg" |
4900 | func_append finalize_command " $wl$qarg" | 4900 | func_append finalize_command " $wl$qarg" |
4901 | @@ -4686,15 +5542,16 @@ func_mode_link () | 4901 | @@ -4686,15 +5542,16 @@ |
4902 | ;; | 4902 | ;; |
4903 | 4903 | ||
4904 | -L*) | 4904 | -L*) |
@@ -4918,7 +4918,7 @@ Index: binutils-2.21/ltmain.sh | |||
4918 | # We need an absolute path. | 4918 | # We need an absolute path. |
4919 | case $dir in | 4919 | case $dir in |
4920 | [\\/]* | [A-Za-z]:[\\/]*) ;; | 4920 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
4921 | @@ -4706,10 +5563,16 @@ func_mode_link () | 4921 | @@ -4706,10 +5563,16 @@ |
4922 | ;; | 4922 | ;; |
4923 | esac | 4923 | esac |
4924 | case "$deplibs " in | 4924 | case "$deplibs " in |
@@ -4938,7 +4938,7 @@ Index: binutils-2.21/ltmain.sh | |||
4938 | ;; | 4938 | ;; |
4939 | esac | 4939 | esac |
4940 | case $host in | 4940 | case $host in |
4941 | @@ -4718,12 +5581,12 @@ func_mode_link () | 4941 | @@ -4718,12 +5581,12 @@ |
4942 | case :$dllsearchpath: in | 4942 | case :$dllsearchpath: in |
4943 | *":$dir:"*) ;; | 4943 | *":$dir:"*) ;; |
4944 | ::) dllsearchpath=$dir;; | 4944 | ::) dllsearchpath=$dir;; |
@@ -4953,7 +4953,7 @@ Index: binutils-2.21/ltmain.sh | |||
4953 | esac | 4953 | esac |
4954 | ;; | 4954 | ;; |
4955 | esac | 4955 | esac |
4956 | @@ -4747,7 +5610,7 @@ func_mode_link () | 4956 | @@ -4747,7 +5610,7 @@ |
4957 | ;; | 4957 | ;; |
4958 | *-*-rhapsody* | *-*-darwin1.[012]) | 4958 | *-*-rhapsody* | *-*-darwin1.[012]) |
4959 | # Rhapsody C and math libraries are in the System framework | 4959 | # Rhapsody C and math libraries are in the System framework |
@@ -4962,7 +4962,7 @@ Index: binutils-2.21/ltmain.sh | |||
4962 | continue | 4962 | continue |
4963 | ;; | 4963 | ;; |
4964 | *-*-sco3.2v5* | *-*-sco5v6*) | 4964 | *-*-sco3.2v5* | *-*-sco5v6*) |
4965 | @@ -4758,9 +5621,6 @@ func_mode_link () | 4965 | @@ -4758,9 +5621,6 @@ |
4966 | # Compiler inserts libc in the correct place for threads to work | 4966 | # Compiler inserts libc in the correct place for threads to work |
4967 | test "X$arg" = "X-lc" && continue | 4967 | test "X$arg" = "X-lc" && continue |
4968 | ;; | 4968 | ;; |
@@ -4972,7 +4972,7 @@ Index: binutils-2.21/ltmain.sh | |||
4972 | esac | 4972 | esac |
4973 | elif test "X$arg" = "X-lc_r"; then | 4973 | elif test "X$arg" = "X-lc_r"; then |
4974 | case $host in | 4974 | case $host in |
4975 | @@ -4770,7 +5630,7 @@ func_mode_link () | 4975 | @@ -4770,7 +5630,7 @@ |
4976 | ;; | 4976 | ;; |
4977 | esac | 4977 | esac |
4978 | fi | 4978 | fi |
@@ -4981,7 +4981,7 @@ Index: binutils-2.21/ltmain.sh | |||
4981 | continue | 4981 | continue |
4982 | ;; | 4982 | ;; |
4983 | 4983 | ||
4984 | @@ -4782,8 +5642,8 @@ func_mode_link () | 4984 | @@ -4782,8 +5642,8 @@ |
4985 | # Tru64 UNIX uses -model [arg] to determine the layout of C++ | 4985 | # Tru64 UNIX uses -model [arg] to determine the layout of C++ |
4986 | # classes, name mangling, and exception handling. | 4986 | # classes, name mangling, and exception handling. |
4987 | # Darwin uses the -arch flag to determine output architecture. | 4987 | # Darwin uses the -arch flag to determine output architecture. |
@@ -4992,7 +4992,7 @@ Index: binutils-2.21/ltmain.sh | |||
4992 | func_append compile_command " $arg" | 4992 | func_append compile_command " $arg" |
4993 | func_append finalize_command " $arg" | 4993 | func_append finalize_command " $arg" |
4994 | prev=xcompiler | 4994 | prev=xcompiler |
4995 | @@ -4791,12 +5651,12 @@ func_mode_link () | 4995 | @@ -4791,12 +5651,12 @@ |
4996 | ;; | 4996 | ;; |
4997 | 4997 | ||
4998 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) | 4998 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
@@ -5007,7 +5007,7 @@ Index: binutils-2.21/ltmain.sh | |||
5007 | esac | 5007 | esac |
5008 | continue | 5008 | continue |
5009 | ;; | 5009 | ;; |
5010 | @@ -4863,13 +5723,17 @@ func_mode_link () | 5010 | @@ -4863,13 +5723,17 @@ |
5011 | # We need an absolute path. | 5011 | # We need an absolute path. |
5012 | case $dir in | 5012 | case $dir in |
5013 | [\\/]* | [A-Za-z]:[\\/]*) ;; | 5013 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
@@ -5026,7 +5026,7 @@ Index: binutils-2.21/ltmain.sh | |||
5026 | esac | 5026 | esac |
5027 | continue | 5027 | continue |
5028 | ;; | 5028 | ;; |
5029 | @@ -4922,8 +5786,8 @@ func_mode_link () | 5029 | @@ -4922,8 +5786,8 @@ |
5030 | for flag in $args; do | 5030 | for flag in $args; do |
5031 | IFS="$save_ifs" | 5031 | IFS="$save_ifs" |
5032 | func_quote_for_eval "$flag" | 5032 | func_quote_for_eval "$flag" |
@@ -5037,7 +5037,7 @@ Index: binutils-2.21/ltmain.sh | |||
5037 | done | 5037 | done |
5038 | IFS="$save_ifs" | 5038 | IFS="$save_ifs" |
5039 | func_stripname ' ' '' "$arg" | 5039 | func_stripname ' ' '' "$arg" |
5040 | @@ -4938,9 +5802,9 @@ func_mode_link () | 5040 | @@ -4938,9 +5802,9 @@ |
5041 | for flag in $args; do | 5041 | for flag in $args; do |
5042 | IFS="$save_ifs" | 5042 | IFS="$save_ifs" |
5043 | func_quote_for_eval "$flag" | 5043 | func_quote_for_eval "$flag" |
@@ -5050,7 +5050,7 @@ Index: binutils-2.21/ltmain.sh | |||
5050 | done | 5050 | done |
5051 | IFS="$save_ifs" | 5051 | IFS="$save_ifs" |
5052 | func_stripname ' ' '' "$arg" | 5052 | func_stripname ' ' '' "$arg" |
5053 | @@ -4968,24 +5832,27 @@ func_mode_link () | 5053 | @@ -4968,24 +5832,27 @@ |
5054 | arg="$func_quote_for_eval_result" | 5054 | arg="$func_quote_for_eval_result" |
5055 | ;; | 5055 | ;; |
5056 | 5056 | ||
@@ -5091,7 +5091,7 @@ Index: binutils-2.21/ltmain.sh | |||
5091 | continue | 5091 | continue |
5092 | ;; | 5092 | ;; |
5093 | 5093 | ||
5094 | @@ -4997,7 +5864,7 @@ func_mode_link () | 5094 | @@ -4997,7 +5864,7 @@ |
5095 | 5095 | ||
5096 | *.$objext) | 5096 | *.$objext) |
5097 | # A standard object. | 5097 | # A standard object. |
@@ -5100,7 +5100,7 @@ Index: binutils-2.21/ltmain.sh | |||
5100 | ;; | 5100 | ;; |
5101 | 5101 | ||
5102 | *.lo) | 5102 | *.lo) |
5103 | @@ -5028,7 +5895,7 @@ func_mode_link () | 5103 | @@ -5028,7 +5895,7 @@ |
5104 | 5104 | ||
5105 | if test "$prev" = dlfiles; then | 5105 | if test "$prev" = dlfiles; then |
5106 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then | 5106 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then |
@@ -5109,7 +5109,7 @@ Index: binutils-2.21/ltmain.sh | |||
5109 | prev= | 5109 | prev= |
5110 | continue | 5110 | continue |
5111 | else | 5111 | else |
5112 | @@ -5040,7 +5907,7 @@ func_mode_link () | 5112 | @@ -5040,7 +5907,7 @@ |
5113 | # CHECK ME: I think I busted this. -Ossama | 5113 | # CHECK ME: I think I busted this. -Ossama |
5114 | if test "$prev" = dlprefiles; then | 5114 | if test "$prev" = dlprefiles; then |
5115 | # Preload the old-style object. | 5115 | # Preload the old-style object. |
@@ -5118,7 +5118,7 @@ Index: binutils-2.21/ltmain.sh | |||
5118 | prev= | 5118 | prev= |
5119 | fi | 5119 | fi |
5120 | 5120 | ||
5121 | @@ -5085,24 +5952,25 @@ func_mode_link () | 5121 | @@ -5085,24 +5952,25 @@ |
5122 | 5122 | ||
5123 | *.$libext) | 5123 | *.$libext) |
5124 | # An archive. | 5124 | # An archive. |
@@ -5149,7 +5149,7 @@ Index: binutils-2.21/ltmain.sh | |||
5149 | fi | 5149 | fi |
5150 | continue | 5150 | continue |
5151 | ;; | 5151 | ;; |
5152 | @@ -5127,7 +5995,7 @@ func_mode_link () | 5152 | @@ -5127,7 +5995,7 @@ |
5153 | func_fatal_help "the \`$prevarg' option requires an argument" | 5153 | func_fatal_help "the \`$prevarg' option requires an argument" |
5154 | 5154 | ||
5155 | if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then | 5155 | if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then |
@@ -5158,7 +5158,7 @@ Index: binutils-2.21/ltmain.sh | |||
5158 | func_append compile_command " $arg" | 5158 | func_append compile_command " $arg" |
5159 | func_append finalize_command " $arg" | 5159 | func_append finalize_command " $arg" |
5160 | fi | 5160 | fi |
5161 | @@ -5144,11 +6012,13 @@ func_mode_link () | 5161 | @@ -5144,11 +6012,13 @@ |
5162 | else | 5162 | else |
5163 | shlib_search_path= | 5163 | shlib_search_path= |
5164 | fi | 5164 | fi |
@@ -5174,7 +5174,7 @@ Index: binutils-2.21/ltmain.sh | |||
5174 | # Create the object directory. | 5174 | # Create the object directory. |
5175 | func_mkdir_p "$output_objdir" | 5175 | func_mkdir_p "$output_objdir" |
5176 | 5176 | ||
5177 | @@ -5169,12 +6039,12 @@ func_mode_link () | 5177 | @@ -5169,12 +6039,12 @@ |
5178 | # Find all interdependent deplibs by searching for libraries | 5178 | # Find all interdependent deplibs by searching for libraries |
5179 | # that are linked more than once (e.g. -la -lb -la) | 5179 | # that are linked more than once (e.g. -la -lb -la) |
5180 | for deplib in $deplibs; do | 5180 | for deplib in $deplibs; do |
@@ -5190,7 +5190,7 @@ Index: binutils-2.21/ltmain.sh | |||
5190 | done | 5190 | done |
5191 | 5191 | ||
5192 | if test "$linkmode" = lib; then | 5192 | if test "$linkmode" = lib; then |
5193 | @@ -5187,9 +6057,9 @@ func_mode_link () | 5193 | @@ -5187,9 +6057,9 @@ |
5194 | if $opt_duplicate_compiler_generated_deps; then | 5194 | if $opt_duplicate_compiler_generated_deps; then |
5195 | for pre_post_dep in $predeps $postdeps; do | 5195 | for pre_post_dep in $predeps $postdeps; do |
5196 | case "$pre_post_deps " in | 5196 | case "$pre_post_deps " in |
@@ -5202,7 +5202,7 @@ Index: binutils-2.21/ltmain.sh | |||
5202 | done | 5202 | done |
5203 | fi | 5203 | fi |
5204 | pre_post_deps= | 5204 | pre_post_deps= |
5205 | @@ -5256,8 +6126,9 @@ func_mode_link () | 5205 | @@ -5256,8 +6126,9 @@ |
5206 | for lib in $dlprefiles; do | 5206 | for lib in $dlprefiles; do |
5207 | # Ignore non-libtool-libs | 5207 | # Ignore non-libtool-libs |
5208 | dependency_libs= | 5208 | dependency_libs= |
@@ -5213,7 +5213,7 @@ Index: binutils-2.21/ltmain.sh | |||
5213 | esac | 5213 | esac |
5214 | 5214 | ||
5215 | # Collect preopened libtool deplibs, except any this library | 5215 | # Collect preopened libtool deplibs, except any this library |
5216 | @@ -5267,7 +6138,7 @@ func_mode_link () | 5216 | @@ -5267,7 +6138,7 @@ |
5217 | deplib_base=$func_basename_result | 5217 | deplib_base=$func_basename_result |
5218 | case " $weak_libs " in | 5218 | case " $weak_libs " in |
5219 | *" $deplib_base "*) ;; | 5219 | *" $deplib_base "*) ;; |
@@ -5222,7 +5222,7 @@ Index: binutils-2.21/ltmain.sh | |||
5222 | esac | 5222 | esac |
5223 | done | 5223 | done |
5224 | done | 5224 | done |
5225 | @@ -5288,11 +6159,11 @@ func_mode_link () | 5225 | @@ -5288,11 +6159,11 @@ |
5226 | compile_deplibs="$deplib $compile_deplibs" | 5226 | compile_deplibs="$deplib $compile_deplibs" |
5227 | finalize_deplibs="$deplib $finalize_deplibs" | 5227 | finalize_deplibs="$deplib $finalize_deplibs" |
5228 | else | 5228 | else |
@@ -5236,7 +5236,7 @@ Index: binutils-2.21/ltmain.sh | |||
5236 | esac | 5236 | esac |
5237 | fi | 5237 | fi |
5238 | fi | 5238 | fi |
5239 | @@ -5377,7 +6248,7 @@ func_mode_link () | 5239 | @@ -5377,7 +6248,7 @@ |
5240 | if test "$linkmode" = lib ; then | 5240 | if test "$linkmode" = lib ; then |
5241 | case "$new_inherited_linker_flags " in | 5241 | case "$new_inherited_linker_flags " in |
5242 | *" $deplib "*) ;; | 5242 | *" $deplib "*) ;; |
@@ -5245,7 +5245,7 @@ Index: binutils-2.21/ltmain.sh | |||
5245 | esac | 5245 | esac |
5246 | fi | 5246 | fi |
5247 | fi | 5247 | fi |
5248 | @@ -5390,7 +6261,8 @@ func_mode_link () | 5248 | @@ -5390,7 +6261,8 @@ |
5249 | test "$pass" = conv && continue | 5249 | test "$pass" = conv && continue |
5250 | newdependency_libs="$deplib $newdependency_libs" | 5250 | newdependency_libs="$deplib $newdependency_libs" |
5251 | func_stripname '-L' '' "$deplib" | 5251 | func_stripname '-L' '' "$deplib" |
@@ -5255,7 +5255,7 @@ Index: binutils-2.21/ltmain.sh | |||
5255 | ;; | 5255 | ;; |
5256 | prog) | 5256 | prog) |
5257 | if test "$pass" = conv; then | 5257 | if test "$pass" = conv; then |
5258 | @@ -5404,7 +6276,8 @@ func_mode_link () | 5258 | @@ -5404,7 +6276,8 @@ |
5259 | finalize_deplibs="$deplib $finalize_deplibs" | 5259 | finalize_deplibs="$deplib $finalize_deplibs" |
5260 | fi | 5260 | fi |
5261 | func_stripname '-L' '' "$deplib" | 5261 | func_stripname '-L' '' "$deplib" |
@@ -5265,7 +5265,7 @@ Index: binutils-2.21/ltmain.sh | |||
5265 | ;; | 5265 | ;; |
5266 | *) | 5266 | *) |
5267 | func_warning "\`-L' is ignored for archives/objects" | 5267 | func_warning "\`-L' is ignored for archives/objects" |
5268 | @@ -5415,17 +6288,21 @@ func_mode_link () | 5268 | @@ -5415,17 +6288,21 @@ |
5269 | -R*) | 5269 | -R*) |
5270 | if test "$pass" = link; then | 5270 | if test "$pass" = link; then |
5271 | func_stripname '-R' '' "$deplib" | 5271 | func_stripname '-R' '' "$deplib" |
@@ -5290,7 +5290,7 @@ Index: binutils-2.21/ltmain.sh | |||
5290 | *.$libext) | 5290 | *.$libext) |
5291 | if test "$pass" = conv; then | 5291 | if test "$pass" = conv; then |
5292 | deplibs="$deplib $deplibs" | 5292 | deplibs="$deplib $deplibs" |
5293 | @@ -5488,11 +6365,11 @@ func_mode_link () | 5293 | @@ -5488,11 +6365,11 @@ |
5294 | if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then | 5294 | if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
5295 | # If there is no dlopen support or we're linking statically, | 5295 | # If there is no dlopen support or we're linking statically, |
5296 | # we need to preload. | 5296 | # we need to preload. |
@@ -5304,7 +5304,7 @@ Index: binutils-2.21/ltmain.sh | |||
5304 | fi | 5304 | fi |
5305 | fi | 5305 | fi |
5306 | continue | 5306 | continue |
5307 | @@ -5538,7 +6415,7 @@ func_mode_link () | 5307 | @@ -5538,7 +6415,7 @@ |
5308 | for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do | 5308 | for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do |
5309 | case " $new_inherited_linker_flags " in | 5309 | case " $new_inherited_linker_flags " in |
5310 | *" $tmp_inherited_linker_flag "*) ;; | 5310 | *" $tmp_inherited_linker_flag "*) ;; |
@@ -5313,7 +5313,7 @@ Index: binutils-2.21/ltmain.sh | |||
5313 | esac | 5313 | esac |
5314 | done | 5314 | done |
5315 | fi | 5315 | fi |
5316 | @@ -5546,8 +6423,8 @@ func_mode_link () | 5316 | @@ -5546,8 +6423,8 @@ |
5317 | if test "$linkmode,$pass" = "lib,link" || | 5317 | if test "$linkmode,$pass" = "lib,link" || |
5318 | test "$linkmode,$pass" = "prog,scan" || | 5318 | test "$linkmode,$pass" = "prog,scan" || |
5319 | { test "$linkmode" != prog && test "$linkmode" != lib; }; then | 5319 | { test "$linkmode" != prog && test "$linkmode" != lib; }; then |
@@ -5324,7 +5324,7 @@ Index: binutils-2.21/ltmain.sh | |||
5324 | fi | 5324 | fi |
5325 | 5325 | ||
5326 | if test "$pass" = conv; then | 5326 | if test "$pass" = conv; then |
5327 | @@ -5558,20 +6435,20 @@ func_mode_link () | 5327 | @@ -5558,20 +6435,20 @@ |
5328 | func_fatal_error "cannot find name of link library for \`$lib'" | 5328 | func_fatal_error "cannot find name of link library for \`$lib'" |
5329 | fi | 5329 | fi |
5330 | # It is a libtool convenience library, so add in its objects. | 5330 | # It is a libtool convenience library, so add in its objects. |
@@ -5350,7 +5350,7 @@ Index: binutils-2.21/ltmain.sh | |||
5350 | done | 5350 | done |
5351 | continue | 5351 | continue |
5352 | fi # $pass = conv | 5352 | fi # $pass = conv |
5353 | @@ -5579,9 +6456,15 @@ func_mode_link () | 5353 | @@ -5579,9 +6456,15 @@ |
5354 | 5354 | ||
5355 | # Get the name of the library we link against. | 5355 | # Get the name of the library we link against. |
5356 | linklib= | 5356 | linklib= |
@@ -5369,7 +5369,7 @@ Index: binutils-2.21/ltmain.sh | |||
5369 | if test -z "$linklib"; then | 5369 | if test -z "$linklib"; then |
5370 | func_fatal_error "cannot find name of link library for \`$lib'" | 5370 | func_fatal_error "cannot find name of link library for \`$lib'" |
5371 | fi | 5371 | fi |
5372 | @@ -5598,9 +6481,9 @@ func_mode_link () | 5372 | @@ -5598,9 +6481,9 @@ |
5373 | # statically, we need to preload. We also need to preload any | 5373 | # statically, we need to preload. We also need to preload any |
5374 | # dependent libraries so libltdl's deplib preloader doesn't | 5374 | # dependent libraries so libltdl's deplib preloader doesn't |
5375 | # bomb out in the load deplibs phase. | 5375 | # bomb out in the load deplibs phase. |
@@ -5381,7 +5381,7 @@ Index: binutils-2.21/ltmain.sh | |||
5381 | fi | 5381 | fi |
5382 | continue | 5382 | continue |
5383 | fi # $pass = dlopen | 5383 | fi # $pass = dlopen |
5384 | @@ -5622,14 +6505,14 @@ func_mode_link () | 5384 | @@ -5622,14 +6505,14 @@ |
5385 | 5385 | ||
5386 | # Find the relevant object directory and library name. | 5386 | # Find the relevant object directory and library name. |
5387 | if test "X$installed" = Xyes; then | 5387 | if test "X$installed" = Xyes; then |
@@ -5399,7 +5399,7 @@ Index: binutils-2.21/ltmain.sh | |||
5399 | fi | 5399 | fi |
5400 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes | 5400 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes |
5401 | else | 5401 | else |
5402 | @@ -5637,12 +6520,12 @@ func_mode_link () | 5402 | @@ -5637,12 +6520,12 @@ |
5403 | dir="$ladir" | 5403 | dir="$ladir" |
5404 | absdir="$abs_ladir" | 5404 | absdir="$abs_ladir" |
5405 | # Remove this search path later | 5405 | # Remove this search path later |
@@ -5414,7 +5414,7 @@ Index: binutils-2.21/ltmain.sh | |||
5414 | fi | 5414 | fi |
5415 | fi # $installed = yes | 5415 | fi # $installed = yes |
5416 | func_stripname 'lib' '.la' "$laname" | 5416 | func_stripname 'lib' '.la' "$laname" |
5417 | @@ -5653,20 +6536,46 @@ func_mode_link () | 5417 | @@ -5653,20 +6536,46 @@ |
5418 | if test -z "$libdir" && test "$linkmode" = prog; then | 5418 | if test -z "$libdir" && test "$linkmode" = prog; then |
5419 | func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" | 5419 | func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" |
5420 | fi | 5420 | fi |
@@ -5475,7 +5475,7 @@ Index: binutils-2.21/ltmain.sh | |||
5475 | fi # $pass = dlpreopen | 5475 | fi # $pass = dlpreopen |
5476 | 5476 | ||
5477 | if test -z "$libdir"; then | 5477 | if test -z "$libdir"; then |
5478 | @@ -5684,7 +6593,7 @@ func_mode_link () | 5478 | @@ -5684,7 +6593,7 @@ |
5479 | 5479 | ||
5480 | 5480 | ||
5481 | if test "$linkmode" = prog && test "$pass" != link; then | 5481 | if test "$linkmode" = prog && test "$pass" != link; then |
@@ -5484,7 +5484,7 @@ Index: binutils-2.21/ltmain.sh | |||
5484 | deplibs="$lib $deplibs" | 5484 | deplibs="$lib $deplibs" |
5485 | 5485 | ||
5486 | linkalldeplibs=no | 5486 | linkalldeplibs=no |
5487 | @@ -5697,7 +6606,8 @@ func_mode_link () | 5487 | @@ -5697,7 +6606,8 @@ |
5488 | for deplib in $dependency_libs; do | 5488 | for deplib in $dependency_libs; do |
5489 | case $deplib in | 5489 | case $deplib in |
5490 | -L*) func_stripname '-L' '' "$deplib" | 5490 | -L*) func_stripname '-L' '' "$deplib" |
@@ -5494,7 +5494,7 @@ Index: binutils-2.21/ltmain.sh | |||
5494 | ;; | 5494 | ;; |
5495 | esac | 5495 | esac |
5496 | # Need to link against all dependency_libs? | 5496 | # Need to link against all dependency_libs? |
5497 | @@ -5708,12 +6618,12 @@ func_mode_link () | 5497 | @@ -5708,12 +6618,12 @@ |
5498 | # or/and link against static libraries | 5498 | # or/and link against static libraries |
5499 | newdependency_libs="$deplib $newdependency_libs" | 5499 | newdependency_libs="$deplib $newdependency_libs" |
5500 | fi | 5500 | fi |
@@ -5510,7 +5510,7 @@ Index: binutils-2.21/ltmain.sh | |||
5510 | done # for deplib | 5510 | done # for deplib |
5511 | continue | 5511 | continue |
5512 | fi # $linkmode = prog... | 5512 | fi # $linkmode = prog... |
5513 | @@ -5728,7 +6638,7 @@ func_mode_link () | 5513 | @@ -5728,7 +6638,7 @@ |
5514 | # Make sure the rpath contains only unique directories. | 5514 | # Make sure the rpath contains only unique directories. |
5515 | case "$temp_rpath:" in | 5515 | case "$temp_rpath:" in |
5516 | *"$absdir:"*) ;; | 5516 | *"$absdir:"*) ;; |
@@ -5519,7 +5519,7 @@ Index: binutils-2.21/ltmain.sh | |||
5519 | esac | 5519 | esac |
5520 | fi | 5520 | fi |
5521 | 5521 | ||
5522 | @@ -5740,7 +6650,7 @@ func_mode_link () | 5522 | @@ -5740,7 +6650,7 @@ |
5523 | *) | 5523 | *) |
5524 | case "$compile_rpath " in | 5524 | case "$compile_rpath " in |
5525 | *" $absdir "*) ;; | 5525 | *" $absdir "*) ;; |
@@ -5528,7 +5528,7 @@ Index: binutils-2.21/ltmain.sh | |||
5528 | esac | 5528 | esac |
5529 | ;; | 5529 | ;; |
5530 | esac | 5530 | esac |
5531 | @@ -5749,7 +6659,7 @@ func_mode_link () | 5531 | @@ -5749,7 +6659,7 @@ |
5532 | *) | 5532 | *) |
5533 | case "$finalize_rpath " in | 5533 | case "$finalize_rpath " in |
5534 | *" $libdir "*) ;; | 5534 | *" $libdir "*) ;; |
@@ -5537,7 +5537,7 @@ Index: binutils-2.21/ltmain.sh | |||
5537 | esac | 5537 | esac |
5538 | ;; | 5538 | ;; |
5539 | esac | 5539 | esac |
5540 | @@ -5774,12 +6684,12 @@ func_mode_link () | 5540 | @@ -5774,12 +6684,12 @@ |
5541 | case $host in | 5541 | case $host in |
5542 | *cygwin* | *mingw* | *cegcc*) | 5542 | *cygwin* | *mingw* | *cegcc*) |
5543 | # No point in relinking DLLs because paths are not encoded | 5543 | # No point in relinking DLLs because paths are not encoded |
@@ -5552,7 +5552,7 @@ Index: binutils-2.21/ltmain.sh | |||
5552 | need_relink=yes | 5552 | need_relink=yes |
5553 | fi | 5553 | fi |
5554 | ;; | 5554 | ;; |
5555 | @@ -5814,7 +6724,7 @@ func_mode_link () | 5555 | @@ -5814,7 +6724,7 @@ |
5556 | *) | 5556 | *) |
5557 | case "$compile_rpath " in | 5557 | case "$compile_rpath " in |
5558 | *" $absdir "*) ;; | 5558 | *" $absdir "*) ;; |
@@ -5561,7 +5561,7 @@ Index: binutils-2.21/ltmain.sh | |||
5561 | esac | 5561 | esac |
5562 | ;; | 5562 | ;; |
5563 | esac | 5563 | esac |
5564 | @@ -5823,7 +6733,7 @@ func_mode_link () | 5564 | @@ -5823,7 +6733,7 @@ |
5565 | *) | 5565 | *) |
5566 | case "$finalize_rpath " in | 5566 | case "$finalize_rpath " in |
5567 | *" $libdir "*) ;; | 5567 | *" $libdir "*) ;; |
@@ -5570,7 +5570,7 @@ Index: binutils-2.21/ltmain.sh | |||
5570 | esac | 5570 | esac |
5571 | ;; | 5571 | ;; |
5572 | esac | 5572 | esac |
5573 | @@ -5835,7 +6745,7 @@ func_mode_link () | 5573 | @@ -5835,7 +6745,7 @@ |
5574 | shift | 5574 | shift |
5575 | realname="$1" | 5575 | realname="$1" |
5576 | shift | 5576 | shift |
@@ -5579,7 +5579,7 @@ Index: binutils-2.21/ltmain.sh | |||
5579 | # use dlname if we got it. it's perfectly good, no? | 5579 | # use dlname if we got it. it's perfectly good, no? |
5580 | if test -n "$dlname"; then | 5580 | if test -n "$dlname"; then |
5581 | soname="$dlname" | 5581 | soname="$dlname" |
5582 | @@ -5848,7 +6758,7 @@ func_mode_link () | 5582 | @@ -5848,7 +6758,7 @@ |
5583 | versuffix="-$major" | 5583 | versuffix="-$major" |
5584 | ;; | 5584 | ;; |
5585 | esac | 5585 | esac |
@@ -5588,7 +5588,7 @@ Index: binutils-2.21/ltmain.sh | |||
5588 | else | 5588 | else |
5589 | soname="$realname" | 5589 | soname="$realname" |
5590 | fi | 5590 | fi |
5591 | @@ -5877,7 +6787,7 @@ func_mode_link () | 5591 | @@ -5877,7 +6787,7 @@ |
5592 | linklib=$newlib | 5592 | linklib=$newlib |
5593 | fi # test -n "$old_archive_from_expsyms_cmds" | 5593 | fi # test -n "$old_archive_from_expsyms_cmds" |
5594 | 5594 | ||
@@ -5597,7 +5597,7 @@ Index: binutils-2.21/ltmain.sh | |||
5597 | add_shlibpath= | 5597 | add_shlibpath= |
5598 | add_dir= | 5598 | add_dir= |
5599 | add= | 5599 | add= |
5600 | @@ -5933,7 +6843,7 @@ func_mode_link () | 5600 | @@ -5933,7 +6843,7 @@ |
5601 | if test -n "$inst_prefix_dir"; then | 5601 | if test -n "$inst_prefix_dir"; then |
5602 | case $libdir in | 5602 | case $libdir in |
5603 | [\\/]*) | 5603 | [\\/]*) |
@@ -5606,7 +5606,7 @@ Index: binutils-2.21/ltmain.sh | |||
5606 | ;; | 5606 | ;; |
5607 | esac | 5607 | esac |
5608 | fi | 5608 | fi |
5609 | @@ -5955,7 +6865,7 @@ func_mode_link () | 5609 | @@ -5955,7 +6865,7 @@ |
5610 | if test -n "$add_shlibpath"; then | 5610 | if test -n "$add_shlibpath"; then |
5611 | case :$compile_shlibpath: in | 5611 | case :$compile_shlibpath: in |
5612 | *":$add_shlibpath:"*) ;; | 5612 | *":$add_shlibpath:"*) ;; |
@@ -5615,7 +5615,7 @@ Index: binutils-2.21/ltmain.sh | |||
5615 | esac | 5615 | esac |
5616 | fi | 5616 | fi |
5617 | if test "$linkmode" = prog; then | 5617 | if test "$linkmode" = prog; then |
5618 | @@ -5969,13 +6879,13 @@ func_mode_link () | 5618 | @@ -5969,13 +6879,13 @@ |
5619 | test "$hardcode_shlibpath_var" = yes; then | 5619 | test "$hardcode_shlibpath_var" = yes; then |
5620 | case :$finalize_shlibpath: in | 5620 | case :$finalize_shlibpath: in |
5621 | *":$libdir:"*) ;; | 5621 | *":$libdir:"*) ;; |
@@ -5631,7 +5631,7 @@ Index: binutils-2.21/ltmain.sh | |||
5631 | add_shlibpath= | 5631 | add_shlibpath= |
5632 | add_dir= | 5632 | add_dir= |
5633 | add= | 5633 | add= |
5634 | @@ -5989,7 +6899,7 @@ func_mode_link () | 5634 | @@ -5989,7 +6899,7 @@ |
5635 | elif test "$hardcode_shlibpath_var" = yes; then | 5635 | elif test "$hardcode_shlibpath_var" = yes; then |
5636 | case :$finalize_shlibpath: in | 5636 | case :$finalize_shlibpath: in |
5637 | *":$libdir:"*) ;; | 5637 | *":$libdir:"*) ;; |
@@ -5640,7 +5640,7 @@ Index: binutils-2.21/ltmain.sh | |||
5640 | esac | 5640 | esac |
5641 | add="-l$name" | 5641 | add="-l$name" |
5642 | elif test "$hardcode_automatic" = yes; then | 5642 | elif test "$hardcode_automatic" = yes; then |
5643 | @@ -6001,12 +6911,12 @@ func_mode_link () | 5643 | @@ -6001,12 +6911,12 @@ |
5644 | fi | 5644 | fi |
5645 | else | 5645 | else |
5646 | # We cannot seem to hardcode it, guess we'll fake it. | 5646 | # We cannot seem to hardcode it, guess we'll fake it. |
@@ -5655,7 +5655,7 @@ Index: binutils-2.21/ltmain.sh | |||
5655 | ;; | 5655 | ;; |
5656 | esac | 5656 | esac |
5657 | fi | 5657 | fi |
5658 | @@ -6083,27 +6993,33 @@ func_mode_link () | 5658 | @@ -6083,27 +6993,33 @@ |
5659 | temp_xrpath=$func_stripname_result | 5659 | temp_xrpath=$func_stripname_result |
5660 | case " $xrpath " in | 5660 | case " $xrpath " in |
5661 | *" $temp_xrpath "*) ;; | 5661 | *" $temp_xrpath "*) ;; |
@@ -5695,7 +5695,7 @@ Index: binutils-2.21/ltmain.sh | |||
5695 | done | 5695 | done |
5696 | 5696 | ||
5697 | if test "$link_all_deplibs" != no; then | 5697 | if test "$link_all_deplibs" != no; then |
5698 | @@ -6113,8 +7029,10 @@ func_mode_link () | 5698 | @@ -6113,8 +7029,10 @@ |
5699 | case $deplib in | 5699 | case $deplib in |
5700 | -L*) path="$deplib" ;; | 5700 | -L*) path="$deplib" ;; |
5701 | *.la) | 5701 | *.la) |
@@ -5707,7 +5707,7 @@ Index: binutils-2.21/ltmain.sh | |||
5707 | # We need an absolute path. | 5707 | # We need an absolute path. |
5708 | case $dir in | 5708 | case $dir in |
5709 | [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; | 5709 | [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; |
5710 | @@ -6130,7 +7048,7 @@ func_mode_link () | 5710 | @@ -6130,7 +7048,7 @@ |
5711 | case $host in | 5711 | case $host in |
5712 | *-*-darwin*) | 5712 | *-*-darwin*) |
5713 | depdepl= | 5713 | depdepl= |
@@ -5716,7 +5716,7 @@ Index: binutils-2.21/ltmain.sh | |||
5716 | if test -n "$deplibrary_names" ; then | 5716 | if test -n "$deplibrary_names" ; then |
5717 | for tmp in $deplibrary_names ; do | 5717 | for tmp in $deplibrary_names ; do |
5718 | depdepl=$tmp | 5718 | depdepl=$tmp |
5719 | @@ -6141,8 +7059,8 @@ func_mode_link () | 5719 | @@ -6141,8 +7059,8 @@ |
5720 | if test -z "$darwin_install_name"; then | 5720 | if test -z "$darwin_install_name"; then |
5721 | darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` | 5721 | darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` |
5722 | fi | 5722 | fi |
@@ -5727,7 +5727,7 @@ Index: binutils-2.21/ltmain.sh | |||
5727 | path= | 5727 | path= |
5728 | fi | 5728 | fi |
5729 | fi | 5729 | fi |
5730 | @@ -6152,7 +7070,7 @@ func_mode_link () | 5730 | @@ -6152,7 +7070,7 @@ |
5731 | ;; | 5731 | ;; |
5732 | esac | 5732 | esac |
5733 | else | 5733 | else |
@@ -5736,7 +5736,7 @@ Index: binutils-2.21/ltmain.sh | |||
5736 | test -z "$libdir" && \ | 5736 | test -z "$libdir" && \ |
5737 | func_fatal_error "\`$deplib' is not a valid libtool archive" | 5737 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
5738 | test "$absdir" != "$libdir" && \ | 5738 | test "$absdir" != "$libdir" && \ |
5739 | @@ -6192,7 +7110,7 @@ func_mode_link () | 5739 | @@ -6192,7 +7110,7 @@ |
5740 | for dir in $newlib_search_path; do | 5740 | for dir in $newlib_search_path; do |
5741 | case "$lib_search_path " in | 5741 | case "$lib_search_path " in |
5742 | *" $dir "*) ;; | 5742 | *" $dir "*) ;; |
@@ -5745,7 +5745,7 @@ Index: binutils-2.21/ltmain.sh | |||
5745 | esac | 5745 | esac |
5746 | done | 5746 | done |
5747 | newlib_search_path= | 5747 | newlib_search_path= |
5748 | @@ -6205,7 +7123,7 @@ func_mode_link () | 5748 | @@ -6205,7 +7123,7 @@ |
5749 | fi | 5749 | fi |
5750 | for var in $vars dependency_libs; do | 5750 | for var in $vars dependency_libs; do |
5751 | # Add libraries to $var in reverse order | 5751 | # Add libraries to $var in reverse order |
@@ -5754,7 +5754,7 @@ Index: binutils-2.21/ltmain.sh | |||
5754 | new_libs= | 5754 | new_libs= |
5755 | for deplib in $tmp_libs; do | 5755 | for deplib in $tmp_libs; do |
5756 | # FIXME: Pedantically, this is the right thing to do, so | 5756 | # FIXME: Pedantically, this is the right thing to do, so |
5757 | @@ -6250,13 +7168,13 @@ func_mode_link () | 5757 | @@ -6250,13 +7168,13 @@ |
5758 | -L*) | 5758 | -L*) |
5759 | case " $tmp_libs " in | 5759 | case " $tmp_libs " in |
5760 | *" $deplib "*) ;; | 5760 | *" $deplib "*) ;; |
@@ -5771,7 +5771,7 @@ Index: binutils-2.21/ltmain.sh | |||
5771 | done # for var | 5771 | done # for var |
5772 | fi | 5772 | fi |
5773 | # Last step: remove runtime libs from dependency_libs | 5773 | # Last step: remove runtime libs from dependency_libs |
5774 | @@ -6269,7 +7187,7 @@ func_mode_link () | 5774 | @@ -6269,7 +7187,7 @@ |
5775 | ;; | 5775 | ;; |
5776 | esac | 5776 | esac |
5777 | if test -n "$i" ; then | 5777 | if test -n "$i" ; then |
@@ -5780,7 +5780,7 @@ Index: binutils-2.21/ltmain.sh | |||
5780 | fi | 5780 | fi |
5781 | done | 5781 | done |
5782 | dependency_libs=$tmp_libs | 5782 | dependency_libs=$tmp_libs |
5783 | @@ -6310,7 +7228,7 @@ func_mode_link () | 5783 | @@ -6310,7 +7228,7 @@ |
5784 | # Now set the variables for building old libraries. | 5784 | # Now set the variables for building old libraries. |
5785 | build_libtool_libs=no | 5785 | build_libtool_libs=no |
5786 | oldlibs="$output" | 5786 | oldlibs="$output" |
@@ -5789,7 +5789,7 @@ Index: binutils-2.21/ltmain.sh | |||
5789 | ;; | 5789 | ;; |
5790 | 5790 | ||
5791 | lib) | 5791 | lib) |
5792 | @@ -6319,8 +7237,8 @@ func_mode_link () | 5792 | @@ -6319,8 +7237,8 @@ |
5793 | lib*) | 5793 | lib*) |
5794 | func_stripname 'lib' '.la' "$outputname" | 5794 | func_stripname 'lib' '.la' "$outputname" |
5795 | name=$func_stripname_result | 5795 | name=$func_stripname_result |
@@ -5800,7 +5800,7 @@ Index: binutils-2.21/ltmain.sh | |||
5800 | ;; | 5800 | ;; |
5801 | *) | 5801 | *) |
5802 | test "$module" = no && \ | 5802 | test "$module" = no && \ |
5803 | @@ -6330,8 +7248,8 @@ func_mode_link () | 5803 | @@ -6330,8 +7248,8 @@ |
5804 | # Add the "lib" prefix for modules if required | 5804 | # Add the "lib" prefix for modules if required |
5805 | func_stripname '' '.la' "$outputname" | 5805 | func_stripname '' '.la' "$outputname" |
5806 | name=$func_stripname_result | 5806 | name=$func_stripname_result |
@@ -5811,7 +5811,7 @@ Index: binutils-2.21/ltmain.sh | |||
5811 | else | 5811 | else |
5812 | func_stripname '' '.la' "$outputname" | 5812 | func_stripname '' '.la' "$outputname" |
5813 | libname=$func_stripname_result | 5813 | libname=$func_stripname_result |
5814 | @@ -6346,7 +7264,7 @@ func_mode_link () | 5814 | @@ -6346,7 +7264,7 @@ |
5815 | echo | 5815 | echo |
5816 | $ECHO "*** Warning: Linking the shared library $output against the non-libtool" | 5816 | $ECHO "*** Warning: Linking the shared library $output against the non-libtool" |
5817 | $ECHO "*** objects $objs is not portable!" | 5817 | $ECHO "*** objects $objs is not portable!" |
@@ -5820,7 +5820,7 @@ Index: binutils-2.21/ltmain.sh | |||
5820 | fi | 5820 | fi |
5821 | fi | 5821 | fi |
5822 | 5822 | ||
5823 | @@ -6544,7 +7462,7 @@ func_mode_link () | 5823 | @@ -6544,7 +7462,7 @@ |
5824 | done | 5824 | done |
5825 | 5825 | ||
5826 | # Make executables depend on our current version. | 5826 | # Make executables depend on our current version. |
@@ -5829,7 +5829,7 @@ Index: binutils-2.21/ltmain.sh | |||
5829 | ;; | 5829 | ;; |
5830 | 5830 | ||
5831 | qnx) | 5831 | qnx) |
5832 | @@ -6612,10 +7530,10 @@ func_mode_link () | 5832 | @@ -6612,10 +7530,10 @@ |
5833 | fi | 5833 | fi |
5834 | 5834 | ||
5835 | func_generate_dlsyms "$libname" "$libname" "yes" | 5835 | func_generate_dlsyms "$libname" "$libname" "yes" |
@@ -5842,7 +5842,7 @@ Index: binutils-2.21/ltmain.sh | |||
5842 | # Remove our outputs, but don't remove object files since they | 5842 | # Remove our outputs, but don't remove object files since they |
5843 | # may have been created when compiling PIC objects. | 5843 | # may have been created when compiling PIC objects. |
5844 | removelist= | 5844 | removelist= |
5845 | @@ -6631,7 +7549,7 @@ func_mode_link () | 5845 | @@ -6631,7 +7549,7 @@ |
5846 | continue | 5846 | continue |
5847 | fi | 5847 | fi |
5848 | fi | 5848 | fi |
@@ -5851,7 +5851,7 @@ Index: binutils-2.21/ltmain.sh | |||
5851 | ;; | 5851 | ;; |
5852 | *) ;; | 5852 | *) ;; |
5853 | esac | 5853 | esac |
5854 | @@ -6642,7 +7560,7 @@ func_mode_link () | 5854 | @@ -6642,7 +7560,7 @@ |
5855 | 5855 | ||
5856 | # Now set the variables for building old libraries. | 5856 | # Now set the variables for building old libraries. |
5857 | if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then | 5857 | if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then |
@@ -5860,7 +5860,7 @@ Index: binutils-2.21/ltmain.sh | |||
5860 | 5860 | ||
5861 | # Transform .lo files to .o files. | 5861 | # Transform .lo files to .o files. |
5862 | oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` | 5862 | oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` |
5863 | @@ -6659,10 +7577,11 @@ func_mode_link () | 5863 | @@ -6659,10 +7577,11 @@ |
5864 | # If the user specified any rpath flags, then add them. | 5864 | # If the user specified any rpath flags, then add them. |
5865 | temp_xrpath= | 5865 | temp_xrpath= |
5866 | for libdir in $xrpath; do | 5866 | for libdir in $xrpath; do |
@@ -5874,7 +5874,7 @@ Index: binutils-2.21/ltmain.sh | |||
5874 | esac | 5874 | esac |
5875 | done | 5875 | done |
5876 | if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then | 5876 | if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then |
5877 | @@ -6676,7 +7595,7 @@ func_mode_link () | 5877 | @@ -6676,7 +7595,7 @@ |
5878 | for lib in $old_dlfiles; do | 5878 | for lib in $old_dlfiles; do |
5879 | case " $dlprefiles $dlfiles " in | 5879 | case " $dlprefiles $dlfiles " in |
5880 | *" $lib "*) ;; | 5880 | *" $lib "*) ;; |
@@ -5883,7 +5883,7 @@ Index: binutils-2.21/ltmain.sh | |||
5883 | esac | 5883 | esac |
5884 | done | 5884 | done |
5885 | 5885 | ||
5886 | @@ -6686,7 +7605,7 @@ func_mode_link () | 5886 | @@ -6686,7 +7605,7 @@ |
5887 | for lib in $old_dlprefiles; do | 5887 | for lib in $old_dlprefiles; do |
5888 | case "$dlprefiles " in | 5888 | case "$dlprefiles " in |
5889 | *" $lib "*) ;; | 5889 | *" $lib "*) ;; |
@@ -5892,7 +5892,7 @@ Index: binutils-2.21/ltmain.sh | |||
5892 | esac | 5892 | esac |
5893 | done | 5893 | done |
5894 | 5894 | ||
5895 | @@ -6698,7 +7617,7 @@ func_mode_link () | 5895 | @@ -6698,7 +7617,7 @@ |
5896 | ;; | 5896 | ;; |
5897 | *-*-rhapsody* | *-*-darwin1.[012]) | 5897 | *-*-rhapsody* | *-*-darwin1.[012]) |
5898 | # Rhapsody C library is in the System framework | 5898 | # Rhapsody C library is in the System framework |
@@ -5901,7 +5901,7 @@ Index: binutils-2.21/ltmain.sh | |||
5901 | ;; | 5901 | ;; |
5902 | *-*-netbsd*) | 5902 | *-*-netbsd*) |
5903 | # Don't link with libc until the a.out ld.so is fixed. | 5903 | # Don't link with libc until the a.out ld.so is fixed. |
5904 | @@ -6715,7 +7634,7 @@ func_mode_link () | 5904 | @@ -6715,7 +7634,7 @@ |
5905 | *) | 5905 | *) |
5906 | # Add libc to deplibs on all other systems if necessary. | 5906 | # Add libc to deplibs on all other systems if necessary. |
5907 | if test "$build_libtool_need_lc" = "yes"; then | 5907 | if test "$build_libtool_need_lc" = "yes"; then |
@@ -5910,7 +5910,7 @@ Index: binutils-2.21/ltmain.sh | |||
5910 | fi | 5910 | fi |
5911 | ;; | 5911 | ;; |
5912 | esac | 5912 | esac |
5913 | @@ -6764,18 +7683,18 @@ EOF | 5913 | @@ -6764,18 +7683,18 @@ |
5914 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then | 5914 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
5915 | case " $predeps $postdeps " in | 5915 | case " $predeps $postdeps " in |
5916 | *" $i "*) | 5916 | *" $i "*) |
@@ -5933,7 +5933,7 @@ Index: binutils-2.21/ltmain.sh | |||
5933 | else | 5933 | else |
5934 | droppeddeps=yes | 5934 | droppeddeps=yes |
5935 | echo | 5935 | echo |
5936 | @@ -6789,7 +7708,7 @@ EOF | 5936 | @@ -6789,7 +7708,7 @@ |
5937 | fi | 5937 | fi |
5938 | ;; | 5938 | ;; |
5939 | *) | 5939 | *) |
@@ -5942,7 +5942,7 @@ Index: binutils-2.21/ltmain.sh | |||
5942 | ;; | 5942 | ;; |
5943 | esac | 5943 | esac |
5944 | done | 5944 | done |
5945 | @@ -6807,18 +7726,18 @@ EOF | 5945 | @@ -6807,18 +7726,18 @@ |
5946 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then | 5946 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
5947 | case " $predeps $postdeps " in | 5947 | case " $predeps $postdeps " in |
5948 | *" $i "*) | 5948 | *" $i "*) |
@@ -5965,7 +5965,7 @@ Index: binutils-2.21/ltmain.sh | |||
5965 | else | 5965 | else |
5966 | droppeddeps=yes | 5966 | droppeddeps=yes |
5967 | echo | 5967 | echo |
5968 | @@ -6840,7 +7759,7 @@ EOF | 5968 | @@ -6840,7 +7759,7 @@ |
5969 | fi | 5969 | fi |
5970 | ;; | 5970 | ;; |
5971 | *) | 5971 | *) |
@@ -5974,7 +5974,7 @@ Index: binutils-2.21/ltmain.sh | |||
5974 | ;; | 5974 | ;; |
5975 | esac | 5975 | esac |
5976 | done | 5976 | done |
5977 | @@ -6857,15 +7776,27 @@ EOF | 5977 | @@ -6857,15 +7776,27 @@ |
5978 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then | 5978 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
5979 | case " $predeps $postdeps " in | 5979 | case " $predeps $postdeps " in |
5980 | *" $a_deplib "*) | 5980 | *" $a_deplib "*) |
@@ -6005,7 +6005,7 @@ Index: binutils-2.21/ltmain.sh | |||
6005 | for potent_lib in $potential_libs; do | 6005 | for potent_lib in $potential_libs; do |
6006 | # Follow soft links. | 6006 | # Follow soft links. |
6007 | if ls -lLd "$potent_lib" 2>/dev/null | | 6007 | if ls -lLd "$potent_lib" 2>/dev/null | |
6008 | @@ -6885,10 +7816,10 @@ EOF | 6008 | @@ -6885,10 +7816,10 @@ |
6009 | *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; | 6009 | *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; |
6010 | esac | 6010 | esac |
6011 | done | 6011 | done |
@@ -6018,7 +6018,7 @@ Index: binutils-2.21/ltmain.sh | |||
6018 | a_deplib="" | 6018 | a_deplib="" |
6019 | break 2 | 6019 | break 2 |
6020 | fi | 6020 | fi |
6021 | @@ -6913,7 +7844,7 @@ EOF | 6021 | @@ -6913,7 +7844,7 @@ |
6022 | ;; | 6022 | ;; |
6023 | *) | 6023 | *) |
6024 | # Add a -L argument. | 6024 | # Add a -L argument. |
@@ -6027,7 +6027,7 @@ Index: binutils-2.21/ltmain.sh | |||
6027 | ;; | 6027 | ;; |
6028 | esac | 6028 | esac |
6029 | done # Gone through all deplibs. | 6029 | done # Gone through all deplibs. |
6030 | @@ -6929,20 +7860,20 @@ EOF | 6030 | @@ -6929,20 +7860,20 @@ |
6031 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then | 6031 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
6032 | case " $predeps $postdeps " in | 6032 | case " $predeps $postdeps " in |
6033 | *" $a_deplib "*) | 6033 | *" $a_deplib "*) |
@@ -6051,7 +6051,7 @@ Index: binutils-2.21/ltmain.sh | |||
6051 | a_deplib="" | 6051 | a_deplib="" |
6052 | break 2 | 6052 | break 2 |
6053 | fi | 6053 | fi |
6054 | @@ -6967,7 +7898,7 @@ EOF | 6054 | @@ -6967,7 +7898,7 @@ |
6055 | ;; | 6055 | ;; |
6056 | *) | 6056 | *) |
6057 | # Add a -L argument. | 6057 | # Add a -L argument. |
@@ -6060,7 +6060,7 @@ Index: binutils-2.21/ltmain.sh | |||
6060 | ;; | 6060 | ;; |
6061 | esac | 6061 | esac |
6062 | done # Gone through all deplibs. | 6062 | done # Gone through all deplibs. |
6063 | @@ -7071,7 +8002,7 @@ EOF | 6063 | @@ -7071,7 +8002,7 @@ |
6064 | *) | 6064 | *) |
6065 | case " $deplibs " in | 6065 | case " $deplibs " in |
6066 | *" -L$path/$objdir "*) | 6066 | *" -L$path/$objdir "*) |
@@ -6069,7 +6069,7 @@ Index: binutils-2.21/ltmain.sh | |||
6069 | esac | 6069 | esac |
6070 | ;; | 6070 | ;; |
6071 | esac | 6071 | esac |
6072 | @@ -7081,10 +8012,10 @@ EOF | 6072 | @@ -7081,10 +8012,10 @@ |
6073 | -L*) | 6073 | -L*) |
6074 | case " $new_libs " in | 6074 | case " $new_libs " in |
6075 | *" $deplib "*) ;; | 6075 | *" $deplib "*) ;; |
@@ -6082,7 +6082,7 @@ Index: binutils-2.21/ltmain.sh | |||
6082 | esac | 6082 | esac |
6083 | done | 6083 | done |
6084 | deplibs="$new_libs" | 6084 | deplibs="$new_libs" |
6085 | @@ -7101,10 +8032,12 @@ EOF | 6085 | @@ -7101,10 +8032,12 @@ |
6086 | hardcode_libdirs= | 6086 | hardcode_libdirs= |
6087 | dep_rpath= | 6087 | dep_rpath= |
6088 | rpath="$finalize_rpath" | 6088 | rpath="$finalize_rpath" |
@@ -6096,7 +6096,7 @@ Index: binutils-2.21/ltmain.sh | |||
6096 | if test -z "$hardcode_libdirs"; then | 6096 | if test -z "$hardcode_libdirs"; then |
6097 | hardcode_libdirs="$libdir" | 6097 | hardcode_libdirs="$libdir" |
6098 | else | 6098 | else |
6099 | @@ -7113,18 +8046,18 @@ EOF | 6099 | @@ -7113,18 +8046,18 @@ |
6100 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) | 6100 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
6101 | ;; | 6101 | ;; |
6102 | *) | 6102 | *) |
@@ -6119,7 +6119,7 @@ Index: binutils-2.21/ltmain.sh | |||
6119 | esac | 6119 | esac |
6120 | fi | 6120 | fi |
6121 | done | 6121 | done |
6122 | @@ -7133,40 +8066,38 @@ EOF | 6122 | @@ -7133,40 +8066,38 @@ |
6123 | test -n "$hardcode_libdirs"; then | 6123 | test -n "$hardcode_libdirs"; then |
6124 | libdir="$hardcode_libdirs" | 6124 | libdir="$hardcode_libdirs" |
6125 | if test -n "$hardcode_libdir_flag_spec_ld"; then | 6125 | if test -n "$hardcode_libdir_flag_spec_ld"; then |
@@ -6169,7 +6169,7 @@ Index: binutils-2.21/ltmain.sh | |||
6169 | else | 6169 | else |
6170 | soname="$realname" | 6170 | soname="$realname" |
6171 | fi | 6171 | fi |
6172 | @@ -7178,7 +8109,7 @@ EOF | 6172 | @@ -7178,7 +8109,7 @@ |
6173 | linknames= | 6173 | linknames= |
6174 | for link | 6174 | for link |
6175 | do | 6175 | do |
@@ -6178,7 +6178,7 @@ Index: binutils-2.21/ltmain.sh | |||
6178 | done | 6178 | done |
6179 | 6179 | ||
6180 | # Use standard objects if they are pic | 6180 | # Use standard objects if they are pic |
6181 | @@ -7189,7 +8120,7 @@ EOF | 6181 | @@ -7189,7 +8120,7 @@ |
6182 | if test -n "$export_symbols" && test -n "$include_expsyms"; then | 6182 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
6183 | $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" | 6183 | $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" |
6184 | export_symbols="$output_objdir/$libname.uexp" | 6184 | export_symbols="$output_objdir/$libname.uexp" |
@@ -6187,7 +6187,7 @@ Index: binutils-2.21/ltmain.sh | |||
6187 | fi | 6187 | fi |
6188 | 6188 | ||
6189 | orig_export_symbols= | 6189 | orig_export_symbols= |
6190 | @@ -7220,13 +8151,45 @@ EOF | 6190 | @@ -7220,13 +8151,45 @@ |
6191 | $opt_dry_run || $RM $export_symbols | 6191 | $opt_dry_run || $RM $export_symbols |
6192 | cmds=$export_symbols_cmds | 6192 | cmds=$export_symbols_cmds |
6193 | save_ifs="$IFS"; IFS='~' | 6193 | save_ifs="$IFS"; IFS='~' |
@@ -6238,7 +6238,7 @@ Index: binutils-2.21/ltmain.sh | |||
6238 | skipped_export=false | 6238 | skipped_export=false |
6239 | else | 6239 | else |
6240 | # The command line is too long to execute in one step. | 6240 | # The command line is too long to execute in one step. |
6241 | @@ -7248,7 +8211,7 @@ EOF | 6241 | @@ -7248,7 +8211,7 @@ |
6242 | if test -n "$export_symbols" && test -n "$include_expsyms"; then | 6242 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
6243 | tmp_export_symbols="$export_symbols" | 6243 | tmp_export_symbols="$export_symbols" |
6244 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" | 6244 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" |
@@ -6247,7 +6247,7 @@ Index: binutils-2.21/ltmain.sh | |||
6247 | fi | 6247 | fi |
6248 | 6248 | ||
6249 | if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then | 6249 | if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then |
6250 | @@ -7260,7 +8223,7 @@ EOF | 6250 | @@ -7260,7 +8223,7 @@ |
6251 | # global variables. join(1) would be nice here, but unfortunately | 6251 | # global variables. join(1) would be nice here, but unfortunately |
6252 | # isn't a blessed tool. | 6252 | # isn't a blessed tool. |
6253 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter | 6253 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter |
@@ -6256,7 +6256,7 @@ Index: binutils-2.21/ltmain.sh | |||
6256 | export_symbols=$output_objdir/$libname.def | 6256 | export_symbols=$output_objdir/$libname.def |
6257 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols | 6257 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols |
6258 | fi | 6258 | fi |
6259 | @@ -7270,7 +8233,7 @@ EOF | 6259 | @@ -7270,7 +8233,7 @@ |
6260 | case " $convenience " in | 6260 | case " $convenience " in |
6261 | *" $test_deplib "*) ;; | 6261 | *" $test_deplib "*) ;; |
6262 | *) | 6262 | *) |
@@ -6265,7 +6265,7 @@ Index: binutils-2.21/ltmain.sh | |||
6265 | ;; | 6265 | ;; |
6266 | esac | 6266 | esac |
6267 | done | 6267 | done |
6268 | @@ -7286,43 +8249,43 @@ EOF | 6268 | @@ -7286,43 +8249,43 @@ |
6269 | fi | 6269 | fi |
6270 | if test -n "$whole_archive_flag_spec"; then | 6270 | if test -n "$whole_archive_flag_spec"; then |
6271 | save_libobjs=$libobjs | 6271 | save_libobjs=$libobjs |
@@ -6320,7 +6320,7 @@ Index: binutils-2.21/ltmain.sh | |||
6320 | cmds=$archive_cmds | 6320 | cmds=$archive_cmds |
6321 | fi | 6321 | fi |
6322 | fi | 6322 | fi |
6323 | @@ -7366,10 +8329,13 @@ EOF | 6323 | @@ -7366,10 +8329,13 @@ |
6324 | echo 'INPUT (' > $output | 6324 | echo 'INPUT (' > $output |
6325 | for obj in $save_libobjs | 6325 | for obj in $save_libobjs |
6326 | do | 6326 | do |
@@ -6336,7 +6336,7 @@ Index: binutils-2.21/ltmain.sh | |||
6336 | elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then | 6336 | elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then |
6337 | output=${output_objdir}/${output_la}.lnk | 6337 | output=${output_objdir}/${output_la}.lnk |
6338 | func_verbose "creating linker input file list: $output" | 6338 | func_verbose "creating linker input file list: $output" |
6339 | @@ -7383,15 +8349,17 @@ EOF | 6339 | @@ -7383,15 +8349,17 @@ |
6340 | fi | 6340 | fi |
6341 | for obj | 6341 | for obj |
6342 | do | 6342 | do |
@@ -6358,7 +6358,7 @@ Index: binutils-2.21/ltmain.sh | |||
6358 | func_len " $test_cmds" | 6358 | func_len " $test_cmds" |
6359 | len0=$func_len_result | 6359 | len0=$func_len_result |
6360 | len=$len0 | 6360 | len=$len0 |
6361 | @@ -7411,12 +8379,12 @@ EOF | 6361 | @@ -7411,12 +8379,12 @@ |
6362 | if test "$k" -eq 1 ; then | 6362 | if test "$k" -eq 1 ; then |
6363 | # The first file doesn't have a previous command to add. | 6363 | # The first file doesn't have a previous command to add. |
6364 | reload_objs=$objlist | 6364 | reload_objs=$objlist |
@@ -6373,7 +6373,7 @@ Index: binutils-2.21/ltmain.sh | |||
6373 | fi | 6373 | fi |
6374 | last_robj=$output_objdir/$output_la-${k}.$objext | 6374 | last_robj=$output_objdir/$output_la-${k}.$objext |
6375 | func_arith $k + 1 | 6375 | func_arith $k + 1 |
6376 | @@ -7433,11 +8401,11 @@ EOF | 6376 | @@ -7433,11 +8401,11 @@ |
6377 | # files will link in the last one created. | 6377 | # files will link in the last one created. |
6378 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ | 6378 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
6379 | reload_objs="$objlist $last_robj" | 6379 | reload_objs="$objlist $last_robj" |
@@ -6388,7 +6388,7 @@ Index: binutils-2.21/ltmain.sh | |||
6388 | 6388 | ||
6389 | else | 6389 | else |
6390 | output= | 6390 | output= |
6391 | @@ -7450,9 +8418,9 @@ EOF | 6391 | @@ -7450,9 +8418,9 @@ |
6392 | libobjs=$output | 6392 | libobjs=$output |
6393 | # Append the command to create the export file. | 6393 | # Append the command to create the export file. |
6394 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ | 6394 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
@@ -6400,7 +6400,7 @@ Index: binutils-2.21/ltmain.sh | |||
6400 | fi | 6400 | fi |
6401 | fi | 6401 | fi |
6402 | 6402 | ||
6403 | @@ -7471,7 +8439,7 @@ EOF | 6403 | @@ -7471,7 +8439,7 @@ |
6404 | lt_exit=$? | 6404 | lt_exit=$? |
6405 | 6405 | ||
6406 | # Restore the uninstalled library and exit | 6406 | # Restore the uninstalled library and exit |
@@ -6409,7 +6409,7 @@ Index: binutils-2.21/ltmain.sh | |||
6409 | ( cd "$output_objdir" && \ | 6409 | ( cd "$output_objdir" && \ |
6410 | $RM "${realname}T" && \ | 6410 | $RM "${realname}T" && \ |
6411 | $MV "${realname}U" "$realname" ) | 6411 | $MV "${realname}U" "$realname" ) |
6412 | @@ -7492,7 +8460,7 @@ EOF | 6412 | @@ -7492,7 +8460,7 @@ |
6413 | if test -n "$export_symbols" && test -n "$include_expsyms"; then | 6413 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
6414 | tmp_export_symbols="$export_symbols" | 6414 | tmp_export_symbols="$export_symbols" |
6415 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" | 6415 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" |
@@ -6418,7 +6418,7 @@ Index: binutils-2.21/ltmain.sh | |||
6418 | fi | 6418 | fi |
6419 | 6419 | ||
6420 | if test -n "$orig_export_symbols"; then | 6420 | if test -n "$orig_export_symbols"; then |
6421 | @@ -7504,7 +8472,7 @@ EOF | 6421 | @@ -7504,7 +8472,7 @@ |
6422 | # global variables. join(1) would be nice here, but unfortunately | 6422 | # global variables. join(1) would be nice here, but unfortunately |
6423 | # isn't a blessed tool. | 6423 | # isn't a blessed tool. |
6424 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter | 6424 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter |
@@ -6427,7 +6427,7 @@ Index: binutils-2.21/ltmain.sh | |||
6427 | export_symbols=$output_objdir/$libname.def | 6427 | export_symbols=$output_objdir/$libname.def |
6428 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols | 6428 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols |
6429 | fi | 6429 | fi |
6430 | @@ -7515,7 +8483,7 @@ EOF | 6430 | @@ -7515,7 +8483,7 @@ |
6431 | output=$save_output | 6431 | output=$save_output |
6432 | 6432 | ||
6433 | if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then | 6433 | if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then |
@@ -6436,7 +6436,7 @@ Index: binutils-2.21/ltmain.sh | |||
6436 | test "X$libobjs" = "X " && libobjs= | 6436 | test "X$libobjs" = "X " && libobjs= |
6437 | fi | 6437 | fi |
6438 | # Expand the library linking commands again to reset the | 6438 | # Expand the library linking commands again to reset the |
6439 | @@ -7539,23 +8507,23 @@ EOF | 6439 | @@ -7539,23 +8507,23 @@ |
6440 | 6440 | ||
6441 | if test -n "$delfiles"; then | 6441 | if test -n "$delfiles"; then |
6442 | # Append the command to remove temporary files to $cmds. | 6442 | # Append the command to remove temporary files to $cmds. |
@@ -6464,7 +6464,7 @@ Index: binutils-2.21/ltmain.sh | |||
6464 | $opt_silent || { | 6464 | $opt_silent || { |
6465 | func_quote_for_expand "$cmd" | 6465 | func_quote_for_expand "$cmd" |
6466 | eval "func_echo $func_quote_for_expand_result" | 6466 | eval "func_echo $func_quote_for_expand_result" |
6467 | @@ -7564,7 +8532,7 @@ EOF | 6467 | @@ -7564,7 +8532,7 @@ |
6468 | lt_exit=$? | 6468 | lt_exit=$? |
6469 | 6469 | ||
6470 | # Restore the uninstalled library and exit | 6470 | # Restore the uninstalled library and exit |
@@ -6473,7 +6473,7 @@ Index: binutils-2.21/ltmain.sh | |||
6473 | ( cd "$output_objdir" && \ | 6473 | ( cd "$output_objdir" && \ |
6474 | $RM "${realname}T" && \ | 6474 | $RM "${realname}T" && \ |
6475 | $MV "${realname}U" "$realname" ) | 6475 | $MV "${realname}U" "$realname" ) |
6476 | @@ -7576,8 +8544,8 @@ EOF | 6476 | @@ -7576,8 +8544,8 @@ |
6477 | IFS="$save_ifs" | 6477 | IFS="$save_ifs" |
6478 | 6478 | ||
6479 | # Restore the uninstalled library and exit | 6479 | # Restore the uninstalled library and exit |
@@ -6484,7 +6484,7 @@ Index: binutils-2.21/ltmain.sh | |||
6484 | 6484 | ||
6485 | if test -n "$convenience"; then | 6485 | if test -n "$convenience"; then |
6486 | if test -z "$whole_archive_flag_spec"; then | 6486 | if test -z "$whole_archive_flag_spec"; then |
6487 | @@ -7656,17 +8624,20 @@ EOF | 6487 | @@ -7656,17 +8624,20 @@ |
6488 | 6488 | ||
6489 | if test -n "$convenience"; then | 6489 | if test -n "$convenience"; then |
6490 | if test -n "$whole_archive_flag_spec"; then | 6490 | if test -n "$whole_archive_flag_spec"; then |
@@ -6507,7 +6507,7 @@ Index: binutils-2.21/ltmain.sh | |||
6507 | # Create the old-style object. | 6507 | # Create the old-style object. |
6508 | reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test | 6508 | reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test |
6509 | 6509 | ||
6510 | @@ -7690,7 +8661,7 @@ EOF | 6510 | @@ -7690,7 +8661,7 @@ |
6511 | # Create an invalid libtool object if no PIC, so that we don't | 6511 | # Create an invalid libtool object if no PIC, so that we don't |
6512 | # accidentally link it into a program. | 6512 | # accidentally link it into a program. |
6513 | # $show "echo timestamp > $libobj" | 6513 | # $show "echo timestamp > $libobj" |
@@ -6516,7 +6516,7 @@ Index: binutils-2.21/ltmain.sh | |||
6516 | exit $EXIT_SUCCESS | 6516 | exit $EXIT_SUCCESS |
6517 | fi | 6517 | fi |
6518 | 6518 | ||
6519 | @@ -7740,8 +8711,8 @@ EOF | 6519 | @@ -7740,8 +8711,8 @@ |
6520 | if test "$tagname" = CXX ; then | 6520 | if test "$tagname" = CXX ; then |
6521 | case ${MACOSX_DEPLOYMENT_TARGET-10.0} in | 6521 | case ${MACOSX_DEPLOYMENT_TARGET-10.0} in |
6522 | 10.[0123]) | 6522 | 10.[0123]) |
@@ -6527,7 +6527,7 @@ Index: binutils-2.21/ltmain.sh | |||
6527 | ;; | 6527 | ;; |
6528 | esac | 6528 | esac |
6529 | fi | 6529 | fi |
6530 | @@ -7761,7 +8732,7 @@ EOF | 6530 | @@ -7761,7 +8732,7 @@ |
6531 | *) | 6531 | *) |
6532 | case " $compile_deplibs " in | 6532 | case " $compile_deplibs " in |
6533 | *" -L$path/$objdir "*) | 6533 | *" -L$path/$objdir "*) |
@@ -6536,7 +6536,7 @@ Index: binutils-2.21/ltmain.sh | |||
6536 | esac | 6536 | esac |
6537 | ;; | 6537 | ;; |
6538 | esac | 6538 | esac |
6539 | @@ -7771,17 +8742,17 @@ EOF | 6539 | @@ -7771,17 +8742,17 @@ |
6540 | -L*) | 6540 | -L*) |
6541 | case " $new_libs " in | 6541 | case " $new_libs " in |
6542 | *" $deplib "*) ;; | 6542 | *" $deplib "*) ;; |
@@ -6558,7 +6558,7 @@ Index: binutils-2.21/ltmain.sh | |||
6558 | 6558 | ||
6559 | if test -n "$rpath$xrpath"; then | 6559 | if test -n "$rpath$xrpath"; then |
6560 | # If the user specified any rpath flags, then add them. | 6560 | # If the user specified any rpath flags, then add them. |
6561 | @@ -7789,7 +8760,7 @@ EOF | 6561 | @@ -7789,7 +8760,7 @@ |
6562 | # This is the magic to use -rpath. | 6562 | # This is the magic to use -rpath. |
6563 | case "$finalize_rpath " in | 6563 | case "$finalize_rpath " in |
6564 | *" $libdir "*) ;; | 6564 | *" $libdir "*) ;; |
@@ -6567,7 +6567,7 @@ Index: binutils-2.21/ltmain.sh | |||
6567 | esac | 6567 | esac |
6568 | done | 6568 | done |
6569 | fi | 6569 | fi |
6570 | @@ -7808,18 +8779,18 @@ EOF | 6570 | @@ -7808,18 +8779,18 @@ |
6571 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) | 6571 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
6572 | ;; | 6572 | ;; |
6573 | *) | 6573 | *) |
@@ -6590,7 +6590,7 @@ Index: binutils-2.21/ltmain.sh | |||
6590 | esac | 6590 | esac |
6591 | fi | 6591 | fi |
6592 | case $host in | 6592 | case $host in |
6593 | @@ -7828,12 +8799,12 @@ EOF | 6593 | @@ -7828,12 +8799,12 @@ |
6594 | case :$dllsearchpath: in | 6594 | case :$dllsearchpath: in |
6595 | *":$libdir:"*) ;; | 6595 | *":$libdir:"*) ;; |
6596 | ::) dllsearchpath=$libdir;; | 6596 | ::) dllsearchpath=$libdir;; |
@@ -6605,7 +6605,7 @@ Index: binutils-2.21/ltmain.sh | |||
6605 | esac | 6605 | esac |
6606 | ;; | 6606 | ;; |
6607 | esac | 6607 | esac |
6608 | @@ -7842,7 +8813,7 @@ EOF | 6608 | @@ -7842,7 +8813,7 @@ |
6609 | if test -n "$hardcode_libdir_separator" && | 6609 | if test -n "$hardcode_libdir_separator" && |
6610 | test -n "$hardcode_libdirs"; then | 6610 | test -n "$hardcode_libdirs"; then |
6611 | libdir="$hardcode_libdirs" | 6611 | libdir="$hardcode_libdirs" |
@@ -6614,7 +6614,7 @@ Index: binutils-2.21/ltmain.sh | |||
6614 | fi | 6614 | fi |
6615 | compile_rpath="$rpath" | 6615 | compile_rpath="$rpath" |
6616 | 6616 | ||
6617 | @@ -7859,18 +8830,18 @@ EOF | 6617 | @@ -7859,18 +8830,18 @@ |
6618 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) | 6618 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
6619 | ;; | 6619 | ;; |
6620 | *) | 6620 | *) |
@@ -6637,7 +6637,7 @@ Index: binutils-2.21/ltmain.sh | |||
6637 | esac | 6637 | esac |
6638 | fi | 6638 | fi |
6639 | done | 6639 | done |
6640 | @@ -7878,7 +8849,7 @@ EOF | 6640 | @@ -7878,7 +8849,7 @@ |
6641 | if test -n "$hardcode_libdir_separator" && | 6641 | if test -n "$hardcode_libdir_separator" && |
6642 | test -n "$hardcode_libdirs"; then | 6642 | test -n "$hardcode_libdirs"; then |
6643 | libdir="$hardcode_libdirs" | 6643 | libdir="$hardcode_libdirs" |
@@ -6646,7 +6646,7 @@ Index: binutils-2.21/ltmain.sh | |||
6646 | fi | 6646 | fi |
6647 | finalize_rpath="$rpath" | 6647 | finalize_rpath="$rpath" |
6648 | 6648 | ||
6649 | @@ -7921,6 +8892,12 @@ EOF | 6649 | @@ -7921,6 +8892,12 @@ |
6650 | exit_status=0 | 6650 | exit_status=0 |
6651 | func_show_eval "$link_command" 'exit_status=$?' | 6651 | func_show_eval "$link_command" 'exit_status=$?' |
6652 | 6652 | ||
@@ -6659,7 +6659,7 @@ Index: binutils-2.21/ltmain.sh | |||
6659 | # Delete the generated files. | 6659 | # Delete the generated files. |
6660 | if test -f "$output_objdir/${outputname}S.${objext}"; then | 6660 | if test -f "$output_objdir/${outputname}S.${objext}"; then |
6661 | func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' | 6661 | func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' |
6662 | @@ -7943,7 +8920,7 @@ EOF | 6662 | @@ -7943,7 +8920,7 @@ |
6663 | # We should set the runpath_var. | 6663 | # We should set the runpath_var. |
6664 | rpath= | 6664 | rpath= |
6665 | for dir in $perm_rpath; do | 6665 | for dir in $perm_rpath; do |
@@ -6668,7 +6668,7 @@ Index: binutils-2.21/ltmain.sh | |||
6668 | done | 6668 | done |
6669 | compile_var="$runpath_var=\"$rpath\$$runpath_var\" " | 6669 | compile_var="$runpath_var=\"$rpath\$$runpath_var\" " |
6670 | fi | 6670 | fi |
6671 | @@ -7951,7 +8928,7 @@ EOF | 6671 | @@ -7951,7 +8928,7 @@ |
6672 | # We should set the runpath_var. | 6672 | # We should set the runpath_var. |
6673 | rpath= | 6673 | rpath= |
6674 | for dir in $finalize_perm_rpath; do | 6674 | for dir in $finalize_perm_rpath; do |
@@ -6677,7 +6677,7 @@ Index: binutils-2.21/ltmain.sh | |||
6677 | done | 6677 | done |
6678 | finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " | 6678 | finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " |
6679 | fi | 6679 | fi |
6680 | @@ -7966,6 +8943,13 @@ EOF | 6680 | @@ -7966,6 +8943,13 @@ |
6681 | $opt_dry_run || $RM $output | 6681 | $opt_dry_run || $RM $output |
6682 | # Link the executable and exit | 6682 | # Link the executable and exit |
6683 | func_show_eval "$link_command" 'exit $?' | 6683 | func_show_eval "$link_command" 'exit $?' |
@@ -6691,7 +6691,7 @@ Index: binutils-2.21/ltmain.sh | |||
6691 | exit $EXIT_SUCCESS | 6691 | exit $EXIT_SUCCESS |
6692 | fi | 6692 | fi |
6693 | 6693 | ||
6694 | @@ -7999,6 +8983,12 @@ EOF | 6694 | @@ -7999,6 +8983,12 @@ |
6695 | 6695 | ||
6696 | func_show_eval "$link_command" 'exit $?' | 6696 | func_show_eval "$link_command" 'exit $?' |
6697 | 6697 | ||
@@ -6704,7 +6704,7 @@ Index: binutils-2.21/ltmain.sh | |||
6704 | # Now create the wrapper script. | 6704 | # Now create the wrapper script. |
6705 | func_verbose "creating $output" | 6705 | func_verbose "creating $output" |
6706 | 6706 | ||
6707 | @@ -8096,7 +9086,7 @@ EOF | 6707 | @@ -8096,7 +9086,7 @@ |
6708 | else | 6708 | else |
6709 | oldobjs="$old_deplibs $non_pic_objects" | 6709 | oldobjs="$old_deplibs $non_pic_objects" |
6710 | if test "$preload" = yes && test -f "$symfileobj"; then | 6710 | if test "$preload" = yes && test -f "$symfileobj"; then |
@@ -6713,7 +6713,7 @@ Index: binutils-2.21/ltmain.sh | |||
6713 | fi | 6713 | fi |
6714 | fi | 6714 | fi |
6715 | addlibs="$old_convenience" | 6715 | addlibs="$old_convenience" |
6716 | @@ -8104,10 +9094,10 @@ EOF | 6716 | @@ -8104,10 +9094,10 @@ |
6717 | 6717 | ||
6718 | if test -n "$addlibs"; then | 6718 | if test -n "$addlibs"; then |
6719 | gentop="$output_objdir/${outputname}x" | 6719 | gentop="$output_objdir/${outputname}x" |
@@ -6726,7 +6726,7 @@ Index: binutils-2.21/ltmain.sh | |||
6726 | fi | 6726 | fi |
6727 | 6727 | ||
6728 | # Do each command in the archive commands. | 6728 | # Do each command in the archive commands. |
6729 | @@ -8118,10 +9108,10 @@ EOF | 6729 | @@ -8118,10 +9108,10 @@ |
6730 | # Add any objects from preloaded convenience libraries | 6730 | # Add any objects from preloaded convenience libraries |
6731 | if test -n "$dlprefiles"; then | 6731 | if test -n "$dlprefiles"; then |
6732 | gentop="$output_objdir/${outputname}x" | 6732 | gentop="$output_objdir/${outputname}x" |
@@ -6739,7 +6739,7 @@ Index: binutils-2.21/ltmain.sh | |||
6739 | fi | 6739 | fi |
6740 | 6740 | ||
6741 | # POSIX demands no paths to be encoded in archives. We have | 6741 | # POSIX demands no paths to be encoded in archives. We have |
6742 | @@ -8139,7 +9129,7 @@ EOF | 6742 | @@ -8139,7 +9129,7 @@ |
6743 | else | 6743 | else |
6744 | echo "copying selected object files to avoid basename conflicts..." | 6744 | echo "copying selected object files to avoid basename conflicts..." |
6745 | gentop="$output_objdir/${outputname}x" | 6745 | gentop="$output_objdir/${outputname}x" |
@@ -6748,7 +6748,7 @@ Index: binutils-2.21/ltmain.sh | |||
6748 | func_mkdir_p "$gentop" | 6748 | func_mkdir_p "$gentop" |
6749 | save_oldobjs=$oldobjs | 6749 | save_oldobjs=$oldobjs |
6750 | oldobjs= | 6750 | oldobjs= |
6751 | @@ -8163,18 +9153,28 @@ EOF | 6751 | @@ -8163,18 +9153,28 @@ |
6752 | esac | 6752 | esac |
6753 | done | 6753 | done |
6754 | func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" | 6754 | func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" |
@@ -6780,7 +6780,7 @@ Index: binutils-2.21/ltmain.sh | |||
6780 | else | 6780 | else |
6781 | # the command line is too long to link in one step, link in parts | 6781 | # the command line is too long to link in one step, link in parts |
6782 | func_verbose "using piecewise archive linking..." | 6782 | func_verbose "using piecewise archive linking..." |
6783 | @@ -8189,7 +9189,7 @@ EOF | 6783 | @@ -8189,7 +9189,7 @@ |
6784 | do | 6784 | do |
6785 | last_oldobj=$obj | 6785 | last_oldobj=$obj |
6786 | done | 6786 | done |
@@ -6789,7 +6789,7 @@ Index: binutils-2.21/ltmain.sh | |||
6789 | func_len " $test_cmds" | 6789 | func_len " $test_cmds" |
6790 | len0=$func_len_result | 6790 | len0=$func_len_result |
6791 | len=$len0 | 6791 | len=$len0 |
6792 | @@ -8208,7 +9208,7 @@ EOF | 6792 | @@ -8208,7 +9208,7 @@ |
6793 | RANLIB=$save_RANLIB | 6793 | RANLIB=$save_RANLIB |
6794 | fi | 6794 | fi |
6795 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ | 6795 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
@@ -6798,7 +6798,7 @@ Index: binutils-2.21/ltmain.sh | |||
6798 | objlist= | 6798 | objlist= |
6799 | len=$len0 | 6799 | len=$len0 |
6800 | fi | 6800 | fi |
6801 | @@ -8216,9 +9216,9 @@ EOF | 6801 | @@ -8216,9 +9216,9 @@ |
6802 | RANLIB=$save_RANLIB | 6802 | RANLIB=$save_RANLIB |
6803 | oldobjs=$objlist | 6803 | oldobjs=$objlist |
6804 | if test "X$oldobjs" = "X" ; then | 6804 | if test "X$oldobjs" = "X" ; then |
@@ -6810,7 +6810,7 @@ Index: binutils-2.21/ltmain.sh | |||
6810 | fi | 6810 | fi |
6811 | fi | 6811 | fi |
6812 | fi | 6812 | fi |
6813 | @@ -8268,12 +9268,23 @@ EOF | 6813 | @@ -8268,12 +9268,23 @@ |
6814 | *.la) | 6814 | *.la) |
6815 | func_basename "$deplib" | 6815 | func_basename "$deplib" |
6816 | name="$func_basename_result" | 6816 | name="$func_basename_result" |
@@ -6837,7 +6837,7 @@ Index: binutils-2.21/ltmain.sh | |||
6837 | esac | 6837 | esac |
6838 | done | 6838 | done |
6839 | dependency_libs="$newdependency_libs" | 6839 | dependency_libs="$newdependency_libs" |
6840 | @@ -8284,12 +9295,14 @@ EOF | 6840 | @@ -8284,12 +9295,14 @@ |
6841 | *.la) | 6841 | *.la) |
6842 | func_basename "$lib" | 6842 | func_basename "$lib" |
6843 | name="$func_basename_result" | 6843 | name="$func_basename_result" |
@@ -6855,7 +6855,7 @@ Index: binutils-2.21/ltmain.sh | |||
6855 | esac | 6855 | esac |
6856 | done | 6856 | done |
6857 | dlfiles="$newdlfiles" | 6857 | dlfiles="$newdlfiles" |
6858 | @@ -8303,10 +9316,11 @@ EOF | 6858 | @@ -8303,10 +9316,11 @@ |
6859 | # the library: | 6859 | # the library: |
6860 | func_basename "$lib" | 6860 | func_basename "$lib" |
6861 | name="$func_basename_result" | 6861 | name="$func_basename_result" |
@@ -6869,7 +6869,7 @@ Index: binutils-2.21/ltmain.sh | |||
6869 | ;; | 6869 | ;; |
6870 | esac | 6870 | esac |
6871 | done | 6871 | done |
6872 | @@ -8318,7 +9332,7 @@ EOF | 6872 | @@ -8318,7 +9332,7 @@ |
6873 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; | 6873 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; |
6874 | *) abs=`pwd`"/$lib" ;; | 6874 | *) abs=`pwd`"/$lib" ;; |
6875 | esac | 6875 | esac |
@@ -6878,7 +6878,7 @@ Index: binutils-2.21/ltmain.sh | |||
6878 | done | 6878 | done |
6879 | dlfiles="$newdlfiles" | 6879 | dlfiles="$newdlfiles" |
6880 | newdlprefiles= | 6880 | newdlprefiles= |
6881 | @@ -8327,7 +9341,7 @@ EOF | 6881 | @@ -8327,7 +9341,7 @@ |
6882 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; | 6882 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; |
6883 | *) abs=`pwd`"/$lib" ;; | 6883 | *) abs=`pwd`"/$lib" ;; |
6884 | esac | 6884 | esac |
@@ -6887,7 +6887,7 @@ Index: binutils-2.21/ltmain.sh | |||
6887 | done | 6887 | done |
6888 | dlprefiles="$newdlprefiles" | 6888 | dlprefiles="$newdlprefiles" |
6889 | fi | 6889 | fi |
6890 | @@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" | 6890 | @@ -8412,7 +9426,7 @@ |
6891 | exit $EXIT_SUCCESS | 6891 | exit $EXIT_SUCCESS |
6892 | } | 6892 | } |
6893 | 6893 | ||
@@ -6896,7 +6896,7 @@ Index: binutils-2.21/ltmain.sh | |||
6896 | func_mode_link ${1+"$@"} | 6896 | func_mode_link ${1+"$@"} |
6897 | 6897 | ||
6898 | 6898 | ||
6899 | @@ -8432,9 +9446,9 @@ func_mode_uninstall () | 6899 | @@ -8432,9 +9446,9 @@ |
6900 | for arg | 6900 | for arg |
6901 | do | 6901 | do |
6902 | case $arg in | 6902 | case $arg in |
@@ -6909,7 +6909,7 @@ Index: binutils-2.21/ltmain.sh | |||
6909 | esac | 6909 | esac |
6910 | done | 6910 | done |
6911 | 6911 | ||
6912 | @@ -8443,24 +9457,23 @@ func_mode_uninstall () | 6912 | @@ -8443,24 +9457,23 @@ |
6913 | 6913 | ||
6914 | rmdirs= | 6914 | rmdirs= |
6915 | 6915 | ||
@@ -6941,7 +6941,7 @@ Index: binutils-2.21/ltmain.sh | |||
6941 | esac | 6941 | esac |
6942 | fi | 6942 | fi |
6943 | 6943 | ||
6944 | @@ -8486,18 +9499,17 @@ func_mode_uninstall () | 6944 | @@ -8486,18 +9499,17 @@ |
6945 | 6945 | ||
6946 | # Delete the libtool libraries and symlinks. | 6946 | # Delete the libtool libraries and symlinks. |
6947 | for n in $library_names; do | 6947 | for n in $library_names; do |
@@ -6966,7 +6966,7 @@ Index: binutils-2.21/ltmain.sh | |||
6966 | ;; | 6966 | ;; |
6967 | uninstall) | 6967 | uninstall) |
6968 | if test -n "$library_names"; then | 6968 | if test -n "$library_names"; then |
6969 | @@ -8525,19 +9537,19 @@ func_mode_uninstall () | 6969 | @@ -8525,19 +9537,19 @@ |
6970 | # Add PIC object to the list of files to remove. | 6970 | # Add PIC object to the list of files to remove. |
6971 | if test -n "$pic_object" && | 6971 | if test -n "$pic_object" && |
6972 | test "$pic_object" != none; then | 6972 | test "$pic_object" != none; then |
@@ -6989,7 +6989,7 @@ Index: binutils-2.21/ltmain.sh | |||
6989 | noexename=$name | 6989 | noexename=$name |
6990 | case $file in | 6990 | case $file in |
6991 | *.exe) | 6991 | *.exe) |
6992 | @@ -8547,7 +9559,7 @@ func_mode_uninstall () | 6992 | @@ -8547,7 +9559,7 @@ |
6993 | noexename=$func_stripname_result | 6993 | noexename=$func_stripname_result |
6994 | # $file with .exe has already been added to rmfiles, | 6994 | # $file with .exe has already been added to rmfiles, |
6995 | # add $file without .exe | 6995 | # add $file without .exe |
@@ -6998,7 +6998,7 @@ Index: binutils-2.21/ltmain.sh | |||
6998 | ;; | 6998 | ;; |
6999 | esac | 6999 | esac |
7000 | # Do a test to see if this is a libtool program. | 7000 | # Do a test to see if this is a libtool program. |
7001 | @@ -8556,7 +9568,7 @@ func_mode_uninstall () | 7001 | @@ -8556,7 +9568,7 @@ |
7002 | func_ltwrapper_scriptname "$file" | 7002 | func_ltwrapper_scriptname "$file" |
7003 | relink_command= | 7003 | relink_command= |
7004 | func_source $func_ltwrapper_scriptname_result | 7004 | func_source $func_ltwrapper_scriptname_result |
@@ -7007,7 +7007,7 @@ Index: binutils-2.21/ltmain.sh | |||
7007 | else | 7007 | else |
7008 | relink_command= | 7008 | relink_command= |
7009 | func_source $dir/$noexename | 7009 | func_source $dir/$noexename |
7010 | @@ -8564,12 +9576,12 @@ func_mode_uninstall () | 7010 | @@ -8564,12 +9576,12 @@ |
7011 | 7011 | ||
7012 | # note $name still contains .exe if it was in $file originally | 7012 | # note $name still contains .exe if it was in $file originally |
7013 | # as does the version of $file that was added into $rmfiles | 7013 | # as does the version of $file that was added into $rmfiles |
@@ -7023,7 +7023,7 @@ Index: binutils-2.21/ltmain.sh | |||
7023 | fi | 7023 | fi |
7024 | fi | 7024 | fi |
7025 | fi | 7025 | fi |
7026 | @@ -8577,7 +9589,6 @@ func_mode_uninstall () | 7026 | @@ -8577,7 +9589,6 @@ |
7027 | esac | 7027 | esac |
7028 | func_show_eval "$RM $rmfiles" 'exit_status=1' | 7028 | func_show_eval "$RM $rmfiles" 'exit_status=1' |
7029 | done | 7029 | done |
@@ -7031,7 +7031,7 @@ Index: binutils-2.21/ltmain.sh | |||
7031 | 7031 | ||
7032 | # Try to remove the ${objdir}s in the directories where we deleted files | 7032 | # Try to remove the ${objdir}s in the directories where we deleted files |
7033 | for dir in $rmdirs; do | 7033 | for dir in $rmdirs; do |
7034 | @@ -8589,16 +9600,16 @@ func_mode_uninstall () | 7034 | @@ -8589,16 +9600,16 @@ |
7035 | exit $exit_status | 7035 | exit $exit_status |
7036 | } | 7036 | } |
7037 | 7037 | ||
@@ -7053,8 +7053,8 @@ Index: binutils-2.21/ltmain.sh | |||
7053 | eval exec "$exec_cmd" | 7053 | eval exec "$exec_cmd" |
7054 | Index: binutils-2.21/ltoptions.m4 | 7054 | Index: binutils-2.21/ltoptions.m4 |
7055 | =================================================================== | 7055 | =================================================================== |
7056 | --- binutils-2.21.orig/ltoptions.m4 | 7056 | --- binutils-2.21.orig/ltoptions.m4 2010-01-09 13:11:32.000000000 -0800 |
7057 | +++ binutils-2.21/ltoptions.m4 | 7057 | +++ binutils-2.21/ltoptions.m4 2011-01-07 10:49:16.406101000 -0800 |
7058 | @@ -8,7 +8,7 @@ | 7058 | @@ -8,7 +8,7 @@ |
7059 | # unlimited permission to copy and/or distribute it, with or without | 7059 | # unlimited permission to copy and/or distribute it, with or without |
7060 | # modifications, as long as this notice is preserved. | 7060 | # modifications, as long as this notice is preserved. |
@@ -7066,8 +7066,8 @@ Index: binutils-2.21/ltoptions.m4 | |||
7066 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) | 7066 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
7067 | Index: binutils-2.21/ltversion.m4 | 7067 | Index: binutils-2.21/ltversion.m4 |
7068 | =================================================================== | 7068 | =================================================================== |
7069 | --- binutils-2.21.orig/ltversion.m4 | 7069 | --- binutils-2.21.orig/ltversion.m4 2010-01-09 13:11:32.000000000 -0800 |
7070 | +++ binutils-2.21/ltversion.m4 | 7070 | +++ binutils-2.21/ltversion.m4 2011-01-07 10:49:16.406101000 -0800 |
7071 | @@ -7,17 +7,17 @@ | 7071 | @@ -7,17 +7,17 @@ |
7072 | # unlimited permission to copy and/or distribute it, with or without | 7072 | # unlimited permission to copy and/or distribute it, with or without |
7073 | # modifications, as long as this notice is preserved. | 7073 | # modifications, as long as this notice is preserved. |
@@ -7094,8 +7094,8 @@ Index: binutils-2.21/ltversion.m4 | |||
7094 | ]) | 7094 | ]) |
7095 | Index: binutils-2.21/lt~obsolete.m4 | 7095 | Index: binutils-2.21/lt~obsolete.m4 |
7096 | =================================================================== | 7096 | =================================================================== |
7097 | --- binutils-2.21.orig/lt~obsolete.m4 | 7097 | --- binutils-2.21.orig/lt~obsolete.m4 2010-01-09 13:11:32.000000000 -0800 |
7098 | +++ binutils-2.21/lt~obsolete.m4 | 7098 | +++ binutils-2.21/lt~obsolete.m4 2011-01-07 10:49:16.406101000 -0800 |
7099 | @@ -7,7 +7,7 @@ | 7099 | @@ -7,7 +7,7 @@ |
7100 | # unlimited permission to copy and/or distribute it, with or without | 7100 | # unlimited permission to copy and/or distribute it, with or without |
7101 | # modifications, as long as this notice is preserved. | 7101 | # modifications, as long as this notice is preserved. |
@@ -7107,9 +7107,9 @@ Index: binutils-2.21/lt~obsolete.m4 | |||
7107 | # | 7107 | # |
7108 | Index: binutils-2.21/configure | 7108 | Index: binutils-2.21/configure |
7109 | =================================================================== | 7109 | =================================================================== |
7110 | --- binutils-2.21.orig/configure | 7110 | --- binutils-2.21.orig/configure 2011-01-07 10:49:16.006101000 -0800 |
7111 | +++ binutils-2.21/configure | 7111 | +++ binutils-2.21/configure 2011-01-07 10:49:17.906101000 -0800 |
7112 | @@ -2670,7 +2670,7 @@ host_libs="intl mmalloc libiberty opcode | 7112 | @@ -2670,7 +2670,7 @@ |
7113 | # binutils, gas and ld appear in that order because it makes sense to run | 7113 | # binutils, gas and ld appear in that order because it makes sense to run |
7114 | # "make check" in that particular order. | 7114 | # "make check" in that particular order. |
7115 | # If --enable-gold is used, "gold" may replace "ld". | 7115 | # If --enable-gold is used, "gold" may replace "ld". |
@@ -7118,7 +7118,7 @@ Index: binutils-2.21/configure | |||
7118 | 7118 | ||
7119 | # libgcj represents the runtime libraries only used by gcj. | 7119 | # libgcj represents the runtime libraries only used by gcj. |
7120 | libgcj="target-libffi \ | 7120 | libgcj="target-libffi \ |
7121 | @@ -3148,7 +3148,7 @@ case "${target}" in | 7121 | @@ -3148,7 +3148,7 @@ |
7122 | am33_2.0-*-linux*) | 7122 | am33_2.0-*-linux*) |
7123 | noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" | 7123 | noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" |
7124 | ;; | 7124 | ;; |
@@ -7127,7 +7127,7 @@ Index: binutils-2.21/configure | |||
7127 | noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" | 7127 | noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" |
7128 | ;; | 7128 | ;; |
7129 | sh*-*-pe|mips*-*-pe|*arm-wince-pe) | 7129 | sh*-*-pe|mips*-*-pe|*arm-wince-pe) |
7130 | @@ -3487,7 +3487,7 @@ case "${target}" in | 7130 | @@ -3487,7 +3487,7 @@ |
7131 | romp-*-*) | 7131 | romp-*-*) |
7132 | noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" | 7132 | noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" |
7133 | ;; | 7133 | ;; |
@@ -7136,7 +7136,7 @@ Index: binutils-2.21/configure | |||
7136 | case "${host}" in | 7136 | case "${host}" in |
7137 | i[3456789]86-*-vsta) ;; # don't add gprof back in | 7137 | i[3456789]86-*-vsta) ;; # don't add gprof back in |
7138 | i[3456789]86-*-go32*) ;; # don't add gprof back in | 7138 | i[3456789]86-*-go32*) ;; # don't add gprof back in |
7139 | @@ -7597,7 +7597,7 @@ case " $build_configdirs " in | 7139 | @@ -7597,7 +7597,7 @@ |
7140 | # For an installed makeinfo, we require it to be from texinfo 4.7 or | 7140 | # For an installed makeinfo, we require it to be from texinfo 4.7 or |
7141 | # higher, else we use the "missing" dummy. | 7141 | # higher, else we use the "missing" dummy. |
7142 | if ${MAKEINFO} --version \ | 7142 | if ${MAKEINFO} --version \ |
@@ -7147,9 +7147,9 @@ Index: binutils-2.21/configure | |||
7147 | MAKEINFO="$MISSING makeinfo" | 7147 | MAKEINFO="$MISSING makeinfo" |
7148 | Index: binutils-2.21/bfd/configure | 7148 | Index: binutils-2.21/bfd/configure |
7149 | =================================================================== | 7149 | =================================================================== |
7150 | --- binutils-2.21.orig/bfd/configure | 7150 | --- binutils-2.21.orig/bfd/configure 2010-12-08 00:37:34.000000000 -0800 |
7151 | +++ binutils-2.21/bfd/configure | 7151 | +++ binutils-2.21/bfd/configure 2011-01-07 11:25:57.156101002 -0800 |
7152 | @@ -667,6 +667,9 @@ OTOOL | 7152 | @@ -667,6 +667,9 @@ |
7153 | LIPO | 7153 | LIPO |
7154 | NMEDIT | 7154 | NMEDIT |
7155 | DSYMUTIL | 7155 | DSYMUTIL |
@@ -7159,7 +7159,7 @@ Index: binutils-2.21/bfd/configure | |||
7159 | OBJDUMP | 7159 | OBJDUMP |
7160 | LN_S | 7160 | LN_S |
7161 | NM | 7161 | NM |
7162 | @@ -779,6 +782,7 @@ enable_static | 7162 | @@ -779,6 +782,7 @@ |
7163 | with_pic | 7163 | with_pic |
7164 | enable_fast_install | 7164 | enable_fast_install |
7165 | with_gnu_ld | 7165 | with_gnu_ld |
@@ -7167,7 +7167,7 @@ Index: binutils-2.21/bfd/configure | |||
7167 | enable_libtool_lock | 7167 | enable_libtool_lock |
7168 | enable_plugins | 7168 | enable_plugins |
7169 | enable_largefile | 7169 | enable_largefile |
7170 | @@ -1453,6 +1457,8 @@ Optional Packages: | 7170 | @@ -1453,6 +1457,8 @@ |
7171 | --with-pic try to use only PIC/non-PIC objects [default=use | 7171 | --with-pic try to use only PIC/non-PIC objects [default=use |
7172 | both] | 7172 | both] |
7173 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 7173 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -7176,7 +7176,7 @@ Index: binutils-2.21/bfd/configure | |||
7176 | --with-mmap try using mmap for BFD input files if available | 7176 | --with-mmap try using mmap for BFD input files if available |
7177 | --with-separate-debug-dir=DIR | 7177 | --with-separate-debug-dir=DIR |
7178 | Look for global separate debug info in DIR | 7178 | Look for global separate debug info in DIR |
7179 | @@ -5383,8 +5389,8 @@ esac | 7179 | @@ -5383,8 +5389,8 @@ |
7180 | 7180 | ||
7181 | 7181 | ||
7182 | 7182 | ||
@@ -7187,7 +7187,7 @@ Index: binutils-2.21/bfd/configure | |||
7187 | 7187 | ||
7188 | 7188 | ||
7189 | 7189 | ||
7190 | @@ -5424,7 +5430,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 7190 | @@ -5424,7 +5430,7 @@ |
7191 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 7191 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
7192 | $as_echo_n "checking how to print strings... " >&6; } | 7192 | $as_echo_n "checking how to print strings... " >&6; } |
7193 | # Test print first, because it will be a builtin if present. | 7193 | # Test print first, because it will be a builtin if present. |
@@ -7196,7 +7196,7 @@ Index: binutils-2.21/bfd/configure | |||
7196 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 7196 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
7197 | ECHO='print -r --' | 7197 | ECHO='print -r --' |
7198 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 7198 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
7199 | @@ -6110,8 +6116,8 @@ $as_echo_n "checking whether the shell u | 7199 | @@ -6110,8 +6116,8 @@ |
7200 | # Try some XSI features | 7200 | # Try some XSI features |
7201 | xsi_shell=no | 7201 | xsi_shell=no |
7202 | ( _lt_dummy="a/b/c" | 7202 | ( _lt_dummy="a/b/c" |
@@ -7207,7 +7207,7 @@ Index: binutils-2.21/bfd/configure | |||
7207 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 7207 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
7208 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 7208 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
7209 | && xsi_shell=yes | 7209 | && xsi_shell=yes |
7210 | @@ -6160,6 +6166,80 @@ esac | 7210 | @@ -6160,6 +6166,80 @@ |
7211 | 7211 | ||
7212 | 7212 | ||
7213 | 7213 | ||
@@ -7288,7 +7288,7 @@ Index: binutils-2.21/bfd/configure | |||
7288 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 7288 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
7289 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 7289 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
7290 | if test "${lt_cv_ld_reload_flag+set}" = set; then : | 7290 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
7291 | @@ -6176,6 +6256,11 @@ case $reload_flag in | 7291 | @@ -6176,6 +6256,11 @@ |
7292 | esac | 7292 | esac |
7293 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 7293 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
7294 | case $host_os in | 7294 | case $host_os in |
@@ -7300,7 +7300,7 @@ Index: binutils-2.21/bfd/configure | |||
7300 | darwin*) | 7300 | darwin*) |
7301 | if test "$GCC" = yes; then | 7301 | if test "$GCC" = yes; then |
7302 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 7302 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
7303 | @@ -6344,7 +6429,8 @@ mingw* | pw32*) | 7303 | @@ -6344,7 +6429,8 @@ |
7304 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 7304 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
7305 | lt_cv_file_magic_cmd='func_win32_libid' | 7305 | lt_cv_file_magic_cmd='func_win32_libid' |
7306 | else | 7306 | else |
@@ -7310,7 +7310,7 @@ Index: binutils-2.21/bfd/configure | |||
7310 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 7310 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
7311 | fi | 7311 | fi |
7312 | ;; | 7312 | ;; |
7313 | @@ -6498,6 +6584,21 @@ esac | 7313 | @@ -6498,6 +6584,21 @@ |
7314 | fi | 7314 | fi |
7315 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 7315 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
7316 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 7316 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -7332,7 +7332,7 @@ Index: binutils-2.21/bfd/configure | |||
7332 | file_magic_cmd=$lt_cv_file_magic_cmd | 7332 | file_magic_cmd=$lt_cv_file_magic_cmd |
7333 | deplibs_check_method=$lt_cv_deplibs_check_method | 7333 | deplibs_check_method=$lt_cv_deplibs_check_method |
7334 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 7334 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
7335 | @@ -6513,9 +6614,162 @@ test -z "$deplibs_check_method" && depli | 7335 | @@ -6513,9 +6614,162 @@ |
7336 | 7336 | ||
7337 | 7337 | ||
7338 | 7338 | ||
@@ -7497,7 +7497,7 @@ Index: binutils-2.21/bfd/configure | |||
7497 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 7497 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
7498 | $as_echo_n "checking for $ac_word... " >&6; } | 7498 | $as_echo_n "checking for $ac_word... " >&6; } |
7499 | if test "${ac_cv_prog_AR+set}" = set; then : | 7499 | if test "${ac_cv_prog_AR+set}" = set; then : |
7500 | @@ -6531,7 +6785,7 @@ do | 7500 | @@ -6531,7 +6785,7 @@ |
7501 | test -z "$as_dir" && as_dir=. | 7501 | test -z "$as_dir" && as_dir=. |
7502 | for ac_exec_ext in '' $ac_executable_extensions; do | 7502 | for ac_exec_ext in '' $ac_executable_extensions; do |
7503 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 7503 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -7506,7 +7506,7 @@ Index: binutils-2.21/bfd/configure | |||
7506 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 7506 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7507 | break 2 | 7507 | break 2 |
7508 | fi | 7508 | fi |
7509 | @@ -6551,11 +6805,15 @@ $as_echo "no" >&6; } | 7509 | @@ -6551,11 +6805,15 @@ |
7510 | fi | 7510 | fi |
7511 | 7511 | ||
7512 | 7512 | ||
@@ -7525,7 +7525,7 @@ Index: binutils-2.21/bfd/configure | |||
7525 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 7525 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
7526 | $as_echo_n "checking for $ac_word... " >&6; } | 7526 | $as_echo_n "checking for $ac_word... " >&6; } |
7527 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | 7527 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
7528 | @@ -6571,7 +6829,7 @@ do | 7528 | @@ -6571,7 +6829,7 @@ |
7529 | test -z "$as_dir" && as_dir=. | 7529 | test -z "$as_dir" && as_dir=. |
7530 | for ac_exec_ext in '' $ac_executable_extensions; do | 7530 | for ac_exec_ext in '' $ac_executable_extensions; do |
7531 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 7531 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -7534,7 +7534,7 @@ Index: binutils-2.21/bfd/configure | |||
7534 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 7534 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7535 | break 2 | 7535 | break 2 |
7536 | fi | 7536 | fi |
7537 | @@ -6590,6 +6848,10 @@ else | 7537 | @@ -6590,6 +6848,10 @@ |
7538 | $as_echo "no" >&6; } | 7538 | $as_echo "no" >&6; } |
7539 | fi | 7539 | fi |
7540 | 7540 | ||
@@ -7545,7 +7545,7 @@ Index: binutils-2.21/bfd/configure | |||
7545 | if test "x$ac_ct_AR" = x; then | 7545 | if test "x$ac_ct_AR" = x; then |
7546 | AR="false" | 7546 | AR="false" |
7547 | else | 7547 | else |
7548 | @@ -6601,16 +6863,72 @@ ac_tool_warned=yes ;; | 7548 | @@ -6601,16 +6863,72 @@ |
7549 | esac | 7549 | esac |
7550 | AR=$ac_ct_AR | 7550 | AR=$ac_ct_AR |
7551 | fi | 7551 | fi |
@@ -7622,7 +7622,7 @@ Index: binutils-2.21/bfd/configure | |||
7622 | 7622 | ||
7623 | 7623 | ||
7624 | 7624 | ||
7625 | @@ -6952,8 +7270,8 @@ esac | 7625 | @@ -6952,8 +7270,8 @@ |
7626 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 7626 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
7627 | 7627 | ||
7628 | # Transform an extracted symbol line into symbol name and symbol address | 7628 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -7633,7 +7633,7 @@ Index: binutils-2.21/bfd/configure | |||
7633 | 7633 | ||
7634 | # Handle CRLF in mingw tool chain | 7634 | # Handle CRLF in mingw tool chain |
7635 | opt_cr= | 7635 | opt_cr= |
7636 | @@ -6989,6 +7307,7 @@ for ac_symprfx in "" "_"; do | 7636 | @@ -6989,6 +7307,7 @@ |
7637 | else | 7637 | else |
7638 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 7638 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
7639 | fi | 7639 | fi |
@@ -7641,7 +7641,7 @@ Index: binutils-2.21/bfd/configure | |||
7641 | 7641 | ||
7642 | # Check to see that the pipe works correctly. | 7642 | # Check to see that the pipe works correctly. |
7643 | pipe_works=no | 7643 | pipe_works=no |
7644 | @@ -7030,6 +7349,18 @@ _LT_EOF | 7644 | @@ -7030,6 +7349,18 @@ |
7645 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 7645 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
7646 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 7646 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
7647 | cat <<_LT_EOF > conftest.$ac_ext | 7647 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -7660,7 +7660,7 @@ Index: binutils-2.21/bfd/configure | |||
7660 | #ifdef __cplusplus | 7660 | #ifdef __cplusplus |
7661 | extern "C" { | 7661 | extern "C" { |
7662 | #endif | 7662 | #endif |
7663 | @@ -7041,7 +7372,7 @@ _LT_EOF | 7663 | @@ -7041,7 +7372,7 @@ |
7664 | cat <<_LT_EOF >> conftest.$ac_ext | 7664 | cat <<_LT_EOF >> conftest.$ac_ext |
7665 | 7665 | ||
7666 | /* The mapping between symbol names and symbols. */ | 7666 | /* The mapping between symbol names and symbols. */ |
@@ -7669,7 +7669,7 @@ Index: binutils-2.21/bfd/configure | |||
7669 | const char *name; | 7669 | const char *name; |
7670 | void *address; | 7670 | void *address; |
7671 | } | 7671 | } |
7672 | @@ -7067,8 +7398,8 @@ static const void *lt_preloaded_setup() | 7672 | @@ -7067,8 +7398,8 @@ |
7673 | _LT_EOF | 7673 | _LT_EOF |
7674 | # Now try linking the two files. | 7674 | # Now try linking the two files. |
7675 | mv conftest.$ac_objext conftstm.$ac_objext | 7675 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -7680,7 +7680,7 @@ Index: binutils-2.21/bfd/configure | |||
7680 | LIBS="conftstm.$ac_objext" | 7680 | LIBS="conftstm.$ac_objext" |
7681 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 7681 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
7682 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 7682 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
7683 | @@ -7078,8 +7409,8 @@ _LT_EOF | 7683 | @@ -7078,8 +7409,8 @@ |
7684 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 7684 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
7685 | pipe_works=yes | 7685 | pipe_works=yes |
7686 | fi | 7686 | fi |
@@ -7691,7 +7691,7 @@ Index: binutils-2.21/bfd/configure | |||
7691 | else | 7691 | else |
7692 | echo "cannot find nm_test_func in $nlist" >&5 | 7692 | echo "cannot find nm_test_func in $nlist" >&5 |
7693 | fi | 7693 | fi |
7694 | @@ -7116,6 +7447,20 @@ else | 7694 | @@ -7116,6 +7447,20 @@ |
7695 | $as_echo "ok" >&6; } | 7695 | $as_echo "ok" >&6; } |
7696 | fi | 7696 | fi |
7697 | 7697 | ||
@@ -7712,7 +7712,7 @@ Index: binutils-2.21/bfd/configure | |||
7712 | 7712 | ||
7713 | 7713 | ||
7714 | 7714 | ||
7715 | @@ -7135,6 +7480,41 @@ fi | 7715 | @@ -7135,6 +7480,41 @@ |
7716 | 7716 | ||
7717 | 7717 | ||
7718 | 7718 | ||
@@ -7754,7 +7754,7 @@ Index: binutils-2.21/bfd/configure | |||
7754 | 7754 | ||
7755 | 7755 | ||
7756 | # Check whether --enable-libtool-lock was given. | 7756 | # Check whether --enable-libtool-lock was given. |
7757 | @@ -7330,6 +7710,123 @@ esac | 7757 | @@ -7330,6 +7710,123 @@ |
7758 | 7758 | ||
7759 | need_locks="$enable_libtool_lock" | 7759 | need_locks="$enable_libtool_lock" |
7760 | 7760 | ||
@@ -7878,7 +7878,7 @@ Index: binutils-2.21/bfd/configure | |||
7878 | 7878 | ||
7879 | case $host_os in | 7879 | case $host_os in |
7880 | rhapsody* | darwin*) | 7880 | rhapsody* | darwin*) |
7881 | @@ -7893,6 +8390,8 @@ _LT_EOF | 7881 | @@ -7893,6 +8390,8 @@ |
7882 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 7882 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
7883 | echo "$AR cru libconftest.a conftest.o" >&5 | 7883 | echo "$AR cru libconftest.a conftest.o" >&5 |
7884 | $AR cru libconftest.a conftest.o 2>&5 | 7884 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -7887,7 +7887,7 @@ Index: binutils-2.21/bfd/configure | |||
7887 | cat > conftest.c << _LT_EOF | 7887 | cat > conftest.c << _LT_EOF |
7888 | int main() { return 0;} | 7888 | int main() { return 0;} |
7889 | _LT_EOF | 7889 | _LT_EOF |
7890 | @@ -8057,7 +8556,8 @@ fi | 7890 | @@ -8057,7 +8556,8 @@ |
7891 | LIBTOOL_DEPS="$ltmain" | 7891 | LIBTOOL_DEPS="$ltmain" |
7892 | 7892 | ||
7893 | # Always use our own libtool. | 7893 | # Always use our own libtool. |
@@ -7897,7 +7897,7 @@ Index: binutils-2.21/bfd/configure | |||
7897 | 7897 | ||
7898 | 7898 | ||
7899 | 7899 | ||
7900 | @@ -8146,7 +8646,7 @@ aix3*) | 7900 | @@ -8146,7 +8646,7 @@ |
7901 | esac | 7901 | esac |
7902 | 7902 | ||
7903 | # Global variables: | 7903 | # Global variables: |
@@ -7906,7 +7906,7 @@ Index: binutils-2.21/bfd/configure | |||
7906 | can_build_shared=yes | 7906 | can_build_shared=yes |
7907 | 7907 | ||
7908 | # All known linkers require a `.a' archive for static linking (except MSVC, | 7908 | # All known linkers require a `.a' archive for static linking (except MSVC, |
7909 | @@ -8444,8 +8944,6 @@ fi | 7909 | @@ -8444,8 +8944,6 @@ |
7910 | lt_prog_compiler_pic= | 7910 | lt_prog_compiler_pic= |
7911 | lt_prog_compiler_static= | 7911 | lt_prog_compiler_static= |
7912 | 7912 | ||
@@ -7915,7 +7915,7 @@ Index: binutils-2.21/bfd/configure | |||
7915 | 7915 | ||
7916 | if test "$GCC" = yes; then | 7916 | if test "$GCC" = yes; then |
7917 | lt_prog_compiler_wl='-Wl,' | 7917 | lt_prog_compiler_wl='-Wl,' |
7918 | @@ -8610,6 +9108,12 @@ $as_echo_n "checking for $compiler optio | 7918 | @@ -8610,6 +9108,12 @@ |
7919 | lt_prog_compiler_pic='--shared' | 7919 | lt_prog_compiler_pic='--shared' |
7920 | lt_prog_compiler_static='--static' | 7920 | lt_prog_compiler_static='--static' |
7921 | ;; | 7921 | ;; |
@@ -7928,7 +7928,7 @@ Index: binutils-2.21/bfd/configure | |||
7928 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 7928 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
7929 | # Portland Group compilers (*not* the Pentium gcc compiler, | 7929 | # Portland Group compilers (*not* the Pentium gcc compiler, |
7930 | # which looks to be a dead project) | 7930 | # which looks to be a dead project) |
7931 | @@ -8672,7 +9176,7 @@ $as_echo_n "checking for $compiler optio | 7931 | @@ -8672,7 +9176,7 @@ |
7932 | lt_prog_compiler_pic='-KPIC' | 7932 | lt_prog_compiler_pic='-KPIC' |
7933 | lt_prog_compiler_static='-Bstatic' | 7933 | lt_prog_compiler_static='-Bstatic' |
7934 | case $cc_basename in | 7934 | case $cc_basename in |
@@ -7937,7 +7937,7 @@ Index: binutils-2.21/bfd/configure | |||
7937 | lt_prog_compiler_wl='-Qoption ld ';; | 7937 | lt_prog_compiler_wl='-Qoption ld ';; |
7938 | *) | 7938 | *) |
7939 | lt_prog_compiler_wl='-Wl,';; | 7939 | lt_prog_compiler_wl='-Wl,';; |
7940 | @@ -8729,13 +9233,17 @@ case $host_os in | 7940 | @@ -8729,13 +9233,17 @@ |
7941 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 7941 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
7942 | ;; | 7942 | ;; |
7943 | esac | 7943 | esac |
@@ -7961,7 +7961,7 @@ Index: binutils-2.21/bfd/configure | |||
7961 | 7961 | ||
7962 | # | 7962 | # |
7963 | # Check to make sure the PIC flag actually works. | 7963 | # Check to make sure the PIC flag actually works. |
7964 | @@ -8796,6 +9304,11 @@ fi | 7964 | @@ -8796,6 +9304,11 @@ |
7965 | 7965 | ||
7966 | 7966 | ||
7967 | 7967 | ||
@@ -7973,7 +7973,7 @@ Index: binutils-2.21/bfd/configure | |||
7973 | # | 7973 | # |
7974 | # Check to make sure the static flag actually works. | 7974 | # Check to make sure the static flag actually works. |
7975 | # | 7975 | # |
7976 | @@ -9146,7 +9659,8 @@ _LT_EOF | 7976 | @@ -9146,7 +9659,8 @@ |
7977 | allow_undefined_flag=unsupported | 7977 | allow_undefined_flag=unsupported |
7978 | always_export_symbols=no | 7978 | always_export_symbols=no |
7979 | enable_shared_with_static_runtimes=yes | 7979 | enable_shared_with_static_runtimes=yes |
@@ -7983,7 +7983,7 @@ Index: binutils-2.21/bfd/configure | |||
7983 | 7983 | ||
7984 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 7984 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
7985 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 7985 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
7986 | @@ -9194,7 +9708,7 @@ _LT_EOF | 7986 | @@ -9194,7 +9708,7 @@ |
7987 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 7987 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
7988 | && test "$tmp_diet" = no | 7988 | && test "$tmp_diet" = no |
7989 | then | 7989 | then |
@@ -7992,7 +7992,7 @@ Index: binutils-2.21/bfd/configure | |||
7992 | tmp_sharedflag='-shared' | 7992 | tmp_sharedflag='-shared' |
7993 | case $cc_basename,$host_cpu in | 7993 | case $cc_basename,$host_cpu in |
7994 | pgcc*) # Portland Group C compiler | 7994 | pgcc*) # Portland Group C compiler |
7995 | @@ -9245,12 +9759,12 @@ _LT_EOF | 7995 | @@ -9245,12 +9759,12 @@ |
7996 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 7996 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
7997 | hardcode_libdir_flag_spec= | 7997 | hardcode_libdir_flag_spec= |
7998 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 7998 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -8007,7 +8007,7 @@ Index: binutils-2.21/bfd/configure | |||
8007 | fi | 8007 | fi |
8008 | ;; | 8008 | ;; |
8009 | esac | 8009 | esac |
8010 | @@ -9264,8 +9778,8 @@ _LT_EOF | 8010 | @@ -9264,8 +9778,8 @@ |
8011 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 8011 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
8012 | wlarc= | 8012 | wlarc= |
8013 | else | 8013 | else |
@@ -8018,7 +8018,7 @@ Index: binutils-2.21/bfd/configure | |||
8018 | fi | 8018 | fi |
8019 | ;; | 8019 | ;; |
8020 | 8020 | ||
8021 | @@ -9283,8 +9797,8 @@ _LT_EOF | 8021 | @@ -9283,8 +9797,8 @@ |
8022 | 8022 | ||
8023 | _LT_EOF | 8023 | _LT_EOF |
8024 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 8024 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -8029,7 +8029,7 @@ Index: binutils-2.21/bfd/configure | |||
8029 | else | 8029 | else |
8030 | ld_shlibs=no | 8030 | ld_shlibs=no |
8031 | fi | 8031 | fi |
8032 | @@ -9330,8 +9844,8 @@ _LT_EOF | 8032 | @@ -9330,8 +9844,8 @@ |
8033 | 8033 | ||
8034 | *) | 8034 | *) |
8035 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 8035 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -8040,7 +8040,7 @@ Index: binutils-2.21/bfd/configure | |||
8040 | else | 8040 | else |
8041 | ld_shlibs=no | 8041 | ld_shlibs=no |
8042 | fi | 8042 | fi |
8043 | @@ -9461,7 +9975,13 @@ _LT_EOF | 8043 | @@ -9461,7 +9975,13 @@ |
8044 | allow_undefined_flag='-berok' | 8044 | allow_undefined_flag='-berok' |
8045 | # Determine the default libpath from the value encoded in an | 8045 | # Determine the default libpath from the value encoded in an |
8046 | # empty executable. | 8046 | # empty executable. |
@@ -8055,7 +8055,7 @@ Index: binutils-2.21/bfd/configure | |||
8055 | /* end confdefs.h. */ | 8055 | /* end confdefs.h. */ |
8056 | 8056 | ||
8057 | int | 8057 | int |
8058 | @@ -9474,22 +9994,29 @@ main () | 8058 | @@ -9474,22 +9994,29 @@ |
8059 | _ACEOF | 8059 | _ACEOF |
8060 | if ac_fn_c_try_link "$LINENO"; then : | 8060 | if ac_fn_c_try_link "$LINENO"; then : |
8061 | 8061 | ||
@@ -8098,7 +8098,7 @@ Index: binutils-2.21/bfd/configure | |||
8098 | 8098 | ||
8099 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 8099 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
8100 | 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" | 8100 | 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" |
8101 | @@ -9501,7 +10028,13 @@ if test -z "$aix_libpath"; then aix_libp | 8101 | @@ -9501,7 +10028,13 @@ |
8102 | else | 8102 | else |
8103 | # Determine the default libpath from the value encoded in an | 8103 | # Determine the default libpath from the value encoded in an |
8104 | # empty executable. | 8104 | # empty executable. |
@@ -8113,7 +8113,7 @@ Index: binutils-2.21/bfd/configure | |||
8113 | /* end confdefs.h. */ | 8113 | /* end confdefs.h. */ |
8114 | 8114 | ||
8115 | int | 8115 | int |
8116 | @@ -9514,22 +10047,29 @@ main () | 8116 | @@ -9514,22 +10047,29 @@ |
8117 | _ACEOF | 8117 | _ACEOF |
8118 | if ac_fn_c_try_link "$LINENO"; then : | 8118 | if ac_fn_c_try_link "$LINENO"; then : |
8119 | 8119 | ||
@@ -8156,7 +8156,7 @@ Index: binutils-2.21/bfd/configure | |||
8156 | 8156 | ||
8157 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 8157 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
8158 | # Warning - without using the other run time loading flags, | 8158 | # Warning - without using the other run time loading flags, |
8159 | @@ -9574,20 +10114,63 @@ if test -z "$aix_libpath"; then aix_libp | 8159 | @@ -9574,20 +10114,63 @@ |
8160 | # Microsoft Visual C++. | 8160 | # Microsoft Visual C++. |
8161 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 8161 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
8162 | # no search path for DLLs. | 8162 | # no search path for DLLs. |
@@ -8234,7 +8234,7 @@ Index: binutils-2.21/bfd/configure | |||
8234 | ;; | 8234 | ;; |
8235 | 8235 | ||
8236 | darwin* | rhapsody*) | 8236 | darwin* | rhapsody*) |
8237 | @@ -9652,7 +10235,7 @@ if test -z "$aix_libpath"; then aix_libp | 8237 | @@ -9652,7 +10235,7 @@ |
8238 | 8238 | ||
8239 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 8239 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
8240 | freebsd* | dragonfly*) | 8240 | freebsd* | dragonfly*) |
@@ -8243,7 +8243,7 @@ Index: binutils-2.21/bfd/configure | |||
8243 | hardcode_libdir_flag_spec='-R$libdir' | 8243 | hardcode_libdir_flag_spec='-R$libdir' |
8244 | hardcode_direct=yes | 8244 | hardcode_direct=yes |
8245 | hardcode_shlibpath_var=no | 8245 | hardcode_shlibpath_var=no |
8246 | @@ -9660,7 +10243,7 @@ if test -z "$aix_libpath"; then aix_libp | 8246 | @@ -9660,7 +10243,7 @@ |
8247 | 8247 | ||
8248 | hpux9*) | 8248 | hpux9*) |
8249 | if test "$GCC" = yes; then | 8249 | if test "$GCC" = yes; then |
@@ -8252,7 +8252,7 @@ Index: binutils-2.21/bfd/configure | |||
8252 | else | 8252 | else |
8253 | 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' | 8253 | 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' |
8254 | fi | 8254 | fi |
8255 | @@ -9676,7 +10259,7 @@ if test -z "$aix_libpath"; then aix_libp | 8255 | @@ -9676,7 +10259,7 @@ |
8256 | 8256 | ||
8257 | hpux10*) | 8257 | hpux10*) |
8258 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 8258 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -8261,7 +8261,7 @@ Index: binutils-2.21/bfd/configure | |||
8261 | else | 8261 | else |
8262 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 8262 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
8263 | fi | 8263 | fi |
8264 | @@ -9700,10 +10283,10 @@ if test -z "$aix_libpath"; then aix_libp | 8264 | @@ -9700,10 +10283,10 @@ |
8265 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 8265 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
8266 | ;; | 8266 | ;; |
8267 | ia64*) | 8267 | ia64*) |
@@ -8274,7 +8274,7 @@ Index: binutils-2.21/bfd/configure | |||
8274 | ;; | 8274 | ;; |
8275 | esac | 8275 | esac |
8276 | else | 8276 | else |
8277 | @@ -9782,23 +10365,36 @@ fi | 8277 | @@ -9782,23 +10365,36 @@ |
8278 | 8278 | ||
8279 | irix5* | irix6* | nonstopux*) | 8279 | irix5* | irix6* | nonstopux*) |
8280 | if test "$GCC" = yes; then | 8280 | if test "$GCC" = yes; then |
@@ -8319,7 +8319,7 @@ Index: binutils-2.21/bfd/configure | |||
8319 | else | 8319 | else |
8320 | 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' | 8320 | 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' |
8321 | 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' | 8321 | 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' |
8322 | @@ -9883,7 +10479,7 @@ rm -f core conftest.err conftest.$ac_obj | 8322 | @@ -9883,7 +10479,7 @@ |
8323 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 8323 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
8324 | if test "$GCC" = yes; then | 8324 | if test "$GCC" = yes; then |
8325 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 8325 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -8328,7 +8328,7 @@ Index: binutils-2.21/bfd/configure | |||
8328 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 8328 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
8329 | else | 8329 | else |
8330 | allow_undefined_flag=' -expect_unresolved \*' | 8330 | allow_undefined_flag=' -expect_unresolved \*' |
8331 | @@ -9902,9 +10498,9 @@ rm -f core conftest.err conftest.$ac_obj | 8331 | @@ -9902,9 +10498,9 @@ |
8332 | no_undefined_flag=' -z defs' | 8332 | no_undefined_flag=' -z defs' |
8333 | if test "$GCC" = yes; then | 8333 | if test "$GCC" = yes; then |
8334 | wlarc='${wl}' | 8334 | wlarc='${wl}' |
@@ -8340,7 +8340,7 @@ Index: binutils-2.21/bfd/configure | |||
8340 | else | 8340 | else |
8341 | case `$CC -V 2>&1` in | 8341 | case `$CC -V 2>&1` in |
8342 | *"Compilers 5.0"*) | 8342 | *"Compilers 5.0"*) |
8343 | @@ -10480,8 +11076,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 8343 | @@ -10480,8 +11076,9 @@ |
8344 | need_version=no | 8344 | need_version=no |
8345 | need_lib_prefix=no | 8345 | need_lib_prefix=no |
8346 | 8346 | ||
@@ -8352,7 +8352,7 @@ Index: binutils-2.21/bfd/configure | |||
8352 | library_names_spec='$libname.dll.a' | 8352 | library_names_spec='$libname.dll.a' |
8353 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 8353 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
8354 | postinstall_cmds='base_file=`basename \${file}`~ | 8354 | postinstall_cmds='base_file=`basename \${file}`~ |
8355 | @@ -10514,13 +11111,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 8355 | @@ -10514,13 +11111,71 @@ |
8356 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 8356 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
8357 | ;; | 8357 | ;; |
8358 | esac | 8358 | esac |
@@ -8425,7 +8425,7 @@ Index: binutils-2.21/bfd/configure | |||
8425 | # FIXME: first we should search . and the directory the executable is in | 8425 | # FIXME: first we should search . and the directory the executable is in |
8426 | shlibpath_var=PATH | 8426 | shlibpath_var=PATH |
8427 | ;; | 8427 | ;; |
8428 | @@ -10616,7 +11271,7 @@ haiku*) | 8428 | @@ -10616,7 +11271,7 @@ |
8429 | soname_spec='${libname}${release}${shared_ext}$major' | 8429 | soname_spec='${libname}${release}${shared_ext}$major' |
8430 | shlibpath_var=LIBRARY_PATH | 8430 | shlibpath_var=LIBRARY_PATH |
8431 | shlibpath_overrides_runpath=yes | 8431 | shlibpath_overrides_runpath=yes |
@@ -8434,7 +8434,7 @@ Index: binutils-2.21/bfd/configure | |||
8434 | hardcode_into_libs=yes | 8434 | hardcode_into_libs=yes |
8435 | ;; | 8435 | ;; |
8436 | 8436 | ||
8437 | @@ -11412,7 +12067,7 @@ else | 8437 | @@ -11412,7 +12067,7 @@ |
8438 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 8438 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
8439 | lt_status=$lt_dlunknown | 8439 | lt_status=$lt_dlunknown |
8440 | cat > conftest.$ac_ext <<_LT_EOF | 8440 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -8443,7 +8443,7 @@ Index: binutils-2.21/bfd/configure | |||
8443 | #include "confdefs.h" | 8443 | #include "confdefs.h" |
8444 | 8444 | ||
8445 | #if HAVE_DLFCN_H | 8445 | #if HAVE_DLFCN_H |
8446 | @@ -11456,10 +12111,10 @@ else | 8446 | @@ -11456,10 +12111,10 @@ |
8447 | /* When -fvisbility=hidden is used, assume the code has been annotated | 8447 | /* When -fvisbility=hidden is used, assume the code has been annotated |
8448 | correspondingly for the symbols needed. */ | 8448 | correspondingly for the symbols needed. */ |
8449 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 8449 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -8456,7 +8456,7 @@ Index: binutils-2.21/bfd/configure | |||
8456 | int main () | 8456 | int main () |
8457 | { | 8457 | { |
8458 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 8458 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
8459 | @@ -11518,7 +12173,7 @@ else | 8459 | @@ -11518,7 +12173,7 @@ |
8460 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 8460 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
8461 | lt_status=$lt_dlunknown | 8461 | lt_status=$lt_dlunknown |
8462 | cat > conftest.$ac_ext <<_LT_EOF | 8462 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -8465,7 +8465,7 @@ Index: binutils-2.21/bfd/configure | |||
8465 | #include "confdefs.h" | 8465 | #include "confdefs.h" |
8466 | 8466 | ||
8467 | #if HAVE_DLFCN_H | 8467 | #if HAVE_DLFCN_H |
8468 | @@ -11562,10 +12217,10 @@ else | 8468 | @@ -11562,10 +12217,10 @@ |
8469 | /* When -fvisbility=hidden is used, assume the code has been annotated | 8469 | /* When -fvisbility=hidden is used, assume the code has been annotated |
8470 | correspondingly for the symbols needed. */ | 8470 | correspondingly for the symbols needed. */ |
8471 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 8471 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -8478,7 +8478,16 @@ Index: binutils-2.21/bfd/configure | |||
8478 | int main () | 8478 | int main () |
8479 | { | 8479 | { |
8480 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 8480 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
8481 | @@ -16473,13 +17128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 8481 | @@ -14897,7 +15552,7 @@ |
8482 | if test "$enable_shared" = "yes"; then | ||
8483 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | ||
8484 | if test -n "$x"; then | ||
8485 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" | ||
8486 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" | ||
8487 | fi | ||
8488 | |||
8489 | # More hacks to build DLLs on Windows. | ||
8490 | @@ -16473,13 +17128,20 @@ | ||
8482 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 8491 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
8483 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 8492 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
8484 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 8493 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -8499,7 +8508,7 @@ Index: binutils-2.21/bfd/configure | |||
8499 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 8508 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
8500 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 8509 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
8501 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 8510 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
8502 | @@ -16494,14 +17156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 8511 | @@ -16494,14 +17156,17 @@ |
8503 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 8512 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
8504 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 8513 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
8505 | 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"`' | 8514 | 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"`' |
@@ -8518,7 +8527,7 @@ Index: binutils-2.21/bfd/configure | |||
8518 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 8527 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
8519 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 8528 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
8520 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 8529 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
8521 | @@ -16534,12 +17199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 8530 | @@ -16534,12 +17199,12 @@ |
8522 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 8531 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
8523 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 8532 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
8524 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 8533 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -8532,7 +8541,7 @@ Index: binutils-2.21/bfd/configure | |||
8532 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 8541 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
8533 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 8542 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
8534 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 8543 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
8535 | @@ -16594,8 +17259,13 @@ reload_flag \ | 8544 | @@ -16594,8 +17259,13 @@ |
8536 | OBJDUMP \ | 8545 | OBJDUMP \ |
8537 | deplibs_check_method \ | 8546 | deplibs_check_method \ |
8538 | file_magic_cmd \ | 8547 | file_magic_cmd \ |
@@ -8546,7 +8555,7 @@ Index: binutils-2.21/bfd/configure | |||
8546 | STRIP \ | 8555 | STRIP \ |
8547 | RANLIB \ | 8556 | RANLIB \ |
8548 | CC \ | 8557 | CC \ |
8549 | @@ -16605,12 +17275,14 @@ lt_cv_sys_global_symbol_pipe \ | 8558 | @@ -16605,12 +17275,14 @@ |
8550 | lt_cv_sys_global_symbol_to_cdecl \ | 8559 | lt_cv_sys_global_symbol_to_cdecl \ |
8551 | lt_cv_sys_global_symbol_to_c_name_address \ | 8560 | lt_cv_sys_global_symbol_to_c_name_address \ |
8552 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 8561 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -8562,7 +8571,7 @@ Index: binutils-2.21/bfd/configure | |||
8562 | DSYMUTIL \ | 8571 | DSYMUTIL \ |
8563 | NMEDIT \ | 8572 | NMEDIT \ |
8564 | LIPO \ | 8573 | LIPO \ |
8565 | @@ -16626,7 +17298,6 @@ no_undefined_flag \ | 8574 | @@ -16626,7 +17298,6 @@ |
8566 | hardcode_libdir_flag_spec \ | 8575 | hardcode_libdir_flag_spec \ |
8567 | hardcode_libdir_flag_spec_ld \ | 8576 | hardcode_libdir_flag_spec_ld \ |
8568 | hardcode_libdir_separator \ | 8577 | hardcode_libdir_separator \ |
@@ -8570,7 +8579,7 @@ Index: binutils-2.21/bfd/configure | |||
8570 | exclude_expsyms \ | 8579 | exclude_expsyms \ |
8571 | include_expsyms \ | 8580 | include_expsyms \ |
8572 | file_list_spec \ | 8581 | file_list_spec \ |
8573 | @@ -16662,6 +17333,7 @@ module_cmds \ | 8582 | @@ -16662,6 +17333,7 @@ |
8574 | module_expsym_cmds \ | 8583 | module_expsym_cmds \ |
8575 | export_symbols_cmds \ | 8584 | export_symbols_cmds \ |
8576 | prelink_cmds \ | 8585 | prelink_cmds \ |
@@ -8578,7 +8587,7 @@ Index: binutils-2.21/bfd/configure | |||
8578 | postinstall_cmds \ | 8587 | postinstall_cmds \ |
8579 | postuninstall_cmds \ | 8588 | postuninstall_cmds \ |
8580 | finish_cmds \ | 8589 | finish_cmds \ |
8581 | @@ -17441,7 +18113,8 @@ $as_echo X"$file" | | 8590 | @@ -17441,7 +18113,8 @@ |
8582 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 8591 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
8583 | # | 8592 | # |
8584 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 8593 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -8588,7 +8597,7 @@ Index: binutils-2.21/bfd/configure | |||
8588 | # Written by Gordon Matzigkeit, 1996 | 8597 | # Written by Gordon Matzigkeit, 1996 |
8589 | # | 8598 | # |
8590 | # This file is part of GNU Libtool. | 8599 | # This file is part of GNU Libtool. |
8591 | @@ -17544,19 +18217,42 @@ SP2NL=$lt_lt_SP2NL | 8600 | @@ -17544,19 +18217,42 @@ |
8592 | # turn newlines into spaces. | 8601 | # turn newlines into spaces. |
8593 | NL2SP=$lt_lt_NL2SP | 8602 | NL2SP=$lt_lt_NL2SP |
8594 | 8603 | ||
@@ -8632,7 +8641,7 @@ Index: binutils-2.21/bfd/configure | |||
8632 | # A symbol stripping program. | 8641 | # A symbol stripping program. |
8633 | STRIP=$lt_STRIP | 8642 | STRIP=$lt_STRIP |
8634 | 8643 | ||
8635 | @@ -17586,6 +18282,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 8644 | @@ -17586,6 +18282,12 @@ |
8636 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 8645 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
8637 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 8646 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
8638 | 8647 | ||
@@ -8645,7 +8654,7 @@ Index: binutils-2.21/bfd/configure | |||
8645 | # The name of the directory that contains temporary libtool files. | 8654 | # The name of the directory that contains temporary libtool files. |
8646 | objdir=$objdir | 8655 | objdir=$objdir |
8647 | 8656 | ||
8648 | @@ -17595,6 +18297,9 @@ MAGIC_CMD=$MAGIC_CMD | 8657 | @@ -17595,6 +18297,9 @@ |
8649 | # Must we lock files when doing compilation? | 8658 | # Must we lock files when doing compilation? |
8650 | need_locks=$lt_need_locks | 8659 | need_locks=$lt_need_locks |
8651 | 8660 | ||
@@ -8655,7 +8664,7 @@ Index: binutils-2.21/bfd/configure | |||
8655 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 8664 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
8656 | DSYMUTIL=$lt_DSYMUTIL | 8665 | DSYMUTIL=$lt_DSYMUTIL |
8657 | 8666 | ||
8658 | @@ -17709,12 +18414,12 @@ with_gcc=$GCC | 8667 | @@ -17709,12 +18414,12 @@ |
8659 | # Compiler flag to turn off builtin functions. | 8668 | # Compiler flag to turn off builtin functions. |
8660 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 8669 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
8661 | 8670 | ||
@@ -8671,7 +8680,7 @@ Index: binutils-2.21/bfd/configure | |||
8671 | # Compiler flag to prevent dynamic linking. | 8680 | # Compiler flag to prevent dynamic linking. |
8672 | link_static_flag=$lt_lt_prog_compiler_static | 8681 | link_static_flag=$lt_lt_prog_compiler_static |
8673 | 8682 | ||
8674 | @@ -17801,9 +18506,6 @@ inherit_rpath=$inherit_rpath | 8683 | @@ -17801,9 +18506,6 @@ |
8675 | # Whether libtool must link a program against all its dependency libraries. | 8684 | # Whether libtool must link a program against all its dependency libraries. |
8676 | link_all_deplibs=$link_all_deplibs | 8685 | link_all_deplibs=$link_all_deplibs |
8677 | 8686 | ||
@@ -8681,7 +8690,7 @@ Index: binutils-2.21/bfd/configure | |||
8681 | # Set to "yes" if exported symbols are required. | 8690 | # Set to "yes" if exported symbols are required. |
8682 | always_export_symbols=$always_export_symbols | 8691 | always_export_symbols=$always_export_symbols |
8683 | 8692 | ||
8684 | @@ -17819,6 +18521,9 @@ include_expsyms=$lt_include_expsyms | 8693 | @@ -17819,6 +18521,9 @@ |
8685 | # Commands necessary for linking programs (against libraries) with templates. | 8694 | # Commands necessary for linking programs (against libraries) with templates. |
8686 | prelink_cmds=$lt_prelink_cmds | 8695 | prelink_cmds=$lt_prelink_cmds |
8687 | 8696 | ||
@@ -8691,7 +8700,7 @@ Index: binutils-2.21/bfd/configure | |||
8691 | # Specify filename containing input files. | 8700 | # Specify filename containing input files. |
8692 | file_list_spec=$lt_file_list_spec | 8701 | file_list_spec=$lt_file_list_spec |
8693 | 8702 | ||
8694 | @@ -17851,210 +18556,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 8703 | @@ -17851,210 +18556,169 @@ |
8695 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 8704 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
8696 | # text mode, it properly converts lines to CR/LF. This bash problem | 8705 | # text mode, it properly converts lines to CR/LF. This bash problem |
8697 | # is reportedly fixed, but why not run on old versions too? | 8706 | # is reportedly fixed, but why not run on old versions too? |
@@ -9064,9 +9073,9 @@ Index: binutils-2.21/bfd/configure | |||
9064 | 9073 | ||
9065 | Index: binutils-2.21/opcodes/configure | 9074 | Index: binutils-2.21/opcodes/configure |
9066 | =================================================================== | 9075 | =================================================================== |
9067 | --- binutils-2.21.orig/opcodes/configure | 9076 | --- binutils-2.21.orig/opcodes/configure 2010-11-05 03:32:32.000000000 -0700 |
9068 | +++ binutils-2.21/opcodes/configure | 9077 | +++ binutils-2.21/opcodes/configure 2011-01-07 11:26:03.686101001 -0800 |
9069 | @@ -647,6 +647,9 @@ OTOOL | 9078 | @@ -647,6 +647,9 @@ |
9070 | LIPO | 9079 | LIPO |
9071 | NMEDIT | 9080 | NMEDIT |
9072 | DSYMUTIL | 9081 | DSYMUTIL |
@@ -9076,7 +9085,7 @@ Index: binutils-2.21/opcodes/configure | |||
9076 | OBJDUMP | 9085 | OBJDUMP |
9077 | LN_S | 9086 | LN_S |
9078 | NM | 9087 | NM |
9079 | @@ -759,6 +762,7 @@ enable_static | 9088 | @@ -759,6 +762,7 @@ |
9080 | with_pic | 9089 | with_pic |
9081 | enable_fast_install | 9090 | enable_fast_install |
9082 | with_gnu_ld | 9091 | with_gnu_ld |
@@ -9084,7 +9093,7 @@ Index: binutils-2.21/opcodes/configure | |||
9084 | enable_libtool_lock | 9093 | enable_libtool_lock |
9085 | enable_targets | 9094 | enable_targets |
9086 | enable_werror | 9095 | enable_werror |
9087 | @@ -1417,6 +1421,8 @@ Optional Packages: | 9096 | @@ -1417,6 +1421,8 @@ |
9088 | --with-pic try to use only PIC/non-PIC objects [default=use | 9097 | --with-pic try to use only PIC/non-PIC objects [default=use |
9089 | both] | 9098 | both] |
9090 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 9099 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -9093,7 +9102,7 @@ Index: binutils-2.21/opcodes/configure | |||
9093 | 9102 | ||
9094 | Some influential environment variables: | 9103 | Some influential environment variables: |
9095 | CC C compiler command | 9104 | CC C compiler command |
9096 | @@ -5112,8 +5118,8 @@ esac | 9105 | @@ -5112,8 +5118,8 @@ |
9097 | 9106 | ||
9098 | 9107 | ||
9099 | 9108 | ||
@@ -9104,7 +9113,7 @@ Index: binutils-2.21/opcodes/configure | |||
9104 | 9113 | ||
9105 | 9114 | ||
9106 | 9115 | ||
9107 | @@ -5153,7 +5159,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 9116 | @@ -5153,7 +5159,7 @@ |
9108 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 9117 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
9109 | $as_echo_n "checking how to print strings... " >&6; } | 9118 | $as_echo_n "checking how to print strings... " >&6; } |
9110 | # Test print first, because it will be a builtin if present. | 9119 | # Test print first, because it will be a builtin if present. |
@@ -9113,7 +9122,7 @@ Index: binutils-2.21/opcodes/configure | |||
9113 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 9122 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
9114 | ECHO='print -r --' | 9123 | ECHO='print -r --' |
9115 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 9124 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
9116 | @@ -5839,8 +5845,8 @@ $as_echo_n "checking whether the shell u | 9125 | @@ -5839,8 +5845,8 @@ |
9117 | # Try some XSI features | 9126 | # Try some XSI features |
9118 | xsi_shell=no | 9127 | xsi_shell=no |
9119 | ( _lt_dummy="a/b/c" | 9128 | ( _lt_dummy="a/b/c" |
@@ -9124,7 +9133,7 @@ Index: binutils-2.21/opcodes/configure | |||
9124 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 9133 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
9125 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 9134 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
9126 | && xsi_shell=yes | 9135 | && xsi_shell=yes |
9127 | @@ -5889,6 +5895,80 @@ esac | 9136 | @@ -5889,6 +5895,80 @@ |
9128 | 9137 | ||
9129 | 9138 | ||
9130 | 9139 | ||
@@ -9205,7 +9214,7 @@ Index: binutils-2.21/opcodes/configure | |||
9205 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 9214 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
9206 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 9215 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
9207 | if test "${lt_cv_ld_reload_flag+set}" = set; then : | 9216 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
9208 | @@ -5905,6 +5985,11 @@ case $reload_flag in | 9217 | @@ -5905,6 +5985,11 @@ |
9209 | esac | 9218 | esac |
9210 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 9219 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
9211 | case $host_os in | 9220 | case $host_os in |
@@ -9217,7 +9226,7 @@ Index: binutils-2.21/opcodes/configure | |||
9217 | darwin*) | 9226 | darwin*) |
9218 | if test "$GCC" = yes; then | 9227 | if test "$GCC" = yes; then |
9219 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 9228 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
9220 | @@ -6073,7 +6158,8 @@ mingw* | pw32*) | 9229 | @@ -6073,7 +6158,8 @@ |
9221 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 9230 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
9222 | lt_cv_file_magic_cmd='func_win32_libid' | 9231 | lt_cv_file_magic_cmd='func_win32_libid' |
9223 | else | 9232 | else |
@@ -9227,7 +9236,7 @@ Index: binutils-2.21/opcodes/configure | |||
9227 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 9236 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
9228 | fi | 9237 | fi |
9229 | ;; | 9238 | ;; |
9230 | @@ -6227,6 +6313,21 @@ esac | 9239 | @@ -6227,6 +6313,21 @@ |
9231 | fi | 9240 | fi |
9232 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 9241 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
9233 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 9242 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -9249,7 +9258,7 @@ Index: binutils-2.21/opcodes/configure | |||
9249 | file_magic_cmd=$lt_cv_file_magic_cmd | 9258 | file_magic_cmd=$lt_cv_file_magic_cmd |
9250 | deplibs_check_method=$lt_cv_deplibs_check_method | 9259 | deplibs_check_method=$lt_cv_deplibs_check_method |
9251 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 9260 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
9252 | @@ -6242,9 +6343,162 @@ test -z "$deplibs_check_method" && depli | 9261 | @@ -6242,9 +6343,162 @@ |
9253 | 9262 | ||
9254 | 9263 | ||
9255 | 9264 | ||
@@ -9414,7 +9423,7 @@ Index: binutils-2.21/opcodes/configure | |||
9414 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 9423 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
9415 | $as_echo_n "checking for $ac_word... " >&6; } | 9424 | $as_echo_n "checking for $ac_word... " >&6; } |
9416 | if test "${ac_cv_prog_AR+set}" = set; then : | 9425 | if test "${ac_cv_prog_AR+set}" = set; then : |
9417 | @@ -6260,7 +6514,7 @@ do | 9426 | @@ -6260,7 +6514,7 @@ |
9418 | test -z "$as_dir" && as_dir=. | 9427 | test -z "$as_dir" && as_dir=. |
9419 | for ac_exec_ext in '' $ac_executable_extensions; do | 9428 | for ac_exec_ext in '' $ac_executable_extensions; do |
9420 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 9429 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -9423,7 +9432,7 @@ Index: binutils-2.21/opcodes/configure | |||
9423 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 9432 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
9424 | break 2 | 9433 | break 2 |
9425 | fi | 9434 | fi |
9426 | @@ -6280,11 +6534,15 @@ $as_echo "no" >&6; } | 9435 | @@ -6280,11 +6534,15 @@ |
9427 | fi | 9436 | fi |
9428 | 9437 | ||
9429 | 9438 | ||
@@ -9442,7 +9451,7 @@ Index: binutils-2.21/opcodes/configure | |||
9442 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 9451 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
9443 | $as_echo_n "checking for $ac_word... " >&6; } | 9452 | $as_echo_n "checking for $ac_word... " >&6; } |
9444 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | 9453 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
9445 | @@ -6300,7 +6558,7 @@ do | 9454 | @@ -6300,7 +6558,7 @@ |
9446 | test -z "$as_dir" && as_dir=. | 9455 | test -z "$as_dir" && as_dir=. |
9447 | for ac_exec_ext in '' $ac_executable_extensions; do | 9456 | for ac_exec_ext in '' $ac_executable_extensions; do |
9448 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 9457 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -9451,7 +9460,7 @@ Index: binutils-2.21/opcodes/configure | |||
9451 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 9460 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
9452 | break 2 | 9461 | break 2 |
9453 | fi | 9462 | fi |
9454 | @@ -6319,6 +6577,10 @@ else | 9463 | @@ -6319,6 +6577,10 @@ |
9455 | $as_echo "no" >&6; } | 9464 | $as_echo "no" >&6; } |
9456 | fi | 9465 | fi |
9457 | 9466 | ||
@@ -9462,7 +9471,7 @@ Index: binutils-2.21/opcodes/configure | |||
9462 | if test "x$ac_ct_AR" = x; then | 9471 | if test "x$ac_ct_AR" = x; then |
9463 | AR="false" | 9472 | AR="false" |
9464 | else | 9473 | else |
9465 | @@ -6330,12 +6592,11 @@ ac_tool_warned=yes ;; | 9474 | @@ -6330,12 +6592,11 @@ |
9466 | esac | 9475 | esac |
9467 | AR=$ac_ct_AR | 9476 | AR=$ac_ct_AR |
9468 | fi | 9477 | fi |
@@ -9478,7 +9487,7 @@ Index: binutils-2.21/opcodes/configure | |||
9478 | 9487 | ||
9479 | 9488 | ||
9480 | 9489 | ||
9481 | @@ -6346,6 +6607,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 9490 | @@ -6346,6 +6607,63 @@ |
9482 | 9491 | ||
9483 | 9492 | ||
9484 | 9493 | ||
@@ -9542,7 +9551,7 @@ Index: binutils-2.21/opcodes/configure | |||
9542 | 9551 | ||
9543 | if test -n "$ac_tool_prefix"; then | 9552 | if test -n "$ac_tool_prefix"; then |
9544 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 9553 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
9545 | @@ -6681,8 +6999,8 @@ esac | 9554 | @@ -6681,8 +6999,8 @@ |
9546 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 9555 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
9547 | 9556 | ||
9548 | # Transform an extracted symbol line into symbol name and symbol address | 9557 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -9553,7 +9562,7 @@ Index: binutils-2.21/opcodes/configure | |||
9553 | 9562 | ||
9554 | # Handle CRLF in mingw tool chain | 9563 | # Handle CRLF in mingw tool chain |
9555 | opt_cr= | 9564 | opt_cr= |
9556 | @@ -6718,6 +7036,7 @@ for ac_symprfx in "" "_"; do | 9565 | @@ -6718,6 +7036,7 @@ |
9557 | else | 9566 | else |
9558 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 9567 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
9559 | fi | 9568 | fi |
@@ -9561,7 +9570,7 @@ Index: binutils-2.21/opcodes/configure | |||
9561 | 9570 | ||
9562 | # Check to see that the pipe works correctly. | 9571 | # Check to see that the pipe works correctly. |
9563 | pipe_works=no | 9572 | pipe_works=no |
9564 | @@ -6759,6 +7078,18 @@ _LT_EOF | 9573 | @@ -6759,6 +7078,18 @@ |
9565 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 9574 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
9566 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 9575 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
9567 | cat <<_LT_EOF > conftest.$ac_ext | 9576 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -9580,7 +9589,7 @@ Index: binutils-2.21/opcodes/configure | |||
9580 | #ifdef __cplusplus | 9589 | #ifdef __cplusplus |
9581 | extern "C" { | 9590 | extern "C" { |
9582 | #endif | 9591 | #endif |
9583 | @@ -6770,7 +7101,7 @@ _LT_EOF | 9592 | @@ -6770,7 +7101,7 @@ |
9584 | cat <<_LT_EOF >> conftest.$ac_ext | 9593 | cat <<_LT_EOF >> conftest.$ac_ext |
9585 | 9594 | ||
9586 | /* The mapping between symbol names and symbols. */ | 9595 | /* The mapping between symbol names and symbols. */ |
@@ -9589,7 +9598,7 @@ Index: binutils-2.21/opcodes/configure | |||
9589 | const char *name; | 9598 | const char *name; |
9590 | void *address; | 9599 | void *address; |
9591 | } | 9600 | } |
9592 | @@ -6796,8 +7127,8 @@ static const void *lt_preloaded_setup() | 9601 | @@ -6796,8 +7127,8 @@ |
9593 | _LT_EOF | 9602 | _LT_EOF |
9594 | # Now try linking the two files. | 9603 | # Now try linking the two files. |
9595 | mv conftest.$ac_objext conftstm.$ac_objext | 9604 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -9600,7 +9609,7 @@ Index: binutils-2.21/opcodes/configure | |||
9600 | LIBS="conftstm.$ac_objext" | 9609 | LIBS="conftstm.$ac_objext" |
9601 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 9610 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
9602 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 9611 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
9603 | @@ -6807,8 +7138,8 @@ _LT_EOF | 9612 | @@ -6807,8 +7138,8 @@ |
9604 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 9613 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
9605 | pipe_works=yes | 9614 | pipe_works=yes |
9606 | fi | 9615 | fi |
@@ -9611,7 +9620,7 @@ Index: binutils-2.21/opcodes/configure | |||
9611 | else | 9620 | else |
9612 | echo "cannot find nm_test_func in $nlist" >&5 | 9621 | echo "cannot find nm_test_func in $nlist" >&5 |
9613 | fi | 9622 | fi |
9614 | @@ -6845,6 +7176,14 @@ else | 9623 | @@ -6845,6 +7176,14 @@ |
9615 | $as_echo "ok" >&6; } | 9624 | $as_echo "ok" >&6; } |
9616 | fi | 9625 | fi |
9617 | 9626 | ||
@@ -9626,7 +9635,7 @@ Index: binutils-2.21/opcodes/configure | |||
9626 | 9635 | ||
9627 | 9636 | ||
9628 | 9637 | ||
9629 | @@ -6866,6 +7205,47 @@ fi | 9638 | @@ -6866,6 +7205,47 @@ |
9630 | 9639 | ||
9631 | 9640 | ||
9632 | 9641 | ||
@@ -9674,7 +9683,7 @@ Index: binutils-2.21/opcodes/configure | |||
9674 | # Check whether --enable-libtool-lock was given. | 9683 | # Check whether --enable-libtool-lock was given. |
9675 | if test "${enable_libtool_lock+set}" = set; then : | 9684 | if test "${enable_libtool_lock+set}" = set; then : |
9676 | enableval=$enable_libtool_lock; | 9685 | enableval=$enable_libtool_lock; |
9677 | @@ -7059,6 +7439,123 @@ esac | 9686 | @@ -7059,6 +7439,123 @@ |
9678 | 9687 | ||
9679 | need_locks="$enable_libtool_lock" | 9688 | need_locks="$enable_libtool_lock" |
9680 | 9689 | ||
@@ -9798,7 +9807,7 @@ Index: binutils-2.21/opcodes/configure | |||
9798 | 9807 | ||
9799 | case $host_os in | 9808 | case $host_os in |
9800 | rhapsody* | darwin*) | 9809 | rhapsody* | darwin*) |
9801 | @@ -7622,6 +8119,8 @@ _LT_EOF | 9810 | @@ -7622,6 +8119,8 @@ |
9802 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 9811 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
9803 | echo "$AR cru libconftest.a conftest.o" >&5 | 9812 | echo "$AR cru libconftest.a conftest.o" >&5 |
9804 | $AR cru libconftest.a conftest.o 2>&5 | 9813 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -9807,7 +9816,7 @@ Index: binutils-2.21/opcodes/configure | |||
9807 | cat > conftest.c << _LT_EOF | 9816 | cat > conftest.c << _LT_EOF |
9808 | int main() { return 0;} | 9817 | int main() { return 0;} |
9809 | _LT_EOF | 9818 | _LT_EOF |
9810 | @@ -7787,7 +8286,8 @@ fi | 9819 | @@ -7787,7 +8286,8 @@ |
9811 | LIBTOOL_DEPS="$ltmain" | 9820 | LIBTOOL_DEPS="$ltmain" |
9812 | 9821 | ||
9813 | # Always use our own libtool. | 9822 | # Always use our own libtool. |
@@ -9817,7 +9826,7 @@ Index: binutils-2.21/opcodes/configure | |||
9817 | 9826 | ||
9818 | 9827 | ||
9819 | 9828 | ||
9820 | @@ -7876,7 +8376,7 @@ aix3*) | 9829 | @@ -7876,7 +8376,7 @@ |
9821 | esac | 9830 | esac |
9822 | 9831 | ||
9823 | # Global variables: | 9832 | # Global variables: |
@@ -9826,7 +9835,7 @@ Index: binutils-2.21/opcodes/configure | |||
9826 | can_build_shared=yes | 9835 | can_build_shared=yes |
9827 | 9836 | ||
9828 | # All known linkers require a `.a' archive for static linking (except MSVC, | 9837 | # All known linkers require a `.a' archive for static linking (except MSVC, |
9829 | @@ -8174,8 +8674,6 @@ fi | 9838 | @@ -8174,8 +8674,6 @@ |
9830 | lt_prog_compiler_pic= | 9839 | lt_prog_compiler_pic= |
9831 | lt_prog_compiler_static= | 9840 | lt_prog_compiler_static= |
9832 | 9841 | ||
@@ -9835,7 +9844,7 @@ Index: binutils-2.21/opcodes/configure | |||
9835 | 9844 | ||
9836 | if test "$GCC" = yes; then | 9845 | if test "$GCC" = yes; then |
9837 | lt_prog_compiler_wl='-Wl,' | 9846 | lt_prog_compiler_wl='-Wl,' |
9838 | @@ -8340,6 +8838,12 @@ $as_echo_n "checking for $compiler optio | 9847 | @@ -8340,6 +8838,12 @@ |
9839 | lt_prog_compiler_pic='--shared' | 9848 | lt_prog_compiler_pic='--shared' |
9840 | lt_prog_compiler_static='--static' | 9849 | lt_prog_compiler_static='--static' |
9841 | ;; | 9850 | ;; |
@@ -9848,7 +9857,7 @@ Index: binutils-2.21/opcodes/configure | |||
9848 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 9857 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
9849 | # Portland Group compilers (*not* the Pentium gcc compiler, | 9858 | # Portland Group compilers (*not* the Pentium gcc compiler, |
9850 | # which looks to be a dead project) | 9859 | # which looks to be a dead project) |
9851 | @@ -8402,7 +8906,7 @@ $as_echo_n "checking for $compiler optio | 9860 | @@ -8402,7 +8906,7 @@ |
9852 | lt_prog_compiler_pic='-KPIC' | 9861 | lt_prog_compiler_pic='-KPIC' |
9853 | lt_prog_compiler_static='-Bstatic' | 9862 | lt_prog_compiler_static='-Bstatic' |
9854 | case $cc_basename in | 9863 | case $cc_basename in |
@@ -9857,7 +9866,7 @@ Index: binutils-2.21/opcodes/configure | |||
9857 | lt_prog_compiler_wl='-Qoption ld ';; | 9866 | lt_prog_compiler_wl='-Qoption ld ';; |
9858 | *) | 9867 | *) |
9859 | lt_prog_compiler_wl='-Wl,';; | 9868 | lt_prog_compiler_wl='-Wl,';; |
9860 | @@ -8459,13 +8963,17 @@ case $host_os in | 9869 | @@ -8459,13 +8963,17 @@ |
9861 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 9870 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
9862 | ;; | 9871 | ;; |
9863 | esac | 9872 | esac |
@@ -9881,7 +9890,7 @@ Index: binutils-2.21/opcodes/configure | |||
9881 | 9890 | ||
9882 | # | 9891 | # |
9883 | # Check to make sure the PIC flag actually works. | 9892 | # Check to make sure the PIC flag actually works. |
9884 | @@ -8526,6 +9034,11 @@ fi | 9893 | @@ -8526,6 +9034,11 @@ |
9885 | 9894 | ||
9886 | 9895 | ||
9887 | 9896 | ||
@@ -9893,7 +9902,7 @@ Index: binutils-2.21/opcodes/configure | |||
9893 | # | 9902 | # |
9894 | # Check to make sure the static flag actually works. | 9903 | # Check to make sure the static flag actually works. |
9895 | # | 9904 | # |
9896 | @@ -8876,7 +9389,8 @@ _LT_EOF | 9905 | @@ -8876,7 +9389,8 @@ |
9897 | allow_undefined_flag=unsupported | 9906 | allow_undefined_flag=unsupported |
9898 | always_export_symbols=no | 9907 | always_export_symbols=no |
9899 | enable_shared_with_static_runtimes=yes | 9908 | enable_shared_with_static_runtimes=yes |
@@ -9903,7 +9912,7 @@ Index: binutils-2.21/opcodes/configure | |||
9903 | 9912 | ||
9904 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 9913 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
9905 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 9914 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
9906 | @@ -8924,7 +9438,7 @@ _LT_EOF | 9915 | @@ -8924,7 +9438,7 @@ |
9907 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 9916 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
9908 | && test "$tmp_diet" = no | 9917 | && test "$tmp_diet" = no |
9909 | then | 9918 | then |
@@ -9912,7 +9921,7 @@ Index: binutils-2.21/opcodes/configure | |||
9912 | tmp_sharedflag='-shared' | 9921 | tmp_sharedflag='-shared' |
9913 | case $cc_basename,$host_cpu in | 9922 | case $cc_basename,$host_cpu in |
9914 | pgcc*) # Portland Group C compiler | 9923 | pgcc*) # Portland Group C compiler |
9915 | @@ -8975,12 +9489,12 @@ _LT_EOF | 9924 | @@ -8975,12 +9489,12 @@ |
9916 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 9925 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
9917 | hardcode_libdir_flag_spec= | 9926 | hardcode_libdir_flag_spec= |
9918 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 9927 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -9927,7 +9936,7 @@ Index: binutils-2.21/opcodes/configure | |||
9927 | fi | 9936 | fi |
9928 | ;; | 9937 | ;; |
9929 | esac | 9938 | esac |
9930 | @@ -8994,8 +9508,8 @@ _LT_EOF | 9939 | @@ -8994,8 +9508,8 @@ |
9931 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 9940 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
9932 | wlarc= | 9941 | wlarc= |
9933 | else | 9942 | else |
@@ -9938,7 +9947,7 @@ Index: binutils-2.21/opcodes/configure | |||
9938 | fi | 9947 | fi |
9939 | ;; | 9948 | ;; |
9940 | 9949 | ||
9941 | @@ -9013,8 +9527,8 @@ _LT_EOF | 9950 | @@ -9013,8 +9527,8 @@ |
9942 | 9951 | ||
9943 | _LT_EOF | 9952 | _LT_EOF |
9944 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 9953 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -9949,7 +9958,7 @@ Index: binutils-2.21/opcodes/configure | |||
9949 | else | 9958 | else |
9950 | ld_shlibs=no | 9959 | ld_shlibs=no |
9951 | fi | 9960 | fi |
9952 | @@ -9060,8 +9574,8 @@ _LT_EOF | 9961 | @@ -9060,8 +9574,8 @@ |
9953 | 9962 | ||
9954 | *) | 9963 | *) |
9955 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 9964 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -9960,7 +9969,7 @@ Index: binutils-2.21/opcodes/configure | |||
9960 | else | 9969 | else |
9961 | ld_shlibs=no | 9970 | ld_shlibs=no |
9962 | fi | 9971 | fi |
9963 | @@ -9191,7 +9705,13 @@ _LT_EOF | 9972 | @@ -9191,7 +9705,13 @@ |
9964 | allow_undefined_flag='-berok' | 9973 | allow_undefined_flag='-berok' |
9965 | # Determine the default libpath from the value encoded in an | 9974 | # Determine the default libpath from the value encoded in an |
9966 | # empty executable. | 9975 | # empty executable. |
@@ -9975,7 +9984,7 @@ Index: binutils-2.21/opcodes/configure | |||
9975 | /* end confdefs.h. */ | 9984 | /* end confdefs.h. */ |
9976 | 9985 | ||
9977 | int | 9986 | int |
9978 | @@ -9204,22 +9724,29 @@ main () | 9987 | @@ -9204,22 +9724,29 @@ |
9979 | _ACEOF | 9988 | _ACEOF |
9980 | if ac_fn_c_try_link "$LINENO"; then : | 9989 | if ac_fn_c_try_link "$LINENO"; then : |
9981 | 9990 | ||
@@ -10018,7 +10027,7 @@ Index: binutils-2.21/opcodes/configure | |||
10018 | 10027 | ||
10019 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 10028 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
10020 | 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" | 10029 | 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" |
10021 | @@ -9231,7 +9758,13 @@ if test -z "$aix_libpath"; then aix_libp | 10030 | @@ -9231,7 +9758,13 @@ |
10022 | else | 10031 | else |
10023 | # Determine the default libpath from the value encoded in an | 10032 | # Determine the default libpath from the value encoded in an |
10024 | # empty executable. | 10033 | # empty executable. |
@@ -10033,7 +10042,7 @@ Index: binutils-2.21/opcodes/configure | |||
10033 | /* end confdefs.h. */ | 10042 | /* end confdefs.h. */ |
10034 | 10043 | ||
10035 | int | 10044 | int |
10036 | @@ -9244,22 +9777,29 @@ main () | 10045 | @@ -9244,22 +9777,29 @@ |
10037 | _ACEOF | 10046 | _ACEOF |
10038 | if ac_fn_c_try_link "$LINENO"; then : | 10047 | if ac_fn_c_try_link "$LINENO"; then : |
10039 | 10048 | ||
@@ -10076,7 +10085,7 @@ Index: binutils-2.21/opcodes/configure | |||
10076 | 10085 | ||
10077 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 10086 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
10078 | # Warning - without using the other run time loading flags, | 10087 | # Warning - without using the other run time loading flags, |
10079 | @@ -9304,20 +9844,63 @@ if test -z "$aix_libpath"; then aix_libp | 10088 | @@ -9304,20 +9844,63 @@ |
10080 | # Microsoft Visual C++. | 10089 | # Microsoft Visual C++. |
10081 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 10090 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
10082 | # no search path for DLLs. | 10091 | # no search path for DLLs. |
@@ -10154,7 +10163,7 @@ Index: binutils-2.21/opcodes/configure | |||
10154 | ;; | 10163 | ;; |
10155 | 10164 | ||
10156 | darwin* | rhapsody*) | 10165 | darwin* | rhapsody*) |
10157 | @@ -9382,7 +9965,7 @@ if test -z "$aix_libpath"; then aix_libp | 10166 | @@ -9382,7 +9965,7 @@ |
10158 | 10167 | ||
10159 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 10168 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
10160 | freebsd* | dragonfly*) | 10169 | freebsd* | dragonfly*) |
@@ -10163,7 +10172,7 @@ Index: binutils-2.21/opcodes/configure | |||
10163 | hardcode_libdir_flag_spec='-R$libdir' | 10172 | hardcode_libdir_flag_spec='-R$libdir' |
10164 | hardcode_direct=yes | 10173 | hardcode_direct=yes |
10165 | hardcode_shlibpath_var=no | 10174 | hardcode_shlibpath_var=no |
10166 | @@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libp | 10175 | @@ -9390,7 +9973,7 @@ |
10167 | 10176 | ||
10168 | hpux9*) | 10177 | hpux9*) |
10169 | if test "$GCC" = yes; then | 10178 | if test "$GCC" = yes; then |
@@ -10172,7 +10181,7 @@ Index: binutils-2.21/opcodes/configure | |||
10172 | else | 10181 | else |
10173 | 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' | 10182 | 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' |
10174 | fi | 10183 | fi |
10175 | @@ -9406,7 +9989,7 @@ if test -z "$aix_libpath"; then aix_libp | 10184 | @@ -9406,7 +9989,7 @@ |
10176 | 10185 | ||
10177 | hpux10*) | 10186 | hpux10*) |
10178 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 10187 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -10181,7 +10190,7 @@ Index: binutils-2.21/opcodes/configure | |||
10181 | else | 10190 | else |
10182 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 10191 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
10183 | fi | 10192 | fi |
10184 | @@ -9430,10 +10013,10 @@ if test -z "$aix_libpath"; then aix_libp | 10193 | @@ -9430,10 +10013,10 @@ |
10185 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 10194 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
10186 | ;; | 10195 | ;; |
10187 | ia64*) | 10196 | ia64*) |
@@ -10194,7 +10203,7 @@ Index: binutils-2.21/opcodes/configure | |||
10194 | ;; | 10203 | ;; |
10195 | esac | 10204 | esac |
10196 | else | 10205 | else |
10197 | @@ -9512,23 +10095,36 @@ fi | 10206 | @@ -9512,23 +10095,36 @@ |
10198 | 10207 | ||
10199 | irix5* | irix6* | nonstopux*) | 10208 | irix5* | irix6* | nonstopux*) |
10200 | if test "$GCC" = yes; then | 10209 | if test "$GCC" = yes; then |
@@ -10239,7 +10248,7 @@ Index: binutils-2.21/opcodes/configure | |||
10239 | else | 10248 | else |
10240 | 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' | 10249 | 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' |
10241 | 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' | 10250 | 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' |
10242 | @@ -9613,7 +10209,7 @@ rm -f core conftest.err conftest.$ac_obj | 10251 | @@ -9613,7 +10209,7 @@ |
10243 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 10252 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
10244 | if test "$GCC" = yes; then | 10253 | if test "$GCC" = yes; then |
10245 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 10254 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -10248,7 +10257,7 @@ Index: binutils-2.21/opcodes/configure | |||
10248 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 10257 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
10249 | else | 10258 | else |
10250 | allow_undefined_flag=' -expect_unresolved \*' | 10259 | allow_undefined_flag=' -expect_unresolved \*' |
10251 | @@ -9632,9 +10228,9 @@ rm -f core conftest.err conftest.$ac_obj | 10260 | @@ -9632,9 +10228,9 @@ |
10252 | no_undefined_flag=' -z defs' | 10261 | no_undefined_flag=' -z defs' |
10253 | if test "$GCC" = yes; then | 10262 | if test "$GCC" = yes; then |
10254 | wlarc='${wl}' | 10263 | wlarc='${wl}' |
@@ -10260,7 +10269,7 @@ Index: binutils-2.21/opcodes/configure | |||
10260 | else | 10269 | else |
10261 | case `$CC -V 2>&1` in | 10270 | case `$CC -V 2>&1` in |
10262 | *"Compilers 5.0"*) | 10271 | *"Compilers 5.0"*) |
10263 | @@ -10210,8 +10806,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 10272 | @@ -10210,8 +10806,9 @@ |
10264 | need_version=no | 10273 | need_version=no |
10265 | need_lib_prefix=no | 10274 | need_lib_prefix=no |
10266 | 10275 | ||
@@ -10272,7 +10281,7 @@ Index: binutils-2.21/opcodes/configure | |||
10272 | library_names_spec='$libname.dll.a' | 10281 | library_names_spec='$libname.dll.a' |
10273 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 10282 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
10274 | postinstall_cmds='base_file=`basename \${file}`~ | 10283 | postinstall_cmds='base_file=`basename \${file}`~ |
10275 | @@ -10244,13 +10841,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 10284 | @@ -10244,13 +10841,71 @@ |
10276 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 10285 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
10277 | ;; | 10286 | ;; |
10278 | esac | 10287 | esac |
@@ -10345,7 +10354,7 @@ Index: binutils-2.21/opcodes/configure | |||
10345 | # FIXME: first we should search . and the directory the executable is in | 10354 | # FIXME: first we should search . and the directory the executable is in |
10346 | shlibpath_var=PATH | 10355 | shlibpath_var=PATH |
10347 | ;; | 10356 | ;; |
10348 | @@ -10346,7 +11001,7 @@ haiku*) | 10357 | @@ -10346,7 +11001,7 @@ |
10349 | soname_spec='${libname}${release}${shared_ext}$major' | 10358 | soname_spec='${libname}${release}${shared_ext}$major' |
10350 | shlibpath_var=LIBRARY_PATH | 10359 | shlibpath_var=LIBRARY_PATH |
10351 | shlibpath_overrides_runpath=yes | 10360 | shlibpath_overrides_runpath=yes |
@@ -10354,7 +10363,7 @@ Index: binutils-2.21/opcodes/configure | |||
10354 | hardcode_into_libs=yes | 10363 | hardcode_into_libs=yes |
10355 | ;; | 10364 | ;; |
10356 | 10365 | ||
10357 | @@ -11142,7 +11797,7 @@ else | 10366 | @@ -11142,7 +11797,7 @@ |
10358 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 10367 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
10359 | lt_status=$lt_dlunknown | 10368 | lt_status=$lt_dlunknown |
10360 | cat > conftest.$ac_ext <<_LT_EOF | 10369 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -10363,7 +10372,7 @@ Index: binutils-2.21/opcodes/configure | |||
10363 | #include "confdefs.h" | 10372 | #include "confdefs.h" |
10364 | 10373 | ||
10365 | #if HAVE_DLFCN_H | 10374 | #if HAVE_DLFCN_H |
10366 | @@ -11186,10 +11841,10 @@ else | 10375 | @@ -11186,10 +11841,10 @@ |
10367 | /* When -fvisbility=hidden is used, assume the code has been annotated | 10376 | /* When -fvisbility=hidden is used, assume the code has been annotated |
10368 | correspondingly for the symbols needed. */ | 10377 | correspondingly for the symbols needed. */ |
10369 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 10378 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -10376,7 +10385,7 @@ Index: binutils-2.21/opcodes/configure | |||
10376 | int main () | 10385 | int main () |
10377 | { | 10386 | { |
10378 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 10387 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
10379 | @@ -11248,7 +11903,7 @@ else | 10388 | @@ -11248,7 +11903,7 @@ |
10380 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 10389 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
10381 | lt_status=$lt_dlunknown | 10390 | lt_status=$lt_dlunknown |
10382 | cat > conftest.$ac_ext <<_LT_EOF | 10391 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -10385,7 +10394,7 @@ Index: binutils-2.21/opcodes/configure | |||
10385 | #include "confdefs.h" | 10394 | #include "confdefs.h" |
10386 | 10395 | ||
10387 | #if HAVE_DLFCN_H | 10396 | #if HAVE_DLFCN_H |
10388 | @@ -11292,10 +11947,10 @@ else | 10397 | @@ -11292,10 +11947,10 @@ |
10389 | /* When -fvisbility=hidden is used, assume the code has been annotated | 10398 | /* When -fvisbility=hidden is used, assume the code has been annotated |
10390 | correspondingly for the symbols needed. */ | 10399 | correspondingly for the symbols needed. */ |
10391 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 10400 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -10398,7 +10407,16 @@ Index: binutils-2.21/opcodes/configure | |||
10398 | int main () | 10407 | int main () |
10399 | { | 10408 | { |
10400 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 10409 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
10401 | @@ -13289,13 +13944,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 10410 | @@ -12328,7 +12983,7 @@ |
10411 | # since libbfd may not pull in the entirety of libiberty. | ||
10412 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | ||
10413 | if test -n "$x"; then | ||
10414 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" | ||
10415 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" | ||
10416 | fi | ||
10417 | |||
10418 | case "${host}" in | ||
10419 | @@ -13289,13 +13944,20 @@ | ||
10402 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 10420 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
10403 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 10421 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
10404 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 10422 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -10419,7 +10437,7 @@ Index: binutils-2.21/opcodes/configure | |||
10419 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 10437 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
10420 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 10438 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
10421 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 10439 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
10422 | @@ -13310,14 +13972,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 10440 | @@ -13310,14 +13972,17 @@ |
10423 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 10441 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
10424 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 10442 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
10425 | 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"`' | 10443 | 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"`' |
@@ -10438,7 +10456,7 @@ Index: binutils-2.21/opcodes/configure | |||
10438 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 10456 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
10439 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 10457 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
10440 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 10458 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
10441 | @@ -13350,12 +14015,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 10459 | @@ -13350,12 +14015,12 @@ |
10442 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 10460 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
10443 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 10461 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
10444 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 10462 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -10452,7 +10470,7 @@ Index: binutils-2.21/opcodes/configure | |||
10452 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 10470 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
10453 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 10471 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
10454 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 10472 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
10455 | @@ -13410,8 +14075,13 @@ reload_flag \ | 10473 | @@ -13410,8 +14075,13 @@ |
10456 | OBJDUMP \ | 10474 | OBJDUMP \ |
10457 | deplibs_check_method \ | 10475 | deplibs_check_method \ |
10458 | file_magic_cmd \ | 10476 | file_magic_cmd \ |
@@ -10466,7 +10484,7 @@ Index: binutils-2.21/opcodes/configure | |||
10466 | STRIP \ | 10484 | STRIP \ |
10467 | RANLIB \ | 10485 | RANLIB \ |
10468 | CC \ | 10486 | CC \ |
10469 | @@ -13421,12 +14091,14 @@ lt_cv_sys_global_symbol_pipe \ | 10487 | @@ -13421,12 +14091,14 @@ |
10470 | lt_cv_sys_global_symbol_to_cdecl \ | 10488 | lt_cv_sys_global_symbol_to_cdecl \ |
10471 | lt_cv_sys_global_symbol_to_c_name_address \ | 10489 | lt_cv_sys_global_symbol_to_c_name_address \ |
10472 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 10490 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -10482,7 +10500,7 @@ Index: binutils-2.21/opcodes/configure | |||
10482 | DSYMUTIL \ | 10500 | DSYMUTIL \ |
10483 | NMEDIT \ | 10501 | NMEDIT \ |
10484 | LIPO \ | 10502 | LIPO \ |
10485 | @@ -13442,7 +14114,6 @@ no_undefined_flag \ | 10503 | @@ -13442,7 +14114,6 @@ |
10486 | hardcode_libdir_flag_spec \ | 10504 | hardcode_libdir_flag_spec \ |
10487 | hardcode_libdir_flag_spec_ld \ | 10505 | hardcode_libdir_flag_spec_ld \ |
10488 | hardcode_libdir_separator \ | 10506 | hardcode_libdir_separator \ |
@@ -10490,7 +10508,7 @@ Index: binutils-2.21/opcodes/configure | |||
10490 | exclude_expsyms \ | 10508 | exclude_expsyms \ |
10491 | include_expsyms \ | 10509 | include_expsyms \ |
10492 | file_list_spec \ | 10510 | file_list_spec \ |
10493 | @@ -13478,6 +14149,7 @@ module_cmds \ | 10511 | @@ -13478,6 +14149,7 @@ |
10494 | module_expsym_cmds \ | 10512 | module_expsym_cmds \ |
10495 | export_symbols_cmds \ | 10513 | export_symbols_cmds \ |
10496 | prelink_cmds \ | 10514 | prelink_cmds \ |
@@ -10498,7 +10516,7 @@ Index: binutils-2.21/opcodes/configure | |||
10498 | postinstall_cmds \ | 10516 | postinstall_cmds \ |
10499 | postuninstall_cmds \ | 10517 | postuninstall_cmds \ |
10500 | finish_cmds \ | 10518 | finish_cmds \ |
10501 | @@ -14234,7 +14906,8 @@ $as_echo X"$file" | | 10519 | @@ -14234,7 +14906,8 @@ |
10502 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 10520 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
10503 | # | 10521 | # |
10504 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 10522 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -10508,7 +10526,7 @@ Index: binutils-2.21/opcodes/configure | |||
10508 | # Written by Gordon Matzigkeit, 1996 | 10526 | # Written by Gordon Matzigkeit, 1996 |
10509 | # | 10527 | # |
10510 | # This file is part of GNU Libtool. | 10528 | # This file is part of GNU Libtool. |
10511 | @@ -14337,19 +15010,42 @@ SP2NL=$lt_lt_SP2NL | 10529 | @@ -14337,19 +15010,42 @@ |
10512 | # turn newlines into spaces. | 10530 | # turn newlines into spaces. |
10513 | NL2SP=$lt_lt_NL2SP | 10531 | NL2SP=$lt_lt_NL2SP |
10514 | 10532 | ||
@@ -10552,7 +10570,7 @@ Index: binutils-2.21/opcodes/configure | |||
10552 | # A symbol stripping program. | 10570 | # A symbol stripping program. |
10553 | STRIP=$lt_STRIP | 10571 | STRIP=$lt_STRIP |
10554 | 10572 | ||
10555 | @@ -14379,6 +15075,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 10573 | @@ -14379,6 +15075,12 @@ |
10556 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 10574 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
10557 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 10575 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
10558 | 10576 | ||
@@ -10565,7 +10583,7 @@ Index: binutils-2.21/opcodes/configure | |||
10565 | # The name of the directory that contains temporary libtool files. | 10583 | # The name of the directory that contains temporary libtool files. |
10566 | objdir=$objdir | 10584 | objdir=$objdir |
10567 | 10585 | ||
10568 | @@ -14388,6 +15090,9 @@ MAGIC_CMD=$MAGIC_CMD | 10586 | @@ -14388,6 +15090,9 @@ |
10569 | # Must we lock files when doing compilation? | 10587 | # Must we lock files when doing compilation? |
10570 | need_locks=$lt_need_locks | 10588 | need_locks=$lt_need_locks |
10571 | 10589 | ||
@@ -10575,7 +10593,7 @@ Index: binutils-2.21/opcodes/configure | |||
10575 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 10593 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
10576 | DSYMUTIL=$lt_DSYMUTIL | 10594 | DSYMUTIL=$lt_DSYMUTIL |
10577 | 10595 | ||
10578 | @@ -14502,12 +15207,12 @@ with_gcc=$GCC | 10596 | @@ -14502,12 +15207,12 @@ |
10579 | # Compiler flag to turn off builtin functions. | 10597 | # Compiler flag to turn off builtin functions. |
10580 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 10598 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
10581 | 10599 | ||
@@ -10591,7 +10609,7 @@ Index: binutils-2.21/opcodes/configure | |||
10591 | # Compiler flag to prevent dynamic linking. | 10609 | # Compiler flag to prevent dynamic linking. |
10592 | link_static_flag=$lt_lt_prog_compiler_static | 10610 | link_static_flag=$lt_lt_prog_compiler_static |
10593 | 10611 | ||
10594 | @@ -14594,9 +15299,6 @@ inherit_rpath=$inherit_rpath | 10612 | @@ -14594,9 +15299,6 @@ |
10595 | # Whether libtool must link a program against all its dependency libraries. | 10613 | # Whether libtool must link a program against all its dependency libraries. |
10596 | link_all_deplibs=$link_all_deplibs | 10614 | link_all_deplibs=$link_all_deplibs |
10597 | 10615 | ||
@@ -10601,7 +10619,7 @@ Index: binutils-2.21/opcodes/configure | |||
10601 | # Set to "yes" if exported symbols are required. | 10619 | # Set to "yes" if exported symbols are required. |
10602 | always_export_symbols=$always_export_symbols | 10620 | always_export_symbols=$always_export_symbols |
10603 | 10621 | ||
10604 | @@ -14612,6 +15314,9 @@ include_expsyms=$lt_include_expsyms | 10622 | @@ -14612,6 +15314,9 @@ |
10605 | # Commands necessary for linking programs (against libraries) with templates. | 10623 | # Commands necessary for linking programs (against libraries) with templates. |
10606 | prelink_cmds=$lt_prelink_cmds | 10624 | prelink_cmds=$lt_prelink_cmds |
10607 | 10625 | ||
@@ -10611,7 +10629,7 @@ Index: binutils-2.21/opcodes/configure | |||
10611 | # Specify filename containing input files. | 10629 | # Specify filename containing input files. |
10612 | file_list_spec=$lt_file_list_spec | 10630 | file_list_spec=$lt_file_list_spec |
10613 | 10631 | ||
10614 | @@ -14644,210 +15349,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 10632 | @@ -14644,210 +15349,169 @@ |
10615 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 10633 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
10616 | # text mode, it properly converts lines to CR/LF. This bash problem | 10634 | # text mode, it properly converts lines to CR/LF. This bash problem |
10617 | # is reportedly fixed, but why not run on old versions too? | 10635 | # is reportedly fixed, but why not run on old versions too? |
@@ -10984,9 +11002,9 @@ Index: binutils-2.21/opcodes/configure | |||
10984 | 11002 | ||
10985 | Index: binutils-2.21/binutils/configure | 11003 | Index: binutils-2.21/binutils/configure |
10986 | =================================================================== | 11004 | =================================================================== |
10987 | --- binutils-2.21.orig/binutils/configure | 11005 | --- binutils-2.21.orig/binutils/configure 2010-11-05 03:32:55.000000000 -0700 |
10988 | +++ binutils-2.21/binutils/configure | 11006 | +++ binutils-2.21/binutils/configure 2011-01-07 10:49:16.426101000 -0800 |
10989 | @@ -654,8 +654,11 @@ OTOOL | 11007 | @@ -654,8 +654,11 @@ |
10990 | LIPO | 11008 | LIPO |
10991 | NMEDIT | 11009 | NMEDIT |
10992 | DSYMUTIL | 11010 | DSYMUTIL |
@@ -10998,7 +11016,7 @@ Index: binutils-2.21/binutils/configure | |||
10998 | OBJDUMP | 11016 | OBJDUMP |
10999 | LN_S | 11017 | LN_S |
11000 | NM | 11018 | NM |
11001 | @@ -768,6 +771,7 @@ enable_static | 11019 | @@ -768,6 +771,7 @@ |
11002 | with_pic | 11020 | with_pic |
11003 | enable_fast_install | 11021 | enable_fast_install |
11004 | with_gnu_ld | 11022 | with_gnu_ld |
@@ -11006,7 +11024,7 @@ Index: binutils-2.21/binutils/configure | |||
11006 | enable_libtool_lock | 11024 | enable_libtool_lock |
11007 | enable_targets | 11025 | enable_targets |
11008 | enable_werror | 11026 | enable_werror |
11009 | @@ -1429,6 +1433,8 @@ Optional Packages: | 11027 | @@ -1429,6 +1433,8 @@ |
11010 | --with-pic try to use only PIC/non-PIC objects [default=use | 11028 | --with-pic try to use only PIC/non-PIC objects [default=use |
11011 | both] | 11029 | both] |
11012 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 11030 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -11015,7 +11033,7 @@ Index: binutils-2.21/binutils/configure | |||
11015 | --with-gnu-ld assume the C compiler uses GNU ld default=no | 11033 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
11016 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib | 11034 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
11017 | --without-libiconv-prefix don't search for libiconv in includedir and libdir | 11035 | --without-libiconv-prefix don't search for libiconv in includedir and libdir |
11018 | @@ -5146,8 +5152,8 @@ esac | 11036 | @@ -5146,8 +5152,8 @@ |
11019 | 11037 | ||
11020 | 11038 | ||
11021 | 11039 | ||
@@ -11026,7 +11044,7 @@ Index: binutils-2.21/binutils/configure | |||
11026 | 11044 | ||
11027 | 11045 | ||
11028 | 11046 | ||
11029 | @@ -5187,7 +5193,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 11047 | @@ -5187,7 +5193,7 @@ |
11030 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 11048 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
11031 | $as_echo_n "checking how to print strings... " >&6; } | 11049 | $as_echo_n "checking how to print strings... " >&6; } |
11032 | # Test print first, because it will be a builtin if present. | 11050 | # Test print first, because it will be a builtin if present. |
@@ -11035,7 +11053,7 @@ Index: binutils-2.21/binutils/configure | |||
11035 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 11053 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
11036 | ECHO='print -r --' | 11054 | ECHO='print -r --' |
11037 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 11055 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
11038 | @@ -5873,8 +5879,8 @@ $as_echo_n "checking whether the shell u | 11056 | @@ -5873,8 +5879,8 @@ |
11039 | # Try some XSI features | 11057 | # Try some XSI features |
11040 | xsi_shell=no | 11058 | xsi_shell=no |
11041 | ( _lt_dummy="a/b/c" | 11059 | ( _lt_dummy="a/b/c" |
@@ -11046,7 +11064,7 @@ Index: binutils-2.21/binutils/configure | |||
11046 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 11064 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
11047 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 11065 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
11048 | && xsi_shell=yes | 11066 | && xsi_shell=yes |
11049 | @@ -5923,6 +5929,80 @@ esac | 11067 | @@ -5923,6 +5929,80 @@ |
11050 | 11068 | ||
11051 | 11069 | ||
11052 | 11070 | ||
@@ -11127,7 +11145,7 @@ Index: binutils-2.21/binutils/configure | |||
11127 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 11145 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
11128 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 11146 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
11129 | if test "${lt_cv_ld_reload_flag+set}" = set; then : | 11147 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
11130 | @@ -5939,6 +6019,11 @@ case $reload_flag in | 11148 | @@ -5939,6 +6019,11 @@ |
11131 | esac | 11149 | esac |
11132 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 11150 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
11133 | case $host_os in | 11151 | case $host_os in |
@@ -11139,7 +11157,7 @@ Index: binutils-2.21/binutils/configure | |||
11139 | darwin*) | 11157 | darwin*) |
11140 | if test "$GCC" = yes; then | 11158 | if test "$GCC" = yes; then |
11141 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 11159 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
11142 | @@ -6107,7 +6192,8 @@ mingw* | pw32*) | 11160 | @@ -6107,7 +6192,8 @@ |
11143 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 11161 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
11144 | lt_cv_file_magic_cmd='func_win32_libid' | 11162 | lt_cv_file_magic_cmd='func_win32_libid' |
11145 | else | 11163 | else |
@@ -11149,7 +11167,7 @@ Index: binutils-2.21/binutils/configure | |||
11149 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 11167 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
11150 | fi | 11168 | fi |
11151 | ;; | 11169 | ;; |
11152 | @@ -6261,6 +6347,21 @@ esac | 11170 | @@ -6261,6 +6347,21 @@ |
11153 | fi | 11171 | fi |
11154 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 11172 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
11155 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 11173 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -11171,7 +11189,7 @@ Index: binutils-2.21/binutils/configure | |||
11171 | file_magic_cmd=$lt_cv_file_magic_cmd | 11189 | file_magic_cmd=$lt_cv_file_magic_cmd |
11172 | deplibs_check_method=$lt_cv_deplibs_check_method | 11190 | deplibs_check_method=$lt_cv_deplibs_check_method |
11173 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 11191 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
11174 | @@ -6276,9 +6377,162 @@ test -z "$deplibs_check_method" && depli | 11192 | @@ -6276,9 +6377,162 @@ |
11175 | 11193 | ||
11176 | 11194 | ||
11177 | 11195 | ||
@@ -11336,7 +11354,7 @@ Index: binutils-2.21/binutils/configure | |||
11336 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 11354 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
11337 | $as_echo_n "checking for $ac_word... " >&6; } | 11355 | $as_echo_n "checking for $ac_word... " >&6; } |
11338 | if test "${ac_cv_prog_AR+set}" = set; then : | 11356 | if test "${ac_cv_prog_AR+set}" = set; then : |
11339 | @@ -6294,7 +6548,7 @@ do | 11357 | @@ -6294,7 +6548,7 @@ |
11340 | test -z "$as_dir" && as_dir=. | 11358 | test -z "$as_dir" && as_dir=. |
11341 | for ac_exec_ext in '' $ac_executable_extensions; do | 11359 | for ac_exec_ext in '' $ac_executable_extensions; do |
11342 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 11360 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -11345,7 +11363,7 @@ Index: binutils-2.21/binutils/configure | |||
11345 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 11363 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
11346 | break 2 | 11364 | break 2 |
11347 | fi | 11365 | fi |
11348 | @@ -6314,11 +6568,15 @@ $as_echo "no" >&6; } | 11366 | @@ -6314,11 +6568,15 @@ |
11349 | fi | 11367 | fi |
11350 | 11368 | ||
11351 | 11369 | ||
@@ -11364,7 +11382,7 @@ Index: binutils-2.21/binutils/configure | |||
11364 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 11382 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
11365 | $as_echo_n "checking for $ac_word... " >&6; } | 11383 | $as_echo_n "checking for $ac_word... " >&6; } |
11366 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | 11384 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
11367 | @@ -6334,7 +6592,7 @@ do | 11385 | @@ -6334,7 +6592,7 @@ |
11368 | test -z "$as_dir" && as_dir=. | 11386 | test -z "$as_dir" && as_dir=. |
11369 | for ac_exec_ext in '' $ac_executable_extensions; do | 11387 | for ac_exec_ext in '' $ac_executable_extensions; do |
11370 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 11388 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -11373,7 +11391,7 @@ Index: binutils-2.21/binutils/configure | |||
11373 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 11391 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
11374 | break 2 | 11392 | break 2 |
11375 | fi | 11393 | fi |
11376 | @@ -6353,6 +6611,10 @@ else | 11394 | @@ -6353,6 +6611,10 @@ |
11377 | $as_echo "no" >&6; } | 11395 | $as_echo "no" >&6; } |
11378 | fi | 11396 | fi |
11379 | 11397 | ||
@@ -11384,7 +11402,7 @@ Index: binutils-2.21/binutils/configure | |||
11384 | if test "x$ac_ct_AR" = x; then | 11402 | if test "x$ac_ct_AR" = x; then |
11385 | AR="false" | 11403 | AR="false" |
11386 | else | 11404 | else |
11387 | @@ -6364,12 +6626,10 @@ ac_tool_warned=yes ;; | 11405 | @@ -6364,12 +6626,10 @@ |
11388 | esac | 11406 | esac |
11389 | AR=$ac_ct_AR | 11407 | AR=$ac_ct_AR |
11390 | fi | 11408 | fi |
@@ -11399,7 +11417,7 @@ Index: binutils-2.21/binutils/configure | |||
11399 | 11417 | ||
11400 | 11418 | ||
11401 | 11419 | ||
11402 | @@ -6381,6 +6641,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 11420 | @@ -6381,6 +6641,64 @@ |
11403 | 11421 | ||
11404 | 11422 | ||
11405 | 11423 | ||
@@ -11464,7 +11482,7 @@ Index: binutils-2.21/binutils/configure | |||
11464 | if test -n "$ac_tool_prefix"; then | 11482 | if test -n "$ac_tool_prefix"; then |
11465 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 11483 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
11466 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 11484 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
11467 | @@ -6715,8 +7033,8 @@ esac | 11485 | @@ -6715,8 +7033,8 @@ |
11468 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 11486 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
11469 | 11487 | ||
11470 | # Transform an extracted symbol line into symbol name and symbol address | 11488 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -11475,7 +11493,7 @@ Index: binutils-2.21/binutils/configure | |||
11475 | 11493 | ||
11476 | # Handle CRLF in mingw tool chain | 11494 | # Handle CRLF in mingw tool chain |
11477 | opt_cr= | 11495 | opt_cr= |
11478 | @@ -6752,6 +7070,7 @@ for ac_symprfx in "" "_"; do | 11496 | @@ -6752,6 +7070,7 @@ |
11479 | else | 11497 | else |
11480 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 11498 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
11481 | fi | 11499 | fi |
@@ -11483,7 +11501,7 @@ Index: binutils-2.21/binutils/configure | |||
11483 | 11501 | ||
11484 | # Check to see that the pipe works correctly. | 11502 | # Check to see that the pipe works correctly. |
11485 | pipe_works=no | 11503 | pipe_works=no |
11486 | @@ -6793,6 +7112,18 @@ _LT_EOF | 11504 | @@ -6793,6 +7112,18 @@ |
11487 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 11505 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
11488 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 11506 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
11489 | cat <<_LT_EOF > conftest.$ac_ext | 11507 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -11502,7 +11520,7 @@ Index: binutils-2.21/binutils/configure | |||
11502 | #ifdef __cplusplus | 11520 | #ifdef __cplusplus |
11503 | extern "C" { | 11521 | extern "C" { |
11504 | #endif | 11522 | #endif |
11505 | @@ -6804,7 +7135,7 @@ _LT_EOF | 11523 | @@ -6804,7 +7135,7 @@ |
11506 | cat <<_LT_EOF >> conftest.$ac_ext | 11524 | cat <<_LT_EOF >> conftest.$ac_ext |
11507 | 11525 | ||
11508 | /* The mapping between symbol names and symbols. */ | 11526 | /* The mapping between symbol names and symbols. */ |
@@ -11511,7 +11529,7 @@ Index: binutils-2.21/binutils/configure | |||
11511 | const char *name; | 11529 | const char *name; |
11512 | void *address; | 11530 | void *address; |
11513 | } | 11531 | } |
11514 | @@ -6830,8 +7161,8 @@ static const void *lt_preloaded_setup() | 11532 | @@ -6830,8 +7161,8 @@ |
11515 | _LT_EOF | 11533 | _LT_EOF |
11516 | # Now try linking the two files. | 11534 | # Now try linking the two files. |
11517 | mv conftest.$ac_objext conftstm.$ac_objext | 11535 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -11522,7 +11540,7 @@ Index: binutils-2.21/binutils/configure | |||
11522 | LIBS="conftstm.$ac_objext" | 11540 | LIBS="conftstm.$ac_objext" |
11523 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 11541 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
11524 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 11542 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
11525 | @@ -6841,8 +7172,8 @@ _LT_EOF | 11543 | @@ -6841,8 +7172,8 @@ |
11526 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 11544 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
11527 | pipe_works=yes | 11545 | pipe_works=yes |
11528 | fi | 11546 | fi |
@@ -11533,7 +11551,7 @@ Index: binutils-2.21/binutils/configure | |||
11533 | else | 11551 | else |
11534 | echo "cannot find nm_test_func in $nlist" >&5 | 11552 | echo "cannot find nm_test_func in $nlist" >&5 |
11535 | fi | 11553 | fi |
11536 | @@ -6879,6 +7210,19 @@ else | 11554 | @@ -6879,6 +7210,19 @@ |
11537 | $as_echo "ok" >&6; } | 11555 | $as_echo "ok" >&6; } |
11538 | fi | 11556 | fi |
11539 | 11557 | ||
@@ -11553,7 +11571,7 @@ Index: binutils-2.21/binutils/configure | |||
11553 | 11571 | ||
11554 | 11572 | ||
11555 | 11573 | ||
11556 | @@ -6899,6 +7243,42 @@ fi | 11574 | @@ -6899,6 +7243,42 @@ |
11557 | 11575 | ||
11558 | 11576 | ||
11559 | 11577 | ||
@@ -11596,7 +11614,7 @@ Index: binutils-2.21/binutils/configure | |||
11596 | 11614 | ||
11597 | # Check whether --enable-libtool-lock was given. | 11615 | # Check whether --enable-libtool-lock was given. |
11598 | if test "${enable_libtool_lock+set}" = set; then : | 11616 | if test "${enable_libtool_lock+set}" = set; then : |
11599 | @@ -7093,6 +7473,123 @@ esac | 11617 | @@ -7093,6 +7473,123 @@ |
11600 | 11618 | ||
11601 | need_locks="$enable_libtool_lock" | 11619 | need_locks="$enable_libtool_lock" |
11602 | 11620 | ||
@@ -11720,7 +11738,7 @@ Index: binutils-2.21/binutils/configure | |||
11720 | 11738 | ||
11721 | case $host_os in | 11739 | case $host_os in |
11722 | rhapsody* | darwin*) | 11740 | rhapsody* | darwin*) |
11723 | @@ -7656,6 +8153,8 @@ _LT_EOF | 11741 | @@ -7656,6 +8153,8 @@ |
11724 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 11742 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
11725 | echo "$AR cru libconftest.a conftest.o" >&5 | 11743 | echo "$AR cru libconftest.a conftest.o" >&5 |
11726 | $AR cru libconftest.a conftest.o 2>&5 | 11744 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -11729,7 +11747,7 @@ Index: binutils-2.21/binutils/configure | |||
11729 | cat > conftest.c << _LT_EOF | 11747 | cat > conftest.c << _LT_EOF |
11730 | int main() { return 0;} | 11748 | int main() { return 0;} |
11731 | _LT_EOF | 11749 | _LT_EOF |
11732 | @@ -7851,7 +8350,8 @@ fi | 11750 | @@ -7851,7 +8350,8 @@ |
11733 | LIBTOOL_DEPS="$ltmain" | 11751 | LIBTOOL_DEPS="$ltmain" |
11734 | 11752 | ||
11735 | # Always use our own libtool. | 11753 | # Always use our own libtool. |
@@ -11739,7 +11757,7 @@ Index: binutils-2.21/binutils/configure | |||
11739 | 11757 | ||
11740 | 11758 | ||
11741 | 11759 | ||
11742 | @@ -7940,7 +8440,7 @@ aix3*) | 11760 | @@ -7940,7 +8440,7 @@ |
11743 | esac | 11761 | esac |
11744 | 11762 | ||
11745 | # Global variables: | 11763 | # Global variables: |
@@ -11748,7 +11766,7 @@ Index: binutils-2.21/binutils/configure | |||
11748 | can_build_shared=yes | 11766 | can_build_shared=yes |
11749 | 11767 | ||
11750 | # All known linkers require a `.a' archive for static linking (except MSVC, | 11768 | # All known linkers require a `.a' archive for static linking (except MSVC, |
11751 | @@ -8238,8 +8738,6 @@ fi | 11769 | @@ -8238,8 +8738,6 @@ |
11752 | lt_prog_compiler_pic= | 11770 | lt_prog_compiler_pic= |
11753 | lt_prog_compiler_static= | 11771 | lt_prog_compiler_static= |
11754 | 11772 | ||
@@ -11757,7 +11775,7 @@ Index: binutils-2.21/binutils/configure | |||
11757 | 11775 | ||
11758 | if test "$GCC" = yes; then | 11776 | if test "$GCC" = yes; then |
11759 | lt_prog_compiler_wl='-Wl,' | 11777 | lt_prog_compiler_wl='-Wl,' |
11760 | @@ -8404,6 +8902,12 @@ $as_echo_n "checking for $compiler optio | 11778 | @@ -8404,6 +8902,12 @@ |
11761 | lt_prog_compiler_pic='--shared' | 11779 | lt_prog_compiler_pic='--shared' |
11762 | lt_prog_compiler_static='--static' | 11780 | lt_prog_compiler_static='--static' |
11763 | ;; | 11781 | ;; |
@@ -11770,7 +11788,7 @@ Index: binutils-2.21/binutils/configure | |||
11770 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 11788 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
11771 | # Portland Group compilers (*not* the Pentium gcc compiler, | 11789 | # Portland Group compilers (*not* the Pentium gcc compiler, |
11772 | # which looks to be a dead project) | 11790 | # which looks to be a dead project) |
11773 | @@ -8466,7 +8970,7 @@ $as_echo_n "checking for $compiler optio | 11791 | @@ -8466,7 +8970,7 @@ |
11774 | lt_prog_compiler_pic='-KPIC' | 11792 | lt_prog_compiler_pic='-KPIC' |
11775 | lt_prog_compiler_static='-Bstatic' | 11793 | lt_prog_compiler_static='-Bstatic' |
11776 | case $cc_basename in | 11794 | case $cc_basename in |
@@ -11779,7 +11797,7 @@ Index: binutils-2.21/binutils/configure | |||
11779 | lt_prog_compiler_wl='-Qoption ld ';; | 11797 | lt_prog_compiler_wl='-Qoption ld ';; |
11780 | *) | 11798 | *) |
11781 | lt_prog_compiler_wl='-Wl,';; | 11799 | lt_prog_compiler_wl='-Wl,';; |
11782 | @@ -8523,13 +9027,17 @@ case $host_os in | 11800 | @@ -8523,13 +9027,17 @@ |
11783 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 11801 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
11784 | ;; | 11802 | ;; |
11785 | esac | 11803 | esac |
@@ -11803,7 +11821,7 @@ Index: binutils-2.21/binutils/configure | |||
11803 | 11821 | ||
11804 | # | 11822 | # |
11805 | # Check to make sure the PIC flag actually works. | 11823 | # Check to make sure the PIC flag actually works. |
11806 | @@ -8590,6 +9098,11 @@ fi | 11824 | @@ -8590,6 +9098,11 @@ |
11807 | 11825 | ||
11808 | 11826 | ||
11809 | 11827 | ||
@@ -11815,7 +11833,7 @@ Index: binutils-2.21/binutils/configure | |||
11815 | # | 11833 | # |
11816 | # Check to make sure the static flag actually works. | 11834 | # Check to make sure the static flag actually works. |
11817 | # | 11835 | # |
11818 | @@ -8940,7 +9453,8 @@ _LT_EOF | 11836 | @@ -8940,7 +9453,8 @@ |
11819 | allow_undefined_flag=unsupported | 11837 | allow_undefined_flag=unsupported |
11820 | always_export_symbols=no | 11838 | always_export_symbols=no |
11821 | enable_shared_with_static_runtimes=yes | 11839 | enable_shared_with_static_runtimes=yes |
@@ -11825,7 +11843,7 @@ Index: binutils-2.21/binutils/configure | |||
11825 | 11843 | ||
11826 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 11844 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
11827 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 11845 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
11828 | @@ -8988,7 +9502,7 @@ _LT_EOF | 11846 | @@ -8988,7 +9502,7 @@ |
11829 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 11847 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
11830 | && test "$tmp_diet" = no | 11848 | && test "$tmp_diet" = no |
11831 | then | 11849 | then |
@@ -11834,7 +11852,7 @@ Index: binutils-2.21/binutils/configure | |||
11834 | tmp_sharedflag='-shared' | 11852 | tmp_sharedflag='-shared' |
11835 | case $cc_basename,$host_cpu in | 11853 | case $cc_basename,$host_cpu in |
11836 | pgcc*) # Portland Group C compiler | 11854 | pgcc*) # Portland Group C compiler |
11837 | @@ -9039,12 +9553,12 @@ _LT_EOF | 11855 | @@ -9039,12 +9553,12 @@ |
11838 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 11856 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
11839 | hardcode_libdir_flag_spec= | 11857 | hardcode_libdir_flag_spec= |
11840 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 11858 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -11849,7 +11867,7 @@ Index: binutils-2.21/binutils/configure | |||
11849 | fi | 11867 | fi |
11850 | ;; | 11868 | ;; |
11851 | esac | 11869 | esac |
11852 | @@ -9058,8 +9572,8 @@ _LT_EOF | 11870 | @@ -9058,8 +9572,8 @@ |
11853 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 11871 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
11854 | wlarc= | 11872 | wlarc= |
11855 | else | 11873 | else |
@@ -11860,7 +11878,7 @@ Index: binutils-2.21/binutils/configure | |||
11860 | fi | 11878 | fi |
11861 | ;; | 11879 | ;; |
11862 | 11880 | ||
11863 | @@ -9077,8 +9591,8 @@ _LT_EOF | 11881 | @@ -9077,8 +9591,8 @@ |
11864 | 11882 | ||
11865 | _LT_EOF | 11883 | _LT_EOF |
11866 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 11884 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -11871,7 +11889,7 @@ Index: binutils-2.21/binutils/configure | |||
11871 | else | 11889 | else |
11872 | ld_shlibs=no | 11890 | ld_shlibs=no |
11873 | fi | 11891 | fi |
11874 | @@ -9124,8 +9638,8 @@ _LT_EOF | 11892 | @@ -9124,8 +9638,8 @@ |
11875 | 11893 | ||
11876 | *) | 11894 | *) |
11877 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 11895 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -11882,7 +11900,7 @@ Index: binutils-2.21/binutils/configure | |||
11882 | else | 11900 | else |
11883 | ld_shlibs=no | 11901 | ld_shlibs=no |
11884 | fi | 11902 | fi |
11885 | @@ -9255,7 +9769,13 @@ _LT_EOF | 11903 | @@ -9255,7 +9769,13 @@ |
11886 | allow_undefined_flag='-berok' | 11904 | allow_undefined_flag='-berok' |
11887 | # Determine the default libpath from the value encoded in an | 11905 | # Determine the default libpath from the value encoded in an |
11888 | # empty executable. | 11906 | # empty executable. |
@@ -11897,7 +11915,7 @@ Index: binutils-2.21/binutils/configure | |||
11897 | /* end confdefs.h. */ | 11915 | /* end confdefs.h. */ |
11898 | 11916 | ||
11899 | int | 11917 | int |
11900 | @@ -9268,22 +9788,29 @@ main () | 11918 | @@ -9268,22 +9788,29 @@ |
11901 | _ACEOF | 11919 | _ACEOF |
11902 | if ac_fn_c_try_link "$LINENO"; then : | 11920 | if ac_fn_c_try_link "$LINENO"; then : |
11903 | 11921 | ||
@@ -11940,7 +11958,7 @@ Index: binutils-2.21/binutils/configure | |||
11940 | 11958 | ||
11941 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 11959 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
11942 | 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" | 11960 | 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" |
11943 | @@ -9295,7 +9822,13 @@ if test -z "$aix_libpath"; then aix_libp | 11961 | @@ -9295,7 +9822,13 @@ |
11944 | else | 11962 | else |
11945 | # Determine the default libpath from the value encoded in an | 11963 | # Determine the default libpath from the value encoded in an |
11946 | # empty executable. | 11964 | # empty executable. |
@@ -11955,7 +11973,7 @@ Index: binutils-2.21/binutils/configure | |||
11955 | /* end confdefs.h. */ | 11973 | /* end confdefs.h. */ |
11956 | 11974 | ||
11957 | int | 11975 | int |
11958 | @@ -9308,22 +9841,29 @@ main () | 11976 | @@ -9308,22 +9841,29 @@ |
11959 | _ACEOF | 11977 | _ACEOF |
11960 | if ac_fn_c_try_link "$LINENO"; then : | 11978 | if ac_fn_c_try_link "$LINENO"; then : |
11961 | 11979 | ||
@@ -11998,7 +12016,7 @@ Index: binutils-2.21/binutils/configure | |||
11998 | 12016 | ||
11999 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 12017 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
12000 | # Warning - without using the other run time loading flags, | 12018 | # Warning - without using the other run time loading flags, |
12001 | @@ -9368,20 +9908,63 @@ if test -z "$aix_libpath"; then aix_libp | 12019 | @@ -9368,20 +9908,63 @@ |
12002 | # Microsoft Visual C++. | 12020 | # Microsoft Visual C++. |
12003 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 12021 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
12004 | # no search path for DLLs. | 12022 | # no search path for DLLs. |
@@ -12076,7 +12094,7 @@ Index: binutils-2.21/binutils/configure | |||
12076 | ;; | 12094 | ;; |
12077 | 12095 | ||
12078 | darwin* | rhapsody*) | 12096 | darwin* | rhapsody*) |
12079 | @@ -9446,7 +10029,7 @@ if test -z "$aix_libpath"; then aix_libp | 12097 | @@ -9446,7 +10029,7 @@ |
12080 | 12098 | ||
12081 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 12099 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
12082 | freebsd* | dragonfly*) | 12100 | freebsd* | dragonfly*) |
@@ -12085,7 +12103,7 @@ Index: binutils-2.21/binutils/configure | |||
12085 | hardcode_libdir_flag_spec='-R$libdir' | 12103 | hardcode_libdir_flag_spec='-R$libdir' |
12086 | hardcode_direct=yes | 12104 | hardcode_direct=yes |
12087 | hardcode_shlibpath_var=no | 12105 | hardcode_shlibpath_var=no |
12088 | @@ -9454,7 +10037,7 @@ if test -z "$aix_libpath"; then aix_libp | 12106 | @@ -9454,7 +10037,7 @@ |
12089 | 12107 | ||
12090 | hpux9*) | 12108 | hpux9*) |
12091 | if test "$GCC" = yes; then | 12109 | if test "$GCC" = yes; then |
@@ -12094,7 +12112,7 @@ Index: binutils-2.21/binutils/configure | |||
12094 | else | 12112 | else |
12095 | 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' | 12113 | 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' |
12096 | fi | 12114 | fi |
12097 | @@ -9470,7 +10053,7 @@ if test -z "$aix_libpath"; then aix_libp | 12115 | @@ -9470,7 +10053,7 @@ |
12098 | 12116 | ||
12099 | hpux10*) | 12117 | hpux10*) |
12100 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 12118 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -12103,7 +12121,7 @@ Index: binutils-2.21/binutils/configure | |||
12103 | else | 12121 | else |
12104 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 12122 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
12105 | fi | 12123 | fi |
12106 | @@ -9494,10 +10077,10 @@ if test -z "$aix_libpath"; then aix_libp | 12124 | @@ -9494,10 +10077,10 @@ |
12107 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 12125 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
12108 | ;; | 12126 | ;; |
12109 | ia64*) | 12127 | ia64*) |
@@ -12116,7 +12134,7 @@ Index: binutils-2.21/binutils/configure | |||
12116 | ;; | 12134 | ;; |
12117 | esac | 12135 | esac |
12118 | else | 12136 | else |
12119 | @@ -9576,23 +10159,36 @@ fi | 12137 | @@ -9576,23 +10159,36 @@ |
12120 | 12138 | ||
12121 | irix5* | irix6* | nonstopux*) | 12139 | irix5* | irix6* | nonstopux*) |
12122 | if test "$GCC" = yes; then | 12140 | if test "$GCC" = yes; then |
@@ -12161,7 +12179,7 @@ Index: binutils-2.21/binutils/configure | |||
12161 | else | 12179 | else |
12162 | 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' | 12180 | 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' |
12163 | 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' | 12181 | 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' |
12164 | @@ -9677,7 +10273,7 @@ rm -f core conftest.err conftest.$ac_obj | 12182 | @@ -9677,7 +10273,7 @@ |
12165 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 12183 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
12166 | if test "$GCC" = yes; then | 12184 | if test "$GCC" = yes; then |
12167 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 12185 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -12170,7 +12188,7 @@ Index: binutils-2.21/binutils/configure | |||
12170 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 12188 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
12171 | else | 12189 | else |
12172 | allow_undefined_flag=' -expect_unresolved \*' | 12190 | allow_undefined_flag=' -expect_unresolved \*' |
12173 | @@ -9696,9 +10292,9 @@ rm -f core conftest.err conftest.$ac_obj | 12191 | @@ -9696,9 +10292,9 @@ |
12174 | no_undefined_flag=' -z defs' | 12192 | no_undefined_flag=' -z defs' |
12175 | if test "$GCC" = yes; then | 12193 | if test "$GCC" = yes; then |
12176 | wlarc='${wl}' | 12194 | wlarc='${wl}' |
@@ -12182,7 +12200,7 @@ Index: binutils-2.21/binutils/configure | |||
12182 | else | 12200 | else |
12183 | case `$CC -V 2>&1` in | 12201 | case `$CC -V 2>&1` in |
12184 | *"Compilers 5.0"*) | 12202 | *"Compilers 5.0"*) |
12185 | @@ -10274,8 +10870,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 12203 | @@ -10274,8 +10870,9 @@ |
12186 | need_version=no | 12204 | need_version=no |
12187 | need_lib_prefix=no | 12205 | need_lib_prefix=no |
12188 | 12206 | ||
@@ -12194,7 +12212,7 @@ Index: binutils-2.21/binutils/configure | |||
12194 | library_names_spec='$libname.dll.a' | 12212 | library_names_spec='$libname.dll.a' |
12195 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 12213 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
12196 | postinstall_cmds='base_file=`basename \${file}`~ | 12214 | postinstall_cmds='base_file=`basename \${file}`~ |
12197 | @@ -10308,13 +10905,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 12215 | @@ -10308,13 +10905,71 @@ |
12198 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 12216 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
12199 | ;; | 12217 | ;; |
12200 | esac | 12218 | esac |
@@ -12267,7 +12285,7 @@ Index: binutils-2.21/binutils/configure | |||
12267 | # FIXME: first we should search . and the directory the executable is in | 12285 | # FIXME: first we should search . and the directory the executable is in |
12268 | shlibpath_var=PATH | 12286 | shlibpath_var=PATH |
12269 | ;; | 12287 | ;; |
12270 | @@ -10410,7 +11065,7 @@ haiku*) | 12288 | @@ -10410,7 +11065,7 @@ |
12271 | soname_spec='${libname}${release}${shared_ext}$major' | 12289 | soname_spec='${libname}${release}${shared_ext}$major' |
12272 | shlibpath_var=LIBRARY_PATH | 12290 | shlibpath_var=LIBRARY_PATH |
12273 | shlibpath_overrides_runpath=yes | 12291 | shlibpath_overrides_runpath=yes |
@@ -12276,7 +12294,7 @@ Index: binutils-2.21/binutils/configure | |||
12276 | hardcode_into_libs=yes | 12294 | hardcode_into_libs=yes |
12277 | ;; | 12295 | ;; |
12278 | 12296 | ||
12279 | @@ -11206,7 +11861,7 @@ else | 12297 | @@ -11206,7 +11861,7 @@ |
12280 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 12298 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
12281 | lt_status=$lt_dlunknown | 12299 | lt_status=$lt_dlunknown |
12282 | cat > conftest.$ac_ext <<_LT_EOF | 12300 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -12285,7 +12303,7 @@ Index: binutils-2.21/binutils/configure | |||
12285 | #include "confdefs.h" | 12303 | #include "confdefs.h" |
12286 | 12304 | ||
12287 | #if HAVE_DLFCN_H | 12305 | #if HAVE_DLFCN_H |
12288 | @@ -11250,10 +11905,10 @@ else | 12306 | @@ -11250,10 +11905,10 @@ |
12289 | /* When -fvisbility=hidden is used, assume the code has been annotated | 12307 | /* When -fvisbility=hidden is used, assume the code has been annotated |
12290 | correspondingly for the symbols needed. */ | 12308 | correspondingly for the symbols needed. */ |
12291 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 12309 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -12298,7 +12316,7 @@ Index: binutils-2.21/binutils/configure | |||
12298 | int main () | 12316 | int main () |
12299 | { | 12317 | { |
12300 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 12318 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
12301 | @@ -11312,7 +11967,7 @@ else | 12319 | @@ -11312,7 +11967,7 @@ |
12302 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 12320 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
12303 | lt_status=$lt_dlunknown | 12321 | lt_status=$lt_dlunknown |
12304 | cat > conftest.$ac_ext <<_LT_EOF | 12322 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -12307,7 +12325,7 @@ Index: binutils-2.21/binutils/configure | |||
12307 | #include "confdefs.h" | 12325 | #include "confdefs.h" |
12308 | 12326 | ||
12309 | #if HAVE_DLFCN_H | 12327 | #if HAVE_DLFCN_H |
12310 | @@ -11356,10 +12011,10 @@ else | 12328 | @@ -11356,10 +12011,10 @@ |
12311 | /* When -fvisbility=hidden is used, assume the code has been annotated | 12329 | /* When -fvisbility=hidden is used, assume the code has been annotated |
12312 | correspondingly for the symbols needed. */ | 12330 | correspondingly for the symbols needed. */ |
12313 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 12331 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -12320,7 +12338,7 @@ Index: binutils-2.21/binutils/configure | |||
12320 | int main () | 12338 | int main () |
12321 | { | 12339 | { |
12322 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 12340 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
12323 | @@ -14751,13 +15406,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 12341 | @@ -14751,13 +15406,20 @@ |
12324 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 12342 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
12325 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 12343 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
12326 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 12344 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -12341,7 +12359,7 @@ Index: binutils-2.21/binutils/configure | |||
12341 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 12359 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
12342 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 12360 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
12343 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 12361 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
12344 | @@ -14772,14 +15434,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 12362 | @@ -14772,14 +15434,17 @@ |
12345 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 12363 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
12346 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 12364 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
12347 | 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"`' | 12365 | 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"`' |
@@ -12360,7 +12378,7 @@ Index: binutils-2.21/binutils/configure | |||
12360 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 12378 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
12361 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 12379 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
12362 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 12380 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
12363 | @@ -14812,12 +15477,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 12381 | @@ -14812,12 +15477,12 @@ |
12364 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 12382 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
12365 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 12383 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
12366 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 12384 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -12374,7 +12392,7 @@ Index: binutils-2.21/binutils/configure | |||
12374 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 12392 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
12375 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 12393 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
12376 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 12394 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
12377 | @@ -14872,8 +15537,13 @@ reload_flag \ | 12395 | @@ -14872,8 +15537,13 @@ |
12378 | OBJDUMP \ | 12396 | OBJDUMP \ |
12379 | deplibs_check_method \ | 12397 | deplibs_check_method \ |
12380 | file_magic_cmd \ | 12398 | file_magic_cmd \ |
@@ -12388,7 +12406,7 @@ Index: binutils-2.21/binutils/configure | |||
12388 | STRIP \ | 12406 | STRIP \ |
12389 | RANLIB \ | 12407 | RANLIB \ |
12390 | CC \ | 12408 | CC \ |
12391 | @@ -14883,12 +15553,14 @@ lt_cv_sys_global_symbol_pipe \ | 12409 | @@ -14883,12 +15553,14 @@ |
12392 | lt_cv_sys_global_symbol_to_cdecl \ | 12410 | lt_cv_sys_global_symbol_to_cdecl \ |
12393 | lt_cv_sys_global_symbol_to_c_name_address \ | 12411 | lt_cv_sys_global_symbol_to_c_name_address \ |
12394 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 12412 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -12404,7 +12422,7 @@ Index: binutils-2.21/binutils/configure | |||
12404 | DSYMUTIL \ | 12422 | DSYMUTIL \ |
12405 | NMEDIT \ | 12423 | NMEDIT \ |
12406 | LIPO \ | 12424 | LIPO \ |
12407 | @@ -14904,7 +15576,6 @@ no_undefined_flag \ | 12425 | @@ -14904,7 +15576,6 @@ |
12408 | hardcode_libdir_flag_spec \ | 12426 | hardcode_libdir_flag_spec \ |
12409 | hardcode_libdir_flag_spec_ld \ | 12427 | hardcode_libdir_flag_spec_ld \ |
12410 | hardcode_libdir_separator \ | 12428 | hardcode_libdir_separator \ |
@@ -12412,7 +12430,7 @@ Index: binutils-2.21/binutils/configure | |||
12412 | exclude_expsyms \ | 12430 | exclude_expsyms \ |
12413 | include_expsyms \ | 12431 | include_expsyms \ |
12414 | file_list_spec \ | 12432 | file_list_spec \ |
12415 | @@ -14940,6 +15611,7 @@ module_cmds \ | 12433 | @@ -14940,6 +15611,7 @@ |
12416 | module_expsym_cmds \ | 12434 | module_expsym_cmds \ |
12417 | export_symbols_cmds \ | 12435 | export_symbols_cmds \ |
12418 | prelink_cmds \ | 12436 | prelink_cmds \ |
@@ -12420,7 +12438,7 @@ Index: binutils-2.21/binutils/configure | |||
12420 | postinstall_cmds \ | 12438 | postinstall_cmds \ |
12421 | postuninstall_cmds \ | 12439 | postuninstall_cmds \ |
12422 | finish_cmds \ | 12440 | finish_cmds \ |
12423 | @@ -15697,7 +16369,8 @@ $as_echo X"$file" | | 12441 | @@ -15697,7 +16369,8 @@ |
12424 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 12442 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
12425 | # | 12443 | # |
12426 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 12444 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -12430,7 +12448,7 @@ Index: binutils-2.21/binutils/configure | |||
12430 | # Written by Gordon Matzigkeit, 1996 | 12448 | # Written by Gordon Matzigkeit, 1996 |
12431 | # | 12449 | # |
12432 | # This file is part of GNU Libtool. | 12450 | # This file is part of GNU Libtool. |
12433 | @@ -15800,19 +16473,42 @@ SP2NL=$lt_lt_SP2NL | 12451 | @@ -15800,19 +16473,42 @@ |
12434 | # turn newlines into spaces. | 12452 | # turn newlines into spaces. |
12435 | NL2SP=$lt_lt_NL2SP | 12453 | NL2SP=$lt_lt_NL2SP |
12436 | 12454 | ||
@@ -12474,7 +12492,7 @@ Index: binutils-2.21/binutils/configure | |||
12474 | # A symbol stripping program. | 12492 | # A symbol stripping program. |
12475 | STRIP=$lt_STRIP | 12493 | STRIP=$lt_STRIP |
12476 | 12494 | ||
12477 | @@ -15842,6 +16538,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 12495 | @@ -15842,6 +16538,12 @@ |
12478 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 12496 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
12479 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 12497 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
12480 | 12498 | ||
@@ -12487,7 +12505,7 @@ Index: binutils-2.21/binutils/configure | |||
12487 | # The name of the directory that contains temporary libtool files. | 12505 | # The name of the directory that contains temporary libtool files. |
12488 | objdir=$objdir | 12506 | objdir=$objdir |
12489 | 12507 | ||
12490 | @@ -15851,6 +16553,9 @@ MAGIC_CMD=$MAGIC_CMD | 12508 | @@ -15851,6 +16553,9 @@ |
12491 | # Must we lock files when doing compilation? | 12509 | # Must we lock files when doing compilation? |
12492 | need_locks=$lt_need_locks | 12510 | need_locks=$lt_need_locks |
12493 | 12511 | ||
@@ -12497,7 +12515,7 @@ Index: binutils-2.21/binutils/configure | |||
12497 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 12515 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
12498 | DSYMUTIL=$lt_DSYMUTIL | 12516 | DSYMUTIL=$lt_DSYMUTIL |
12499 | 12517 | ||
12500 | @@ -15965,12 +16670,12 @@ with_gcc=$GCC | 12518 | @@ -15965,12 +16670,12 @@ |
12501 | # Compiler flag to turn off builtin functions. | 12519 | # Compiler flag to turn off builtin functions. |
12502 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 12520 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
12503 | 12521 | ||
@@ -12513,7 +12531,7 @@ Index: binutils-2.21/binutils/configure | |||
12513 | # Compiler flag to prevent dynamic linking. | 12531 | # Compiler flag to prevent dynamic linking. |
12514 | link_static_flag=$lt_lt_prog_compiler_static | 12532 | link_static_flag=$lt_lt_prog_compiler_static |
12515 | 12533 | ||
12516 | @@ -16057,9 +16762,6 @@ inherit_rpath=$inherit_rpath | 12534 | @@ -16057,9 +16762,6 @@ |
12517 | # Whether libtool must link a program against all its dependency libraries. | 12535 | # Whether libtool must link a program against all its dependency libraries. |
12518 | link_all_deplibs=$link_all_deplibs | 12536 | link_all_deplibs=$link_all_deplibs |
12519 | 12537 | ||
@@ -12523,7 +12541,7 @@ Index: binutils-2.21/binutils/configure | |||
12523 | # Set to "yes" if exported symbols are required. | 12541 | # Set to "yes" if exported symbols are required. |
12524 | always_export_symbols=$always_export_symbols | 12542 | always_export_symbols=$always_export_symbols |
12525 | 12543 | ||
12526 | @@ -16075,6 +16777,9 @@ include_expsyms=$lt_include_expsyms | 12544 | @@ -16075,6 +16777,9 @@ |
12527 | # Commands necessary for linking programs (against libraries) with templates. | 12545 | # Commands necessary for linking programs (against libraries) with templates. |
12528 | prelink_cmds=$lt_prelink_cmds | 12546 | prelink_cmds=$lt_prelink_cmds |
12529 | 12547 | ||
@@ -12533,7 +12551,7 @@ Index: binutils-2.21/binutils/configure | |||
12533 | # Specify filename containing input files. | 12551 | # Specify filename containing input files. |
12534 | file_list_spec=$lt_file_list_spec | 12552 | file_list_spec=$lt_file_list_spec |
12535 | 12553 | ||
12536 | @@ -16107,210 +16812,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 12554 | @@ -16107,210 +16812,169 @@ |
12537 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 12555 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
12538 | # text mode, it properly converts lines to CR/LF. This bash problem | 12556 | # text mode, it properly converts lines to CR/LF. This bash problem |
12539 | # is reportedly fixed, but why not run on old versions too? | 12557 | # is reportedly fixed, but why not run on old versions too? |
@@ -12906,9 +12924,9 @@ Index: binutils-2.21/binutils/configure | |||
12906 | 12924 | ||
12907 | Index: binutils-2.21/gas/configure | 12925 | Index: binutils-2.21/gas/configure |
12908 | =================================================================== | 12926 | =================================================================== |
12909 | --- binutils-2.21.orig/gas/configure | 12927 | --- binutils-2.21.orig/gas/configure 2010-11-05 03:33:36.000000000 -0700 |
12910 | +++ binutils-2.21/gas/configure | 12928 | +++ binutils-2.21/gas/configure 2011-01-07 10:49:16.426101000 -0800 |
12911 | @@ -645,8 +645,11 @@ OTOOL | 12929 | @@ -645,8 +645,11 @@ |
12912 | LIPO | 12930 | LIPO |
12913 | NMEDIT | 12931 | NMEDIT |
12914 | DSYMUTIL | 12932 | DSYMUTIL |
@@ -12920,7 +12938,7 @@ Index: binutils-2.21/gas/configure | |||
12920 | OBJDUMP | 12938 | OBJDUMP |
12921 | LN_S | 12939 | LN_S |
12922 | NM | 12940 | NM |
12923 | @@ -759,6 +762,7 @@ enable_static | 12941 | @@ -759,6 +762,7 @@ |
12924 | with_pic | 12942 | with_pic |
12925 | enable_fast_install | 12943 | enable_fast_install |
12926 | with_gnu_ld | 12944 | with_gnu_ld |
@@ -12928,7 +12946,7 @@ Index: binutils-2.21/gas/configure | |||
12928 | enable_libtool_lock | 12946 | enable_libtool_lock |
12929 | enable_targets | 12947 | enable_targets |
12930 | enable_checking | 12948 | enable_checking |
12931 | @@ -1420,6 +1424,8 @@ Optional Packages: | 12949 | @@ -1420,6 +1424,8 @@ |
12932 | --with-pic try to use only PIC/non-PIC objects [default=use | 12950 | --with-pic try to use only PIC/non-PIC objects [default=use |
12933 | both] | 12951 | both] |
12934 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 12952 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -12937,7 +12955,7 @@ Index: binutils-2.21/gas/configure | |||
12937 | --with-zlib include zlib support (auto/yes/no) default=auto | 12955 | --with-zlib include zlib support (auto/yes/no) default=auto |
12938 | 12956 | ||
12939 | Some influential environment variables: | 12957 | Some influential environment variables: |
12940 | @@ -5135,8 +5141,8 @@ esac | 12958 | @@ -5135,8 +5141,8 @@ |
12941 | 12959 | ||
12942 | 12960 | ||
12943 | 12961 | ||
@@ -12948,7 +12966,7 @@ Index: binutils-2.21/gas/configure | |||
12948 | 12966 | ||
12949 | 12967 | ||
12950 | 12968 | ||
12951 | @@ -5176,7 +5182,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 12969 | @@ -5176,7 +5182,7 @@ |
12952 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 12970 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
12953 | $as_echo_n "checking how to print strings... " >&6; } | 12971 | $as_echo_n "checking how to print strings... " >&6; } |
12954 | # Test print first, because it will be a builtin if present. | 12972 | # Test print first, because it will be a builtin if present. |
@@ -12957,7 +12975,7 @@ Index: binutils-2.21/gas/configure | |||
12957 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 12975 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
12958 | ECHO='print -r --' | 12976 | ECHO='print -r --' |
12959 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 12977 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
12960 | @@ -5862,8 +5868,8 @@ $as_echo_n "checking whether the shell u | 12978 | @@ -5862,8 +5868,8 @@ |
12961 | # Try some XSI features | 12979 | # Try some XSI features |
12962 | xsi_shell=no | 12980 | xsi_shell=no |
12963 | ( _lt_dummy="a/b/c" | 12981 | ( _lt_dummy="a/b/c" |
@@ -12968,7 +12986,7 @@ Index: binutils-2.21/gas/configure | |||
12968 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 12986 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
12969 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 12987 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
12970 | && xsi_shell=yes | 12988 | && xsi_shell=yes |
12971 | @@ -5912,6 +5918,80 @@ esac | 12989 | @@ -5912,6 +5918,80 @@ |
12972 | 12990 | ||
12973 | 12991 | ||
12974 | 12992 | ||
@@ -13049,7 +13067,7 @@ Index: binutils-2.21/gas/configure | |||
13049 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 13067 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
13050 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 13068 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
13051 | if test "${lt_cv_ld_reload_flag+set}" = set; then : | 13069 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
13052 | @@ -5928,6 +6008,11 @@ case $reload_flag in | 13070 | @@ -5928,6 +6008,11 @@ |
13053 | esac | 13071 | esac |
13054 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 13072 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
13055 | case $host_os in | 13073 | case $host_os in |
@@ -13061,7 +13079,7 @@ Index: binutils-2.21/gas/configure | |||
13061 | darwin*) | 13079 | darwin*) |
13062 | if test "$GCC" = yes; then | 13080 | if test "$GCC" = yes; then |
13063 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 13081 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
13064 | @@ -6096,7 +6181,8 @@ mingw* | pw32*) | 13082 | @@ -6096,7 +6181,8 @@ |
13065 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 13083 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
13066 | lt_cv_file_magic_cmd='func_win32_libid' | 13084 | lt_cv_file_magic_cmd='func_win32_libid' |
13067 | else | 13085 | else |
@@ -13071,7 +13089,7 @@ Index: binutils-2.21/gas/configure | |||
13071 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 13089 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
13072 | fi | 13090 | fi |
13073 | ;; | 13091 | ;; |
13074 | @@ -6250,6 +6336,21 @@ esac | 13092 | @@ -6250,6 +6336,21 @@ |
13075 | fi | 13093 | fi |
13076 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 13094 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
13077 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 13095 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -13093,7 +13111,7 @@ Index: binutils-2.21/gas/configure | |||
13093 | file_magic_cmd=$lt_cv_file_magic_cmd | 13111 | file_magic_cmd=$lt_cv_file_magic_cmd |
13094 | deplibs_check_method=$lt_cv_deplibs_check_method | 13112 | deplibs_check_method=$lt_cv_deplibs_check_method |
13095 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 13113 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
13096 | @@ -6265,9 +6366,162 @@ test -z "$deplibs_check_method" && depli | 13114 | @@ -6265,9 +6366,162 @@ |
13097 | 13115 | ||
13098 | 13116 | ||
13099 | 13117 | ||
@@ -13258,7 +13276,7 @@ Index: binutils-2.21/gas/configure | |||
13258 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 13276 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
13259 | $as_echo_n "checking for $ac_word... " >&6; } | 13277 | $as_echo_n "checking for $ac_word... " >&6; } |
13260 | if test "${ac_cv_prog_AR+set}" = set; then : | 13278 | if test "${ac_cv_prog_AR+set}" = set; then : |
13261 | @@ -6283,7 +6537,7 @@ do | 13279 | @@ -6283,7 +6537,7 @@ |
13262 | test -z "$as_dir" && as_dir=. | 13280 | test -z "$as_dir" && as_dir=. |
13263 | for ac_exec_ext in '' $ac_executable_extensions; do | 13281 | for ac_exec_ext in '' $ac_executable_extensions; do |
13264 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 13282 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -13267,7 +13285,7 @@ Index: binutils-2.21/gas/configure | |||
13267 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 13285 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
13268 | break 2 | 13286 | break 2 |
13269 | fi | 13287 | fi |
13270 | @@ -6303,11 +6557,15 @@ $as_echo "no" >&6; } | 13288 | @@ -6303,11 +6557,15 @@ |
13271 | fi | 13289 | fi |
13272 | 13290 | ||
13273 | 13291 | ||
@@ -13286,7 +13304,7 @@ Index: binutils-2.21/gas/configure | |||
13286 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 13304 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
13287 | $as_echo_n "checking for $ac_word... " >&6; } | 13305 | $as_echo_n "checking for $ac_word... " >&6; } |
13288 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | 13306 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
13289 | @@ -6323,7 +6581,7 @@ do | 13307 | @@ -6323,7 +6581,7 @@ |
13290 | test -z "$as_dir" && as_dir=. | 13308 | test -z "$as_dir" && as_dir=. |
13291 | for ac_exec_ext in '' $ac_executable_extensions; do | 13309 | for ac_exec_ext in '' $ac_executable_extensions; do |
13292 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 13310 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -13295,7 +13313,7 @@ Index: binutils-2.21/gas/configure | |||
13295 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 13313 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
13296 | break 2 | 13314 | break 2 |
13297 | fi | 13315 | fi |
13298 | @@ -6342,6 +6600,10 @@ else | 13316 | @@ -6342,6 +6600,10 @@ |
13299 | $as_echo "no" >&6; } | 13317 | $as_echo "no" >&6; } |
13300 | fi | 13318 | fi |
13301 | 13319 | ||
@@ -13306,7 +13324,7 @@ Index: binutils-2.21/gas/configure | |||
13306 | if test "x$ac_ct_AR" = x; then | 13324 | if test "x$ac_ct_AR" = x; then |
13307 | AR="false" | 13325 | AR="false" |
13308 | else | 13326 | else |
13309 | @@ -6353,16 +6615,72 @@ ac_tool_warned=yes ;; | 13327 | @@ -6353,16 +6615,72 @@ |
13310 | esac | 13328 | esac |
13311 | AR=$ac_ct_AR | 13329 | AR=$ac_ct_AR |
13312 | fi | 13330 | fi |
@@ -13383,7 +13401,7 @@ Index: binutils-2.21/gas/configure | |||
13383 | 13401 | ||
13384 | 13402 | ||
13385 | 13403 | ||
13386 | @@ -6704,8 +7022,8 @@ esac | 13404 | @@ -6704,8 +7022,8 @@ |
13387 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 13405 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
13388 | 13406 | ||
13389 | # Transform an extracted symbol line into symbol name and symbol address | 13407 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -13394,7 +13412,7 @@ Index: binutils-2.21/gas/configure | |||
13394 | 13412 | ||
13395 | # Handle CRLF in mingw tool chain | 13413 | # Handle CRLF in mingw tool chain |
13396 | opt_cr= | 13414 | opt_cr= |
13397 | @@ -6741,6 +7059,7 @@ for ac_symprfx in "" "_"; do | 13415 | @@ -6741,6 +7059,7 @@ |
13398 | else | 13416 | else |
13399 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 13417 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
13400 | fi | 13418 | fi |
@@ -13402,7 +13420,7 @@ Index: binutils-2.21/gas/configure | |||
13402 | 13420 | ||
13403 | # Check to see that the pipe works correctly. | 13421 | # Check to see that the pipe works correctly. |
13404 | pipe_works=no | 13422 | pipe_works=no |
13405 | @@ -6782,6 +7101,18 @@ _LT_EOF | 13423 | @@ -6782,6 +7101,18 @@ |
13406 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 13424 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
13407 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 13425 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
13408 | cat <<_LT_EOF > conftest.$ac_ext | 13426 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -13421,7 +13439,7 @@ Index: binutils-2.21/gas/configure | |||
13421 | #ifdef __cplusplus | 13439 | #ifdef __cplusplus |
13422 | extern "C" { | 13440 | extern "C" { |
13423 | #endif | 13441 | #endif |
13424 | @@ -6793,7 +7124,7 @@ _LT_EOF | 13442 | @@ -6793,7 +7124,7 @@ |
13425 | cat <<_LT_EOF >> conftest.$ac_ext | 13443 | cat <<_LT_EOF >> conftest.$ac_ext |
13426 | 13444 | ||
13427 | /* The mapping between symbol names and symbols. */ | 13445 | /* The mapping between symbol names and symbols. */ |
@@ -13430,7 +13448,7 @@ Index: binutils-2.21/gas/configure | |||
13430 | const char *name; | 13448 | const char *name; |
13431 | void *address; | 13449 | void *address; |
13432 | } | 13450 | } |
13433 | @@ -6819,8 +7150,8 @@ static const void *lt_preloaded_setup() | 13451 | @@ -6819,8 +7150,8 @@ |
13434 | _LT_EOF | 13452 | _LT_EOF |
13435 | # Now try linking the two files. | 13453 | # Now try linking the two files. |
13436 | mv conftest.$ac_objext conftstm.$ac_objext | 13454 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -13441,7 +13459,7 @@ Index: binutils-2.21/gas/configure | |||
13441 | LIBS="conftstm.$ac_objext" | 13459 | LIBS="conftstm.$ac_objext" |
13442 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 13460 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
13443 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 13461 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
13444 | @@ -6830,8 +7161,8 @@ _LT_EOF | 13462 | @@ -6830,8 +7161,8 @@ |
13445 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 13463 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
13446 | pipe_works=yes | 13464 | pipe_works=yes |
13447 | fi | 13465 | fi |
@@ -13452,7 +13470,7 @@ Index: binutils-2.21/gas/configure | |||
13452 | else | 13470 | else |
13453 | echo "cannot find nm_test_func in $nlist" >&5 | 13471 | echo "cannot find nm_test_func in $nlist" >&5 |
13454 | fi | 13472 | fi |
13455 | @@ -6868,6 +7199,19 @@ else | 13473 | @@ -6868,6 +7199,19 @@ |
13456 | $as_echo "ok" >&6; } | 13474 | $as_echo "ok" >&6; } |
13457 | fi | 13475 | fi |
13458 | 13476 | ||
@@ -13472,7 +13490,7 @@ Index: binutils-2.21/gas/configure | |||
13472 | 13490 | ||
13473 | 13491 | ||
13474 | 13492 | ||
13475 | @@ -6888,6 +7232,42 @@ fi | 13493 | @@ -6888,6 +7232,42 @@ |
13476 | 13494 | ||
13477 | 13495 | ||
13478 | 13496 | ||
@@ -13515,7 +13533,7 @@ Index: binutils-2.21/gas/configure | |||
13515 | 13533 | ||
13516 | # Check whether --enable-libtool-lock was given. | 13534 | # Check whether --enable-libtool-lock was given. |
13517 | if test "${enable_libtool_lock+set}" = set; then : | 13535 | if test "${enable_libtool_lock+set}" = set; then : |
13518 | @@ -7082,6 +7462,123 @@ esac | 13536 | @@ -7082,6 +7462,123 @@ |
13519 | 13537 | ||
13520 | need_locks="$enable_libtool_lock" | 13538 | need_locks="$enable_libtool_lock" |
13521 | 13539 | ||
@@ -13639,7 +13657,7 @@ Index: binutils-2.21/gas/configure | |||
13639 | 13657 | ||
13640 | case $host_os in | 13658 | case $host_os in |
13641 | rhapsody* | darwin*) | 13659 | rhapsody* | darwin*) |
13642 | @@ -7645,6 +8142,8 @@ _LT_EOF | 13660 | @@ -7645,6 +8142,8 @@ |
13643 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 13661 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
13644 | echo "$AR cru libconftest.a conftest.o" >&5 | 13662 | echo "$AR cru libconftest.a conftest.o" >&5 |
13645 | $AR cru libconftest.a conftest.o 2>&5 | 13663 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -13648,7 +13666,7 @@ Index: binutils-2.21/gas/configure | |||
13648 | cat > conftest.c << _LT_EOF | 13666 | cat > conftest.c << _LT_EOF |
13649 | int main() { return 0;} | 13667 | int main() { return 0;} |
13650 | _LT_EOF | 13668 | _LT_EOF |
13651 | @@ -7840,7 +8339,8 @@ fi | 13669 | @@ -7840,7 +8339,8 @@ |
13652 | LIBTOOL_DEPS="$ltmain" | 13670 | LIBTOOL_DEPS="$ltmain" |
13653 | 13671 | ||
13654 | # Always use our own libtool. | 13672 | # Always use our own libtool. |
@@ -13658,7 +13676,7 @@ Index: binutils-2.21/gas/configure | |||
13658 | 13676 | ||
13659 | 13677 | ||
13660 | 13678 | ||
13661 | @@ -7929,7 +8429,7 @@ aix3*) | 13679 | @@ -7929,7 +8429,7 @@ |
13662 | esac | 13680 | esac |
13663 | 13681 | ||
13664 | # Global variables: | 13682 | # Global variables: |
@@ -13667,7 +13685,7 @@ Index: binutils-2.21/gas/configure | |||
13667 | can_build_shared=yes | 13685 | can_build_shared=yes |
13668 | 13686 | ||
13669 | # All known linkers require a `.a' archive for static linking (except MSVC, | 13687 | # All known linkers require a `.a' archive for static linking (except MSVC, |
13670 | @@ -8227,8 +8727,6 @@ fi | 13688 | @@ -8227,8 +8727,6 @@ |
13671 | lt_prog_compiler_pic= | 13689 | lt_prog_compiler_pic= |
13672 | lt_prog_compiler_static= | 13690 | lt_prog_compiler_static= |
13673 | 13691 | ||
@@ -13676,7 +13694,7 @@ Index: binutils-2.21/gas/configure | |||
13676 | 13694 | ||
13677 | if test "$GCC" = yes; then | 13695 | if test "$GCC" = yes; then |
13678 | lt_prog_compiler_wl='-Wl,' | 13696 | lt_prog_compiler_wl='-Wl,' |
13679 | @@ -8393,6 +8891,12 @@ $as_echo_n "checking for $compiler optio | 13697 | @@ -8393,6 +8891,12 @@ |
13680 | lt_prog_compiler_pic='--shared' | 13698 | lt_prog_compiler_pic='--shared' |
13681 | lt_prog_compiler_static='--static' | 13699 | lt_prog_compiler_static='--static' |
13682 | ;; | 13700 | ;; |
@@ -13689,7 +13707,7 @@ Index: binutils-2.21/gas/configure | |||
13689 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 13707 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
13690 | # Portland Group compilers (*not* the Pentium gcc compiler, | 13708 | # Portland Group compilers (*not* the Pentium gcc compiler, |
13691 | # which looks to be a dead project) | 13709 | # which looks to be a dead project) |
13692 | @@ -8455,7 +8959,7 @@ $as_echo_n "checking for $compiler optio | 13710 | @@ -8455,7 +8959,7 @@ |
13693 | lt_prog_compiler_pic='-KPIC' | 13711 | lt_prog_compiler_pic='-KPIC' |
13694 | lt_prog_compiler_static='-Bstatic' | 13712 | lt_prog_compiler_static='-Bstatic' |
13695 | case $cc_basename in | 13713 | case $cc_basename in |
@@ -13698,7 +13716,7 @@ Index: binutils-2.21/gas/configure | |||
13698 | lt_prog_compiler_wl='-Qoption ld ';; | 13716 | lt_prog_compiler_wl='-Qoption ld ';; |
13699 | *) | 13717 | *) |
13700 | lt_prog_compiler_wl='-Wl,';; | 13718 | lt_prog_compiler_wl='-Wl,';; |
13701 | @@ -8512,13 +9016,17 @@ case $host_os in | 13719 | @@ -8512,13 +9016,17 @@ |
13702 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 13720 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
13703 | ;; | 13721 | ;; |
13704 | esac | 13722 | esac |
@@ -13722,7 +13740,7 @@ Index: binutils-2.21/gas/configure | |||
13722 | 13740 | ||
13723 | # | 13741 | # |
13724 | # Check to make sure the PIC flag actually works. | 13742 | # Check to make sure the PIC flag actually works. |
13725 | @@ -8579,6 +9087,11 @@ fi | 13743 | @@ -8579,6 +9087,11 @@ |
13726 | 13744 | ||
13727 | 13745 | ||
13728 | 13746 | ||
@@ -13734,7 +13752,7 @@ Index: binutils-2.21/gas/configure | |||
13734 | # | 13752 | # |
13735 | # Check to make sure the static flag actually works. | 13753 | # Check to make sure the static flag actually works. |
13736 | # | 13754 | # |
13737 | @@ -8929,7 +9442,8 @@ _LT_EOF | 13755 | @@ -8929,7 +9442,8 @@ |
13738 | allow_undefined_flag=unsupported | 13756 | allow_undefined_flag=unsupported |
13739 | always_export_symbols=no | 13757 | always_export_symbols=no |
13740 | enable_shared_with_static_runtimes=yes | 13758 | enable_shared_with_static_runtimes=yes |
@@ -13744,7 +13762,7 @@ Index: binutils-2.21/gas/configure | |||
13744 | 13762 | ||
13745 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 13763 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
13746 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 13764 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
13747 | @@ -8977,7 +9491,7 @@ _LT_EOF | 13765 | @@ -8977,7 +9491,7 @@ |
13748 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 13766 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
13749 | && test "$tmp_diet" = no | 13767 | && test "$tmp_diet" = no |
13750 | then | 13768 | then |
@@ -13753,7 +13771,7 @@ Index: binutils-2.21/gas/configure | |||
13753 | tmp_sharedflag='-shared' | 13771 | tmp_sharedflag='-shared' |
13754 | case $cc_basename,$host_cpu in | 13772 | case $cc_basename,$host_cpu in |
13755 | pgcc*) # Portland Group C compiler | 13773 | pgcc*) # Portland Group C compiler |
13756 | @@ -9028,12 +9542,12 @@ _LT_EOF | 13774 | @@ -9028,12 +9542,12 @@ |
13757 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 13775 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
13758 | hardcode_libdir_flag_spec= | 13776 | hardcode_libdir_flag_spec= |
13759 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 13777 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -13768,7 +13786,7 @@ Index: binutils-2.21/gas/configure | |||
13768 | fi | 13786 | fi |
13769 | ;; | 13787 | ;; |
13770 | esac | 13788 | esac |
13771 | @@ -9047,8 +9561,8 @@ _LT_EOF | 13789 | @@ -9047,8 +9561,8 @@ |
13772 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 13790 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
13773 | wlarc= | 13791 | wlarc= |
13774 | else | 13792 | else |
@@ -13779,7 +13797,7 @@ Index: binutils-2.21/gas/configure | |||
13779 | fi | 13797 | fi |
13780 | ;; | 13798 | ;; |
13781 | 13799 | ||
13782 | @@ -9066,8 +9580,8 @@ _LT_EOF | 13800 | @@ -9066,8 +9580,8 @@ |
13783 | 13801 | ||
13784 | _LT_EOF | 13802 | _LT_EOF |
13785 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 13803 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -13790,7 +13808,7 @@ Index: binutils-2.21/gas/configure | |||
13790 | else | 13808 | else |
13791 | ld_shlibs=no | 13809 | ld_shlibs=no |
13792 | fi | 13810 | fi |
13793 | @@ -9113,8 +9627,8 @@ _LT_EOF | 13811 | @@ -9113,8 +9627,8 @@ |
13794 | 13812 | ||
13795 | *) | 13813 | *) |
13796 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 13814 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -13801,7 +13819,7 @@ Index: binutils-2.21/gas/configure | |||
13801 | else | 13819 | else |
13802 | ld_shlibs=no | 13820 | ld_shlibs=no |
13803 | fi | 13821 | fi |
13804 | @@ -9244,7 +9758,13 @@ _LT_EOF | 13822 | @@ -9244,7 +9758,13 @@ |
13805 | allow_undefined_flag='-berok' | 13823 | allow_undefined_flag='-berok' |
13806 | # Determine the default libpath from the value encoded in an | 13824 | # Determine the default libpath from the value encoded in an |
13807 | # empty executable. | 13825 | # empty executable. |
@@ -13816,7 +13834,7 @@ Index: binutils-2.21/gas/configure | |||
13816 | /* end confdefs.h. */ | 13834 | /* end confdefs.h. */ |
13817 | 13835 | ||
13818 | int | 13836 | int |
13819 | @@ -9257,22 +9777,29 @@ main () | 13837 | @@ -9257,22 +9777,29 @@ |
13820 | _ACEOF | 13838 | _ACEOF |
13821 | if ac_fn_c_try_link "$LINENO"; then : | 13839 | if ac_fn_c_try_link "$LINENO"; then : |
13822 | 13840 | ||
@@ -13859,7 +13877,7 @@ Index: binutils-2.21/gas/configure | |||
13859 | 13877 | ||
13860 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 13878 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
13861 | 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" | 13879 | 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" |
13862 | @@ -9284,7 +9811,13 @@ if test -z "$aix_libpath"; then aix_libp | 13880 | @@ -9284,7 +9811,13 @@ |
13863 | else | 13881 | else |
13864 | # Determine the default libpath from the value encoded in an | 13882 | # Determine the default libpath from the value encoded in an |
13865 | # empty executable. | 13883 | # empty executable. |
@@ -13874,7 +13892,7 @@ Index: binutils-2.21/gas/configure | |||
13874 | /* end confdefs.h. */ | 13892 | /* end confdefs.h. */ |
13875 | 13893 | ||
13876 | int | 13894 | int |
13877 | @@ -9297,22 +9830,29 @@ main () | 13895 | @@ -9297,22 +9830,29 @@ |
13878 | _ACEOF | 13896 | _ACEOF |
13879 | if ac_fn_c_try_link "$LINENO"; then : | 13897 | if ac_fn_c_try_link "$LINENO"; then : |
13880 | 13898 | ||
@@ -13917,7 +13935,7 @@ Index: binutils-2.21/gas/configure | |||
13917 | 13935 | ||
13918 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 13936 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
13919 | # Warning - without using the other run time loading flags, | 13937 | # Warning - without using the other run time loading flags, |
13920 | @@ -9357,20 +9897,63 @@ if test -z "$aix_libpath"; then aix_libp | 13938 | @@ -9357,20 +9897,63 @@ |
13921 | # Microsoft Visual C++. | 13939 | # Microsoft Visual C++. |
13922 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 13940 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
13923 | # no search path for DLLs. | 13941 | # no search path for DLLs. |
@@ -13995,7 +14013,7 @@ Index: binutils-2.21/gas/configure | |||
13995 | ;; | 14013 | ;; |
13996 | 14014 | ||
13997 | darwin* | rhapsody*) | 14015 | darwin* | rhapsody*) |
13998 | @@ -9435,7 +10018,7 @@ if test -z "$aix_libpath"; then aix_libp | 14016 | @@ -9435,7 +10018,7 @@ |
13999 | 14017 | ||
14000 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 14018 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
14001 | freebsd* | dragonfly*) | 14019 | freebsd* | dragonfly*) |
@@ -14004,7 +14022,7 @@ Index: binutils-2.21/gas/configure | |||
14004 | hardcode_libdir_flag_spec='-R$libdir' | 14022 | hardcode_libdir_flag_spec='-R$libdir' |
14005 | hardcode_direct=yes | 14023 | hardcode_direct=yes |
14006 | hardcode_shlibpath_var=no | 14024 | hardcode_shlibpath_var=no |
14007 | @@ -9443,7 +10026,7 @@ if test -z "$aix_libpath"; then aix_libp | 14025 | @@ -9443,7 +10026,7 @@ |
14008 | 14026 | ||
14009 | hpux9*) | 14027 | hpux9*) |
14010 | if test "$GCC" = yes; then | 14028 | if test "$GCC" = yes; then |
@@ -14013,7 +14031,7 @@ Index: binutils-2.21/gas/configure | |||
14013 | else | 14031 | else |
14014 | 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' | 14032 | 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' |
14015 | fi | 14033 | fi |
14016 | @@ -9459,7 +10042,7 @@ if test -z "$aix_libpath"; then aix_libp | 14034 | @@ -9459,7 +10042,7 @@ |
14017 | 14035 | ||
14018 | hpux10*) | 14036 | hpux10*) |
14019 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 14037 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -14022,7 +14040,7 @@ Index: binutils-2.21/gas/configure | |||
14022 | else | 14040 | else |
14023 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 14041 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
14024 | fi | 14042 | fi |
14025 | @@ -9483,10 +10066,10 @@ if test -z "$aix_libpath"; then aix_libp | 14043 | @@ -9483,10 +10066,10 @@ |
14026 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 14044 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
14027 | ;; | 14045 | ;; |
14028 | ia64*) | 14046 | ia64*) |
@@ -14035,7 +14053,7 @@ Index: binutils-2.21/gas/configure | |||
14035 | ;; | 14053 | ;; |
14036 | esac | 14054 | esac |
14037 | else | 14055 | else |
14038 | @@ -9565,23 +10148,36 @@ fi | 14056 | @@ -9565,23 +10148,36 @@ |
14039 | 14057 | ||
14040 | irix5* | irix6* | nonstopux*) | 14058 | irix5* | irix6* | nonstopux*) |
14041 | if test "$GCC" = yes; then | 14059 | if test "$GCC" = yes; then |
@@ -14080,7 +14098,7 @@ Index: binutils-2.21/gas/configure | |||
14080 | else | 14098 | else |
14081 | 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' | 14099 | 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' |
14082 | 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' | 14100 | 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' |
14083 | @@ -9666,7 +10262,7 @@ rm -f core conftest.err conftest.$ac_obj | 14101 | @@ -9666,7 +10262,7 @@ |
14084 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 14102 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
14085 | if test "$GCC" = yes; then | 14103 | if test "$GCC" = yes; then |
14086 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 14104 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -14089,7 +14107,7 @@ Index: binutils-2.21/gas/configure | |||
14089 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 14107 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
14090 | else | 14108 | else |
14091 | allow_undefined_flag=' -expect_unresolved \*' | 14109 | allow_undefined_flag=' -expect_unresolved \*' |
14092 | @@ -9685,9 +10281,9 @@ rm -f core conftest.err conftest.$ac_obj | 14110 | @@ -9685,9 +10281,9 @@ |
14093 | no_undefined_flag=' -z defs' | 14111 | no_undefined_flag=' -z defs' |
14094 | if test "$GCC" = yes; then | 14112 | if test "$GCC" = yes; then |
14095 | wlarc='${wl}' | 14113 | wlarc='${wl}' |
@@ -14101,7 +14119,7 @@ Index: binutils-2.21/gas/configure | |||
14101 | else | 14119 | else |
14102 | case `$CC -V 2>&1` in | 14120 | case `$CC -V 2>&1` in |
14103 | *"Compilers 5.0"*) | 14121 | *"Compilers 5.0"*) |
14104 | @@ -10263,8 +10859,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 14122 | @@ -10263,8 +10859,9 @@ |
14105 | need_version=no | 14123 | need_version=no |
14106 | need_lib_prefix=no | 14124 | need_lib_prefix=no |
14107 | 14125 | ||
@@ -14113,7 +14131,7 @@ Index: binutils-2.21/gas/configure | |||
14113 | library_names_spec='$libname.dll.a' | 14131 | library_names_spec='$libname.dll.a' |
14114 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 14132 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
14115 | postinstall_cmds='base_file=`basename \${file}`~ | 14133 | postinstall_cmds='base_file=`basename \${file}`~ |
14116 | @@ -10297,13 +10894,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 14134 | @@ -10297,13 +10894,71 @@ |
14117 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 14135 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
14118 | ;; | 14136 | ;; |
14119 | esac | 14137 | esac |
@@ -14186,7 +14204,7 @@ Index: binutils-2.21/gas/configure | |||
14186 | # FIXME: first we should search . and the directory the executable is in | 14204 | # FIXME: first we should search . and the directory the executable is in |
14187 | shlibpath_var=PATH | 14205 | shlibpath_var=PATH |
14188 | ;; | 14206 | ;; |
14189 | @@ -10399,7 +11054,7 @@ haiku*) | 14207 | @@ -10399,7 +11054,7 @@ |
14190 | soname_spec='${libname}${release}${shared_ext}$major' | 14208 | soname_spec='${libname}${release}${shared_ext}$major' |
14191 | shlibpath_var=LIBRARY_PATH | 14209 | shlibpath_var=LIBRARY_PATH |
14192 | shlibpath_overrides_runpath=yes | 14210 | shlibpath_overrides_runpath=yes |
@@ -14195,7 +14213,7 @@ Index: binutils-2.21/gas/configure | |||
14195 | hardcode_into_libs=yes | 14213 | hardcode_into_libs=yes |
14196 | ;; | 14214 | ;; |
14197 | 14215 | ||
14198 | @@ -11195,7 +11850,7 @@ else | 14216 | @@ -11195,7 +11850,7 @@ |
14199 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 14217 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
14200 | lt_status=$lt_dlunknown | 14218 | lt_status=$lt_dlunknown |
14201 | cat > conftest.$ac_ext <<_LT_EOF | 14219 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -14204,7 +14222,7 @@ Index: binutils-2.21/gas/configure | |||
14204 | #include "confdefs.h" | 14222 | #include "confdefs.h" |
14205 | 14223 | ||
14206 | #if HAVE_DLFCN_H | 14224 | #if HAVE_DLFCN_H |
14207 | @@ -11239,10 +11894,10 @@ else | 14225 | @@ -11239,10 +11894,10 @@ |
14208 | /* When -fvisbility=hidden is used, assume the code has been annotated | 14226 | /* When -fvisbility=hidden is used, assume the code has been annotated |
14209 | correspondingly for the symbols needed. */ | 14227 | correspondingly for the symbols needed. */ |
14210 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 14228 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -14217,7 +14235,7 @@ Index: binutils-2.21/gas/configure | |||
14217 | int main () | 14235 | int main () |
14218 | { | 14236 | { |
14219 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 14237 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
14220 | @@ -11301,7 +11956,7 @@ else | 14238 | @@ -11301,7 +11956,7 @@ |
14221 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 14239 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
14222 | lt_status=$lt_dlunknown | 14240 | lt_status=$lt_dlunknown |
14223 | cat > conftest.$ac_ext <<_LT_EOF | 14241 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -14226,7 +14244,7 @@ Index: binutils-2.21/gas/configure | |||
14226 | #include "confdefs.h" | 14244 | #include "confdefs.h" |
14227 | 14245 | ||
14228 | #if HAVE_DLFCN_H | 14246 | #if HAVE_DLFCN_H |
14229 | @@ -11345,10 +12000,10 @@ else | 14247 | @@ -11345,10 +12000,10 @@ |
14230 | /* When -fvisbility=hidden is used, assume the code has been annotated | 14248 | /* When -fvisbility=hidden is used, assume the code has been annotated |
14231 | correspondingly for the symbols needed. */ | 14249 | correspondingly for the symbols needed. */ |
14232 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 14250 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -14239,7 +14257,7 @@ Index: binutils-2.21/gas/configure | |||
14239 | int main () | 14257 | int main () |
14240 | { | 14258 | { |
14241 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 14259 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
14242 | @@ -14941,13 +15596,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 14260 | @@ -14941,13 +15596,20 @@ |
14243 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 14261 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
14244 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 14262 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
14245 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 14263 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -14260,7 +14278,7 @@ Index: binutils-2.21/gas/configure | |||
14260 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 14278 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
14261 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 14279 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
14262 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 14280 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
14263 | @@ -14962,14 +15624,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 14281 | @@ -14962,14 +15624,17 @@ |
14264 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 14282 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
14265 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 14283 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
14266 | 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"`' | 14284 | 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"`' |
@@ -14279,7 +14297,7 @@ Index: binutils-2.21/gas/configure | |||
14279 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 14297 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
14280 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 14298 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
14281 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 14299 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
14282 | @@ -15002,12 +15667,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 14300 | @@ -15002,12 +15667,12 @@ |
14283 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 14301 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
14284 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 14302 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
14285 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 14303 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -14293,7 +14311,7 @@ Index: binutils-2.21/gas/configure | |||
14293 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 14311 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
14294 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 14312 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
14295 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 14313 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
14296 | @@ -15062,8 +15727,13 @@ reload_flag \ | 14314 | @@ -15062,8 +15727,13 @@ |
14297 | OBJDUMP \ | 14315 | OBJDUMP \ |
14298 | deplibs_check_method \ | 14316 | deplibs_check_method \ |
14299 | file_magic_cmd \ | 14317 | file_magic_cmd \ |
@@ -14307,7 +14325,7 @@ Index: binutils-2.21/gas/configure | |||
14307 | STRIP \ | 14325 | STRIP \ |
14308 | RANLIB \ | 14326 | RANLIB \ |
14309 | CC \ | 14327 | CC \ |
14310 | @@ -15073,12 +15743,14 @@ lt_cv_sys_global_symbol_pipe \ | 14328 | @@ -15073,12 +15743,14 @@ |
14311 | lt_cv_sys_global_symbol_to_cdecl \ | 14329 | lt_cv_sys_global_symbol_to_cdecl \ |
14312 | lt_cv_sys_global_symbol_to_c_name_address \ | 14330 | lt_cv_sys_global_symbol_to_c_name_address \ |
14313 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 14331 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -14323,7 +14341,7 @@ Index: binutils-2.21/gas/configure | |||
14323 | DSYMUTIL \ | 14341 | DSYMUTIL \ |
14324 | NMEDIT \ | 14342 | NMEDIT \ |
14325 | LIPO \ | 14343 | LIPO \ |
14326 | @@ -15094,7 +15766,6 @@ no_undefined_flag \ | 14344 | @@ -15094,7 +15766,6 @@ |
14327 | hardcode_libdir_flag_spec \ | 14345 | hardcode_libdir_flag_spec \ |
14328 | hardcode_libdir_flag_spec_ld \ | 14346 | hardcode_libdir_flag_spec_ld \ |
14329 | hardcode_libdir_separator \ | 14347 | hardcode_libdir_separator \ |
@@ -14331,7 +14349,7 @@ Index: binutils-2.21/gas/configure | |||
14331 | exclude_expsyms \ | 14349 | exclude_expsyms \ |
14332 | include_expsyms \ | 14350 | include_expsyms \ |
14333 | file_list_spec \ | 14351 | file_list_spec \ |
14334 | @@ -15130,6 +15801,7 @@ module_cmds \ | 14352 | @@ -15130,6 +15801,7 @@ |
14335 | module_expsym_cmds \ | 14353 | module_expsym_cmds \ |
14336 | export_symbols_cmds \ | 14354 | export_symbols_cmds \ |
14337 | prelink_cmds \ | 14355 | prelink_cmds \ |
@@ -14339,7 +14357,7 @@ Index: binutils-2.21/gas/configure | |||
14339 | postinstall_cmds \ | 14357 | postinstall_cmds \ |
14340 | postuninstall_cmds \ | 14358 | postuninstall_cmds \ |
14341 | finish_cmds \ | 14359 | finish_cmds \ |
14342 | @@ -15894,7 +16566,8 @@ $as_echo X"$file" | | 14360 | @@ -15894,7 +16566,8 @@ |
14343 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 14361 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
14344 | # | 14362 | # |
14345 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 14363 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -14349,7 +14367,7 @@ Index: binutils-2.21/gas/configure | |||
14349 | # Written by Gordon Matzigkeit, 1996 | 14367 | # Written by Gordon Matzigkeit, 1996 |
14350 | # | 14368 | # |
14351 | # This file is part of GNU Libtool. | 14369 | # This file is part of GNU Libtool. |
14352 | @@ -15997,19 +16670,42 @@ SP2NL=$lt_lt_SP2NL | 14370 | @@ -15997,19 +16670,42 @@ |
14353 | # turn newlines into spaces. | 14371 | # turn newlines into spaces. |
14354 | NL2SP=$lt_lt_NL2SP | 14372 | NL2SP=$lt_lt_NL2SP |
14355 | 14373 | ||
@@ -14393,7 +14411,7 @@ Index: binutils-2.21/gas/configure | |||
14393 | # A symbol stripping program. | 14411 | # A symbol stripping program. |
14394 | STRIP=$lt_STRIP | 14412 | STRIP=$lt_STRIP |
14395 | 14413 | ||
14396 | @@ -16039,6 +16735,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 14414 | @@ -16039,6 +16735,12 @@ |
14397 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 14415 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
14398 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 14416 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
14399 | 14417 | ||
@@ -14406,7 +14424,7 @@ Index: binutils-2.21/gas/configure | |||
14406 | # The name of the directory that contains temporary libtool files. | 14424 | # The name of the directory that contains temporary libtool files. |
14407 | objdir=$objdir | 14425 | objdir=$objdir |
14408 | 14426 | ||
14409 | @@ -16048,6 +16750,9 @@ MAGIC_CMD=$MAGIC_CMD | 14427 | @@ -16048,6 +16750,9 @@ |
14410 | # Must we lock files when doing compilation? | 14428 | # Must we lock files when doing compilation? |
14411 | need_locks=$lt_need_locks | 14429 | need_locks=$lt_need_locks |
14412 | 14430 | ||
@@ -14416,7 +14434,7 @@ Index: binutils-2.21/gas/configure | |||
14416 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 14434 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
14417 | DSYMUTIL=$lt_DSYMUTIL | 14435 | DSYMUTIL=$lt_DSYMUTIL |
14418 | 14436 | ||
14419 | @@ -16162,12 +16867,12 @@ with_gcc=$GCC | 14437 | @@ -16162,12 +16867,12 @@ |
14420 | # Compiler flag to turn off builtin functions. | 14438 | # Compiler flag to turn off builtin functions. |
14421 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 14439 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
14422 | 14440 | ||
@@ -14432,7 +14450,7 @@ Index: binutils-2.21/gas/configure | |||
14432 | # Compiler flag to prevent dynamic linking. | 14450 | # Compiler flag to prevent dynamic linking. |
14433 | link_static_flag=$lt_lt_prog_compiler_static | 14451 | link_static_flag=$lt_lt_prog_compiler_static |
14434 | 14452 | ||
14435 | @@ -16254,9 +16959,6 @@ inherit_rpath=$inherit_rpath | 14453 | @@ -16254,9 +16959,6 @@ |
14436 | # Whether libtool must link a program against all its dependency libraries. | 14454 | # Whether libtool must link a program against all its dependency libraries. |
14437 | link_all_deplibs=$link_all_deplibs | 14455 | link_all_deplibs=$link_all_deplibs |
14438 | 14456 | ||
@@ -14442,7 +14460,7 @@ Index: binutils-2.21/gas/configure | |||
14442 | # Set to "yes" if exported symbols are required. | 14460 | # Set to "yes" if exported symbols are required. |
14443 | always_export_symbols=$always_export_symbols | 14461 | always_export_symbols=$always_export_symbols |
14444 | 14462 | ||
14445 | @@ -16272,6 +16974,9 @@ include_expsyms=$lt_include_expsyms | 14463 | @@ -16272,6 +16974,9 @@ |
14446 | # Commands necessary for linking programs (against libraries) with templates. | 14464 | # Commands necessary for linking programs (against libraries) with templates. |
14447 | prelink_cmds=$lt_prelink_cmds | 14465 | prelink_cmds=$lt_prelink_cmds |
14448 | 14466 | ||
@@ -14452,7 +14470,7 @@ Index: binutils-2.21/gas/configure | |||
14452 | # Specify filename containing input files. | 14470 | # Specify filename containing input files. |
14453 | file_list_spec=$lt_file_list_spec | 14471 | file_list_spec=$lt_file_list_spec |
14454 | 14472 | ||
14455 | @@ -16304,210 +17009,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 14473 | @@ -16304,210 +17009,169 @@ |
14456 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 14474 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
14457 | # text mode, it properly converts lines to CR/LF. This bash problem | 14475 | # text mode, it properly converts lines to CR/LF. This bash problem |
14458 | # is reportedly fixed, but why not run on old versions too? | 14476 | # is reportedly fixed, but why not run on old versions too? |
@@ -14825,9 +14843,9 @@ Index: binutils-2.21/gas/configure | |||
14825 | 14843 | ||
14826 | Index: binutils-2.21/gprof/configure | 14844 | Index: binutils-2.21/gprof/configure |
14827 | =================================================================== | 14845 | =================================================================== |
14828 | --- binutils-2.21.orig/gprof/configure | 14846 | --- binutils-2.21.orig/gprof/configure 2011-01-07 10:49:15.956101000 -0800 |
14829 | +++ binutils-2.21/gprof/configure | 14847 | +++ binutils-2.21/gprof/configure 2011-01-07 10:49:16.436101000 -0800 |
14830 | @@ -629,8 +629,11 @@ OTOOL | 14848 | @@ -629,8 +629,11 @@ |
14831 | LIPO | 14849 | LIPO |
14832 | NMEDIT | 14850 | NMEDIT |
14833 | DSYMUTIL | 14851 | DSYMUTIL |
@@ -14839,7 +14857,7 @@ Index: binutils-2.21/gprof/configure | |||
14839 | OBJDUMP | 14857 | OBJDUMP |
14840 | LN_S | 14858 | LN_S |
14841 | NM | 14859 | NM |
14842 | @@ -743,6 +746,7 @@ enable_static | 14860 | @@ -743,6 +746,7 @@ |
14843 | with_pic | 14861 | with_pic |
14844 | enable_fast_install | 14862 | enable_fast_install |
14845 | with_gnu_ld | 14863 | with_gnu_ld |
@@ -14847,7 +14865,7 @@ Index: binutils-2.21/gprof/configure | |||
14847 | enable_libtool_lock | 14865 | enable_libtool_lock |
14848 | enable_nls | 14866 | enable_nls |
14849 | enable_maintainer_mode | 14867 | enable_maintainer_mode |
14850 | @@ -1397,6 +1401,8 @@ Optional Packages: | 14868 | @@ -1397,6 +1401,8 @@ |
14851 | --with-pic try to use only PIC/non-PIC objects [default=use | 14869 | --with-pic try to use only PIC/non-PIC objects [default=use |
14852 | both] | 14870 | both] |
14853 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 14871 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -14856,7 +14874,7 @@ Index: binutils-2.21/gprof/configure | |||
14856 | 14874 | ||
14857 | Some influential environment variables: | 14875 | Some influential environment variables: |
14858 | CC C compiler command | 14876 | CC C compiler command |
14859 | @@ -5065,8 +5071,8 @@ esac | 14877 | @@ -5065,8 +5071,8 @@ |
14860 | 14878 | ||
14861 | 14879 | ||
14862 | 14880 | ||
@@ -14867,7 +14885,7 @@ Index: binutils-2.21/gprof/configure | |||
14867 | 14885 | ||
14868 | 14886 | ||
14869 | 14887 | ||
14870 | @@ -5106,7 +5112,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 14888 | @@ -5106,7 +5112,7 @@ |
14871 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 14889 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
14872 | $as_echo_n "checking how to print strings... " >&6; } | 14890 | $as_echo_n "checking how to print strings... " >&6; } |
14873 | # Test print first, because it will be a builtin if present. | 14891 | # Test print first, because it will be a builtin if present. |
@@ -14876,7 +14894,7 @@ Index: binutils-2.21/gprof/configure | |||
14876 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 14894 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
14877 | ECHO='print -r --' | 14895 | ECHO='print -r --' |
14878 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 14896 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
14879 | @@ -5792,8 +5798,8 @@ $as_echo_n "checking whether the shell u | 14897 | @@ -5792,8 +5798,8 @@ |
14880 | # Try some XSI features | 14898 | # Try some XSI features |
14881 | xsi_shell=no | 14899 | xsi_shell=no |
14882 | ( _lt_dummy="a/b/c" | 14900 | ( _lt_dummy="a/b/c" |
@@ -14887,7 +14905,7 @@ Index: binutils-2.21/gprof/configure | |||
14887 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 14905 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
14888 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 14906 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
14889 | && xsi_shell=yes | 14907 | && xsi_shell=yes |
14890 | @@ -5842,6 +5848,80 @@ esac | 14908 | @@ -5842,6 +5848,80 @@ |
14891 | 14909 | ||
14892 | 14910 | ||
14893 | 14911 | ||
@@ -14968,7 +14986,7 @@ Index: binutils-2.21/gprof/configure | |||
14968 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 14986 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
14969 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 14987 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
14970 | if test "${lt_cv_ld_reload_flag+set}" = set; then : | 14988 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
14971 | @@ -5858,6 +5938,11 @@ case $reload_flag in | 14989 | @@ -5858,6 +5938,11 @@ |
14972 | esac | 14990 | esac |
14973 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 14991 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
14974 | case $host_os in | 14992 | case $host_os in |
@@ -14980,7 +14998,7 @@ Index: binutils-2.21/gprof/configure | |||
14980 | darwin*) | 14998 | darwin*) |
14981 | if test "$GCC" = yes; then | 14999 | if test "$GCC" = yes; then |
14982 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 15000 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
14983 | @@ -6026,7 +6111,8 @@ mingw* | pw32*) | 15001 | @@ -6026,7 +6111,8 @@ |
14984 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 15002 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
14985 | lt_cv_file_magic_cmd='func_win32_libid' | 15003 | lt_cv_file_magic_cmd='func_win32_libid' |
14986 | else | 15004 | else |
@@ -14990,7 +15008,7 @@ Index: binutils-2.21/gprof/configure | |||
14990 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 15008 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
14991 | fi | 15009 | fi |
14992 | ;; | 15010 | ;; |
14993 | @@ -6103,11 +6189,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) | 15011 | @@ -6103,11 +6189,6 @@ |
14994 | lt_cv_deplibs_check_method=pass_all | 15012 | lt_cv_deplibs_check_method=pass_all |
14995 | ;; | 15013 | ;; |
14996 | 15014 | ||
@@ -15002,7 +15020,7 @@ Index: binutils-2.21/gprof/configure | |||
15002 | netbsd*) | 15020 | netbsd*) |
15003 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 15021 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
15004 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | 15022 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
15005 | @@ -6185,6 +6266,21 @@ esac | 15023 | @@ -6185,6 +6266,21 @@ |
15006 | fi | 15024 | fi |
15007 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 15025 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
15008 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 15026 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -15024,7 +15042,7 @@ Index: binutils-2.21/gprof/configure | |||
15024 | file_magic_cmd=$lt_cv_file_magic_cmd | 15042 | file_magic_cmd=$lt_cv_file_magic_cmd |
15025 | deplibs_check_method=$lt_cv_deplibs_check_method | 15043 | deplibs_check_method=$lt_cv_deplibs_check_method |
15026 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 15044 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
15027 | @@ -6200,9 +6296,162 @@ test -z "$deplibs_check_method" && depli | 15045 | @@ -6200,9 +6296,162 @@ |
15028 | 15046 | ||
15029 | 15047 | ||
15030 | 15048 | ||
@@ -15189,7 +15207,7 @@ Index: binutils-2.21/gprof/configure | |||
15189 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 15207 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
15190 | $as_echo_n "checking for $ac_word... " >&6; } | 15208 | $as_echo_n "checking for $ac_word... " >&6; } |
15191 | if test "${ac_cv_prog_AR+set}" = set; then : | 15209 | if test "${ac_cv_prog_AR+set}" = set; then : |
15192 | @@ -6218,7 +6467,7 @@ do | 15210 | @@ -6218,7 +6467,7 @@ |
15193 | test -z "$as_dir" && as_dir=. | 15211 | test -z "$as_dir" && as_dir=. |
15194 | for ac_exec_ext in '' $ac_executable_extensions; do | 15212 | for ac_exec_ext in '' $ac_executable_extensions; do |
15195 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 15213 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -15198,7 +15216,7 @@ Index: binutils-2.21/gprof/configure | |||
15198 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 15216 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
15199 | break 2 | 15217 | break 2 |
15200 | fi | 15218 | fi |
15201 | @@ -6238,11 +6487,15 @@ $as_echo "no" >&6; } | 15219 | @@ -6238,11 +6487,15 @@ |
15202 | fi | 15220 | fi |
15203 | 15221 | ||
15204 | 15222 | ||
@@ -15217,7 +15235,7 @@ Index: binutils-2.21/gprof/configure | |||
15217 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 15235 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
15218 | $as_echo_n "checking for $ac_word... " >&6; } | 15236 | $as_echo_n "checking for $ac_word... " >&6; } |
15219 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | 15237 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
15220 | @@ -6258,7 +6511,7 @@ do | 15238 | @@ -6258,7 +6511,7 @@ |
15221 | test -z "$as_dir" && as_dir=. | 15239 | test -z "$as_dir" && as_dir=. |
15222 | for ac_exec_ext in '' $ac_executable_extensions; do | 15240 | for ac_exec_ext in '' $ac_executable_extensions; do |
15223 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 15241 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -15226,7 +15244,7 @@ Index: binutils-2.21/gprof/configure | |||
15226 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 15244 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
15227 | break 2 | 15245 | break 2 |
15228 | fi | 15246 | fi |
15229 | @@ -6277,6 +6530,10 @@ else | 15247 | @@ -6277,6 +6530,10 @@ |
15230 | $as_echo "no" >&6; } | 15248 | $as_echo "no" >&6; } |
15231 | fi | 15249 | fi |
15232 | 15250 | ||
@@ -15237,7 +15255,7 @@ Index: binutils-2.21/gprof/configure | |||
15237 | if test "x$ac_ct_AR" = x; then | 15255 | if test "x$ac_ct_AR" = x; then |
15238 | AR="false" | 15256 | AR="false" |
15239 | else | 15257 | else |
15240 | @@ -6288,16 +6545,72 @@ ac_tool_warned=yes ;; | 15258 | @@ -6288,16 +6545,72 @@ |
15241 | esac | 15259 | esac |
15242 | AR=$ac_ct_AR | 15260 | AR=$ac_ct_AR |
15243 | fi | 15261 | fi |
@@ -15314,7 +15332,7 @@ Index: binutils-2.21/gprof/configure | |||
15314 | 15332 | ||
15315 | 15333 | ||
15316 | 15334 | ||
15317 | @@ -6639,8 +6952,8 @@ esac | 15335 | @@ -6639,8 +6952,8 @@ |
15318 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 15336 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
15319 | 15337 | ||
15320 | # Transform an extracted symbol line into symbol name and symbol address | 15338 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -15325,7 +15343,7 @@ Index: binutils-2.21/gprof/configure | |||
15325 | 15343 | ||
15326 | # Handle CRLF in mingw tool chain | 15344 | # Handle CRLF in mingw tool chain |
15327 | opt_cr= | 15345 | opt_cr= |
15328 | @@ -6676,6 +6989,7 @@ for ac_symprfx in "" "_"; do | 15346 | @@ -6676,6 +6989,7 @@ |
15329 | else | 15347 | else |
15330 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 15348 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
15331 | fi | 15349 | fi |
@@ -15333,7 +15351,7 @@ Index: binutils-2.21/gprof/configure | |||
15333 | 15351 | ||
15334 | # Check to see that the pipe works correctly. | 15352 | # Check to see that the pipe works correctly. |
15335 | pipe_works=no | 15353 | pipe_works=no |
15336 | @@ -6717,6 +7031,18 @@ _LT_EOF | 15354 | @@ -6717,6 +7031,18 @@ |
15337 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 15355 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
15338 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 15356 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
15339 | cat <<_LT_EOF > conftest.$ac_ext | 15357 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -15352,7 +15370,7 @@ Index: binutils-2.21/gprof/configure | |||
15352 | #ifdef __cplusplus | 15370 | #ifdef __cplusplus |
15353 | extern "C" { | 15371 | extern "C" { |
15354 | #endif | 15372 | #endif |
15355 | @@ -6728,7 +7054,7 @@ _LT_EOF | 15373 | @@ -6728,7 +7054,7 @@ |
15356 | cat <<_LT_EOF >> conftest.$ac_ext | 15374 | cat <<_LT_EOF >> conftest.$ac_ext |
15357 | 15375 | ||
15358 | /* The mapping between symbol names and symbols. */ | 15376 | /* The mapping between symbol names and symbols. */ |
@@ -15361,7 +15379,7 @@ Index: binutils-2.21/gprof/configure | |||
15361 | const char *name; | 15379 | const char *name; |
15362 | void *address; | 15380 | void *address; |
15363 | } | 15381 | } |
15364 | @@ -6754,8 +7080,8 @@ static const void *lt_preloaded_setup() | 15382 | @@ -6754,8 +7080,8 @@ |
15365 | _LT_EOF | 15383 | _LT_EOF |
15366 | # Now try linking the two files. | 15384 | # Now try linking the two files. |
15367 | mv conftest.$ac_objext conftstm.$ac_objext | 15385 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -15372,7 +15390,7 @@ Index: binutils-2.21/gprof/configure | |||
15372 | LIBS="conftstm.$ac_objext" | 15390 | LIBS="conftstm.$ac_objext" |
15373 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 15391 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
15374 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 15392 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
15375 | @@ -6765,8 +7091,8 @@ _LT_EOF | 15393 | @@ -6765,8 +7091,8 @@ |
15376 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 15394 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
15377 | pipe_works=yes | 15395 | pipe_works=yes |
15378 | fi | 15396 | fi |
@@ -15383,7 +15401,7 @@ Index: binutils-2.21/gprof/configure | |||
15383 | else | 15401 | else |
15384 | echo "cannot find nm_test_func in $nlist" >&5 | 15402 | echo "cannot find nm_test_func in $nlist" >&5 |
15385 | fi | 15403 | fi |
15386 | @@ -6803,6 +7129,17 @@ else | 15404 | @@ -6803,6 +7129,17 @@ |
15387 | $as_echo "ok" >&6; } | 15405 | $as_echo "ok" >&6; } |
15388 | fi | 15406 | fi |
15389 | 15407 | ||
@@ -15401,7 +15419,7 @@ Index: binutils-2.21/gprof/configure | |||
15401 | 15419 | ||
15402 | 15420 | ||
15403 | 15421 | ||
15404 | @@ -6824,6 +7161,44 @@ fi | 15422 | @@ -6824,6 +7161,44 @@ |
15405 | 15423 | ||
15406 | 15424 | ||
15407 | 15425 | ||
@@ -15446,7 +15464,7 @@ Index: binutils-2.21/gprof/configure | |||
15446 | # Check whether --enable-libtool-lock was given. | 15464 | # Check whether --enable-libtool-lock was given. |
15447 | if test "${enable_libtool_lock+set}" = set; then : | 15465 | if test "${enable_libtool_lock+set}" = set; then : |
15448 | enableval=$enable_libtool_lock; | 15466 | enableval=$enable_libtool_lock; |
15449 | @@ -7017,6 +7392,123 @@ esac | 15467 | @@ -7017,6 +7392,123 @@ |
15450 | 15468 | ||
15451 | need_locks="$enable_libtool_lock" | 15469 | need_locks="$enable_libtool_lock" |
15452 | 15470 | ||
@@ -15570,7 +15588,7 @@ Index: binutils-2.21/gprof/configure | |||
15570 | 15588 | ||
15571 | case $host_os in | 15589 | case $host_os in |
15572 | rhapsody* | darwin*) | 15590 | rhapsody* | darwin*) |
15573 | @@ -7580,6 +8072,8 @@ _LT_EOF | 15591 | @@ -7580,6 +8072,8 @@ |
15574 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 15592 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
15575 | echo "$AR cru libconftest.a conftest.o" >&5 | 15593 | echo "$AR cru libconftest.a conftest.o" >&5 |
15576 | $AR cru libconftest.a conftest.o 2>&5 | 15594 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -15579,7 +15597,7 @@ Index: binutils-2.21/gprof/configure | |||
15579 | cat > conftest.c << _LT_EOF | 15597 | cat > conftest.c << _LT_EOF |
15580 | int main() { return 0;} | 15598 | int main() { return 0;} |
15581 | _LT_EOF | 15599 | _LT_EOF |
15582 | @@ -7775,7 +8269,8 @@ fi | 15600 | @@ -7775,7 +8269,8 @@ |
15583 | LIBTOOL_DEPS="$ltmain" | 15601 | LIBTOOL_DEPS="$ltmain" |
15584 | 15602 | ||
15585 | # Always use our own libtool. | 15603 | # Always use our own libtool. |
@@ -15589,7 +15607,7 @@ Index: binutils-2.21/gprof/configure | |||
15589 | 15607 | ||
15590 | 15608 | ||
15591 | 15609 | ||
15592 | @@ -7864,7 +8359,7 @@ aix3*) | 15610 | @@ -7864,7 +8359,7 @@ |
15593 | esac | 15611 | esac |
15594 | 15612 | ||
15595 | # Global variables: | 15613 | # Global variables: |
@@ -15598,7 +15616,7 @@ Index: binutils-2.21/gprof/configure | |||
15598 | can_build_shared=yes | 15616 | can_build_shared=yes |
15599 | 15617 | ||
15600 | # All known linkers require a `.a' archive for static linking (except MSVC, | 15618 | # All known linkers require a `.a' archive for static linking (except MSVC, |
15601 | @@ -8162,8 +8657,6 @@ fi | 15619 | @@ -8162,8 +8657,6 @@ |
15602 | lt_prog_compiler_pic= | 15620 | lt_prog_compiler_pic= |
15603 | lt_prog_compiler_static= | 15621 | lt_prog_compiler_static= |
15604 | 15622 | ||
@@ -15607,7 +15625,7 @@ Index: binutils-2.21/gprof/configure | |||
15607 | 15625 | ||
15608 | if test "$GCC" = yes; then | 15626 | if test "$GCC" = yes; then |
15609 | lt_prog_compiler_wl='-Wl,' | 15627 | lt_prog_compiler_wl='-Wl,' |
15610 | @@ -8328,6 +8821,12 @@ $as_echo_n "checking for $compiler optio | 15628 | @@ -8328,6 +8821,12 @@ |
15611 | lt_prog_compiler_pic='--shared' | 15629 | lt_prog_compiler_pic='--shared' |
15612 | lt_prog_compiler_static='--static' | 15630 | lt_prog_compiler_static='--static' |
15613 | ;; | 15631 | ;; |
@@ -15620,7 +15638,7 @@ Index: binutils-2.21/gprof/configure | |||
15620 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 15638 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
15621 | # Portland Group compilers (*not* the Pentium gcc compiler, | 15639 | # Portland Group compilers (*not* the Pentium gcc compiler, |
15622 | # which looks to be a dead project) | 15640 | # which looks to be a dead project) |
15623 | @@ -8390,7 +8889,7 @@ $as_echo_n "checking for $compiler optio | 15641 | @@ -8390,7 +8889,7 @@ |
15624 | lt_prog_compiler_pic='-KPIC' | 15642 | lt_prog_compiler_pic='-KPIC' |
15625 | lt_prog_compiler_static='-Bstatic' | 15643 | lt_prog_compiler_static='-Bstatic' |
15626 | case $cc_basename in | 15644 | case $cc_basename in |
@@ -15629,7 +15647,7 @@ Index: binutils-2.21/gprof/configure | |||
15629 | lt_prog_compiler_wl='-Qoption ld ';; | 15647 | lt_prog_compiler_wl='-Qoption ld ';; |
15630 | *) | 15648 | *) |
15631 | lt_prog_compiler_wl='-Wl,';; | 15649 | lt_prog_compiler_wl='-Wl,';; |
15632 | @@ -8447,13 +8946,17 @@ case $host_os in | 15650 | @@ -8447,13 +8946,17 @@ |
15633 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 15651 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
15634 | ;; | 15652 | ;; |
15635 | esac | 15653 | esac |
@@ -15653,7 +15671,7 @@ Index: binutils-2.21/gprof/configure | |||
15653 | 15671 | ||
15654 | # | 15672 | # |
15655 | # Check to make sure the PIC flag actually works. | 15673 | # Check to make sure the PIC flag actually works. |
15656 | @@ -8514,6 +9017,11 @@ fi | 15674 | @@ -8514,6 +9017,11 @@ |
15657 | 15675 | ||
15658 | 15676 | ||
15659 | 15677 | ||
@@ -15665,7 +15683,7 @@ Index: binutils-2.21/gprof/configure | |||
15665 | # | 15683 | # |
15666 | # Check to make sure the static flag actually works. | 15684 | # Check to make sure the static flag actually works. |
15667 | # | 15685 | # |
15668 | @@ -8864,7 +9372,8 @@ _LT_EOF | 15686 | @@ -8864,7 +9372,8 @@ |
15669 | allow_undefined_flag=unsupported | 15687 | allow_undefined_flag=unsupported |
15670 | always_export_symbols=no | 15688 | always_export_symbols=no |
15671 | enable_shared_with_static_runtimes=yes | 15689 | enable_shared_with_static_runtimes=yes |
@@ -15675,7 +15693,7 @@ Index: binutils-2.21/gprof/configure | |||
15675 | 15693 | ||
15676 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 15694 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
15677 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 15695 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
15678 | @@ -8912,7 +9421,7 @@ _LT_EOF | 15696 | @@ -8912,7 +9421,7 @@ |
15679 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 15697 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
15680 | && test "$tmp_diet" = no | 15698 | && test "$tmp_diet" = no |
15681 | then | 15699 | then |
@@ -15684,7 +15702,7 @@ Index: binutils-2.21/gprof/configure | |||
15684 | tmp_sharedflag='-shared' | 15702 | tmp_sharedflag='-shared' |
15685 | case $cc_basename,$host_cpu in | 15703 | case $cc_basename,$host_cpu in |
15686 | pgcc*) # Portland Group C compiler | 15704 | pgcc*) # Portland Group C compiler |
15687 | @@ -8963,12 +9472,12 @@ _LT_EOF | 15705 | @@ -8963,12 +9472,12 @@ |
15688 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 15706 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
15689 | hardcode_libdir_flag_spec= | 15707 | hardcode_libdir_flag_spec= |
15690 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 15708 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -15699,7 +15717,7 @@ Index: binutils-2.21/gprof/configure | |||
15699 | fi | 15717 | fi |
15700 | ;; | 15718 | ;; |
15701 | esac | 15719 | esac |
15702 | @@ -8982,8 +9491,8 @@ _LT_EOF | 15720 | @@ -8982,8 +9491,8 @@ |
15703 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 15721 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
15704 | wlarc= | 15722 | wlarc= |
15705 | else | 15723 | else |
@@ -15710,7 +15728,7 @@ Index: binutils-2.21/gprof/configure | |||
15710 | fi | 15728 | fi |
15711 | ;; | 15729 | ;; |
15712 | 15730 | ||
15713 | @@ -9001,8 +9510,8 @@ _LT_EOF | 15731 | @@ -9001,8 +9510,8 @@ |
15714 | 15732 | ||
15715 | _LT_EOF | 15733 | _LT_EOF |
15716 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 15734 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -15721,7 +15739,7 @@ Index: binutils-2.21/gprof/configure | |||
15721 | else | 15739 | else |
15722 | ld_shlibs=no | 15740 | ld_shlibs=no |
15723 | fi | 15741 | fi |
15724 | @@ -9048,8 +9557,8 @@ _LT_EOF | 15742 | @@ -9048,8 +9557,8 @@ |
15725 | 15743 | ||
15726 | *) | 15744 | *) |
15727 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 15745 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -15732,7 +15750,7 @@ Index: binutils-2.21/gprof/configure | |||
15732 | else | 15750 | else |
15733 | ld_shlibs=no | 15751 | ld_shlibs=no |
15734 | fi | 15752 | fi |
15735 | @@ -9179,7 +9688,13 @@ _LT_EOF | 15753 | @@ -9179,7 +9688,13 @@ |
15736 | allow_undefined_flag='-berok' | 15754 | allow_undefined_flag='-berok' |
15737 | # Determine the default libpath from the value encoded in an | 15755 | # Determine the default libpath from the value encoded in an |
15738 | # empty executable. | 15756 | # empty executable. |
@@ -15747,7 +15765,7 @@ Index: binutils-2.21/gprof/configure | |||
15747 | /* end confdefs.h. */ | 15765 | /* end confdefs.h. */ |
15748 | 15766 | ||
15749 | int | 15767 | int |
15750 | @@ -9192,22 +9707,29 @@ main () | 15768 | @@ -9192,22 +9707,29 @@ |
15751 | _ACEOF | 15769 | _ACEOF |
15752 | if ac_fn_c_try_link "$LINENO"; then : | 15770 | if ac_fn_c_try_link "$LINENO"; then : |
15753 | 15771 | ||
@@ -15790,7 +15808,7 @@ Index: binutils-2.21/gprof/configure | |||
15790 | 15808 | ||
15791 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 15809 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
15792 | 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" | 15810 | 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" |
15793 | @@ -9219,7 +9741,13 @@ if test -z "$aix_libpath"; then aix_libp | 15811 | @@ -9219,7 +9741,13 @@ |
15794 | else | 15812 | else |
15795 | # Determine the default libpath from the value encoded in an | 15813 | # Determine the default libpath from the value encoded in an |
15796 | # empty executable. | 15814 | # empty executable. |
@@ -15805,7 +15823,7 @@ Index: binutils-2.21/gprof/configure | |||
15805 | /* end confdefs.h. */ | 15823 | /* end confdefs.h. */ |
15806 | 15824 | ||
15807 | int | 15825 | int |
15808 | @@ -9232,22 +9760,29 @@ main () | 15826 | @@ -9232,22 +9760,29 @@ |
15809 | _ACEOF | 15827 | _ACEOF |
15810 | if ac_fn_c_try_link "$LINENO"; then : | 15828 | if ac_fn_c_try_link "$LINENO"; then : |
15811 | 15829 | ||
@@ -15848,7 +15866,7 @@ Index: binutils-2.21/gprof/configure | |||
15848 | 15866 | ||
15849 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 15867 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
15850 | # Warning - without using the other run time loading flags, | 15868 | # Warning - without using the other run time loading flags, |
15851 | @@ -9292,20 +9827,63 @@ if test -z "$aix_libpath"; then aix_libp | 15869 | @@ -9292,20 +9827,63 @@ |
15852 | # Microsoft Visual C++. | 15870 | # Microsoft Visual C++. |
15853 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 15871 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
15854 | # no search path for DLLs. | 15872 | # no search path for DLLs. |
@@ -15926,7 +15944,7 @@ Index: binutils-2.21/gprof/configure | |||
15926 | ;; | 15944 | ;; |
15927 | 15945 | ||
15928 | darwin* | rhapsody*) | 15946 | darwin* | rhapsody*) |
15929 | @@ -9370,7 +9948,7 @@ if test -z "$aix_libpath"; then aix_libp | 15947 | @@ -9370,7 +9948,7 @@ |
15930 | 15948 | ||
15931 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 15949 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
15932 | freebsd* | dragonfly*) | 15950 | freebsd* | dragonfly*) |
@@ -15935,7 +15953,7 @@ Index: binutils-2.21/gprof/configure | |||
15935 | hardcode_libdir_flag_spec='-R$libdir' | 15953 | hardcode_libdir_flag_spec='-R$libdir' |
15936 | hardcode_direct=yes | 15954 | hardcode_direct=yes |
15937 | hardcode_shlibpath_var=no | 15955 | hardcode_shlibpath_var=no |
15938 | @@ -9378,7 +9956,7 @@ if test -z "$aix_libpath"; then aix_libp | 15956 | @@ -9378,7 +9956,7 @@ |
15939 | 15957 | ||
15940 | hpux9*) | 15958 | hpux9*) |
15941 | if test "$GCC" = yes; then | 15959 | if test "$GCC" = yes; then |
@@ -15944,7 +15962,7 @@ Index: binutils-2.21/gprof/configure | |||
15944 | else | 15962 | else |
15945 | 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' | 15963 | 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' |
15946 | fi | 15964 | fi |
15947 | @@ -9394,7 +9972,7 @@ if test -z "$aix_libpath"; then aix_libp | 15965 | @@ -9394,7 +9972,7 @@ |
15948 | 15966 | ||
15949 | hpux10*) | 15967 | hpux10*) |
15950 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 15968 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -15953,7 +15971,7 @@ Index: binutils-2.21/gprof/configure | |||
15953 | else | 15971 | else |
15954 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 15972 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
15955 | fi | 15973 | fi |
15956 | @@ -9418,10 +9996,10 @@ if test -z "$aix_libpath"; then aix_libp | 15974 | @@ -9418,10 +9996,10 @@ |
15957 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 15975 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
15958 | ;; | 15976 | ;; |
15959 | ia64*) | 15977 | ia64*) |
@@ -15966,7 +15984,7 @@ Index: binutils-2.21/gprof/configure | |||
15966 | ;; | 15984 | ;; |
15967 | esac | 15985 | esac |
15968 | else | 15986 | else |
15969 | @@ -9500,23 +10078,36 @@ fi | 15987 | @@ -9500,23 +10078,36 @@ |
15970 | 15988 | ||
15971 | irix5* | irix6* | nonstopux*) | 15989 | irix5* | irix6* | nonstopux*) |
15972 | if test "$GCC" = yes; then | 15990 | if test "$GCC" = yes; then |
@@ -16011,7 +16029,7 @@ Index: binutils-2.21/gprof/configure | |||
16011 | else | 16029 | else |
16012 | 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' | 16030 | 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' |
16013 | 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' | 16031 | 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' |
16014 | @@ -9601,7 +10192,7 @@ rm -f core conftest.err conftest.$ac_obj | 16032 | @@ -9601,7 +10192,7 @@ |
16015 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 16033 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
16016 | if test "$GCC" = yes; then | 16034 | if test "$GCC" = yes; then |
16017 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 16035 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -16020,7 +16038,7 @@ Index: binutils-2.21/gprof/configure | |||
16020 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 16038 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
16021 | else | 16039 | else |
16022 | allow_undefined_flag=' -expect_unresolved \*' | 16040 | allow_undefined_flag=' -expect_unresolved \*' |
16023 | @@ -9620,9 +10211,9 @@ rm -f core conftest.err conftest.$ac_obj | 16041 | @@ -9620,9 +10211,9 @@ |
16024 | no_undefined_flag=' -z defs' | 16042 | no_undefined_flag=' -z defs' |
16025 | if test "$GCC" = yes; then | 16043 | if test "$GCC" = yes; then |
16026 | wlarc='${wl}' | 16044 | wlarc='${wl}' |
@@ -16032,7 +16050,7 @@ Index: binutils-2.21/gprof/configure | |||
16032 | else | 16050 | else |
16033 | case `$CC -V 2>&1` in | 16051 | case `$CC -V 2>&1` in |
16034 | *"Compilers 5.0"*) | 16052 | *"Compilers 5.0"*) |
16035 | @@ -10198,8 +10789,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 16053 | @@ -10198,8 +10789,9 @@ |
16036 | need_version=no | 16054 | need_version=no |
16037 | need_lib_prefix=no | 16055 | need_lib_prefix=no |
16038 | 16056 | ||
@@ -16044,7 +16062,7 @@ Index: binutils-2.21/gprof/configure | |||
16044 | library_names_spec='$libname.dll.a' | 16062 | library_names_spec='$libname.dll.a' |
16045 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 16063 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
16046 | postinstall_cmds='base_file=`basename \${file}`~ | 16064 | postinstall_cmds='base_file=`basename \${file}`~ |
16047 | @@ -10232,13 +10824,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 16065 | @@ -10232,13 +10824,71 @@ |
16048 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 16066 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
16049 | ;; | 16067 | ;; |
16050 | esac | 16068 | esac |
@@ -16117,7 +16135,7 @@ Index: binutils-2.21/gprof/configure | |||
16117 | # FIXME: first we should search . and the directory the executable is in | 16135 | # FIXME: first we should search . and the directory the executable is in |
16118 | shlibpath_var=PATH | 16136 | shlibpath_var=PATH |
16119 | ;; | 16137 | ;; |
16120 | @@ -10334,7 +10984,7 @@ haiku*) | 16138 | @@ -10334,7 +10984,7 @@ |
16121 | soname_spec='${libname}${release}${shared_ext}$major' | 16139 | soname_spec='${libname}${release}${shared_ext}$major' |
16122 | shlibpath_var=LIBRARY_PATH | 16140 | shlibpath_var=LIBRARY_PATH |
16123 | shlibpath_overrides_runpath=yes | 16141 | shlibpath_overrides_runpath=yes |
@@ -16126,7 +16144,7 @@ Index: binutils-2.21/gprof/configure | |||
16126 | hardcode_into_libs=yes | 16144 | hardcode_into_libs=yes |
16127 | ;; | 16145 | ;; |
16128 | 16146 | ||
16129 | @@ -11130,7 +11780,7 @@ else | 16147 | @@ -11130,7 +11780,7 @@ |
16130 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 16148 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
16131 | lt_status=$lt_dlunknown | 16149 | lt_status=$lt_dlunknown |
16132 | cat > conftest.$ac_ext <<_LT_EOF | 16150 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -16135,7 +16153,7 @@ Index: binutils-2.21/gprof/configure | |||
16135 | #include "confdefs.h" | 16153 | #include "confdefs.h" |
16136 | 16154 | ||
16137 | #if HAVE_DLFCN_H | 16155 | #if HAVE_DLFCN_H |
16138 | @@ -11174,10 +11824,10 @@ else | 16156 | @@ -11174,10 +11824,10 @@ |
16139 | /* When -fvisbility=hidden is used, assume the code has been annotated | 16157 | /* When -fvisbility=hidden is used, assume the code has been annotated |
16140 | correspondingly for the symbols needed. */ | 16158 | correspondingly for the symbols needed. */ |
16141 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 16159 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -16148,7 +16166,7 @@ Index: binutils-2.21/gprof/configure | |||
16148 | int main () | 16166 | int main () |
16149 | { | 16167 | { |
16150 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 16168 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
16151 | @@ -11236,7 +11886,7 @@ else | 16169 | @@ -11236,7 +11886,7 @@ |
16152 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 16170 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
16153 | lt_status=$lt_dlunknown | 16171 | lt_status=$lt_dlunknown |
16154 | cat > conftest.$ac_ext <<_LT_EOF | 16172 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -16157,7 +16175,7 @@ Index: binutils-2.21/gprof/configure | |||
16157 | #include "confdefs.h" | 16175 | #include "confdefs.h" |
16158 | 16176 | ||
16159 | #if HAVE_DLFCN_H | 16177 | #if HAVE_DLFCN_H |
16160 | @@ -11280,10 +11930,10 @@ else | 16178 | @@ -11280,10 +11930,10 @@ |
16161 | /* When -fvisbility=hidden is used, assume the code has been annotated | 16179 | /* When -fvisbility=hidden is used, assume the code has been annotated |
16162 | correspondingly for the symbols needed. */ | 16180 | correspondingly for the symbols needed. */ |
16163 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 16181 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -16170,7 +16188,7 @@ Index: binutils-2.21/gprof/configure | |||
16170 | int main () | 16188 | int main () |
16171 | { | 16189 | { |
16172 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 16190 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
16173 | @@ -12825,13 +13475,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 16191 | @@ -12825,13 +13475,20 @@ |
16174 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 16192 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
16175 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 16193 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
16176 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 16194 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -16191,7 +16209,7 @@ Index: binutils-2.21/gprof/configure | |||
16191 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 16209 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
16192 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 16210 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
16193 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 16211 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
16194 | @@ -12846,14 +13503,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 16212 | @@ -12846,14 +13503,17 @@ |
16195 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 16213 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
16196 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 16214 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
16197 | 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"`' | 16215 | 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"`' |
@@ -16210,7 +16228,7 @@ Index: binutils-2.21/gprof/configure | |||
16210 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 16228 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
16211 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 16229 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
16212 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 16230 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
16213 | @@ -12886,12 +13546,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 16231 | @@ -12886,12 +13546,12 @@ |
16214 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 16232 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
16215 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 16233 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
16216 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 16234 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -16224,7 +16242,7 @@ Index: binutils-2.21/gprof/configure | |||
16224 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 16242 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
16225 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 16243 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
16226 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 16244 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
16227 | @@ -12946,8 +13606,13 @@ reload_flag \ | 16245 | @@ -12946,8 +13606,13 @@ |
16228 | OBJDUMP \ | 16246 | OBJDUMP \ |
16229 | deplibs_check_method \ | 16247 | deplibs_check_method \ |
16230 | file_magic_cmd \ | 16248 | file_magic_cmd \ |
@@ -16238,7 +16256,7 @@ Index: binutils-2.21/gprof/configure | |||
16238 | STRIP \ | 16256 | STRIP \ |
16239 | RANLIB \ | 16257 | RANLIB \ |
16240 | CC \ | 16258 | CC \ |
16241 | @@ -12957,12 +13622,14 @@ lt_cv_sys_global_symbol_pipe \ | 16259 | @@ -12957,12 +13622,14 @@ |
16242 | lt_cv_sys_global_symbol_to_cdecl \ | 16260 | lt_cv_sys_global_symbol_to_cdecl \ |
16243 | lt_cv_sys_global_symbol_to_c_name_address \ | 16261 | lt_cv_sys_global_symbol_to_c_name_address \ |
16244 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 16262 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -16254,7 +16272,7 @@ Index: binutils-2.21/gprof/configure | |||
16254 | DSYMUTIL \ | 16272 | DSYMUTIL \ |
16255 | NMEDIT \ | 16273 | NMEDIT \ |
16256 | LIPO \ | 16274 | LIPO \ |
16257 | @@ -12978,7 +13645,6 @@ no_undefined_flag \ | 16275 | @@ -12978,7 +13645,6 @@ |
16258 | hardcode_libdir_flag_spec \ | 16276 | hardcode_libdir_flag_spec \ |
16259 | hardcode_libdir_flag_spec_ld \ | 16277 | hardcode_libdir_flag_spec_ld \ |
16260 | hardcode_libdir_separator \ | 16278 | hardcode_libdir_separator \ |
@@ -16262,7 +16280,7 @@ Index: binutils-2.21/gprof/configure | |||
16262 | exclude_expsyms \ | 16280 | exclude_expsyms \ |
16263 | include_expsyms \ | 16281 | include_expsyms \ |
16264 | file_list_spec \ | 16282 | file_list_spec \ |
16265 | @@ -13014,6 +13680,7 @@ module_cmds \ | 16283 | @@ -13014,6 +13680,7 @@ |
16266 | module_expsym_cmds \ | 16284 | module_expsym_cmds \ |
16267 | export_symbols_cmds \ | 16285 | export_symbols_cmds \ |
16268 | prelink_cmds \ | 16286 | prelink_cmds \ |
@@ -16270,7 +16288,7 @@ Index: binutils-2.21/gprof/configure | |||
16270 | postinstall_cmds \ | 16288 | postinstall_cmds \ |
16271 | postuninstall_cmds \ | 16289 | postuninstall_cmds \ |
16272 | finish_cmds \ | 16290 | finish_cmds \ |
16273 | @@ -13770,7 +14437,8 @@ $as_echo X"$file" | | 16291 | @@ -13770,7 +14437,8 @@ |
16274 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 16292 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
16275 | # | 16293 | # |
16276 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 16294 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -16280,7 +16298,7 @@ Index: binutils-2.21/gprof/configure | |||
16280 | # Written by Gordon Matzigkeit, 1996 | 16298 | # Written by Gordon Matzigkeit, 1996 |
16281 | # | 16299 | # |
16282 | # This file is part of GNU Libtool. | 16300 | # This file is part of GNU Libtool. |
16283 | @@ -13873,19 +14541,42 @@ SP2NL=$lt_lt_SP2NL | 16301 | @@ -13873,19 +14541,42 @@ |
16284 | # turn newlines into spaces. | 16302 | # turn newlines into spaces. |
16285 | NL2SP=$lt_lt_NL2SP | 16303 | NL2SP=$lt_lt_NL2SP |
16286 | 16304 | ||
@@ -16324,7 +16342,7 @@ Index: binutils-2.21/gprof/configure | |||
16324 | # A symbol stripping program. | 16342 | # A symbol stripping program. |
16325 | STRIP=$lt_STRIP | 16343 | STRIP=$lt_STRIP |
16326 | 16344 | ||
16327 | @@ -13915,6 +14606,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 16345 | @@ -13915,6 +14606,12 @@ |
16328 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 16346 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
16329 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 16347 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
16330 | 16348 | ||
@@ -16337,7 +16355,7 @@ Index: binutils-2.21/gprof/configure | |||
16337 | # The name of the directory that contains temporary libtool files. | 16355 | # The name of the directory that contains temporary libtool files. |
16338 | objdir=$objdir | 16356 | objdir=$objdir |
16339 | 16357 | ||
16340 | @@ -13924,6 +14621,9 @@ MAGIC_CMD=$MAGIC_CMD | 16358 | @@ -13924,6 +14621,9 @@ |
16341 | # Must we lock files when doing compilation? | 16359 | # Must we lock files when doing compilation? |
16342 | need_locks=$lt_need_locks | 16360 | need_locks=$lt_need_locks |
16343 | 16361 | ||
@@ -16347,7 +16365,7 @@ Index: binutils-2.21/gprof/configure | |||
16347 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 16365 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
16348 | DSYMUTIL=$lt_DSYMUTIL | 16366 | DSYMUTIL=$lt_DSYMUTIL |
16349 | 16367 | ||
16350 | @@ -14038,12 +14738,12 @@ with_gcc=$GCC | 16368 | @@ -14038,12 +14738,12 @@ |
16351 | # Compiler flag to turn off builtin functions. | 16369 | # Compiler flag to turn off builtin functions. |
16352 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 16370 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
16353 | 16371 | ||
@@ -16363,7 +16381,7 @@ Index: binutils-2.21/gprof/configure | |||
16363 | # Compiler flag to prevent dynamic linking. | 16381 | # Compiler flag to prevent dynamic linking. |
16364 | link_static_flag=$lt_lt_prog_compiler_static | 16382 | link_static_flag=$lt_lt_prog_compiler_static |
16365 | 16383 | ||
16366 | @@ -14130,9 +14830,6 @@ inherit_rpath=$inherit_rpath | 16384 | @@ -14130,9 +14830,6 @@ |
16367 | # Whether libtool must link a program against all its dependency libraries. | 16385 | # Whether libtool must link a program against all its dependency libraries. |
16368 | link_all_deplibs=$link_all_deplibs | 16386 | link_all_deplibs=$link_all_deplibs |
16369 | 16387 | ||
@@ -16373,7 +16391,7 @@ Index: binutils-2.21/gprof/configure | |||
16373 | # Set to "yes" if exported symbols are required. | 16391 | # Set to "yes" if exported symbols are required. |
16374 | always_export_symbols=$always_export_symbols | 16392 | always_export_symbols=$always_export_symbols |
16375 | 16393 | ||
16376 | @@ -14148,6 +14845,9 @@ include_expsyms=$lt_include_expsyms | 16394 | @@ -14148,6 +14845,9 @@ |
16377 | # Commands necessary for linking programs (against libraries) with templates. | 16395 | # Commands necessary for linking programs (against libraries) with templates. |
16378 | prelink_cmds=$lt_prelink_cmds | 16396 | prelink_cmds=$lt_prelink_cmds |
16379 | 16397 | ||
@@ -16383,7 +16401,7 @@ Index: binutils-2.21/gprof/configure | |||
16383 | # Specify filename containing input files. | 16401 | # Specify filename containing input files. |
16384 | file_list_spec=$lt_file_list_spec | 16402 | file_list_spec=$lt_file_list_spec |
16385 | 16403 | ||
16386 | @@ -14180,210 +14880,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 16404 | @@ -14180,210 +14880,169 @@ |
16387 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 16405 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
16388 | # text mode, it properly converts lines to CR/LF. This bash problem | 16406 | # text mode, it properly converts lines to CR/LF. This bash problem |
16389 | # is reportedly fixed, but why not run on old versions too? | 16407 | # is reportedly fixed, but why not run on old versions too? |
@@ -16756,9 +16774,9 @@ Index: binutils-2.21/gprof/configure | |||
16756 | 16774 | ||
16757 | Index: binutils-2.21/ld/configure | 16775 | Index: binutils-2.21/ld/configure |
16758 | =================================================================== | 16776 | =================================================================== |
16759 | --- binutils-2.21.orig/ld/configure | 16777 | --- binutils-2.21.orig/ld/configure 2010-11-23 05:50:32.000000000 -0800 |
16760 | +++ binutils-2.21/ld/configure | 16778 | +++ binutils-2.21/ld/configure 2011-01-07 10:49:16.436101000 -0800 |
16761 | @@ -643,8 +643,11 @@ OTOOL | 16779 | @@ -643,8 +643,11 @@ |
16762 | LIPO | 16780 | LIPO |
16763 | NMEDIT | 16781 | NMEDIT |
16764 | DSYMUTIL | 16782 | DSYMUTIL |
@@ -16770,7 +16788,7 @@ Index: binutils-2.21/ld/configure | |||
16770 | OBJDUMP | 16788 | OBJDUMP |
16771 | LN_S | 16789 | LN_S |
16772 | NM | 16790 | NM |
16773 | @@ -776,6 +779,7 @@ enable_static | 16791 | @@ -776,6 +779,7 @@ |
16774 | with_pic | 16792 | with_pic |
16775 | enable_fast_install | 16793 | enable_fast_install |
16776 | with_gnu_ld | 16794 | with_gnu_ld |
@@ -16778,7 +16796,7 @@ Index: binutils-2.21/ld/configure | |||
16778 | enable_libtool_lock | 16796 | enable_libtool_lock |
16779 | enable_nls | 16797 | enable_nls |
16780 | ' | 16798 | ' |
16781 | @@ -1436,6 +1440,8 @@ Optional Packages: | 16799 | @@ -1436,6 +1440,8 @@ |
16782 | --with-pic try to use only PIC/non-PIC objects [default=use | 16800 | --with-pic try to use only PIC/non-PIC objects [default=use |
16783 | both] | 16801 | both] |
16784 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 16802 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -16787,7 +16805,7 @@ Index: binutils-2.21/ld/configure | |||
16787 | 16805 | ||
16788 | Some influential environment variables: | 16806 | Some influential environment variables: |
16789 | CC C compiler command | 16807 | CC C compiler command |
16790 | @@ -5562,8 +5568,8 @@ esac | 16808 | @@ -5562,8 +5568,8 @@ |
16791 | 16809 | ||
16792 | 16810 | ||
16793 | 16811 | ||
@@ -16798,7 +16816,7 @@ Index: binutils-2.21/ld/configure | |||
16798 | 16816 | ||
16799 | 16817 | ||
16800 | 16818 | ||
16801 | @@ -5603,7 +5609,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 16819 | @@ -5603,7 +5609,7 @@ |
16802 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 16820 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
16803 | $as_echo_n "checking how to print strings... " >&6; } | 16821 | $as_echo_n "checking how to print strings... " >&6; } |
16804 | # Test print first, because it will be a builtin if present. | 16822 | # Test print first, because it will be a builtin if present. |
@@ -16807,7 +16825,7 @@ Index: binutils-2.21/ld/configure | |||
16807 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 16825 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
16808 | ECHO='print -r --' | 16826 | ECHO='print -r --' |
16809 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 16827 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
16810 | @@ -6289,8 +6295,8 @@ $as_echo_n "checking whether the shell u | 16828 | @@ -6289,8 +6295,8 @@ |
16811 | # Try some XSI features | 16829 | # Try some XSI features |
16812 | xsi_shell=no | 16830 | xsi_shell=no |
16813 | ( _lt_dummy="a/b/c" | 16831 | ( _lt_dummy="a/b/c" |
@@ -16818,7 +16836,7 @@ Index: binutils-2.21/ld/configure | |||
16818 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 16836 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
16819 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 16837 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
16820 | && xsi_shell=yes | 16838 | && xsi_shell=yes |
16821 | @@ -6339,6 +6345,80 @@ esac | 16839 | @@ -6339,6 +6345,80 @@ |
16822 | 16840 | ||
16823 | 16841 | ||
16824 | 16842 | ||
@@ -16899,7 +16917,7 @@ Index: binutils-2.21/ld/configure | |||
16899 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 16917 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
16900 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 16918 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
16901 | if test "${lt_cv_ld_reload_flag+set}" = set; then : | 16919 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
16902 | @@ -6355,6 +6435,11 @@ case $reload_flag in | 16920 | @@ -6355,6 +6435,11 @@ |
16903 | esac | 16921 | esac |
16904 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 16922 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
16905 | case $host_os in | 16923 | case $host_os in |
@@ -16911,7 +16929,7 @@ Index: binutils-2.21/ld/configure | |||
16911 | darwin*) | 16929 | darwin*) |
16912 | if test "$GCC" = yes; then | 16930 | if test "$GCC" = yes; then |
16913 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 16931 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
16914 | @@ -6523,7 +6608,8 @@ mingw* | pw32*) | 16932 | @@ -6523,7 +6608,8 @@ |
16915 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 16933 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
16916 | lt_cv_file_magic_cmd='func_win32_libid' | 16934 | lt_cv_file_magic_cmd='func_win32_libid' |
16917 | else | 16935 | else |
@@ -16921,7 +16939,7 @@ Index: binutils-2.21/ld/configure | |||
16921 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 16939 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
16922 | fi | 16940 | fi |
16923 | ;; | 16941 | ;; |
16924 | @@ -6677,6 +6763,21 @@ esac | 16942 | @@ -6677,6 +6763,21 @@ |
16925 | fi | 16943 | fi |
16926 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 16944 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
16927 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 16945 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -16943,7 +16961,7 @@ Index: binutils-2.21/ld/configure | |||
16943 | file_magic_cmd=$lt_cv_file_magic_cmd | 16961 | file_magic_cmd=$lt_cv_file_magic_cmd |
16944 | deplibs_check_method=$lt_cv_deplibs_check_method | 16962 | deplibs_check_method=$lt_cv_deplibs_check_method |
16945 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 16963 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
16946 | @@ -6692,9 +6793,162 @@ test -z "$deplibs_check_method" && depli | 16964 | @@ -6692,9 +6793,162 @@ |
16947 | 16965 | ||
16948 | 16966 | ||
16949 | 16967 | ||
@@ -17108,7 +17126,7 @@ Index: binutils-2.21/ld/configure | |||
17108 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 17126 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
17109 | $as_echo_n "checking for $ac_word... " >&6; } | 17127 | $as_echo_n "checking for $ac_word... " >&6; } |
17110 | if test "${ac_cv_prog_AR+set}" = set; then : | 17128 | if test "${ac_cv_prog_AR+set}" = set; then : |
17111 | @@ -6710,7 +6964,7 @@ do | 17129 | @@ -6710,7 +6964,7 @@ |
17112 | test -z "$as_dir" && as_dir=. | 17130 | test -z "$as_dir" && as_dir=. |
17113 | for ac_exec_ext in '' $ac_executable_extensions; do | 17131 | for ac_exec_ext in '' $ac_executable_extensions; do |
17114 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 17132 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -17117,7 +17135,7 @@ Index: binutils-2.21/ld/configure | |||
17117 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 17135 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
17118 | break 2 | 17136 | break 2 |
17119 | fi | 17137 | fi |
17120 | @@ -6730,11 +6984,15 @@ $as_echo "no" >&6; } | 17138 | @@ -6730,11 +6984,15 @@ |
17121 | fi | 17139 | fi |
17122 | 17140 | ||
17123 | 17141 | ||
@@ -17136,7 +17154,7 @@ Index: binutils-2.21/ld/configure | |||
17136 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 17154 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
17137 | $as_echo_n "checking for $ac_word... " >&6; } | 17155 | $as_echo_n "checking for $ac_word... " >&6; } |
17138 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | 17156 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
17139 | @@ -6750,7 +7008,7 @@ do | 17157 | @@ -6750,7 +7008,7 @@ |
17140 | test -z "$as_dir" && as_dir=. | 17158 | test -z "$as_dir" && as_dir=. |
17141 | for ac_exec_ext in '' $ac_executable_extensions; do | 17159 | for ac_exec_ext in '' $ac_executable_extensions; do |
17142 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 17160 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
@@ -17145,7 +17163,7 @@ Index: binutils-2.21/ld/configure | |||
17145 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 17163 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
17146 | break 2 | 17164 | break 2 |
17147 | fi | 17165 | fi |
17148 | @@ -6769,6 +7027,10 @@ else | 17166 | @@ -6769,6 +7027,10 @@ |
17149 | $as_echo "no" >&6; } | 17167 | $as_echo "no" >&6; } |
17150 | fi | 17168 | fi |
17151 | 17169 | ||
@@ -17156,7 +17174,7 @@ Index: binutils-2.21/ld/configure | |||
17156 | if test "x$ac_ct_AR" = x; then | 17174 | if test "x$ac_ct_AR" = x; then |
17157 | AR="false" | 17175 | AR="false" |
17158 | else | 17176 | else |
17159 | @@ -6780,16 +7042,72 @@ ac_tool_warned=yes ;; | 17177 | @@ -6780,16 +7042,72 @@ |
17160 | esac | 17178 | esac |
17161 | AR=$ac_ct_AR | 17179 | AR=$ac_ct_AR |
17162 | fi | 17180 | fi |
@@ -17233,7 +17251,7 @@ Index: binutils-2.21/ld/configure | |||
17233 | 17251 | ||
17234 | 17252 | ||
17235 | 17253 | ||
17236 | @@ -7131,8 +7449,8 @@ esac | 17254 | @@ -7131,8 +7449,8 @@ |
17237 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 17255 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
17238 | 17256 | ||
17239 | # Transform an extracted symbol line into symbol name and symbol address | 17257 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -17244,7 +17262,7 @@ Index: binutils-2.21/ld/configure | |||
17244 | 17262 | ||
17245 | # Handle CRLF in mingw tool chain | 17263 | # Handle CRLF in mingw tool chain |
17246 | opt_cr= | 17264 | opt_cr= |
17247 | @@ -7168,6 +7486,7 @@ for ac_symprfx in "" "_"; do | 17265 | @@ -7168,6 +7486,7 @@ |
17248 | else | 17266 | else |
17249 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 17267 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
17250 | fi | 17268 | fi |
@@ -17252,7 +17270,7 @@ Index: binutils-2.21/ld/configure | |||
17252 | 17270 | ||
17253 | # Check to see that the pipe works correctly. | 17271 | # Check to see that the pipe works correctly. |
17254 | pipe_works=no | 17272 | pipe_works=no |
17255 | @@ -7209,6 +7528,18 @@ _LT_EOF | 17273 | @@ -7209,6 +7528,18 @@ |
17256 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 17274 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
17257 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 17275 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
17258 | cat <<_LT_EOF > conftest.$ac_ext | 17276 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -17271,7 +17289,7 @@ Index: binutils-2.21/ld/configure | |||
17271 | #ifdef __cplusplus | 17289 | #ifdef __cplusplus |
17272 | extern "C" { | 17290 | extern "C" { |
17273 | #endif | 17291 | #endif |
17274 | @@ -7220,7 +7551,7 @@ _LT_EOF | 17292 | @@ -7220,7 +7551,7 @@ |
17275 | cat <<_LT_EOF >> conftest.$ac_ext | 17293 | cat <<_LT_EOF >> conftest.$ac_ext |
17276 | 17294 | ||
17277 | /* The mapping between symbol names and symbols. */ | 17295 | /* The mapping between symbol names and symbols. */ |
@@ -17280,7 +17298,7 @@ Index: binutils-2.21/ld/configure | |||
17280 | const char *name; | 17298 | const char *name; |
17281 | void *address; | 17299 | void *address; |
17282 | } | 17300 | } |
17283 | @@ -7246,8 +7577,8 @@ static const void *lt_preloaded_setup() | 17301 | @@ -7246,8 +7577,8 @@ |
17284 | _LT_EOF | 17302 | _LT_EOF |
17285 | # Now try linking the two files. | 17303 | # Now try linking the two files. |
17286 | mv conftest.$ac_objext conftstm.$ac_objext | 17304 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -17291,7 +17309,7 @@ Index: binutils-2.21/ld/configure | |||
17291 | LIBS="conftstm.$ac_objext" | 17309 | LIBS="conftstm.$ac_objext" |
17292 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 17310 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
17293 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 17311 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
17294 | @@ -7257,8 +7588,8 @@ _LT_EOF | 17312 | @@ -7257,8 +7588,8 @@ |
17295 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 17313 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
17296 | pipe_works=yes | 17314 | pipe_works=yes |
17297 | fi | 17315 | fi |
@@ -17302,7 +17320,7 @@ Index: binutils-2.21/ld/configure | |||
17302 | else | 17320 | else |
17303 | echo "cannot find nm_test_func in $nlist" >&5 | 17321 | echo "cannot find nm_test_func in $nlist" >&5 |
17304 | fi | 17322 | fi |
17305 | @@ -7295,6 +7626,19 @@ else | 17323 | @@ -7295,6 +7626,19 @@ |
17306 | $as_echo "ok" >&6; } | 17324 | $as_echo "ok" >&6; } |
17307 | fi | 17325 | fi |
17308 | 17326 | ||
@@ -17322,7 +17340,7 @@ Index: binutils-2.21/ld/configure | |||
17322 | 17340 | ||
17323 | 17341 | ||
17324 | 17342 | ||
17325 | @@ -7315,6 +7659,42 @@ fi | 17343 | @@ -7315,6 +7659,42 @@ |
17326 | 17344 | ||
17327 | 17345 | ||
17328 | 17346 | ||
@@ -17365,7 +17383,7 @@ Index: binutils-2.21/ld/configure | |||
17365 | 17383 | ||
17366 | # Check whether --enable-libtool-lock was given. | 17384 | # Check whether --enable-libtool-lock was given. |
17367 | if test "${enable_libtool_lock+set}" = set; then : | 17385 | if test "${enable_libtool_lock+set}" = set; then : |
17368 | @@ -7509,6 +7889,123 @@ esac | 17386 | @@ -7509,6 +7889,123 @@ |
17369 | 17387 | ||
17370 | need_locks="$enable_libtool_lock" | 17388 | need_locks="$enable_libtool_lock" |
17371 | 17389 | ||
@@ -17489,7 +17507,7 @@ Index: binutils-2.21/ld/configure | |||
17489 | 17507 | ||
17490 | case $host_os in | 17508 | case $host_os in |
17491 | rhapsody* | darwin*) | 17509 | rhapsody* | darwin*) |
17492 | @@ -8072,6 +8569,8 @@ _LT_EOF | 17510 | @@ -8072,6 +8569,8 @@ |
17493 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 17511 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
17494 | echo "$AR cru libconftest.a conftest.o" >&5 | 17512 | echo "$AR cru libconftest.a conftest.o" >&5 |
17495 | $AR cru libconftest.a conftest.o 2>&5 | 17513 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -17498,7 +17516,7 @@ Index: binutils-2.21/ld/configure | |||
17498 | cat > conftest.c << _LT_EOF | 17516 | cat > conftest.c << _LT_EOF |
17499 | int main() { return 0;} | 17517 | int main() { return 0;} |
17500 | _LT_EOF | 17518 | _LT_EOF |
17501 | @@ -8267,7 +8766,8 @@ fi | 17519 | @@ -8267,7 +8766,8 @@ |
17502 | LIBTOOL_DEPS="$ltmain" | 17520 | LIBTOOL_DEPS="$ltmain" |
17503 | 17521 | ||
17504 | # Always use our own libtool. | 17522 | # Always use our own libtool. |
@@ -17508,7 +17526,7 @@ Index: binutils-2.21/ld/configure | |||
17508 | 17526 | ||
17509 | 17527 | ||
17510 | 17528 | ||
17511 | @@ -8356,7 +8856,7 @@ aix3*) | 17529 | @@ -8356,7 +8856,7 @@ |
17512 | esac | 17530 | esac |
17513 | 17531 | ||
17514 | # Global variables: | 17532 | # Global variables: |
@@ -17517,7 +17535,7 @@ Index: binutils-2.21/ld/configure | |||
17517 | can_build_shared=yes | 17535 | can_build_shared=yes |
17518 | 17536 | ||
17519 | # All known linkers require a `.a' archive for static linking (except MSVC, | 17537 | # All known linkers require a `.a' archive for static linking (except MSVC, |
17520 | @@ -8654,8 +9154,6 @@ fi | 17538 | @@ -8654,8 +9154,6 @@ |
17521 | lt_prog_compiler_pic= | 17539 | lt_prog_compiler_pic= |
17522 | lt_prog_compiler_static= | 17540 | lt_prog_compiler_static= |
17523 | 17541 | ||
@@ -17526,7 +17544,7 @@ Index: binutils-2.21/ld/configure | |||
17526 | 17544 | ||
17527 | if test "$GCC" = yes; then | 17545 | if test "$GCC" = yes; then |
17528 | lt_prog_compiler_wl='-Wl,' | 17546 | lt_prog_compiler_wl='-Wl,' |
17529 | @@ -8820,6 +9318,12 @@ $as_echo_n "checking for $compiler optio | 17547 | @@ -8820,6 +9318,12 @@ |
17530 | lt_prog_compiler_pic='--shared' | 17548 | lt_prog_compiler_pic='--shared' |
17531 | lt_prog_compiler_static='--static' | 17549 | lt_prog_compiler_static='--static' |
17532 | ;; | 17550 | ;; |
@@ -17539,7 +17557,7 @@ Index: binutils-2.21/ld/configure | |||
17539 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 17557 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
17540 | # Portland Group compilers (*not* the Pentium gcc compiler, | 17558 | # Portland Group compilers (*not* the Pentium gcc compiler, |
17541 | # which looks to be a dead project) | 17559 | # which looks to be a dead project) |
17542 | @@ -8882,7 +9386,7 @@ $as_echo_n "checking for $compiler optio | 17560 | @@ -8882,7 +9386,7 @@ |
17543 | lt_prog_compiler_pic='-KPIC' | 17561 | lt_prog_compiler_pic='-KPIC' |
17544 | lt_prog_compiler_static='-Bstatic' | 17562 | lt_prog_compiler_static='-Bstatic' |
17545 | case $cc_basename in | 17563 | case $cc_basename in |
@@ -17548,7 +17566,7 @@ Index: binutils-2.21/ld/configure | |||
17548 | lt_prog_compiler_wl='-Qoption ld ';; | 17566 | lt_prog_compiler_wl='-Qoption ld ';; |
17549 | *) | 17567 | *) |
17550 | lt_prog_compiler_wl='-Wl,';; | 17568 | lt_prog_compiler_wl='-Wl,';; |
17551 | @@ -8939,13 +9443,17 @@ case $host_os in | 17569 | @@ -8939,13 +9443,17 @@ |
17552 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 17570 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
17553 | ;; | 17571 | ;; |
17554 | esac | 17572 | esac |
@@ -17572,7 +17590,7 @@ Index: binutils-2.21/ld/configure | |||
17572 | 17590 | ||
17573 | # | 17591 | # |
17574 | # Check to make sure the PIC flag actually works. | 17592 | # Check to make sure the PIC flag actually works. |
17575 | @@ -9006,6 +9514,11 @@ fi | 17593 | @@ -9006,6 +9514,11 @@ |
17576 | 17594 | ||
17577 | 17595 | ||
17578 | 17596 | ||
@@ -17584,7 +17602,7 @@ Index: binutils-2.21/ld/configure | |||
17584 | # | 17602 | # |
17585 | # Check to make sure the static flag actually works. | 17603 | # Check to make sure the static flag actually works. |
17586 | # | 17604 | # |
17587 | @@ -9356,7 +9869,8 @@ _LT_EOF | 17605 | @@ -9356,7 +9869,8 @@ |
17588 | allow_undefined_flag=unsupported | 17606 | allow_undefined_flag=unsupported |
17589 | always_export_symbols=no | 17607 | always_export_symbols=no |
17590 | enable_shared_with_static_runtimes=yes | 17608 | enable_shared_with_static_runtimes=yes |
@@ -17594,7 +17612,7 @@ Index: binutils-2.21/ld/configure | |||
17594 | 17612 | ||
17595 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 17613 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
17596 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 17614 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
17597 | @@ -9404,7 +9918,7 @@ _LT_EOF | 17615 | @@ -9404,7 +9918,7 @@ |
17598 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 17616 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
17599 | && test "$tmp_diet" = no | 17617 | && test "$tmp_diet" = no |
17600 | then | 17618 | then |
@@ -17603,7 +17621,7 @@ Index: binutils-2.21/ld/configure | |||
17603 | tmp_sharedflag='-shared' | 17621 | tmp_sharedflag='-shared' |
17604 | case $cc_basename,$host_cpu in | 17622 | case $cc_basename,$host_cpu in |
17605 | pgcc*) # Portland Group C compiler | 17623 | pgcc*) # Portland Group C compiler |
17606 | @@ -9455,12 +9969,12 @@ _LT_EOF | 17624 | @@ -9455,12 +9969,12 @@ |
17607 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 17625 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
17608 | hardcode_libdir_flag_spec= | 17626 | hardcode_libdir_flag_spec= |
17609 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 17627 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -17618,7 +17636,7 @@ Index: binutils-2.21/ld/configure | |||
17618 | fi | 17636 | fi |
17619 | ;; | 17637 | ;; |
17620 | esac | 17638 | esac |
17621 | @@ -9474,8 +9988,8 @@ _LT_EOF | 17639 | @@ -9474,8 +9988,8 @@ |
17622 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 17640 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
17623 | wlarc= | 17641 | wlarc= |
17624 | else | 17642 | else |
@@ -17629,7 +17647,7 @@ Index: binutils-2.21/ld/configure | |||
17629 | fi | 17647 | fi |
17630 | ;; | 17648 | ;; |
17631 | 17649 | ||
17632 | @@ -9493,8 +10007,8 @@ _LT_EOF | 17650 | @@ -9493,8 +10007,8 @@ |
17633 | 17651 | ||
17634 | _LT_EOF | 17652 | _LT_EOF |
17635 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 17653 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -17640,7 +17658,7 @@ Index: binutils-2.21/ld/configure | |||
17640 | else | 17658 | else |
17641 | ld_shlibs=no | 17659 | ld_shlibs=no |
17642 | fi | 17660 | fi |
17643 | @@ -9540,8 +10054,8 @@ _LT_EOF | 17661 | @@ -9540,8 +10054,8 @@ |
17644 | 17662 | ||
17645 | *) | 17663 | *) |
17646 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 17664 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -17651,7 +17669,7 @@ Index: binutils-2.21/ld/configure | |||
17651 | else | 17669 | else |
17652 | ld_shlibs=no | 17670 | ld_shlibs=no |
17653 | fi | 17671 | fi |
17654 | @@ -9671,7 +10185,13 @@ _LT_EOF | 17672 | @@ -9671,7 +10185,13 @@ |
17655 | allow_undefined_flag='-berok' | 17673 | allow_undefined_flag='-berok' |
17656 | # Determine the default libpath from the value encoded in an | 17674 | # Determine the default libpath from the value encoded in an |
17657 | # empty executable. | 17675 | # empty executable. |
@@ -17666,7 +17684,7 @@ Index: binutils-2.21/ld/configure | |||
17666 | /* end confdefs.h. */ | 17684 | /* end confdefs.h. */ |
17667 | 17685 | ||
17668 | int | 17686 | int |
17669 | @@ -9684,22 +10204,29 @@ main () | 17687 | @@ -9684,22 +10204,29 @@ |
17670 | _ACEOF | 17688 | _ACEOF |
17671 | if ac_fn_c_try_link "$LINENO"; then : | 17689 | if ac_fn_c_try_link "$LINENO"; then : |
17672 | 17690 | ||
@@ -17709,7 +17727,7 @@ Index: binutils-2.21/ld/configure | |||
17709 | 17727 | ||
17710 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 17728 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
17711 | 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" | 17729 | 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" |
17712 | @@ -9711,7 +10238,13 @@ if test -z "$aix_libpath"; then aix_libp | 17730 | @@ -9711,7 +10238,13 @@ |
17713 | else | 17731 | else |
17714 | # Determine the default libpath from the value encoded in an | 17732 | # Determine the default libpath from the value encoded in an |
17715 | # empty executable. | 17733 | # empty executable. |
@@ -17724,7 +17742,7 @@ Index: binutils-2.21/ld/configure | |||
17724 | /* end confdefs.h. */ | 17742 | /* end confdefs.h. */ |
17725 | 17743 | ||
17726 | int | 17744 | int |
17727 | @@ -9724,22 +10257,29 @@ main () | 17745 | @@ -9724,22 +10257,29 @@ |
17728 | _ACEOF | 17746 | _ACEOF |
17729 | if ac_fn_c_try_link "$LINENO"; then : | 17747 | if ac_fn_c_try_link "$LINENO"; then : |
17730 | 17748 | ||
@@ -17767,7 +17785,7 @@ Index: binutils-2.21/ld/configure | |||
17767 | 17785 | ||
17768 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 17786 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
17769 | # Warning - without using the other run time loading flags, | 17787 | # Warning - without using the other run time loading flags, |
17770 | @@ -9784,20 +10324,63 @@ if test -z "$aix_libpath"; then aix_libp | 17788 | @@ -9784,20 +10324,63 @@ |
17771 | # Microsoft Visual C++. | 17789 | # Microsoft Visual C++. |
17772 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 17790 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
17773 | # no search path for DLLs. | 17791 | # no search path for DLLs. |
@@ -17845,7 +17863,7 @@ Index: binutils-2.21/ld/configure | |||
17845 | ;; | 17863 | ;; |
17846 | 17864 | ||
17847 | darwin* | rhapsody*) | 17865 | darwin* | rhapsody*) |
17848 | @@ -9862,7 +10445,7 @@ if test -z "$aix_libpath"; then aix_libp | 17866 | @@ -9862,7 +10445,7 @@ |
17849 | 17867 | ||
17850 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 17868 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
17851 | freebsd* | dragonfly*) | 17869 | freebsd* | dragonfly*) |
@@ -17854,7 +17872,7 @@ Index: binutils-2.21/ld/configure | |||
17854 | hardcode_libdir_flag_spec='-R$libdir' | 17872 | hardcode_libdir_flag_spec='-R$libdir' |
17855 | hardcode_direct=yes | 17873 | hardcode_direct=yes |
17856 | hardcode_shlibpath_var=no | 17874 | hardcode_shlibpath_var=no |
17857 | @@ -9870,7 +10453,7 @@ if test -z "$aix_libpath"; then aix_libp | 17875 | @@ -9870,7 +10453,7 @@ |
17858 | 17876 | ||
17859 | hpux9*) | 17877 | hpux9*) |
17860 | if test "$GCC" = yes; then | 17878 | if test "$GCC" = yes; then |
@@ -17863,7 +17881,7 @@ Index: binutils-2.21/ld/configure | |||
17863 | else | 17881 | else |
17864 | 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' | 17882 | 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' |
17865 | fi | 17883 | fi |
17866 | @@ -9886,7 +10469,7 @@ if test -z "$aix_libpath"; then aix_libp | 17884 | @@ -9886,7 +10469,7 @@ |
17867 | 17885 | ||
17868 | hpux10*) | 17886 | hpux10*) |
17869 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 17887 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -17872,7 +17890,7 @@ Index: binutils-2.21/ld/configure | |||
17872 | else | 17890 | else |
17873 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 17891 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
17874 | fi | 17892 | fi |
17875 | @@ -9910,10 +10493,10 @@ if test -z "$aix_libpath"; then aix_libp | 17893 | @@ -9910,10 +10493,10 @@ |
17876 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 17894 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
17877 | ;; | 17895 | ;; |
17878 | ia64*) | 17896 | ia64*) |
@@ -17885,7 +17903,7 @@ Index: binutils-2.21/ld/configure | |||
17885 | ;; | 17903 | ;; |
17886 | esac | 17904 | esac |
17887 | else | 17905 | else |
17888 | @@ -9992,23 +10575,36 @@ fi | 17906 | @@ -9992,23 +10575,36 @@ |
17889 | 17907 | ||
17890 | irix5* | irix6* | nonstopux*) | 17908 | irix5* | irix6* | nonstopux*) |
17891 | if test "$GCC" = yes; then | 17909 | if test "$GCC" = yes; then |
@@ -17930,7 +17948,7 @@ Index: binutils-2.21/ld/configure | |||
17930 | else | 17948 | else |
17931 | 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' | 17949 | 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' |
17932 | 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' | 17950 | 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' |
17933 | @@ -10093,7 +10689,7 @@ rm -f core conftest.err conftest.$ac_obj | 17951 | @@ -10093,7 +10689,7 @@ |
17934 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 17952 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
17935 | if test "$GCC" = yes; then | 17953 | if test "$GCC" = yes; then |
17936 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 17954 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -17939,7 +17957,7 @@ Index: binutils-2.21/ld/configure | |||
17939 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 17957 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
17940 | else | 17958 | else |
17941 | allow_undefined_flag=' -expect_unresolved \*' | 17959 | allow_undefined_flag=' -expect_unresolved \*' |
17942 | @@ -10112,9 +10708,9 @@ rm -f core conftest.err conftest.$ac_obj | 17960 | @@ -10112,9 +10708,9 @@ |
17943 | no_undefined_flag=' -z defs' | 17961 | no_undefined_flag=' -z defs' |
17944 | if test "$GCC" = yes; then | 17962 | if test "$GCC" = yes; then |
17945 | wlarc='${wl}' | 17963 | wlarc='${wl}' |
@@ -17951,7 +17969,7 @@ Index: binutils-2.21/ld/configure | |||
17951 | else | 17969 | else |
17952 | case `$CC -V 2>&1` in | 17970 | case `$CC -V 2>&1` in |
17953 | *"Compilers 5.0"*) | 17971 | *"Compilers 5.0"*) |
17954 | @@ -10690,8 +11286,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 17972 | @@ -10690,8 +11286,9 @@ |
17955 | need_version=no | 17973 | need_version=no |
17956 | need_lib_prefix=no | 17974 | need_lib_prefix=no |
17957 | 17975 | ||
@@ -17963,7 +17981,7 @@ Index: binutils-2.21/ld/configure | |||
17963 | library_names_spec='$libname.dll.a' | 17981 | library_names_spec='$libname.dll.a' |
17964 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 17982 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
17965 | postinstall_cmds='base_file=`basename \${file}`~ | 17983 | postinstall_cmds='base_file=`basename \${file}`~ |
17966 | @@ -10724,13 +11321,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 17984 | @@ -10724,13 +11321,71 @@ |
17967 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 17985 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
17968 | ;; | 17986 | ;; |
17969 | esac | 17987 | esac |
@@ -18036,7 +18054,7 @@ Index: binutils-2.21/ld/configure | |||
18036 | # FIXME: first we should search . and the directory the executable is in | 18054 | # FIXME: first we should search . and the directory the executable is in |
18037 | shlibpath_var=PATH | 18055 | shlibpath_var=PATH |
18038 | ;; | 18056 | ;; |
18039 | @@ -10826,7 +11481,7 @@ haiku*) | 18057 | @@ -10826,7 +11481,7 @@ |
18040 | soname_spec='${libname}${release}${shared_ext}$major' | 18058 | soname_spec='${libname}${release}${shared_ext}$major' |
18041 | shlibpath_var=LIBRARY_PATH | 18059 | shlibpath_var=LIBRARY_PATH |
18042 | shlibpath_overrides_runpath=yes | 18060 | shlibpath_overrides_runpath=yes |
@@ -18045,7 +18063,7 @@ Index: binutils-2.21/ld/configure | |||
18045 | hardcode_into_libs=yes | 18063 | hardcode_into_libs=yes |
18046 | ;; | 18064 | ;; |
18047 | 18065 | ||
18048 | @@ -11622,7 +12277,7 @@ else | 18066 | @@ -11622,7 +12277,7 @@ |
18049 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 18067 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
18050 | lt_status=$lt_dlunknown | 18068 | lt_status=$lt_dlunknown |
18051 | cat > conftest.$ac_ext <<_LT_EOF | 18069 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -18054,7 +18072,7 @@ Index: binutils-2.21/ld/configure | |||
18054 | #include "confdefs.h" | 18072 | #include "confdefs.h" |
18055 | 18073 | ||
18056 | #if HAVE_DLFCN_H | 18074 | #if HAVE_DLFCN_H |
18057 | @@ -11666,10 +12321,10 @@ else | 18075 | @@ -11666,10 +12321,10 @@ |
18058 | /* When -fvisbility=hidden is used, assume the code has been annotated | 18076 | /* When -fvisbility=hidden is used, assume the code has been annotated |
18059 | correspondingly for the symbols needed. */ | 18077 | correspondingly for the symbols needed. */ |
18060 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 18078 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -18067,7 +18085,7 @@ Index: binutils-2.21/ld/configure | |||
18067 | int main () | 18085 | int main () |
18068 | { | 18086 | { |
18069 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 18087 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
18070 | @@ -11728,7 +12383,7 @@ else | 18088 | @@ -11728,7 +12383,7 @@ |
18071 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 18089 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
18072 | lt_status=$lt_dlunknown | 18090 | lt_status=$lt_dlunknown |
18073 | cat > conftest.$ac_ext <<_LT_EOF | 18091 | cat > conftest.$ac_ext <<_LT_EOF |
@@ -18076,7 +18094,7 @@ Index: binutils-2.21/ld/configure | |||
18076 | #include "confdefs.h" | 18094 | #include "confdefs.h" |
18077 | 18095 | ||
18078 | #if HAVE_DLFCN_H | 18096 | #if HAVE_DLFCN_H |
18079 | @@ -11772,10 +12427,10 @@ else | 18097 | @@ -11772,10 +12427,10 @@ |
18080 | /* When -fvisbility=hidden is used, assume the code has been annotated | 18098 | /* When -fvisbility=hidden is used, assume the code has been annotated |
18081 | correspondingly for the symbols needed. */ | 18099 | correspondingly for the symbols needed. */ |
18082 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 18100 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -18089,7 +18107,7 @@ Index: binutils-2.21/ld/configure | |||
18089 | int main () | 18107 | int main () |
18090 | { | 18108 | { |
18091 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 18109 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
18092 | @@ -14063,13 +14718,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 18110 | @@ -14063,13 +14718,20 @@ |
18093 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 18111 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
18094 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 18112 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
18095 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 18113 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -18110,7 +18128,7 @@ Index: binutils-2.21/ld/configure | |||
18110 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 18128 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
18111 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 18129 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
18112 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 18130 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
18113 | @@ -14084,14 +14746,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 18131 | @@ -14084,14 +14746,17 @@ |
18114 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 18132 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
18115 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 18133 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
18116 | 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"`' | 18134 | 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"`' |
@@ -18129,7 +18147,7 @@ Index: binutils-2.21/ld/configure | |||
18129 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 18147 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
18130 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 18148 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
18131 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 18149 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
18132 | @@ -14124,12 +14789,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 18150 | @@ -14124,12 +14789,12 @@ |
18133 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 18151 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
18134 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 18152 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
18135 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 18153 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -18143,7 +18161,7 @@ Index: binutils-2.21/ld/configure | |||
18143 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 18161 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
18144 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 18162 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
18145 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 18163 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
18146 | @@ -14184,8 +14849,13 @@ reload_flag \ | 18164 | @@ -14184,8 +14849,13 @@ |
18147 | OBJDUMP \ | 18165 | OBJDUMP \ |
18148 | deplibs_check_method \ | 18166 | deplibs_check_method \ |
18149 | file_magic_cmd \ | 18167 | file_magic_cmd \ |
@@ -18157,7 +18175,7 @@ Index: binutils-2.21/ld/configure | |||
18157 | STRIP \ | 18175 | STRIP \ |
18158 | RANLIB \ | 18176 | RANLIB \ |
18159 | CC \ | 18177 | CC \ |
18160 | @@ -14195,12 +14865,14 @@ lt_cv_sys_global_symbol_pipe \ | 18178 | @@ -14195,12 +14865,14 @@ |
18161 | lt_cv_sys_global_symbol_to_cdecl \ | 18179 | lt_cv_sys_global_symbol_to_cdecl \ |
18162 | lt_cv_sys_global_symbol_to_c_name_address \ | 18180 | lt_cv_sys_global_symbol_to_c_name_address \ |
18163 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 18181 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -18173,7 +18191,7 @@ Index: binutils-2.21/ld/configure | |||
18173 | DSYMUTIL \ | 18191 | DSYMUTIL \ |
18174 | NMEDIT \ | 18192 | NMEDIT \ |
18175 | LIPO \ | 18193 | LIPO \ |
18176 | @@ -14216,7 +14888,6 @@ no_undefined_flag \ | 18194 | @@ -14216,7 +14888,6 @@ |
18177 | hardcode_libdir_flag_spec \ | 18195 | hardcode_libdir_flag_spec \ |
18178 | hardcode_libdir_flag_spec_ld \ | 18196 | hardcode_libdir_flag_spec_ld \ |
18179 | hardcode_libdir_separator \ | 18197 | hardcode_libdir_separator \ |
@@ -18181,7 +18199,7 @@ Index: binutils-2.21/ld/configure | |||
18181 | exclude_expsyms \ | 18199 | exclude_expsyms \ |
18182 | include_expsyms \ | 18200 | include_expsyms \ |
18183 | file_list_spec \ | 18201 | file_list_spec \ |
18184 | @@ -14252,6 +14923,7 @@ module_cmds \ | 18202 | @@ -14252,6 +14923,7 @@ |
18185 | module_expsym_cmds \ | 18203 | module_expsym_cmds \ |
18186 | export_symbols_cmds \ | 18204 | export_symbols_cmds \ |
18187 | prelink_cmds \ | 18205 | prelink_cmds \ |
@@ -18189,7 +18207,7 @@ Index: binutils-2.21/ld/configure | |||
18189 | postinstall_cmds \ | 18207 | postinstall_cmds \ |
18190 | postuninstall_cmds \ | 18208 | postuninstall_cmds \ |
18191 | finish_cmds \ | 18209 | finish_cmds \ |
18192 | @@ -15047,7 +15719,8 @@ $as_echo X"$file" | | 18210 | @@ -15047,7 +15719,8 @@ |
18193 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 18211 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
18194 | # | 18212 | # |
18195 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 18213 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -18199,7 +18217,7 @@ Index: binutils-2.21/ld/configure | |||
18199 | # Written by Gordon Matzigkeit, 1996 | 18217 | # Written by Gordon Matzigkeit, 1996 |
18200 | # | 18218 | # |
18201 | # This file is part of GNU Libtool. | 18219 | # This file is part of GNU Libtool. |
18202 | @@ -15150,19 +15823,42 @@ SP2NL=$lt_lt_SP2NL | 18220 | @@ -15150,19 +15823,42 @@ |
18203 | # turn newlines into spaces. | 18221 | # turn newlines into spaces. |
18204 | NL2SP=$lt_lt_NL2SP | 18222 | NL2SP=$lt_lt_NL2SP |
18205 | 18223 | ||
@@ -18243,7 +18261,7 @@ Index: binutils-2.21/ld/configure | |||
18243 | # A symbol stripping program. | 18261 | # A symbol stripping program. |
18244 | STRIP=$lt_STRIP | 18262 | STRIP=$lt_STRIP |
18245 | 18263 | ||
18246 | @@ -15192,6 +15888,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 18264 | @@ -15192,6 +15888,12 @@ |
18247 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 18265 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
18248 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 18266 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
18249 | 18267 | ||
@@ -18256,7 +18274,7 @@ Index: binutils-2.21/ld/configure | |||
18256 | # The name of the directory that contains temporary libtool files. | 18274 | # The name of the directory that contains temporary libtool files. |
18257 | objdir=$objdir | 18275 | objdir=$objdir |
18258 | 18276 | ||
18259 | @@ -15201,6 +15903,9 @@ MAGIC_CMD=$MAGIC_CMD | 18277 | @@ -15201,6 +15903,9 @@ |
18260 | # Must we lock files when doing compilation? | 18278 | # Must we lock files when doing compilation? |
18261 | need_locks=$lt_need_locks | 18279 | need_locks=$lt_need_locks |
18262 | 18280 | ||
@@ -18266,7 +18284,7 @@ Index: binutils-2.21/ld/configure | |||
18266 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 18284 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
18267 | DSYMUTIL=$lt_DSYMUTIL | 18285 | DSYMUTIL=$lt_DSYMUTIL |
18268 | 18286 | ||
18269 | @@ -15315,12 +16020,12 @@ with_gcc=$GCC | 18287 | @@ -15315,12 +16020,12 @@ |
18270 | # Compiler flag to turn off builtin functions. | 18288 | # Compiler flag to turn off builtin functions. |
18271 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 18289 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
18272 | 18290 | ||
@@ -18282,7 +18300,7 @@ Index: binutils-2.21/ld/configure | |||
18282 | # Compiler flag to prevent dynamic linking. | 18300 | # Compiler flag to prevent dynamic linking. |
18283 | link_static_flag=$lt_lt_prog_compiler_static | 18301 | link_static_flag=$lt_lt_prog_compiler_static |
18284 | 18302 | ||
18285 | @@ -15407,9 +16112,6 @@ inherit_rpath=$inherit_rpath | 18303 | @@ -15407,9 +16112,6 @@ |
18286 | # Whether libtool must link a program against all its dependency libraries. | 18304 | # Whether libtool must link a program against all its dependency libraries. |
18287 | link_all_deplibs=$link_all_deplibs | 18305 | link_all_deplibs=$link_all_deplibs |
18288 | 18306 | ||
@@ -18292,7 +18310,7 @@ Index: binutils-2.21/ld/configure | |||
18292 | # Set to "yes" if exported symbols are required. | 18310 | # Set to "yes" if exported symbols are required. |
18293 | always_export_symbols=$always_export_symbols | 18311 | always_export_symbols=$always_export_symbols |
18294 | 18312 | ||
18295 | @@ -15425,6 +16127,9 @@ include_expsyms=$lt_include_expsyms | 18313 | @@ -15425,6 +16127,9 @@ |
18296 | # Commands necessary for linking programs (against libraries) with templates. | 18314 | # Commands necessary for linking programs (against libraries) with templates. |
18297 | prelink_cmds=$lt_prelink_cmds | 18315 | prelink_cmds=$lt_prelink_cmds |
18298 | 18316 | ||
@@ -18302,7 +18320,7 @@ Index: binutils-2.21/ld/configure | |||
18302 | # Specify filename containing input files. | 18320 | # Specify filename containing input files. |
18303 | file_list_spec=$lt_file_list_spec | 18321 | file_list_spec=$lt_file_list_spec |
18304 | 18322 | ||
18305 | @@ -15457,210 +16162,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 18323 | @@ -15457,210 +16162,169 @@ |
18306 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 18324 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
18307 | # text mode, it properly converts lines to CR/LF. This bash problem | 18325 | # text mode, it properly converts lines to CR/LF. This bash problem |
18308 | # is reportedly fixed, but why not run on old versions too? | 18326 | # is reportedly fixed, but why not run on old versions too? |
@@ -18673,3 +18691,29 @@ Index: binutils-2.21/ld/configure | |||
18673 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 18691 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
18674 | chmod +x "$ofile" | 18692 | chmod +x "$ofile" |
18675 | 18693 | ||
18694 | Index: binutils-2.21/bfd/configure.in | ||
18695 | =================================================================== | ||
18696 | --- binutils-2.21.orig/bfd/configure.in 2011-01-07 11:24:12.586101000 -0800 | ||
18697 | +++ binutils-2.21/bfd/configure.in 2011-01-07 11:24:45.206101000 -0800 | ||
18698 | @@ -532,7 +532,7 @@ | ||
18699 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | ||
18700 | changequote([,])dnl | ||
18701 | if test -n "$x"; then | ||
18702 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" | ||
18703 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" | ||
18704 | fi | ||
18705 | |||
18706 | # More hacks to build DLLs on Windows. | ||
18707 | Index: binutils-2.21/opcodes/configure.in | ||
18708 | =================================================================== | ||
18709 | --- binutils-2.21.orig/opcodes/configure.in 2011-01-07 11:24:12.606100958 -0800 | ||
18710 | +++ binutils-2.21/opcodes/configure.in 2011-01-07 11:25:36.816101002 -0800 | ||
18711 | @@ -134,7 +134,7 @@ | ||
18712 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | ||
18713 | changequote([,])dnl | ||
18714 | if test -n "$x"; then | ||
18715 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" | ||
18716 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" | ||
18717 | fi | ||
18718 | |||
18719 | case "${host}" in | ||