diff options
27 files changed, 2490 insertions, 1080 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index caa5729512..2de64d5d6b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" | |||
18 | 18 | ||
19 | GCCVERSION ?= "10.%" | 19 | GCCVERSION ?= "10.%" |
20 | SDKGCCVERSION ?= "${GCCVERSION}" | 20 | SDKGCCVERSION ?= "${GCCVERSION}" |
21 | BINUVERSION ?= "2.34%" | 21 | BINUVERSION ?= "2.35%" |
22 | GDBVERSION ?= "9.%" | 22 | GDBVERSION ?= "9.%" |
23 | GLIBCVERSION ?= "2.31%" | 23 | GLIBCVERSION ?= "2.31%" |
24 | LINUXLIBCVERSION ?= "5.4%" | 24 | LINUXLIBCVERSION ?= "5.4%" |
diff --git a/meta/recipes-devtools/binutils/binutils-2.34.inc b/meta/recipes-devtools/binutils/binutils-2.35.inc index f65fdb7328..9aa5e7efe3 100644 --- a/meta/recipes-devtools/binutils/binutils-2.34.inc +++ b/meta/recipes-devtools/binutils/binutils-2.35.inc | |||
@@ -16,32 +16,31 @@ def binutils_branch_version(d): | |||
16 | 16 | ||
17 | # When upgrading to 2.35, please make sure there is no trailing .0, so | 17 | # When upgrading to 2.35, please make sure there is no trailing .0, so |
18 | # that upstream version check can work correctly. | 18 | # that upstream version check can work correctly. |
19 | PV = "2.34" | 19 | PV = "2.35" |
20 | CVE_VERSION = "2.34" | 20 | CVE_VERSION = "2.35" |
21 | BINUPV = "${@binutils_branch_version(d)}" | 21 | BINUPV = "${@binutils_branch_version(d)}" |
22 | #BRANCH = "binutils-${BINUPV}-branch" | 22 | #BRANCH = "binutils-${BINUPV}-branch" |
23 | BRANCH ?= "binutils-2_34-branch" | 23 | BRANCH ?= "binutils-2_35-branch" |
24 | 24 | ||
25 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" | 25 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" |
26 | 26 | ||
27 | SRCREV ?= "d4b50999b3b287b5f984ade2f8734aa8c9359440" | 27 | SRCREV ?= "89a9065674a14a8bd94bb326b27d19a2f3583efb" |
28 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" | 28 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" |
29 | SRC_URI = "\ | 29 | SRC_URI = "\ |
30 | ${BINUTILS_GIT_URI} \ | 30 | ${BINUTILS_GIT_URI} \ |
31 | file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ | 31 | file://0004-configure-widen-the-regexp-for-SH-architectures.patch \ |
32 | file://0005-Point-scripts-location-to-libdir.patch \ | 32 | file://0005-Point-scripts-location-to-libdir.patch \ |
33 | file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ | 33 | file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ |
34 | file://0007-Use-libtool-2.4.patch \ | 34 | file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ |
35 | file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ | 35 | file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ |
36 | file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ | 36 | file://0009-Change-default-emulation-for-mips64-linux.patch \ |
37 | file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ | 37 | file://0010-Add-support-for-Netlogic-XLP.patch \ |
38 | file://0011-Change-default-emulation-for-mips64-linux.patch \ | 38 | file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ |
39 | file://0012-Add-support-for-Netlogic-XLP.patch \ | 39 | file://0012-Detect-64-bit-MIPS-targets.patch \ |
40 | file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ | 40 | file://0013-Use-libtool-2.4.patch \ |
41 | file://0014-Detect-64-bit-MIPS-targets.patch \ | 41 | file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ |
42 | file://0015-sync-with-OE-libtool-changes.patch \ | 42 | file://0015-sync-with-OE-libtool-changes.patch \ |
43 | file://0016-Check-for-clang-before-checking-gcc-version.patch \ | 43 | file://0016-Check-for-clang-before-checking-gcc-version.patch \ |
44 | file://0017-binutils-drop-redundant-program_name-definition-fno-.patch \ | 44 | file://0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch \ |
45 | file://CVE-2020-0551.patch \ | ||
46 | " | 45 | " |
47 | S = "${WORKDIR}/git" | 46 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.35.bb index 5dbaa03017..5dbaa03017 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.34.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.35.bb | |||
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.35.bb index 07a8e7c417..07a8e7c417 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.34.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.35.bb | |||
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.34.bb b/meta/recipes-devtools/binutils/binutils-cross_2.35.bb index fbd1f7d25a..fbd1f7d25a 100644 --- a/meta/recipes-devtools/binutils/binutils-cross_2.34.bb +++ b/meta/recipes-devtools/binutils/binutils-cross_2.35.bb | |||
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.35.bb index 37f4d6d2e9..37f4d6d2e9 100644 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.34.bb +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.35.bb | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch index 14e84215e0..0e62d47616 100644 --- a/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch +++ b/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b05f0be13aadf0b26a0b39dfe7daf2c47a300338 Mon Sep 17 00:00:00 2001 | 1 | From b8d182865081d17549fb9a4b9bc3062b526caf65 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:58:54 +0000 | 3 | Date: Mon, 2 Mar 2015 01:58:54 +0000 |
4 | Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs | 4 | Subject: [PATCH 01/17] binutils-crosssdk: Generate relocatable SDKs |
5 | 5 | ||
6 | This patch will modify the ELF linker scripts so that the crosssdk | 6 | This patch will modify the ELF linker scripts so that the crosssdk |
7 | linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries | 7 | linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries |
@@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
18 | 2 files changed, 5 insertions(+), 2 deletions(-) | 18 | 2 files changed, 5 insertions(+), 2 deletions(-) |
19 | 19 | ||
20 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh | 20 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh |
21 | index 03392d265c..435689ea14 100755 | 21 | index 03392d265c7..435689ea144 100755 |
22 | --- a/ld/genscripts.sh | 22 | --- a/ld/genscripts.sh |
23 | +++ b/ld/genscripts.sh | 23 | +++ b/ld/genscripts.sh |
24 | @@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" | 24 | @@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" |
@@ -43,7 +43,7 @@ index 03392d265c..435689ea14 100755 | |||
43 | DATA_ALIGNMENT=${DATA_ALIGNMENT_} | 43 | DATA_ALIGNMENT=${DATA_ALIGNMENT_} |
44 | RELOCATING=" " | 44 | RELOCATING=" " |
45 | diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc | 45 | diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc |
46 | index 0b8b32a440..ee6b71075d 100644 | 46 | index 0b8b32a4407..ee6b71075d7 100644 |
47 | --- a/ld/scripttempl/elf.sc | 47 | --- a/ld/scripttempl/elf.sc |
48 | +++ b/ld/scripttempl/elf.sc | 48 | +++ b/ld/scripttempl/elf.sc |
49 | @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then | 49 | @@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then |
@@ -57,3 +57,6 @@ index 0b8b32a440..ee6b71075d 100644 | |||
57 | fi | 57 | fi |
58 | if test -z "$PLT"; then | 58 | if test -z "$PLT"; then |
59 | IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" | 59 | IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }" |
60 | -- | ||
61 | 2.28.0 | ||
62 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch index 91de94b768..41dff05b25 100644 --- a/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch +++ b/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 6d79f81336e7cbe727b5a51134f5d314a455379d Mon Sep 17 00:00:00 2001 | 1 | From 0d14f8f333a9b519202246ce779f3e380491826c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 6 Mar 2017 23:37:05 -0800 | 3 | Date: Mon, 6 Mar 2017 23:37:05 -0800 |
4 | Subject: [PATCH] binutils-cross: Do not generate linker script directories | 4 | Subject: [PATCH 02/17] binutils-cross: Do not generate linker script |
5 | directories | ||
5 | 6 | ||
6 | We don't place target libraries within ${exec_prefix}, we'd always place these | 7 | We don't place target libraries within ${exec_prefix}, we'd always place these |
7 | within the target sysroot within the standard library directories. Worse, the | 8 | within the target sysroot within the standard library directories. Worse, the |
@@ -22,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
22 | 1 file changed, 25 deletions(-) | 23 | 1 file changed, 25 deletions(-) |
23 | 24 | ||
24 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh | 25 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh |
25 | index 435689ea14..cff8a1467f 100755 | 26 | index 435689ea144..cff8a1467f9 100755 |
26 | --- a/ld/genscripts.sh | 27 | --- a/ld/genscripts.sh |
27 | +++ b/ld/genscripts.sh | 28 | +++ b/ld/genscripts.sh |
28 | @@ -235,31 +235,6 @@ append_to_lib_path() | 29 | @@ -235,31 +235,6 @@ append_to_lib_path() |
@@ -57,3 +58,6 @@ index 435689ea14..cff8a1467f 100755 | |||
57 | if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then | 58 | if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then |
58 | libs=${NATIVE_LIB_DIRS} | 59 | libs=${NATIVE_LIB_DIRS} |
59 | if [ "x${NATIVE}" = "xyes" ] ; then | 60 | if [ "x${NATIVE}" = "xyes" ] ; then |
61 | -- | ||
62 | 2.28.0 | ||
63 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch index 4b4d73d21d..28daf58f74 100644 --- a/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-binutils-nativesdk-Search-for-alternative-ld.so.conf.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From d057b215f114f6158b4010ab44a19cae9dcc8386 Mon Sep 17 00:00:00 2001 | 1 | From 3bbec749ec9fe681ade6812c48c541a752fcffd5 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Wed, 19 Feb 2020 09:51:16 -0800 | 3 | Date: Wed, 19 Feb 2020 09:51:16 -0800 |
4 | Subject: [PATCH] binutils-nativesdk: Search for alternative ld.so.conf in SDK | 4 | Subject: [PATCH 03/17] binutils-nativesdk: Search for alternative ld.so.conf |
5 | installation | 5 | in SDK installation |
6 | 6 | ||
7 | We need binutils to look at our ld.so.conf file within the SDK to ensure | 7 | We need binutils to look at our ld.so.conf file within the SDK to ensure |
8 | we search the SDK's libdirs as well as those from the host system. | 8 | we search the SDK's libdirs as well as those from the host system. |
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
29 | 5 files changed, 7 insertions(+), 3 deletions(-) | 29 | 5 files changed, 7 insertions(+), 3 deletions(-) |
30 | 30 | ||
31 | diff --git a/ld/Makefile.am b/ld/Makefile.am | 31 | diff --git a/ld/Makefile.am b/ld/Makefile.am |
32 | index 4a9b8404b7..1c132d3ce4 100644 | 32 | index 02c4fc16395..a5762227f0a 100644 |
33 | --- a/ld/Makefile.am | 33 | --- a/ld/Makefile.am |
34 | +++ b/ld/Makefile.am | 34 | +++ b/ld/Makefile.am |
35 | @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ | 35 | @@ -42,7 +42,8 @@ ZLIBINC = @zlibinc@ |
@@ -43,10 +43,10 @@ index 4a9b8404b7..1c132d3ce4 100644 | |||
43 | NO_WERROR = @NO_WERROR@ | 43 | NO_WERROR = @NO_WERROR@ |
44 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 44 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) |
45 | diff --git a/ld/Makefile.in b/ld/Makefile.in | 45 | diff --git a/ld/Makefile.in b/ld/Makefile.in |
46 | index 46d9b14077..e453bc1b33 100644 | 46 | index 2fe12e14f63..8f0c83ac8d2 100644 |
47 | --- a/ld/Makefile.in | 47 | --- a/ld/Makefile.in |
48 | +++ b/ld/Makefile.in | 48 | +++ b/ld/Makefile.in |
49 | @@ -555,7 +555,8 @@ ZLIB = @zlibdir@ -lz | 49 | @@ -548,7 +548,8 @@ ZLIB = @zlibdir@ -lz |
50 | ZLIBINC = @zlibinc@ | 50 | ZLIBINC = @zlibinc@ |
51 | ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ | 51 | ELF_CLFAGS = -DELF_LIST_OPTIONS=@elf_list_options@ \ |
52 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ | 52 | -DELF_SHLIB_LIST_OPTIONS=@elf_shlib_list_options@ \ |
@@ -55,25 +55,25 @@ index 46d9b14077..e453bc1b33 100644 | |||
55 | + -DSYSCONFDIR="\"$(sysconfdir)\"" | 55 | + -DSYSCONFDIR="\"$(sysconfdir)\"" |
56 | 56 | ||
57 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 57 | AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) |
58 | @ENABLE_PLUGINS_FALSE@PLUGIN_C = | 58 | |
59 | diff --git a/ld/ldelf.c b/ld/ldelf.c | 59 | diff --git a/ld/ldelf.c b/ld/ldelf.c |
60 | index 2e27cf48a8..a095d6aac5 100644 | 60 | index bada3ade2d7..b4784009d7a 100644 |
61 | --- a/ld/ldelf.c | 61 | --- a/ld/ldelf.c |
62 | +++ b/ld/ldelf.c | 62 | +++ b/ld/ldelf.c |
63 | @@ -907,7 +907,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, | 63 | @@ -911,7 +911,7 @@ ldelf_check_ld_so_conf (const struct bfd_link_needed_list *l, int force, |
64 | 64 | ||
65 | info.path = NULL; | 65 | info.path = NULL; |
66 | info.len = info.alloc = 0; | 66 | info.len = info.alloc = 0; |
67 | - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", | 67 | - tmppath = concat (ld_sysroot, prefix, "/etc/ld.so.conf", |
68 | + tmppath = concat (ld_sysconfdir, "/ld.so.conf", | 68 | + tmppath = concat (ld_sysconfdir, "/etc/ld.so.conf", |
69 | (const char *) NULL); | 69 | (const char *) NULL); |
70 | if (!ldelf_parse_ld_so_conf (&info, tmppath)) | 70 | if (!ldelf_parse_ld_so_conf (&info, tmppath)) |
71 | { | 71 | { |
72 | diff --git a/ld/ldmain.c b/ld/ldmain.c | 72 | diff --git a/ld/ldmain.c b/ld/ldmain.c |
73 | index c4af10f4e9..da1ad17763 100644 | 73 | index 08be9030cb5..f5c5a336320 100644 |
74 | --- a/ld/ldmain.c | 74 | --- a/ld/ldmain.c |
75 | +++ b/ld/ldmain.c | 75 | +++ b/ld/ldmain.c |
76 | @@ -69,6 +69,7 @@ char *program_name; | 76 | @@ -70,6 +70,7 @@ char *program_name; |
77 | 77 | ||
78 | /* The prefix for system library directories. */ | 78 | /* The prefix for system library directories. */ |
79 | const char *ld_sysroot; | 79 | const char *ld_sysroot; |
@@ -82,7 +82,7 @@ index c4af10f4e9..da1ad17763 100644 | |||
82 | /* The canonical representation of ld_sysroot. */ | 82 | /* The canonical representation of ld_sysroot. */ |
83 | char *ld_canon_sysroot; | 83 | char *ld_canon_sysroot; |
84 | diff --git a/ld/ldmain.h b/ld/ldmain.h | 84 | diff --git a/ld/ldmain.h b/ld/ldmain.h |
85 | index 0f05821d1e..54c36a94ce 100644 | 85 | index ac7db5720d5..1cbe1771912 100644 |
86 | --- a/ld/ldmain.h | 86 | --- a/ld/ldmain.h |
87 | +++ b/ld/ldmain.h | 87 | +++ b/ld/ldmain.h |
88 | @@ -23,6 +23,7 @@ | 88 | @@ -23,6 +23,7 @@ |
@@ -93,3 +93,6 @@ index 0f05821d1e..54c36a94ce 100644 | |||
93 | extern char *ld_canon_sysroot; | 93 | extern char *ld_canon_sysroot; |
94 | extern int ld_canon_sysroot_len; | 94 | extern int ld_canon_sysroot_len; |
95 | extern FILE *saved_script_handle; | 95 | extern FILE *saved_script_handle; |
96 | -- | ||
97 | 2.28.0 | ||
98 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch index d10a144ed5..2381c7b85e 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch +++ b/meta/recipes-devtools/binutils/binutils/0004-configure-widen-the-regexp-for-SH-architectures.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f7ad8a44c10f01e03680f093fd7af71c9f5e8606 Mon Sep 17 00:00:00 2001 | 1 | From 361c2c313196c095d12d17cecf0a069107dd629b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:07:33 +0000 | 3 | Date: Mon, 2 Mar 2015 01:07:33 +0000 |
4 | Subject: [PATCH] configure: widen the regexp for SH architectures | 4 | Subject: [PATCH 04/17] configure: widen the regexp for SH architectures |
5 | 5 | ||
6 | gprof needs to know about uclibc | 6 | gprof needs to know about uclibc |
7 | 7 | ||
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | 14 | 2 files changed, 2 insertions(+), 2 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure b/configure | 16 | diff --git a/configure b/configure |
17 | index 91dc42f6c7..7c1b747e7c 100755 | 17 | index 54d0339ab9e..6782f8b6ab8 100755 |
18 | --- a/configure | 18 | --- a/configure |
19 | +++ b/configure | 19 | +++ b/configure |
20 | @@ -3915,7 +3915,7 @@ case "${target}" in | 20 | @@ -3937,7 +3937,7 @@ case "${target}" in |
21 | nvptx*-*-*) | 21 | nvptx*-*-*) |
22 | noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" | 22 | noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" |
23 | ;; | 23 | ;; |
@@ -27,10 +27,10 @@ index 91dc42f6c7..7c1b747e7c 100755 | |||
27 | sh*-*-elf) | 27 | sh*-*-elf) |
28 | ;; | 28 | ;; |
29 | diff --git a/configure.ac b/configure.ac | 29 | diff --git a/configure.ac b/configure.ac |
30 | index 4bd869a63a..7187b34dfc 100644 | 30 | index a910c4fd6ba..55beb1dea46 100644 |
31 | --- a/configure.ac | 31 | --- a/configure.ac |
32 | +++ b/configure.ac | 32 | +++ b/configure.ac |
33 | @@ -1159,7 +1159,7 @@ case "${target}" in | 33 | @@ -1178,7 +1178,7 @@ case "${target}" in |
34 | nvptx*-*-*) | 34 | nvptx*-*-*) |
35 | noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" | 35 | noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" |
36 | ;; | 36 | ;; |
@@ -39,3 +39,6 @@ index 4bd869a63a..7187b34dfc 100644 | |||
39 | case "${target}" in | 39 | case "${target}" in |
40 | sh*-*-elf) | 40 | sh*-*-elf) |
41 | ;; | 41 | ;; |
42 | -- | ||
43 | 2.28.0 | ||
44 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch index 3ba0ba63f1..c31a0bc9a6 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Point-scripts-location-to-libdir.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 08b088b7dd3d9707ed66948a7271ffb438eeddf5 Mon Sep 17 00:00:00 2001 | 1 | From 39b478b7e52fb1b892a392f3c3750b9023cfabc8 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:09:58 +0000 | 3 | Date: Mon, 2 Mar 2015 01:09:58 +0000 |
4 | Subject: [PATCH] Point scripts location to libdir | 4 | Subject: [PATCH 05/17] Point scripts location to libdir |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [debian patch] | 6 | Upstream-Status: Inappropriate [debian patch] |
7 | 7 | ||
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 2 files changed, 2 insertions(+), 2 deletions(-) | 12 | 2 files changed, 2 insertions(+), 2 deletions(-) |
13 | 13 | ||
14 | diff --git a/ld/Makefile.am b/ld/Makefile.am | 14 | diff --git a/ld/Makefile.am b/ld/Makefile.am |
15 | index 1c132d3ce4..8d82cf2e16 100644 | 15 | index a5762227f0a..e1c665898f3 100644 |
16 | --- a/ld/Makefile.am | 16 | --- a/ld/Makefile.am |
17 | +++ b/ld/Makefile.am | 17 | +++ b/ld/Makefile.am |
18 | @@ -64,7 +64,7 @@ endif | 18 | @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) |
19 | # We put the scripts in the directory $(scriptdir)/ldscripts. | 19 | # We put the scripts in the directory $(scriptdir)/ldscripts. |
20 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | 20 | # We can't put the scripts in $(datadir) because the SEARCH_DIR |
21 | # directives need to be different for native and cross linkers. | 21 | # directives need to be different for native and cross linkers. |
@@ -25,10 +25,10 @@ index 1c132d3ce4..8d82cf2e16 100644 | |||
25 | EMUL = @EMUL@ | 25 | EMUL = @EMUL@ |
26 | EMULATION_OFILES = @EMULATION_OFILES@ | 26 | EMULATION_OFILES = @EMULATION_OFILES@ |
27 | diff --git a/ld/Makefile.in b/ld/Makefile.in | 27 | diff --git a/ld/Makefile.in b/ld/Makefile.in |
28 | index e453bc1b33..2dcd72f809 100644 | 28 | index 8f0c83ac8d2..acc24ec4130 100644 |
29 | --- a/ld/Makefile.in | 29 | --- a/ld/Makefile.in |
30 | +++ b/ld/Makefile.in | 30 | +++ b/ld/Makefile.in |
31 | @@ -573,7 +573,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 31 | @@ -556,7 +556,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) |
32 | # We put the scripts in the directory $(scriptdir)/ldscripts. | 32 | # We put the scripts in the directory $(scriptdir)/ldscripts. |
33 | # We can't put the scripts in $(datadir) because the SEARCH_DIR | 33 | # We can't put the scripts in $(datadir) because the SEARCH_DIR |
34 | # directives need to be different for native and cross linkers. | 34 | # directives need to be different for native and cross linkers. |
@@ -37,3 +37,6 @@ index e453bc1b33..2dcd72f809 100644 | |||
37 | BASEDIR = $(srcdir)/.. | 37 | BASEDIR = $(srcdir)/.. |
38 | BFDDIR = $(BASEDIR)/bfd | 38 | BFDDIR = $(BASEDIR)/bfd |
39 | INCDIR = $(BASEDIR)/include | 39 | INCDIR = $(BASEDIR)/include |
40 | -- | ||
41 | 2.28.0 | ||
42 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index d920729204..654b64ff78 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 13791636abf518f0db209dc51c29445d80421f2e Mon Sep 17 00:00:00 2001 | 1 | From 59640ddf11104a604ccf7c078a48359d711c2f9c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 | 3 | Date: Mon, 2 Mar 2015 01:27:17 +0000 |
4 | Subject: [PATCH] Only generate an RPATH entry if LD_RUN_PATH is not empty | 4 | Subject: [PATCH 06/17] Only generate an RPATH entry if LD_RUN_PATH is not |
5 | empty | ||
5 | 6 | ||
6 | for cases where -rpath isn't specified. debian (#151024) | 7 | for cases where -rpath isn't specified. debian (#151024) |
7 | 8 | ||
@@ -14,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 4 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
15 | 16 | ||
16 | diff --git a/ld/ldelf.c b/ld/ldelf.c | 17 | diff --git a/ld/ldelf.c b/ld/ldelf.c |
17 | index a095d6aac5..a2455a8793 100644 | 18 | index b4784009d7a..541772f4604 100644 |
18 | --- a/ld/ldelf.c | 19 | --- a/ld/ldelf.c |
19 | +++ b/ld/ldelf.c | 20 | +++ b/ld/ldelf.c |
20 | @@ -1229,6 +1229,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, | 21 | @@ -1247,6 +1247,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, |
21 | && command_line.rpath == NULL) | 22 | && command_line.rpath == NULL) |
22 | { | 23 | { |
23 | path = (const char *) getenv ("LD_RUN_PATH"); | 24 | path = (const char *) getenv ("LD_RUN_PATH"); |
@@ -26,7 +27,7 @@ index a095d6aac5..a2455a8793 100644 | |||
26 | if (path | 27 | if (path |
27 | && ldelf_search_needed (path, &n, force, | 28 | && ldelf_search_needed (path, &n, force, |
28 | is_linux, elfsize)) | 29 | is_linux, elfsize)) |
29 | @@ -1573,6 +1575,8 @@ ldelf_before_allocation (char *audit, char *depaudit, | 30 | @@ -1605,6 +1607,8 @@ ldelf_before_allocation (char *audit, char *depaudit, |
30 | rpath = command_line.rpath; | 31 | rpath = command_line.rpath; |
31 | if (rpath == NULL) | 32 | if (rpath == NULL) |
32 | rpath = (const char *) getenv ("LD_RUN_PATH"); | 33 | rpath = (const char *) getenv ("LD_RUN_PATH"); |
@@ -35,3 +36,6 @@ index a095d6aac5..a2455a8793 100644 | |||
35 | 36 | ||
36 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) | 37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) |
37 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) | 38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |
39 | -- | ||
40 | 2.28.0 | ||
41 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch index b0e94ab1cb..7f8fc9a5c0 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch +++ b/meta/recipes-devtools/binutils/binutils/0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From e36a4e05f900bbe6a8d744a93f3a407bc55c96f7 Mon Sep 17 00:00:00 2001 | 1 | From 2b81508b9af76db292cd756432b03035cb8157e0 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:39:01 +0000 | 3 | Date: Mon, 2 Mar 2015 01:39:01 +0000 |
4 | Subject: [PATCH] don't let the distro compiler point to the wrong installation | 4 | Subject: [PATCH 07/17] don't let the distro compiler point to the wrong |
5 | location | 5 | installation location |
6 | 6 | ||
7 | Thanks to RP for helping find the source code causing the issue. | 7 | Thanks to RP for helping find the source code causing the issue. |
8 | 8 | ||
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | 17 | 1 file changed, 2 insertions(+), 1 deletion(-) |
18 | 18 | ||
19 | diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in | 19 | diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in |
20 | index fe738d0db4..27d818f253 100644 | 20 | index 895f701bcd0..97a53f15bb6 100644 |
21 | --- a/libiberty/Makefile.in | 21 | --- a/libiberty/Makefile.in |
22 | +++ b/libiberty/Makefile.in | 22 | +++ b/libiberty/Makefile.in |
23 | @@ -365,7 +365,8 @@ install-strip: install | 23 | @@ -367,7 +367,8 @@ install-strip: install |
24 | # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the | 24 | # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the |
25 | # default multilib, so we have to take CFLAGS into account as well, | 25 | # default multilib, so we have to take CFLAGS into account as well, |
26 | # since it will be passed the multilib flags. | 26 | # since it will be passed the multilib flags. |
@@ -30,3 +30,6 @@ index fe738d0db4..27d818f253 100644 | |||
30 | install_to_libdir: all | 30 | install_to_libdir: all |
31 | if test -n "${target_header_dir}"; then \ | 31 | if test -n "${target_header_dir}"; then \ |
32 | ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ | 32 | ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ |
33 | -- | ||
34 | 2.28.0 | ||
35 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch index 11a8110d40..2356c6a60f 100644 --- a/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7b24f81e04c9d00d96de7dbd250beade6d2c6e44 Mon Sep 17 00:00:00 2001 | 1 | From 413075afbdb16e7cc05511682ca9e3c880acb5a7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 15 Jan 2016 06:31:09 +0000 | 3 | Date: Fri, 15 Jan 2016 06:31:09 +0000 |
4 | Subject: [PATCH] warn for uses of system directories when cross linking | 4 | Subject: [PATCH 08/17] warn for uses of system directories when cross linking |
5 | 5 | ||
6 | 2008-07-02 Joseph Myers <joseph@codesourcery.com> | 6 | 2008-07-02 Joseph Myers <joseph@codesourcery.com> |
7 | 7 | ||
@@ -57,16 +57,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
57 | ld/ld.h | 8 ++++++++ | 57 | ld/ld.h | 8 ++++++++ |
58 | ld/ld.texi | 12 ++++++++++++ | 58 | ld/ld.texi | 12 ++++++++++++ |
59 | ld/ldfile.c | 17 +++++++++++++++++ | 59 | ld/ldfile.c | 17 +++++++++++++++++ |
60 | ld/ldlex.h | 2 ++ | 60 | ld/ldlex.h | 5 +++++ |
61 | ld/ldmain.c | 2 ++ | 61 | ld/ldmain.c | 2 ++ |
62 | ld/lexsup.c | 15 +++++++++++++++ | 62 | ld/lexsup.c | 27 +++++++++++++++++++++++++++ |
63 | 9 files changed, 85 insertions(+) | 63 | 9 files changed, 100 insertions(+) |
64 | 64 | ||
65 | diff --git a/ld/config.in b/ld/config.in | 65 | diff --git a/ld/config.in b/ld/config.in |
66 | index d93c9b0830..5da2742bea 100644 | 66 | index f1712107367..308e0173c16 100644 |
67 | --- a/ld/config.in | 67 | --- a/ld/config.in |
68 | +++ b/ld/config.in | 68 | +++ b/ld/config.in |
69 | @@ -31,6 +31,9 @@ | 69 | @@ -40,6 +40,9 @@ |
70 | language is requested. */ | 70 | language is requested. */ |
71 | #undef ENABLE_NLS | 71 | #undef ENABLE_NLS |
72 | 72 | ||
@@ -77,7 +77,7 @@ index d93c9b0830..5da2742bea 100644 | |||
77 | #undef EXTRA_SHLIB_EXTENSION | 77 | #undef EXTRA_SHLIB_EXTENSION |
78 | 78 | ||
79 | diff --git a/ld/configure b/ld/configure | 79 | diff --git a/ld/configure b/ld/configure |
80 | index 811134a503..f8c17c19ae 100755 | 80 | index f08ce9969ea..1c872c0db5f 100755 |
81 | --- a/ld/configure | 81 | --- a/ld/configure |
82 | +++ b/ld/configure | 82 | +++ b/ld/configure |
83 | @@ -826,6 +826,7 @@ with_lib_path | 83 | @@ -826,6 +826,7 @@ with_lib_path |
@@ -88,7 +88,7 @@ index 811134a503..f8c17c19ae 100755 | |||
88 | enable_gold | 88 | enable_gold |
89 | enable_got | 89 | enable_got |
90 | enable_compressed_debug_sections | 90 | enable_compressed_debug_sections |
91 | @@ -1491,6 +1492,8 @@ Optional Features: | 91 | @@ -1493,6 +1494,8 @@ Optional Features: |
92 | --disable-largefile omit support for large files | 92 | --disable-largefile omit support for large files |
93 | --enable-targets alternative target configurations | 93 | --enable-targets alternative target configurations |
94 | --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) | 94 | --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) |
@@ -97,7 +97,7 @@ index 811134a503..f8c17c19ae 100755 | |||
97 | --enable-gold[=ARG] build gold [ARG={default,yes,no}] | 97 | --enable-gold[=ARG] build gold [ARG={default,yes,no}] |
98 | --enable-got=<type> GOT handling scheme (target, single, negative, | 98 | --enable-got=<type> GOT handling scheme (target, single, negative, |
99 | multigot) | 99 | multigot) |
100 | @@ -15788,6 +15791,19 @@ fi | 100 | @@ -15793,6 +15796,19 @@ fi |
101 | 101 | ||
102 | 102 | ||
103 | 103 | ||
@@ -118,7 +118,7 @@ index 811134a503..f8c17c19ae 100755 | |||
118 | if test "${enable_gold+set}" = set; then : | 118 | if test "${enable_gold+set}" = set; then : |
119 | enableval=$enable_gold; case "${enableval}" in | 119 | enableval=$enable_gold; case "${enableval}" in |
120 | diff --git a/ld/configure.ac b/ld/configure.ac | 120 | diff --git a/ld/configure.ac b/ld/configure.ac |
121 | index b5e849d84a..22e022ec03 100644 | 121 | index 5a4938afdb0..dbbbde74b04 100644 |
122 | --- a/ld/configure.ac | 122 | --- a/ld/configure.ac |
123 | +++ b/ld/configure.ac | 123 | +++ b/ld/configure.ac |
124 | @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) | 124 | @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) |
@@ -139,7 +139,7 @@ index b5e849d84a..22e022ec03 100644 | |||
139 | dnl "install_as_default" is set to false if gold is the default linker. | 139 | dnl "install_as_default" is set to false if gold is the default linker. |
140 | dnl "installed_linker" is the installed BFD linker name. | 140 | dnl "installed_linker" is the installed BFD linker name. |
141 | diff --git a/ld/ld.h b/ld/ld.h | 141 | diff --git a/ld/ld.h b/ld/ld.h |
142 | index 71fd781267..5c7843100b 100644 | 142 | index 1790dc81a66..73f832eb169 100644 |
143 | --- a/ld/ld.h | 143 | --- a/ld/ld.h |
144 | +++ b/ld/ld.h | 144 | +++ b/ld/ld.h |
145 | @@ -166,6 +166,14 @@ typedef struct | 145 | @@ -166,6 +166,14 @@ typedef struct |
@@ -158,10 +158,10 @@ index 71fd781267..5c7843100b 100644 | |||
158 | enum endian_enum endian; | 158 | enum endian_enum endian; |
159 | 159 | ||
160 | diff --git a/ld/ld.texi b/ld/ld.texi | 160 | diff --git a/ld/ld.texi b/ld/ld.texi |
161 | index eb7bcb9933..3c73d445a0 100644 | 161 | index 2a93e9456ac..3eeb70607fd 100644 |
162 | --- a/ld/ld.texi | 162 | --- a/ld/ld.texi |
163 | +++ b/ld/ld.texi | 163 | +++ b/ld/ld.texi |
164 | @@ -2551,6 +2551,18 @@ string identifying the original linked file does not change. | 164 | @@ -2655,6 +2655,18 @@ string identifying the original linked file does not change. |
165 | 165 | ||
166 | Passing @code{none} for @var{style} disables the setting from any | 166 | Passing @code{none} for @var{style} disables the setting from any |
167 | @code{--build-id} options earlier on the command line. | 167 | @code{--build-id} options earlier on the command line. |
@@ -181,7 +181,7 @@ index eb7bcb9933..3c73d445a0 100644 | |||
181 | 181 | ||
182 | @c man end | 182 | @c man end |
183 | diff --git a/ld/ldfile.c b/ld/ldfile.c | 183 | diff --git a/ld/ldfile.c b/ld/ldfile.c |
184 | index 411f7ddf97..17db16c2cc 100644 | 184 | index e39170b5d94..fadc248a140 100644 |
185 | --- a/ld/ldfile.c | 185 | --- a/ld/ldfile.c |
186 | +++ b/ld/ldfile.c | 186 | +++ b/ld/ldfile.c |
187 | @@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) | 187 | @@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) |
@@ -209,23 +209,26 @@ index 411f7ddf97..17db16c2cc 100644 | |||
209 | 209 | ||
210 | /* Try to open a BFD for a lang_input_statement. */ | 210 | /* Try to open a BFD for a lang_input_statement. */ |
211 | diff --git a/ld/ldlex.h b/ld/ldlex.h | 211 | diff --git a/ld/ldlex.h b/ld/ldlex.h |
212 | index 5287f19a7f..55096e4fc9 100644 | 212 | index 5ea083ebeb3..941dc5f3dc8 100644 |
213 | --- a/ld/ldlex.h | 213 | --- a/ld/ldlex.h |
214 | +++ b/ld/ldlex.h | 214 | +++ b/ld/ldlex.h |
215 | @@ -150,6 +150,8 @@ enum option_values | 215 | @@ -155,6 +155,11 @@ enum option_values |
216 | OPTION_FORCE_GROUP_ALLOCATION, | 216 | OPTION_NON_CONTIGUOUS_REGIONS, |
217 | OPTION_PRINT_MAP_DISCARDED, | 217 | OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, |
218 | OPTION_NO_PRINT_MAP_DISCARDED, | 218 | OPTION_DEPENDENCY_FILE, |
219 | + OPTION_CTF_VARIABLES, | ||
220 | + OPTION_NO_CTF_VARIABLES, | ||
221 | + OPTION_CTF_SHARE_TYPES, | ||
219 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES, | 222 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES, |
220 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, | 223 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, |
221 | }; | 224 | }; |
222 | 225 | ||
223 | /* The initial parser states. */ | 226 | /* The initial parser states. */ |
224 | diff --git a/ld/ldmain.c b/ld/ldmain.c | 227 | diff --git a/ld/ldmain.c b/ld/ldmain.c |
225 | index da1ad17763..12d0b07d8a 100644 | 228 | index f5c5a336320..516ba0360e2 100644 |
226 | --- a/ld/ldmain.c | 229 | --- a/ld/ldmain.c |
227 | +++ b/ld/ldmain.c | 230 | +++ b/ld/ldmain.c |
228 | @@ -274,6 +274,8 @@ main (int argc, char **argv) | 231 | @@ -322,6 +322,8 @@ main (int argc, char **argv) |
229 | command_line.warn_mismatch = TRUE; | 232 | command_line.warn_mismatch = TRUE; |
230 | command_line.warn_search_mismatch = TRUE; | 233 | command_line.warn_search_mismatch = TRUE; |
231 | command_line.check_section_addresses = -1; | 234 | command_line.check_section_addresses = -1; |
@@ -235,13 +238,25 @@ index da1ad17763..12d0b07d8a 100644 | |||
235 | /* We initialize DEMANGLING based on the environment variable | 238 | /* We initialize DEMANGLING based on the environment variable |
236 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the | 239 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the |
237 | diff --git a/ld/lexsup.c b/ld/lexsup.c | 240 | diff --git a/ld/lexsup.c b/ld/lexsup.c |
238 | index 3d15cc491d..0e8b4f2b7a 100644 | 241 | index 58c6c078325..879e7bb7658 100644 |
239 | --- a/ld/lexsup.c | 242 | --- a/ld/lexsup.c |
240 | +++ b/ld/lexsup.c | 243 | +++ b/ld/lexsup.c |
241 | @@ -550,6 +550,14 @@ static const struct ld_option ld_options[] = | 244 | @@ -572,6 +572,26 @@ static const struct ld_option ld_options[] = |
242 | { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, | 245 | { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, |
243 | '\0', NULL, N_("Do not show discarded sections in map file output"), | 246 | '\0', NULL, N_("Do not show discarded sections in map file output"), |
244 | TWO_DASHES }, | 247 | TWO_DASHES }, |
248 | + { {"ctf-variables", no_argument, NULL, OPTION_CTF_VARIABLES}, | ||
249 | + '\0', NULL, N_("Emit names and types of static variables in CTF"), | ||
250 | + TWO_DASHES }, | ||
251 | + { {"no-ctf-variables", no_argument, NULL, OPTION_NO_CTF_VARIABLES}, | ||
252 | + '\0', NULL, N_("Do not emit names and types of static variables in CTF"), | ||
253 | + TWO_DASHES }, | ||
254 | + { {"ctf-share-types=<method>", required_argument, NULL, | ||
255 | + OPTION_CTF_SHARE_TYPES}, | ||
256 | + '\0', NULL, N_("How to share CTF types between translation units.\n" | ||
257 | + " <method> is: share-unconflicted (default),\n" | ||
258 | + " share-duplicated"), | ||
259 | + TWO_DASHES }, | ||
245 | + { {"no-poison-system-directories", no_argument, NULL, | 260 | + { {"no-poison-system-directories", no_argument, NULL, |
246 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, | 261 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, |
247 | + '\0', NULL, N_("Do not warn for -L options using system directories"), | 262 | + '\0', NULL, N_("Do not warn for -L options using system directories"), |
@@ -253,7 +268,7 @@ index 3d15cc491d..0e8b4f2b7a 100644 | |||
253 | }; | 268 | }; |
254 | 269 | ||
255 | #define OPTION_COUNT ARRAY_SIZE (ld_options) | 270 | #define OPTION_COUNT ARRAY_SIZE (ld_options) |
256 | @@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv) | 271 | @@ -1632,6 +1652,13 @@ parse_args (unsigned argc, char **argv) |
257 | 272 | ||
258 | case OPTION_PRINT_MAP_DISCARDED: | 273 | case OPTION_PRINT_MAP_DISCARDED: |
259 | config.print_map_discarded = TRUE; | 274 | config.print_map_discarded = TRUE; |
@@ -265,5 +280,8 @@ index 3d15cc491d..0e8b4f2b7a 100644 | |||
265 | + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: | 280 | + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: |
266 | + command_line.error_poison_system_directories = TRUE; | 281 | + command_line.error_poison_system_directories = TRUE; |
267 | break; | 282 | break; |
268 | } | 283 | |
269 | } | 284 | case OPTION_DEPENDENCY_FILE: |
285 | -- | ||
286 | 2.28.0 | ||
287 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch index c49b8e863f..fb5276e183 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2182791a453f34bee6968b3e72848608cf7d7abe Mon Sep 17 00:00:00 2001 | 1 | From 13a67e9040c01abd284fe506471e0eab668ee3dc Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:44:14 +0000 | 3 | Date: Mon, 2 Mar 2015 01:44:14 +0000 |
4 | Subject: [PATCH] Change default emulation for mips64*-*-linux | 4 | Subject: [PATCH 09/17] Change default emulation for mips64*-*-linux |
5 | 5 | ||
6 | we change the default emulations to be N64 instead of N32 | 6 | we change the default emulations to be N64 instead of N32 |
7 | 7 | ||
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 2 files changed, 8 insertions(+), 8 deletions(-) | 14 | 2 files changed, 8 insertions(+), 8 deletions(-) |
15 | 15 | ||
16 | diff --git a/bfd/config.bfd b/bfd/config.bfd | 16 | diff --git a/bfd/config.bfd b/bfd/config.bfd |
17 | index b96931f52e..847f9f0ba9 100644 | 17 | index 14523caf0c5..e5233cd1f7e 100644 |
18 | --- a/bfd/config.bfd | 18 | --- a/bfd/config.bfd |
19 | +++ b/bfd/config.bfd | 19 | +++ b/bfd/config.bfd |
20 | @@ -911,12 +911,12 @@ case "${targ}" in | 20 | @@ -894,12 +894,12 @@ case "${targ}" in |
21 | targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" | 21 | targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" |
22 | ;; | 22 | ;; |
23 | mips64*el-*-linux*) | 23 | mips64*el-*-linux*) |
@@ -35,10 +35,10 @@ index b96931f52e..847f9f0ba9 100644 | |||
35 | mips*el-*-linux*) | 35 | mips*el-*-linux*) |
36 | targ_defvec=mips_elf32_trad_le_vec | 36 | targ_defvec=mips_elf32_trad_le_vec |
37 | diff --git a/ld/configure.tgt b/ld/configure.tgt | 37 | diff --git a/ld/configure.tgt b/ld/configure.tgt |
38 | index 23194e357f..f4f0eaf9b2 100644 | 38 | index 87c7d9a4cad..9b4bf2ca964 100644 |
39 | --- a/ld/configure.tgt | 39 | --- a/ld/configure.tgt |
40 | +++ b/ld/configure.tgt | 40 | +++ b/ld/configure.tgt |
41 | @@ -541,12 +541,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks | 41 | @@ -531,12 +531,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks |
42 | ;; | 42 | ;; |
43 | mips*-*-windiss) targ_emul=elf32mipswindiss | 43 | mips*-*-windiss) targ_emul=elf32mipswindiss |
44 | ;; | 44 | ;; |
@@ -55,3 +55,6 @@ index 23194e357f..f4f0eaf9b2 100644 | |||
55 | targ_extra_libpath=$targ_extra_emuls | 55 | targ_extra_libpath=$targ_extra_emuls |
56 | ;; | 56 | ;; |
57 | mips*el-*-linux-*) targ_emul=elf32ltsmip | 57 | mips*el-*-linux-*) targ_emul=elf32ltsmip |
58 | -- | ||
59 | 2.28.0 | ||
60 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch index c32867a238..277db4ec5c 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Add-support-for-Netlogic-XLP.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a0237ec2d1e58bd35c236df39dd5a06504c6d2ed Mon Sep 17 00:00:00 2001 | 1 | From 69ab45c16f80f18fa78121f6e774750b9e9a200b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 14 Feb 2016 17:06:19 +0000 | 3 | Date: Sun, 14 Feb 2016 17:06:19 +0000 |
4 | Subject: [PATCH] Add support for Netlogic XLP | 4 | Subject: [PATCH 10/17] Add support for Netlogic XLP |
5 | 5 | ||
6 | Patch From: Nebu Philips <nphilips@netlogicmicro.com> | 6 | Patch From: Nebu Philips <nphilips@netlogicmicro.com> |
7 | 7 | ||
@@ -35,10 +35,10 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | |||
35 | 15 files changed, 65 insertions(+), 21 deletions(-) | 35 | 15 files changed, 65 insertions(+), 21 deletions(-) |
36 | 36 | ||
37 | diff --git a/bfd/aoutx.h b/bfd/aoutx.h | 37 | diff --git a/bfd/aoutx.h b/bfd/aoutx.h |
38 | index fa3a9746b6..5078024fd5 100644 | 38 | index d352a1a3e44..2e2c3c1af86 100644 |
39 | --- a/bfd/aoutx.h | 39 | --- a/bfd/aoutx.h |
40 | +++ b/bfd/aoutx.h | 40 | +++ b/bfd/aoutx.h |
41 | @@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, | 41 | @@ -810,6 +810,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, |
42 | case bfd_mach_mipsisa64r6: | 42 | case bfd_mach_mipsisa64r6: |
43 | case bfd_mach_mips_sb1: | 43 | case bfd_mach_mips_sb1: |
44 | case bfd_mach_mips_xlr: | 44 | case bfd_mach_mips_xlr: |
@@ -47,7 +47,7 @@ index fa3a9746b6..5078024fd5 100644 | |||
47 | arch_flags = M_MIPS2; | 47 | arch_flags = M_MIPS2; |
48 | break; | 48 | break; |
49 | diff --git a/bfd/archures.c b/bfd/archures.c | 49 | diff --git a/bfd/archures.c b/bfd/archures.c |
50 | index 232103817c..b2b3b8c124 100644 | 50 | index 551ec8732f0..2665b378623 100644 |
51 | --- a/bfd/archures.c | 51 | --- a/bfd/archures.c |
52 | +++ b/bfd/archures.c | 52 | +++ b/bfd/archures.c |
53 | @@ -185,6 +185,7 @@ DESCRIPTION | 53 | @@ -185,6 +185,7 @@ DESCRIPTION |
@@ -59,10 +59,10 @@ index 232103817c..b2b3b8c124 100644 | |||
59 | .#define bfd_mach_mipsisa32r2 33 | 59 | .#define bfd_mach_mipsisa32r2 33 |
60 | .#define bfd_mach_mipsisa32r3 34 | 60 | .#define bfd_mach_mipsisa32r3 34 |
61 | diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h | 61 | diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h |
62 | index 7c13bc8c91..2e453c50c1 100644 | 62 | index 35ef4d755bb..48db00af80b 100644 |
63 | --- a/bfd/bfd-in2.h | 63 | --- a/bfd/bfd-in2.h |
64 | +++ b/bfd/bfd-in2.h | 64 | +++ b/bfd/bfd-in2.h |
65 | @@ -1568,6 +1568,7 @@ enum bfd_architecture | 65 | @@ -1585,6 +1585,7 @@ enum bfd_architecture |
66 | #define bfd_mach_mips_octeon3 6503 | 66 | #define bfd_mach_mips_octeon3 6503 |
67 | #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ | 67 | #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ |
68 | #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ | 68 | #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ |
@@ -71,10 +71,10 @@ index 7c13bc8c91..2e453c50c1 100644 | |||
71 | #define bfd_mach_mipsisa32r2 33 | 71 | #define bfd_mach_mipsisa32r2 33 |
72 | #define bfd_mach_mipsisa32r3 34 | 72 | #define bfd_mach_mipsisa32r3 34 |
73 | diff --git a/bfd/config.bfd b/bfd/config.bfd | 73 | diff --git a/bfd/config.bfd b/bfd/config.bfd |
74 | index 847f9f0ba9..a12707f827 100644 | 74 | index e5233cd1f7e..2e4ae6bbdff 100644 |
75 | --- a/bfd/config.bfd | 75 | --- a/bfd/config.bfd |
76 | +++ b/bfd/config.bfd | 76 | +++ b/bfd/config.bfd |
77 | @@ -894,6 +894,11 @@ case "${targ}" in | 77 | @@ -877,6 +877,11 @@ case "${targ}" in |
78 | targ_defvec=mips_elf32_le_vec | 78 | targ_defvec=mips_elf32_le_vec |
79 | targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" | 79 | targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" |
80 | ;; | 80 | ;; |
@@ -87,7 +87,7 @@ index 847f9f0ba9..a12707f827 100644 | |||
87 | targ_defvec=mips_elf32_be_vec | 87 | targ_defvec=mips_elf32_be_vec |
88 | targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" | 88 | targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" |
89 | diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c | 89 | diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c |
90 | index 802acb45f1..fd9ec4c0ad 100644 | 90 | index 802acb45f1e..fd9ec4c0ad4 100644 |
91 | --- a/bfd/cpu-mips.c | 91 | --- a/bfd/cpu-mips.c |
92 | +++ b/bfd/cpu-mips.c | 92 | +++ b/bfd/cpu-mips.c |
93 | @@ -108,7 +108,8 @@ enum | 93 | @@ -108,7 +108,8 @@ enum |
@@ -111,10 +111,10 @@ index 802acb45f1..fd9ec4c0ad 100644 | |||
111 | 111 | ||
112 | /* The default architecture is mips:3000, but with a machine number of | 112 | /* The default architecture is mips:3000, but with a machine number of |
113 | diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c | 113 | diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c |
114 | index d7e3aed3b6..7baeee9ee3 100644 | 114 | index 160febec94c..4c9499cc2cf 100644 |
115 | --- a/bfd/elfxx-mips.c | 115 | --- a/bfd/elfxx-mips.c |
116 | +++ b/bfd/elfxx-mips.c | 116 | +++ b/bfd/elfxx-mips.c |
117 | @@ -6999,6 +6999,9 @@ _bfd_elf_mips_mach (flagword flags) | 117 | @@ -6982,6 +6982,9 @@ _bfd_elf_mips_mach (flagword flags) |
118 | case E_MIPS_MACH_IAMR2: | 118 | case E_MIPS_MACH_IAMR2: |
119 | return bfd_mach_mips_interaptiv_mr2; | 119 | return bfd_mach_mips_interaptiv_mr2; |
120 | 120 | ||
@@ -124,7 +124,7 @@ index d7e3aed3b6..7baeee9ee3 100644 | |||
124 | default: | 124 | default: |
125 | switch (flags & EF_MIPS_ARCH) | 125 | switch (flags & EF_MIPS_ARCH) |
126 | { | 126 | { |
127 | @@ -12355,6 +12358,10 @@ mips_set_isa_flags (bfd *abfd) | 127 | @@ -12356,6 +12359,10 @@ mips_set_isa_flags (bfd *abfd) |
128 | val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; | 128 | val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; |
129 | break; | 129 | break; |
130 | 130 | ||
@@ -135,7 +135,7 @@ index d7e3aed3b6..7baeee9ee3 100644 | |||
135 | case bfd_mach_mipsisa32: | 135 | case bfd_mach_mipsisa32: |
136 | val = E_MIPS_ARCH_32; | 136 | val = E_MIPS_ARCH_32; |
137 | break; | 137 | break; |
138 | @@ -14379,6 +14386,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = | 138 | @@ -14373,6 +14380,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = |
139 | { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, | 139 | { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, |
140 | { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, | 140 | { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, |
141 | { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, | 141 | { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, |
@@ -144,10 +144,10 @@ index d7e3aed3b6..7baeee9ee3 100644 | |||
144 | /* MIPS64 extensions. */ | 144 | /* MIPS64 extensions. */ |
145 | { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, | 145 | { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, |
146 | diff --git a/binutils/readelf.c b/binutils/readelf.c | 146 | diff --git a/binutils/readelf.c b/binutils/readelf.c |
147 | index 6b5bebe743..d15a7828db 100644 | 147 | index 6057515a89b..ea119b0b254 100644 |
148 | --- a/binutils/readelf.c | 148 | --- a/binutils/readelf.c |
149 | +++ b/binutils/readelf.c | 149 | +++ b/binutils/readelf.c |
150 | @@ -3440,6 +3440,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) | 150 | @@ -3483,6 +3483,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) |
151 | case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; | 151 | case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; |
152 | case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; | 152 | case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; |
153 | case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; | 153 | case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; |
@@ -156,7 +156,7 @@ index 6b5bebe743..d15a7828db 100644 | |||
156 | /* We simply ignore the field in this case to avoid confusion: | 156 | /* We simply ignore the field in this case to avoid confusion: |
157 | MIPS ELF does not specify EF_MIPS_MACH, it is a GNU | 157 | MIPS ELF does not specify EF_MIPS_MACH, it is a GNU |
158 | diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c | 158 | diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c |
159 | index fc6898834e..2c7151ccdb 100644 | 159 | index 31acb77d78a..0ead168d51e 100644 |
160 | --- a/gas/config/tc-mips.c | 160 | --- a/gas/config/tc-mips.c |
161 | +++ b/gas/config/tc-mips.c | 161 | +++ b/gas/config/tc-mips.c |
162 | @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; | 162 | @@ -568,6 +568,7 @@ static int mips_32bitmode = 0; |
@@ -175,7 +175,7 @@ index fc6898834e..2c7151ccdb 100644 | |||
175 | ) | 175 | ) |
176 | 176 | ||
177 | /* Whether the processor uses hardware interlocks to protect reads | 177 | /* Whether the processor uses hardware interlocks to protect reads |
178 | @@ -20135,7 +20137,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = | 178 | @@ -20174,7 +20176,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = |
179 | /* Broadcom XLP. | 179 | /* Broadcom XLP. |
180 | XLP is mostly like XLR, with the prominent exception that it is | 180 | XLP is mostly like XLR, with the prominent exception that it is |
181 | MIPS64R2 rather than MIPS64. */ | 181 | MIPS64R2 rather than MIPS64. */ |
@@ -185,7 +185,7 @@ index fc6898834e..2c7151ccdb 100644 | |||
185 | /* MIPS 64 Release 6. */ | 185 | /* MIPS 64 Release 6. */ |
186 | { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, | 186 | { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, |
187 | diff --git a/gas/configure b/gas/configure | 187 | diff --git a/gas/configure b/gas/configure |
188 | index 60c1a055ae..59d6d11215 100755 | 188 | index 5bccfd9d1b7..d4b13e6fc8b 100755 |
189 | --- a/gas/configure | 189 | --- a/gas/configure |
190 | +++ b/gas/configure | 190 | +++ b/gas/configure |
191 | @@ -12722,6 +12722,9 @@ _ACEOF | 191 | @@ -12722,6 +12722,9 @@ _ACEOF |
@@ -199,7 +199,7 @@ index 60c1a055ae..59d6d11215 100755 | |||
199 | mips_cpu=r3900 | 199 | mips_cpu=r3900 |
200 | ;; | 200 | ;; |
201 | diff --git a/gas/configure.ac b/gas/configure.ac | 201 | diff --git a/gas/configure.ac b/gas/configure.ac |
202 | index 6f32e55a1a..11c2e0d273 100644 | 202 | index b65108fecb2..ce1f2dad9bc 100644 |
203 | --- a/gas/configure.ac | 203 | --- a/gas/configure.ac |
204 | +++ b/gas/configure.ac | 204 | +++ b/gas/configure.ac |
205 | @@ -325,6 +325,9 @@ changequote([,])dnl | 205 | @@ -325,6 +325,9 @@ changequote([,])dnl |
@@ -213,7 +213,7 @@ index 6f32e55a1a..11c2e0d273 100644 | |||
213 | mips_cpu=r3900 | 213 | mips_cpu=r3900 |
214 | ;; | 214 | ;; |
215 | diff --git a/include/elf/mips.h b/include/elf/mips.h | 215 | diff --git a/include/elf/mips.h b/include/elf/mips.h |
216 | index d116b036b6..dceeb3f156 100644 | 216 | index cc08ebd4318..bb518575ce1 100644 |
217 | --- a/include/elf/mips.h | 217 | --- a/include/elf/mips.h |
218 | +++ b/include/elf/mips.h | 218 | +++ b/include/elf/mips.h |
219 | @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) | 219 | @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) |
@@ -225,7 +225,7 @@ index d116b036b6..dceeb3f156 100644 | |||
225 | #define E_MIPS_MACH_OCTEON3 0x008e0000 | 225 | #define E_MIPS_MACH_OCTEON3 0x008e0000 |
226 | #define E_MIPS_MACH_5400 0x00910000 | 226 | #define E_MIPS_MACH_5400 0x00910000 |
227 | diff --git a/include/opcode/mips.h b/include/opcode/mips.h | 227 | diff --git a/include/opcode/mips.h b/include/opcode/mips.h |
228 | index fd031f3758..a96a44df84 100644 | 228 | index fd031f37588..a96a44df840 100644 |
229 | --- a/include/opcode/mips.h | 229 | --- a/include/opcode/mips.h |
230 | +++ b/include/opcode/mips.h | 230 | +++ b/include/opcode/mips.h |
231 | @@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { | 231 | @@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { |
@@ -256,10 +256,10 @@ index fd031f3758..a96a44df84 100644 | |||
256 | return FALSE; | 256 | return FALSE; |
257 | } | 257 | } |
258 | diff --git a/ld/configure.tgt b/ld/configure.tgt | 258 | diff --git a/ld/configure.tgt b/ld/configure.tgt |
259 | index f4f0eaf9b2..0da3eca19c 100644 | 259 | index 9b4bf2ca964..f6d7171dff7 100644 |
260 | --- a/ld/configure.tgt | 260 | --- a/ld/configure.tgt |
261 | +++ b/ld/configure.tgt | 261 | +++ b/ld/configure.tgt |
262 | @@ -520,6 +520,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) | 262 | @@ -510,6 +510,9 @@ mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) |
263 | targ_emul=elf32btsmip | 263 | targ_emul=elf32btsmip |
264 | targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" | 264 | targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" |
265 | ;; | 265 | ;; |
@@ -270,7 +270,7 @@ index f4f0eaf9b2..0da3eca19c 100644 | |||
270 | targ_extra_emuls="elf32lr5900" | 270 | targ_extra_emuls="elf32lr5900" |
271 | targ_extra_libpath=$targ_extra_emuls | 271 | targ_extra_libpath=$targ_extra_emuls |
272 | diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c | 272 | diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c |
273 | index 755bbe294b..ce22ef683a 100644 | 273 | index 755bbe294bd..ce22ef683a6 100644 |
274 | --- a/opcodes/mips-dis.c | 274 | --- a/opcodes/mips-dis.c |
275 | +++ b/opcodes/mips-dis.c | 275 | +++ b/opcodes/mips-dis.c |
276 | @@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = | 276 | @@ -674,13 +674,11 @@ const struct mips_arch_choice mips_arch_choices[] = |
@@ -293,7 +293,7 @@ index 755bbe294b..ce22ef683a 100644 | |||
293 | /* This entry, mips16, is here only for ISA/processor selection; do | 293 | /* This entry, mips16, is here only for ISA/processor selection; do |
294 | not print its name. */ | 294 | not print its name. */ |
295 | diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c | 295 | diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c |
296 | index 5270aeefa8..d17dc78cd7 100644 | 296 | index 5270aeefa80..d17dc78cd71 100644 |
297 | --- a/opcodes/mips-opc.c | 297 | --- a/opcodes/mips-opc.c |
298 | +++ b/opcodes/mips-opc.c | 298 | +++ b/opcodes/mips-opc.c |
299 | @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) | 299 | @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) |
@@ -404,3 +404,6 @@ index 5270aeefa8..d17dc78cd7 100644 | |||
404 | {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, | 404 | {"swc0", "E,o(b)", 0xe0000000, 0xfc000000, RD_3|RD_C0|SM, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, |
405 | {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, | 405 | {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, |
406 | {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, | 406 | {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, |
407 | -- | ||
408 | 2.28.0 | ||
409 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch new file mode 100644 index 0000000000..10c3d80865 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 7836f8aa56ef0f18c8658dc7e4952a9d097ba7e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhenhua Luo <zhenhua.luo@nxp.com> | ||
3 | Date: Sat, 11 Jun 2016 22:08:29 -0500 | ||
4 | Subject: [PATCH 11/17] fix the incorrect assembling for ppc wait mnemonic | ||
5 | |||
6 | Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | --- | ||
10 | opcodes/ppc-opc.c | 4 +--- | ||
11 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c | ||
14 | index 5e20d617664..4c9656ecf08 100644 | ||
15 | --- a/opcodes/ppc-opc.c | ||
16 | +++ b/opcodes/ppc-opc.c | ||
17 | @@ -6265,8 +6265,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { | ||
18 | {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, | ||
19 | {"waitrsv", XWCPL(31,30,1,0),0xffffffff, POWER10, 0, {0}}, | ||
20 | {"pause_short", XWCPL(31,30,2,0),0xffffffff, POWER10, 0, {0}}, | ||
21 | -{"wait", X(31,30), XWCPL_MASK, POWER10, 0, {WC, PL}}, | ||
22 | -{"wait", X(31,30), XWC_MASK, POWER9, POWER10, {WC}}, | ||
23 | |||
24 | {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, | ||
25 | |||
26 | @@ -6326,7 +6324,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { | ||
27 | |||
28 | {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | ||
29 | {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | ||
30 | -{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}}, | ||
31 | +{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9|POWER10, 0, {WC}}, | ||
32 | |||
33 | {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, | ||
34 | |||
35 | -- | ||
36 | 2.28.0 | ||
37 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch index 6acde1f781..ef8b253b6a 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-Detect-64-bit-MIPS-targets.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2f7f2389764ef1d699f6ad32057314024b7e84e7 Mon Sep 17 00:00:00 2001 | 1 | From dbff6bdf2123f5495b8be930304d9aa5e88006a7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 31 Mar 2017 11:42:03 -0700 | 3 | Date: Fri, 31 Mar 2017 11:42:03 -0700 |
4 | Subject: [PATCH] Detect 64-bit MIPS targets | 4 | Subject: [PATCH 12/17] Detect 64-bit MIPS targets |
5 | 5 | ||
6 | Add mips64 target triplets and default to N64 | 6 | Add mips64 target triplets and default to N64 |
7 | 7 | ||
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 14 insertions(+) | 14 | 1 file changed, 14 insertions(+) |
15 | 15 | ||
16 | diff --git a/gold/configure.tgt b/gold/configure.tgt | 16 | diff --git a/gold/configure.tgt b/gold/configure.tgt |
17 | index aa7ec552ae..470515062e 100644 | 17 | index aa7ec552aec..470515062e4 100644 |
18 | --- a/gold/configure.tgt | 18 | --- a/gold/configure.tgt |
19 | +++ b/gold/configure.tgt | 19 | +++ b/gold/configure.tgt |
20 | @@ -153,6 +153,13 @@ aarch64*-*) | 20 | @@ -153,6 +153,13 @@ aarch64*-*) |
@@ -45,3 +45,6 @@ index aa7ec552ae..470515062e 100644 | |||
45 | mips*-*-*) | 45 | mips*-*-*) |
46 | targ_obj=mips | 46 | targ_obj=mips |
47 | targ_machine=EM_MIPS | 47 | targ_machine=EM_MIPS |
48 | -- | ||
49 | 2.28.0 | ||
50 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch index 89da62fbf7..987a96f4b7 100644 --- a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-Use-libtool-2.4.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b8fafd8ce6c47c9a551ed796176d884a34930086 Mon Sep 17 00:00:00 2001 | 1 | From 7e2ddee8704c9c3b73760dd9464b18fade563d85 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 14 Feb 2016 17:04:07 +0000 | 3 | Date: Sun, 14 Feb 2016 17:04:07 +0000 |
4 | Subject: [PATCH 07/15] Use libtool 2.4 | 4 | Subject: [PATCH 13/17] Use libtool 2.4 |
5 | 5 | ||
6 | get libtool sysroot support | 6 | get libtool sysroot support |
7 | 7 | ||
@@ -22,10 +22,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
22 | ltversion.m4 | 12 +- | 22 | ltversion.m4 | 12 +- |
23 | lt~obsolete.m4 | 2 +- | 23 | lt~obsolete.m4 | 2 +- |
24 | opcodes/configure | 1320 +++++++++++++++----- | 24 | opcodes/configure | 1320 +++++++++++++++----- |
25 | 13 files changed, 9939 insertions(+), 3700 deletions(-) | 25 | zlib/configure | 1320 +++++++++++++++----- |
26 | 14 files changed, 10931 insertions(+), 4028 deletions(-) | ||
26 | 27 | ||
27 | diff --git a/bfd/configure b/bfd/configure | 28 | diff --git a/bfd/configure b/bfd/configure |
28 | index bc576b7894a..cd036638081 100755 | 29 | index 0340ed541b5..2012656b3b7 100755 |
29 | --- a/bfd/configure | 30 | --- a/bfd/configure |
30 | +++ b/bfd/configure | 31 | +++ b/bfd/configure |
31 | @@ -704,6 +704,9 @@ OTOOL | 32 | @@ -704,6 +704,9 @@ OTOOL |
@@ -1350,7 +1351,7 @@ index bc576b7894a..cd036638081 100755 | |||
1350 | int main () | 1351 | int main () |
1351 | { | 1352 | { |
1352 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 1353 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
1353 | @@ -14554,7 +15209,7 @@ SHARED_LDFLAGS= | 1354 | @@ -14578,7 +15233,7 @@ SHARED_LDFLAGS= |
1354 | if test "$enable_shared" = "yes"; then | 1355 | if test "$enable_shared" = "yes"; then |
1355 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | 1356 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
1356 | if test -n "$x"; then | 1357 | if test -n "$x"; then |
@@ -1359,7 +1360,7 @@ index bc576b7894a..cd036638081 100755 | |||
1359 | fi | 1360 | fi |
1360 | 1361 | ||
1361 | case "${host}" in | 1362 | case "${host}" in |
1362 | @@ -17176,13 +17831,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 1363 | @@ -17197,13 +17852,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
1363 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 1364 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
1364 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 1365 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
1365 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 1366 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -1380,7 +1381,7 @@ index bc576b7894a..cd036638081 100755 | |||
1380 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 1381 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
1381 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 1382 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
1382 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 1383 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
1383 | @@ -17197,14 +17859,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 1384 | @@ -17218,14 +17880,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
1384 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 1385 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
1385 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 1386 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
1386 | 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"`' | 1387 | 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"`' |
@@ -1399,7 +1400,7 @@ index bc576b7894a..cd036638081 100755 | |||
1399 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 1400 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
1400 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 1401 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
1401 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 1402 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
1402 | @@ -17237,12 +17902,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 1403 | @@ -17258,12 +17923,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
1403 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 1404 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
1404 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 1405 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
1405 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 1406 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -1413,7 +1414,7 @@ index bc576b7894a..cd036638081 100755 | |||
1413 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 1414 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
1414 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 1415 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
1415 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 1416 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
1416 | @@ -17297,8 +17962,13 @@ reload_flag \ | 1417 | @@ -17318,8 +17983,13 @@ reload_flag \ |
1417 | OBJDUMP \ | 1418 | OBJDUMP \ |
1418 | deplibs_check_method \ | 1419 | deplibs_check_method \ |
1419 | file_magic_cmd \ | 1420 | file_magic_cmd \ |
@@ -1427,7 +1428,7 @@ index bc576b7894a..cd036638081 100755 | |||
1427 | STRIP \ | 1428 | STRIP \ |
1428 | RANLIB \ | 1429 | RANLIB \ |
1429 | CC \ | 1430 | CC \ |
1430 | @@ -17308,12 +17978,14 @@ lt_cv_sys_global_symbol_pipe \ | 1431 | @@ -17329,12 +17999,14 @@ lt_cv_sys_global_symbol_pipe \ |
1431 | lt_cv_sys_global_symbol_to_cdecl \ | 1432 | lt_cv_sys_global_symbol_to_cdecl \ |
1432 | lt_cv_sys_global_symbol_to_c_name_address \ | 1433 | lt_cv_sys_global_symbol_to_c_name_address \ |
1433 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 1434 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -1443,7 +1444,7 @@ index bc576b7894a..cd036638081 100755 | |||
1443 | DSYMUTIL \ | 1444 | DSYMUTIL \ |
1444 | NMEDIT \ | 1445 | NMEDIT \ |
1445 | LIPO \ | 1446 | LIPO \ |
1446 | @@ -17329,7 +18001,6 @@ no_undefined_flag \ | 1447 | @@ -17350,7 +18022,6 @@ no_undefined_flag \ |
1447 | hardcode_libdir_flag_spec \ | 1448 | hardcode_libdir_flag_spec \ |
1448 | hardcode_libdir_flag_spec_ld \ | 1449 | hardcode_libdir_flag_spec_ld \ |
1449 | hardcode_libdir_separator \ | 1450 | hardcode_libdir_separator \ |
@@ -1451,7 +1452,7 @@ index bc576b7894a..cd036638081 100755 | |||
1451 | exclude_expsyms \ | 1452 | exclude_expsyms \ |
1452 | include_expsyms \ | 1453 | include_expsyms \ |
1453 | file_list_spec \ | 1454 | file_list_spec \ |
1454 | @@ -17365,6 +18036,7 @@ module_cmds \ | 1455 | @@ -17386,6 +18057,7 @@ module_cmds \ |
1455 | module_expsym_cmds \ | 1456 | module_expsym_cmds \ |
1456 | export_symbols_cmds \ | 1457 | export_symbols_cmds \ |
1457 | prelink_cmds \ | 1458 | prelink_cmds \ |
@@ -1459,7 +1460,7 @@ index bc576b7894a..cd036638081 100755 | |||
1459 | postinstall_cmds \ | 1460 | postinstall_cmds \ |
1460 | postuninstall_cmds \ | 1461 | postuninstall_cmds \ |
1461 | finish_cmds \ | 1462 | finish_cmds \ |
1462 | @@ -18153,7 +18825,8 @@ $as_echo X"$file" | | 1463 | @@ -18174,7 +18846,8 @@ $as_echo X"$file" | |
1463 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 1464 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
1464 | # | 1465 | # |
1465 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 1466 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -1469,7 +1470,7 @@ index bc576b7894a..cd036638081 100755 | |||
1469 | # Written by Gordon Matzigkeit, 1996 | 1470 | # Written by Gordon Matzigkeit, 1996 |
1470 | # | 1471 | # |
1471 | # This file is part of GNU Libtool. | 1472 | # This file is part of GNU Libtool. |
1472 | @@ -18256,19 +18929,42 @@ SP2NL=$lt_lt_SP2NL | 1473 | @@ -18277,19 +18950,42 @@ SP2NL=$lt_lt_SP2NL |
1473 | # turn newlines into spaces. | 1474 | # turn newlines into spaces. |
1474 | NL2SP=$lt_lt_NL2SP | 1475 | NL2SP=$lt_lt_NL2SP |
1475 | 1476 | ||
@@ -1513,7 +1514,7 @@ index bc576b7894a..cd036638081 100755 | |||
1513 | # A symbol stripping program. | 1514 | # A symbol stripping program. |
1514 | STRIP=$lt_STRIP | 1515 | STRIP=$lt_STRIP |
1515 | 1516 | ||
1516 | @@ -18298,6 +18994,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 1517 | @@ -18319,6 +19015,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
1517 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 1518 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
1518 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 1519 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
1519 | 1520 | ||
@@ -1526,7 +1527,7 @@ index bc576b7894a..cd036638081 100755 | |||
1526 | # The name of the directory that contains temporary libtool files. | 1527 | # The name of the directory that contains temporary libtool files. |
1527 | objdir=$objdir | 1528 | objdir=$objdir |
1528 | 1529 | ||
1529 | @@ -18307,6 +19009,9 @@ MAGIC_CMD=$MAGIC_CMD | 1530 | @@ -18328,6 +19030,9 @@ MAGIC_CMD=$MAGIC_CMD |
1530 | # Must we lock files when doing compilation? | 1531 | # Must we lock files when doing compilation? |
1531 | need_locks=$lt_need_locks | 1532 | need_locks=$lt_need_locks |
1532 | 1533 | ||
@@ -1536,7 +1537,7 @@ index bc576b7894a..cd036638081 100755 | |||
1536 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 1537 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
1537 | DSYMUTIL=$lt_DSYMUTIL | 1538 | DSYMUTIL=$lt_DSYMUTIL |
1538 | 1539 | ||
1539 | @@ -18421,12 +19126,12 @@ with_gcc=$GCC | 1540 | @@ -18442,12 +19147,12 @@ with_gcc=$GCC |
1540 | # Compiler flag to turn off builtin functions. | 1541 | # Compiler flag to turn off builtin functions. |
1541 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 1542 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
1542 | 1543 | ||
@@ -1552,7 +1553,7 @@ index bc576b7894a..cd036638081 100755 | |||
1552 | # Compiler flag to prevent dynamic linking. | 1553 | # Compiler flag to prevent dynamic linking. |
1553 | link_static_flag=$lt_lt_prog_compiler_static | 1554 | link_static_flag=$lt_lt_prog_compiler_static |
1554 | 1555 | ||
1555 | @@ -18513,9 +19218,6 @@ inherit_rpath=$inherit_rpath | 1556 | @@ -18534,9 +19239,6 @@ inherit_rpath=$inherit_rpath |
1556 | # Whether libtool must link a program against all its dependency libraries. | 1557 | # Whether libtool must link a program against all its dependency libraries. |
1557 | link_all_deplibs=$link_all_deplibs | 1558 | link_all_deplibs=$link_all_deplibs |
1558 | 1559 | ||
@@ -1562,7 +1563,7 @@ index bc576b7894a..cd036638081 100755 | |||
1562 | # Set to "yes" if exported symbols are required. | 1563 | # Set to "yes" if exported symbols are required. |
1563 | always_export_symbols=$always_export_symbols | 1564 | always_export_symbols=$always_export_symbols |
1564 | 1565 | ||
1565 | @@ -18531,6 +19233,9 @@ include_expsyms=$lt_include_expsyms | 1566 | @@ -18552,6 +19254,9 @@ include_expsyms=$lt_include_expsyms |
1566 | # Commands necessary for linking programs (against libraries) with templates. | 1567 | # Commands necessary for linking programs (against libraries) with templates. |
1567 | prelink_cmds=$lt_prelink_cmds | 1568 | prelink_cmds=$lt_prelink_cmds |
1568 | 1569 | ||
@@ -1572,7 +1573,7 @@ index bc576b7894a..cd036638081 100755 | |||
1572 | # Specify filename containing input files. | 1573 | # Specify filename containing input files. |
1573 | file_list_spec=$lt_file_list_spec | 1574 | file_list_spec=$lt_file_list_spec |
1574 | 1575 | ||
1575 | @@ -18563,210 +19268,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 1576 | @@ -18584,210 +19289,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
1576 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 1577 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
1577 | # text mode, it properly converts lines to CR/LF. This bash problem | 1578 | # text mode, it properly converts lines to CR/LF. This bash problem |
1578 | # is reportedly fixed, but why not run on old versions too? | 1579 | # is reportedly fixed, but why not run on old versions too? |
@@ -1947,10 +1948,10 @@ index bc576b7894a..cd036638081 100755 | |||
1947 | chmod +x "$ofile" | 1948 | chmod +x "$ofile" |
1948 | 1949 | ||
1949 | diff --git a/bfd/configure.ac b/bfd/configure.ac | 1950 | diff --git a/bfd/configure.ac b/bfd/configure.ac |
1950 | index c5bfbd5d129..e666b1cc106 100644 | 1951 | index 8e86f8399ce..e8700c9d4d2 100644 |
1951 | --- a/bfd/configure.ac | 1952 | --- a/bfd/configure.ac |
1952 | +++ b/bfd/configure.ac | 1953 | +++ b/bfd/configure.ac |
1953 | @@ -290,7 +290,7 @@ changequote(,)dnl | 1954 | @@ -314,7 +314,7 @@ changequote(,)dnl |
1954 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | 1955 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
1955 | changequote([,])dnl | 1956 | changequote([,])dnl |
1956 | if test -n "$x"; then | 1957 | if test -n "$x"; then |
@@ -1960,10 +1961,10 @@ index c5bfbd5d129..e666b1cc106 100644 | |||
1960 | 1961 | ||
1961 | case "${host}" in | 1962 | case "${host}" in |
1962 | diff --git a/binutils/configure b/binutils/configure | 1963 | diff --git a/binutils/configure b/binutils/configure |
1963 | index a8dfd4bd68c..82316496953 100755 | 1964 | index 89c99abfeba..d3289a5efcd 100755 |
1964 | --- a/binutils/configure | 1965 | --- a/binutils/configure |
1965 | +++ b/binutils/configure | 1966 | +++ b/binutils/configure |
1966 | @@ -690,8 +690,11 @@ OTOOL | 1967 | @@ -692,8 +692,11 @@ OTOOL |
1967 | LIPO | 1968 | LIPO |
1968 | NMEDIT | 1969 | NMEDIT |
1969 | DSYMUTIL | 1970 | DSYMUTIL |
@@ -1975,7 +1976,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
1975 | OBJDUMP | 1976 | OBJDUMP |
1976 | LN_S | 1977 | LN_S |
1977 | NM | 1978 | NM |
1978 | @@ -808,6 +811,7 @@ enable_static | 1979 | @@ -810,6 +813,7 @@ enable_static |
1979 | with_pic | 1980 | with_pic |
1980 | enable_fast_install | 1981 | enable_fast_install |
1981 | with_gnu_ld | 1982 | with_gnu_ld |
@@ -1983,7 +1984,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
1983 | enable_libtool_lock | 1984 | enable_libtool_lock |
1984 | enable_plugins | 1985 | enable_plugins |
1985 | enable_largefile | 1986 | enable_largefile |
1986 | @@ -1485,6 +1489,8 @@ Optional Packages: | 1987 | @@ -1490,6 +1494,8 @@ Optional Packages: |
1987 | --with-pic try to use only PIC/non-PIC objects [default=use | 1988 | --with-pic try to use only PIC/non-PIC objects [default=use |
1988 | both] | 1989 | both] |
1989 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 1990 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -1992,7 +1993,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
1992 | --with-debuginfod Enable debuginfo lookups with debuginfod | 1993 | --with-debuginfod Enable debuginfo lookups with debuginfod |
1993 | (auto/yes/no) | 1994 | (auto/yes/no) |
1994 | --with-system-zlib use installed libz | 1995 | --with-system-zlib use installed libz |
1995 | @@ -5461,8 +5467,8 @@ esac | 1996 | @@ -5467,8 +5473,8 @@ esac |
1996 | 1997 | ||
1997 | 1998 | ||
1998 | 1999 | ||
@@ -2003,7 +2004,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2003 | 2004 | ||
2004 | 2005 | ||
2005 | 2006 | ||
2006 | @@ -5502,7 +5508,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 2007 | @@ -5508,7 +5514,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2007 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 2008 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
2008 | $as_echo_n "checking how to print strings... " >&6; } | 2009 | $as_echo_n "checking how to print strings... " >&6; } |
2009 | # Test print first, because it will be a builtin if present. | 2010 | # Test print first, because it will be a builtin if present. |
@@ -2012,7 +2013,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2012 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 2013 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2013 | ECHO='print -r --' | 2014 | ECHO='print -r --' |
2014 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 2015 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
2015 | @@ -6188,8 +6194,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 2016 | @@ -6194,8 +6200,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
2016 | # Try some XSI features | 2017 | # Try some XSI features |
2017 | xsi_shell=no | 2018 | xsi_shell=no |
2018 | ( _lt_dummy="a/b/c" | 2019 | ( _lt_dummy="a/b/c" |
@@ -2023,7 +2024,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2023 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 2024 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
2024 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 2025 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
2025 | && xsi_shell=yes | 2026 | && xsi_shell=yes |
2026 | @@ -6238,6 +6244,80 @@ esac | 2027 | @@ -6244,6 +6250,80 @@ esac |
2027 | 2028 | ||
2028 | 2029 | ||
2029 | 2030 | ||
@@ -2104,7 +2105,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2104 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 2105 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
2105 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 2106 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
2106 | if ${lt_cv_ld_reload_flag+:} false; then : | 2107 | if ${lt_cv_ld_reload_flag+:} false; then : |
2107 | @@ -6254,6 +6334,11 @@ case $reload_flag in | 2108 | @@ -6260,6 +6340,11 @@ case $reload_flag in |
2108 | esac | 2109 | esac |
2109 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 2110 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2110 | case $host_os in | 2111 | case $host_os in |
@@ -2116,7 +2117,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2116 | darwin*) | 2117 | darwin*) |
2117 | if test "$GCC" = yes; then | 2118 | if test "$GCC" = yes; then |
2118 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 2119 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
2119 | @@ -6422,7 +6507,8 @@ mingw* | pw32*) | 2120 | @@ -6428,7 +6513,8 @@ mingw* | pw32*) |
2120 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 2121 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2121 | lt_cv_file_magic_cmd='func_win32_libid' | 2122 | lt_cv_file_magic_cmd='func_win32_libid' |
2122 | else | 2123 | else |
@@ -2126,7 +2127,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2126 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 2127 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2127 | fi | 2128 | fi |
2128 | ;; | 2129 | ;; |
2129 | @@ -6576,6 +6662,21 @@ esac | 2130 | @@ -6582,6 +6668,21 @@ esac |
2130 | fi | 2131 | fi |
2131 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 2132 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
2132 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 2133 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -2148,7 +2149,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2148 | file_magic_cmd=$lt_cv_file_magic_cmd | 2149 | file_magic_cmd=$lt_cv_file_magic_cmd |
2149 | deplibs_check_method=$lt_cv_deplibs_check_method | 2150 | deplibs_check_method=$lt_cv_deplibs_check_method |
2150 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 2151 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2151 | @@ -6591,9 +6692,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 2152 | @@ -6597,9 +6698,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2152 | 2153 | ||
2153 | 2154 | ||
2154 | 2155 | ||
@@ -2313,7 +2314,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2313 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 2314 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2314 | $as_echo_n "checking for $ac_word... " >&6; } | 2315 | $as_echo_n "checking for $ac_word... " >&6; } |
2315 | if ${ac_cv_prog_AR+:} false; then : | 2316 | if ${ac_cv_prog_AR+:} false; then : |
2316 | @@ -6609,7 +6863,7 @@ do | 2317 | @@ -6615,7 +6869,7 @@ do |
2317 | test -z "$as_dir" && as_dir=. | 2318 | test -z "$as_dir" && as_dir=. |
2318 | for ac_exec_ext in '' $ac_executable_extensions; do | 2319 | for ac_exec_ext in '' $ac_executable_extensions; do |
2319 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 2320 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -2322,7 +2323,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2322 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2323 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2323 | break 2 | 2324 | break 2 |
2324 | fi | 2325 | fi |
2325 | @@ -6629,11 +6883,15 @@ $as_echo "no" >&6; } | 2326 | @@ -6635,11 +6889,15 @@ $as_echo "no" >&6; } |
2326 | fi | 2327 | fi |
2327 | 2328 | ||
2328 | 2329 | ||
@@ -2341,7 +2342,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2341 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 2342 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2342 | $as_echo_n "checking for $ac_word... " >&6; } | 2343 | $as_echo_n "checking for $ac_word... " >&6; } |
2343 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 2344 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
2344 | @@ -6649,7 +6907,7 @@ do | 2345 | @@ -6655,7 +6913,7 @@ do |
2345 | test -z "$as_dir" && as_dir=. | 2346 | test -z "$as_dir" && as_dir=. |
2346 | for ac_exec_ext in '' $ac_executable_extensions; do | 2347 | for ac_exec_ext in '' $ac_executable_extensions; do |
2347 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 2348 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -2350,7 +2351,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2350 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2351 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2351 | break 2 | 2352 | break 2 |
2352 | fi | 2353 | fi |
2353 | @@ -6668,6 +6926,10 @@ else | 2354 | @@ -6674,6 +6932,10 @@ else |
2354 | $as_echo "no" >&6; } | 2355 | $as_echo "no" >&6; } |
2355 | fi | 2356 | fi |
2356 | 2357 | ||
@@ -2361,7 +2362,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2361 | if test "x$ac_ct_AR" = x; then | 2362 | if test "x$ac_ct_AR" = x; then |
2362 | AR="false" | 2363 | AR="false" |
2363 | else | 2364 | else |
2364 | @@ -6679,12 +6941,10 @@ ac_tool_warned=yes ;; | 2365 | @@ -6685,12 +6947,10 @@ ac_tool_warned=yes ;; |
2365 | esac | 2366 | esac |
2366 | AR=$ac_ct_AR | 2367 | AR=$ac_ct_AR |
2367 | fi | 2368 | fi |
@@ -2376,7 +2377,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2376 | 2377 | ||
2377 | 2378 | ||
2378 | 2379 | ||
2379 | @@ -6696,6 +6956,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 2380 | @@ -6702,6 +6962,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
2380 | 2381 | ||
2381 | 2382 | ||
2382 | 2383 | ||
@@ -2441,7 +2442,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2441 | if test -n "$ac_tool_prefix"; then | 2442 | if test -n "$ac_tool_prefix"; then |
2442 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 2443 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
2443 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 2444 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
2444 | @@ -7030,8 +7348,8 @@ esac | 2445 | @@ -7036,8 +7354,8 @@ esac |
2445 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 2446 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
2446 | 2447 | ||
2447 | # Transform an extracted symbol line into symbol name and symbol address | 2448 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -2452,7 +2453,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2452 | 2453 | ||
2453 | # Handle CRLF in mingw tool chain | 2454 | # Handle CRLF in mingw tool chain |
2454 | opt_cr= | 2455 | opt_cr= |
2455 | @@ -7067,6 +7385,7 @@ for ac_symprfx in "" "_"; do | 2456 | @@ -7073,6 +7391,7 @@ for ac_symprfx in "" "_"; do |
2456 | else | 2457 | else |
2457 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 2458 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
2458 | fi | 2459 | fi |
@@ -2460,7 +2461,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2460 | 2461 | ||
2461 | # Check to see that the pipe works correctly. | 2462 | # Check to see that the pipe works correctly. |
2462 | pipe_works=no | 2463 | pipe_works=no |
2463 | @@ -7108,6 +7427,18 @@ _LT_EOF | 2464 | @@ -7114,6 +7433,18 @@ _LT_EOF |
2464 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 2465 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
2465 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 2466 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
2466 | cat <<_LT_EOF > conftest.$ac_ext | 2467 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -2479,7 +2480,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2479 | #ifdef __cplusplus | 2480 | #ifdef __cplusplus |
2480 | extern "C" { | 2481 | extern "C" { |
2481 | #endif | 2482 | #endif |
2482 | @@ -7119,7 +7450,7 @@ _LT_EOF | 2483 | @@ -7125,7 +7456,7 @@ _LT_EOF |
2483 | cat <<_LT_EOF >> conftest.$ac_ext | 2484 | cat <<_LT_EOF >> conftest.$ac_ext |
2484 | 2485 | ||
2485 | /* The mapping between symbol names and symbols. */ | 2486 | /* The mapping between symbol names and symbols. */ |
@@ -2488,7 +2489,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2488 | const char *name; | 2489 | const char *name; |
2489 | void *address; | 2490 | void *address; |
2490 | } | 2491 | } |
2491 | @@ -7145,8 +7476,8 @@ static const void *lt_preloaded_setup() { | 2492 | @@ -7151,8 +7482,8 @@ static const void *lt_preloaded_setup() { |
2492 | _LT_EOF | 2493 | _LT_EOF |
2493 | # Now try linking the two files. | 2494 | # Now try linking the two files. |
2494 | mv conftest.$ac_objext conftstm.$ac_objext | 2495 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -2499,7 +2500,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2499 | LIBS="conftstm.$ac_objext" | 2500 | LIBS="conftstm.$ac_objext" |
2500 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 2501 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
2501 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 2502 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
2502 | @@ -7156,8 +7487,8 @@ _LT_EOF | 2503 | @@ -7162,8 +7493,8 @@ _LT_EOF |
2503 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 2504 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
2504 | pipe_works=yes | 2505 | pipe_works=yes |
2505 | fi | 2506 | fi |
@@ -2510,7 +2511,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2510 | else | 2511 | else |
2511 | echo "cannot find nm_test_func in $nlist" >&5 | 2512 | echo "cannot find nm_test_func in $nlist" >&5 |
2512 | fi | 2513 | fi |
2513 | @@ -7194,6 +7525,21 @@ else | 2514 | @@ -7200,6 +7531,21 @@ else |
2514 | $as_echo "ok" >&6; } | 2515 | $as_echo "ok" >&6; } |
2515 | fi | 2516 | fi |
2516 | 2517 | ||
@@ -2532,7 +2533,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2532 | 2533 | ||
2533 | 2534 | ||
2534 | 2535 | ||
2535 | @@ -7210,6 +7556,40 @@ fi | 2536 | @@ -7216,6 +7562,40 @@ fi |
2536 | 2537 | ||
2537 | 2538 | ||
2538 | 2539 | ||
@@ -2573,7 +2574,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2573 | 2574 | ||
2574 | 2575 | ||
2575 | 2576 | ||
2576 | @@ -7421,6 +7801,123 @@ esac | 2577 | @@ -7427,6 +7807,123 @@ esac |
2577 | 2578 | ||
2578 | need_locks="$enable_libtool_lock" | 2579 | need_locks="$enable_libtool_lock" |
2579 | 2580 | ||
@@ -2697,7 +2698,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2697 | 2698 | ||
2698 | case $host_os in | 2699 | case $host_os in |
2699 | rhapsody* | darwin*) | 2700 | rhapsody* | darwin*) |
2700 | @@ -7984,6 +8481,8 @@ _LT_EOF | 2701 | @@ -7990,6 +8487,8 @@ _LT_EOF |
2701 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 2702 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
2702 | echo "$AR cru libconftest.a conftest.o" >&5 | 2703 | echo "$AR cru libconftest.a conftest.o" >&5 |
2703 | $AR cru libconftest.a conftest.o 2>&5 | 2704 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -2706,7 +2707,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2706 | cat > conftest.c << _LT_EOF | 2707 | cat > conftest.c << _LT_EOF |
2707 | int main() { return 0;} | 2708 | int main() { return 0;} |
2708 | _LT_EOF | 2709 | _LT_EOF |
2709 | @@ -8179,7 +8678,8 @@ fi | 2710 | @@ -8185,7 +8684,8 @@ fi |
2710 | LIBTOOL_DEPS="$ltmain" | 2711 | LIBTOOL_DEPS="$ltmain" |
2711 | 2712 | ||
2712 | # Always use our own libtool. | 2713 | # Always use our own libtool. |
@@ -2716,7 +2717,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2716 | 2717 | ||
2717 | 2718 | ||
2718 | 2719 | ||
2719 | @@ -8268,7 +8768,7 @@ aix3*) | 2720 | @@ -8274,7 +8774,7 @@ aix3*) |
2720 | esac | 2721 | esac |
2721 | 2722 | ||
2722 | # Global variables: | 2723 | # Global variables: |
@@ -2725,7 +2726,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2725 | can_build_shared=yes | 2726 | can_build_shared=yes |
2726 | 2727 | ||
2727 | # All known linkers require a `.a' archive for static linking (except MSVC, | 2728 | # All known linkers require a `.a' archive for static linking (except MSVC, |
2728 | @@ -8566,8 +9066,6 @@ fi | 2729 | @@ -8572,8 +9072,6 @@ fi |
2729 | lt_prog_compiler_pic= | 2730 | lt_prog_compiler_pic= |
2730 | lt_prog_compiler_static= | 2731 | lt_prog_compiler_static= |
2731 | 2732 | ||
@@ -2734,7 +2735,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2734 | 2735 | ||
2735 | if test "$GCC" = yes; then | 2736 | if test "$GCC" = yes; then |
2736 | lt_prog_compiler_wl='-Wl,' | 2737 | lt_prog_compiler_wl='-Wl,' |
2737 | @@ -8733,6 +9231,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 2738 | @@ -8739,6 +9237,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
2738 | lt_prog_compiler_pic='--shared' | 2739 | lt_prog_compiler_pic='--shared' |
2739 | lt_prog_compiler_static='--static' | 2740 | lt_prog_compiler_static='--static' |
2740 | ;; | 2741 | ;; |
@@ -2747,7 +2748,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2747 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 2748 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
2748 | # Portland Group compilers (*not* the Pentium gcc compiler, | 2749 | # Portland Group compilers (*not* the Pentium gcc compiler, |
2749 | # which looks to be a dead project) | 2750 | # which looks to be a dead project) |
2750 | @@ -8795,7 +9299,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 2751 | @@ -8801,7 +9305,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
2751 | lt_prog_compiler_pic='-KPIC' | 2752 | lt_prog_compiler_pic='-KPIC' |
2752 | lt_prog_compiler_static='-Bstatic' | 2753 | lt_prog_compiler_static='-Bstatic' |
2753 | case $cc_basename in | 2754 | case $cc_basename in |
@@ -2756,7 +2757,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2756 | lt_prog_compiler_wl='-Qoption ld ';; | 2757 | lt_prog_compiler_wl='-Qoption ld ';; |
2757 | *) | 2758 | *) |
2758 | lt_prog_compiler_wl='-Wl,';; | 2759 | lt_prog_compiler_wl='-Wl,';; |
2759 | @@ -8852,13 +9356,17 @@ case $host_os in | 2760 | @@ -8858,13 +9362,17 @@ case $host_os in |
2760 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 2761 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
2761 | ;; | 2762 | ;; |
2762 | esac | 2763 | esac |
@@ -2780,7 +2781,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2780 | 2781 | ||
2781 | # | 2782 | # |
2782 | # Check to make sure the PIC flag actually works. | 2783 | # Check to make sure the PIC flag actually works. |
2783 | @@ -8919,6 +9427,11 @@ fi | 2784 | @@ -8925,6 +9433,11 @@ fi |
2784 | 2785 | ||
2785 | 2786 | ||
2786 | 2787 | ||
@@ -2792,7 +2793,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2792 | # | 2793 | # |
2793 | # Check to make sure the static flag actually works. | 2794 | # Check to make sure the static flag actually works. |
2794 | # | 2795 | # |
2795 | @@ -9269,7 +9782,8 @@ _LT_EOF | 2796 | @@ -9275,7 +9788,8 @@ _LT_EOF |
2796 | allow_undefined_flag=unsupported | 2797 | allow_undefined_flag=unsupported |
2797 | always_export_symbols=no | 2798 | always_export_symbols=no |
2798 | enable_shared_with_static_runtimes=yes | 2799 | enable_shared_with_static_runtimes=yes |
@@ -2802,7 +2803,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2802 | 2803 | ||
2803 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 2804 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2804 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 2805 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
2805 | @@ -9368,12 +9882,12 @@ _LT_EOF | 2806 | @@ -9374,12 +9888,12 @@ _LT_EOF |
2806 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 2807 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
2807 | hardcode_libdir_flag_spec= | 2808 | hardcode_libdir_flag_spec= |
2808 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 2809 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -2817,7 +2818,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2817 | fi | 2818 | fi |
2818 | ;; | 2819 | ;; |
2819 | esac | 2820 | esac |
2820 | @@ -9387,8 +9901,8 @@ _LT_EOF | 2821 | @@ -9393,8 +9907,8 @@ _LT_EOF |
2821 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 2822 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
2822 | wlarc= | 2823 | wlarc= |
2823 | else | 2824 | else |
@@ -2828,7 +2829,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2828 | fi | 2829 | fi |
2829 | ;; | 2830 | ;; |
2830 | 2831 | ||
2831 | @@ -9406,8 +9920,8 @@ _LT_EOF | 2832 | @@ -9412,8 +9926,8 @@ _LT_EOF |
2832 | 2833 | ||
2833 | _LT_EOF | 2834 | _LT_EOF |
2834 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 2835 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -2839,7 +2840,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2839 | else | 2840 | else |
2840 | ld_shlibs=no | 2841 | ld_shlibs=no |
2841 | fi | 2842 | fi |
2842 | @@ -9453,8 +9967,8 @@ _LT_EOF | 2843 | @@ -9459,8 +9973,8 @@ _LT_EOF |
2843 | 2844 | ||
2844 | *) | 2845 | *) |
2845 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 2846 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -2850,7 +2851,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2850 | else | 2851 | else |
2851 | ld_shlibs=no | 2852 | ld_shlibs=no |
2852 | fi | 2853 | fi |
2853 | @@ -9584,7 +10098,13 @@ _LT_EOF | 2854 | @@ -9590,7 +10104,13 @@ _LT_EOF |
2854 | allow_undefined_flag='-berok' | 2855 | allow_undefined_flag='-berok' |
2855 | # Determine the default libpath from the value encoded in an | 2856 | # Determine the default libpath from the value encoded in an |
2856 | # empty executable. | 2857 | # empty executable. |
@@ -2865,7 +2866,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2865 | /* end confdefs.h. */ | 2866 | /* end confdefs.h. */ |
2866 | 2867 | ||
2867 | int | 2868 | int |
2868 | @@ -9597,22 +10117,29 @@ main () | 2869 | @@ -9603,22 +10123,29 @@ main () |
2869 | _ACEOF | 2870 | _ACEOF |
2870 | if ac_fn_c_try_link "$LINENO"; then : | 2871 | if ac_fn_c_try_link "$LINENO"; then : |
2871 | 2872 | ||
@@ -2908,7 +2909,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2908 | 2909 | ||
2909 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 2910 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2910 | 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" | 2911 | 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" |
2911 | @@ -9624,7 +10151,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 2912 | @@ -9630,7 +10157,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2912 | else | 2913 | else |
2913 | # Determine the default libpath from the value encoded in an | 2914 | # Determine the default libpath from the value encoded in an |
2914 | # empty executable. | 2915 | # empty executable. |
@@ -2923,7 +2924,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2923 | /* end confdefs.h. */ | 2924 | /* end confdefs.h. */ |
2924 | 2925 | ||
2925 | int | 2926 | int |
2926 | @@ -9637,22 +10170,29 @@ main () | 2927 | @@ -9643,22 +10176,29 @@ main () |
2927 | _ACEOF | 2928 | _ACEOF |
2928 | if ac_fn_c_try_link "$LINENO"; then : | 2929 | if ac_fn_c_try_link "$LINENO"; then : |
2929 | 2930 | ||
@@ -2966,7 +2967,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
2966 | 2967 | ||
2967 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 2968 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2968 | # Warning - without using the other run time loading flags, | 2969 | # Warning - without using the other run time loading flags, |
2969 | @@ -9697,20 +10237,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 2970 | @@ -9703,20 +10243,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2970 | # Microsoft Visual C++. | 2971 | # Microsoft Visual C++. |
2971 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 2972 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
2972 | # no search path for DLLs. | 2973 | # no search path for DLLs. |
@@ -3044,7 +3045,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3044 | ;; | 3045 | ;; |
3045 | 3046 | ||
3046 | darwin* | rhapsody*) | 3047 | darwin* | rhapsody*) |
3047 | @@ -9771,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3048 | @@ -9777,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3048 | 3049 | ||
3049 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 3050 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
3050 | freebsd* | dragonfly*) | 3051 | freebsd* | dragonfly*) |
@@ -3053,7 +3054,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3053 | hardcode_libdir_flag_spec='-R$libdir' | 3054 | hardcode_libdir_flag_spec='-R$libdir' |
3054 | hardcode_direct=yes | 3055 | hardcode_direct=yes |
3055 | hardcode_shlibpath_var=no | 3056 | hardcode_shlibpath_var=no |
3056 | @@ -9779,7 +10362,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3057 | @@ -9785,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3057 | 3058 | ||
3058 | hpux9*) | 3059 | hpux9*) |
3059 | if test "$GCC" = yes; then | 3060 | if test "$GCC" = yes; then |
@@ -3062,7 +3063,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3062 | else | 3063 | else |
3063 | 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' | 3064 | 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' |
3064 | fi | 3065 | fi |
3065 | @@ -9795,7 +10378,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3066 | @@ -9801,7 +10384,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3066 | 3067 | ||
3067 | hpux10*) | 3068 | hpux10*) |
3068 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 3069 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -3071,7 +3072,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3071 | else | 3072 | else |
3072 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 3073 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3073 | fi | 3074 | fi |
3074 | @@ -9819,10 +10402,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 3075 | @@ -9825,10 +10408,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3075 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 3076 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3076 | ;; | 3077 | ;; |
3077 | ia64*) | 3078 | ia64*) |
@@ -3084,7 +3085,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3084 | ;; | 3085 | ;; |
3085 | esac | 3086 | esac |
3086 | else | 3087 | else |
3087 | @@ -9901,23 +10484,36 @@ fi | 3088 | @@ -9907,23 +10490,36 @@ fi |
3088 | 3089 | ||
3089 | irix5* | irix6* | nonstopux*) | 3090 | irix5* | irix6* | nonstopux*) |
3090 | if test "$GCC" = yes; then | 3091 | if test "$GCC" = yes; then |
@@ -3129,7 +3130,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3129 | else | 3130 | else |
3130 | 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' | 3131 | 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' |
3131 | 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' | 3132 | 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' |
3132 | @@ -10002,7 +10598,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 3133 | @@ -10008,7 +10604,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
3133 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 3134 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3134 | if test "$GCC" = yes; then | 3135 | if test "$GCC" = yes; then |
3135 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 3136 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -3138,7 +3139,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3138 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 3139 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3139 | else | 3140 | else |
3140 | allow_undefined_flag=' -expect_unresolved \*' | 3141 | allow_undefined_flag=' -expect_unresolved \*' |
3141 | @@ -10021,9 +10617,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 3142 | @@ -10027,9 +10623,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
3142 | no_undefined_flag=' -z defs' | 3143 | no_undefined_flag=' -z defs' |
3143 | if test "$GCC" = yes; then | 3144 | if test "$GCC" = yes; then |
3144 | wlarc='${wl}' | 3145 | wlarc='${wl}' |
@@ -3150,7 +3151,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3150 | else | 3151 | else |
3151 | case `$CC -V 2>&1` in | 3152 | case `$CC -V 2>&1` in |
3152 | *"Compilers 5.0"*) | 3153 | *"Compilers 5.0"*) |
3153 | @@ -10599,8 +11195,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 3154 | @@ -10605,8 +11201,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
3154 | need_version=no | 3155 | need_version=no |
3155 | need_lib_prefix=no | 3156 | need_lib_prefix=no |
3156 | 3157 | ||
@@ -3162,7 +3163,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3162 | library_names_spec='$libname.dll.a' | 3163 | library_names_spec='$libname.dll.a' |
3163 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 3164 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3164 | postinstall_cmds='base_file=`basename \${file}`~ | 3165 | postinstall_cmds='base_file=`basename \${file}`~ |
3165 | @@ -10633,13 +11230,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 3166 | @@ -10639,13 +11236,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
3166 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 3167 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3167 | ;; | 3168 | ;; |
3168 | esac | 3169 | esac |
@@ -3235,7 +3236,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3235 | # FIXME: first we should search . and the directory the executable is in | 3236 | # FIXME: first we should search . and the directory the executable is in |
3236 | shlibpath_var=PATH | 3237 | shlibpath_var=PATH |
3237 | ;; | 3238 | ;; |
3238 | @@ -10731,7 +11386,7 @@ haiku*) | 3239 | @@ -10737,7 +11392,7 @@ haiku*) |
3239 | soname_spec='${libname}${release}${shared_ext}$major' | 3240 | soname_spec='${libname}${release}${shared_ext}$major' |
3240 | shlibpath_var=LIBRARY_PATH | 3241 | shlibpath_var=LIBRARY_PATH |
3241 | shlibpath_overrides_runpath=yes | 3242 | shlibpath_overrides_runpath=yes |
@@ -3244,16 +3245,16 @@ index a8dfd4bd68c..82316496953 100755 | |||
3244 | hardcode_into_libs=yes | 3245 | hardcode_into_libs=yes |
3245 | ;; | 3246 | ;; |
3246 | 3247 | ||
3247 | @@ -11527,7 +12182,7 @@ else | 3248 | @@ -11533,7 +12188,7 @@ else |
3248 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 3249 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
3249 | lt_status=$lt_dlunknown | 3250 | lt_status=$lt_dlunknown |
3250 | cat > conftest.$ac_ext <<_LT_EOF | 3251 | cat > conftest.$ac_ext <<_LT_EOF |
3251 | -#line 11530 "configure" | 3252 | -#line 11536 "configure" |
3252 | +#line $LINENO "configure" | 3253 | +#line $LINENO "configure" |
3253 | #include "confdefs.h" | 3254 | #include "confdefs.h" |
3254 | 3255 | ||
3255 | #if HAVE_DLFCN_H | 3256 | #if HAVE_DLFCN_H |
3256 | @@ -11571,10 +12226,10 @@ else | 3257 | @@ -11577,10 +12232,10 @@ else |
3257 | /* When -fvisbility=hidden is used, assume the code has been annotated | 3258 | /* When -fvisbility=hidden is used, assume the code has been annotated |
3258 | correspondingly for the symbols needed. */ | 3259 | correspondingly for the symbols needed. */ |
3259 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 3260 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -3266,16 +3267,16 @@ index a8dfd4bd68c..82316496953 100755 | |||
3266 | int main () | 3267 | int main () |
3267 | { | 3268 | { |
3268 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 3269 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
3269 | @@ -11633,7 +12288,7 @@ else | 3270 | @@ -11639,7 +12294,7 @@ else |
3270 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 3271 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
3271 | lt_status=$lt_dlunknown | 3272 | lt_status=$lt_dlunknown |
3272 | cat > conftest.$ac_ext <<_LT_EOF | 3273 | cat > conftest.$ac_ext <<_LT_EOF |
3273 | -#line 11636 "configure" | 3274 | -#line 11642 "configure" |
3274 | +#line $LINENO "configure" | 3275 | +#line $LINENO "configure" |
3275 | #include "confdefs.h" | 3276 | #include "confdefs.h" |
3276 | 3277 | ||
3277 | #if HAVE_DLFCN_H | 3278 | #if HAVE_DLFCN_H |
3278 | @@ -11677,10 +12332,10 @@ else | 3279 | @@ -11683,10 +12338,10 @@ else |
3279 | /* When -fvisbility=hidden is used, assume the code has been annotated | 3280 | /* When -fvisbility=hidden is used, assume the code has been annotated |
3280 | correspondingly for the symbols needed. */ | 3281 | correspondingly for the symbols needed. */ |
3281 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 3282 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -3288,7 +3289,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3288 | int main () | 3289 | int main () |
3289 | { | 3290 | { |
3290 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 3291 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
3291 | @@ -16024,13 +16679,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 3292 | @@ -16076,13 +16731,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
3292 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 3293 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
3293 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 3294 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
3294 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 3295 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -3309,7 +3310,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3309 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 3310 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
3310 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 3311 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
3311 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 3312 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
3312 | @@ -16045,14 +16707,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 3313 | @@ -16097,14 +16759,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
3313 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 3314 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
3314 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 3315 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
3315 | 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"`' | 3316 | 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"`' |
@@ -3328,7 +3329,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3328 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 3329 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
3329 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 3330 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
3330 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 3331 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
3331 | @@ -16085,12 +16750,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 3332 | @@ -16137,12 +16802,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
3332 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 3333 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
3333 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 3334 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
3334 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 3335 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -3342,7 +3343,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3342 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 3343 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
3343 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 3344 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
3344 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 3345 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
3345 | @@ -16145,8 +16810,13 @@ reload_flag \ | 3346 | @@ -16197,8 +16862,13 @@ reload_flag \ |
3346 | OBJDUMP \ | 3347 | OBJDUMP \ |
3347 | deplibs_check_method \ | 3348 | deplibs_check_method \ |
3348 | file_magic_cmd \ | 3349 | file_magic_cmd \ |
@@ -3356,7 +3357,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3356 | STRIP \ | 3357 | STRIP \ |
3357 | RANLIB \ | 3358 | RANLIB \ |
3358 | CC \ | 3359 | CC \ |
3359 | @@ -16156,12 +16826,14 @@ lt_cv_sys_global_symbol_pipe \ | 3360 | @@ -16208,12 +16878,14 @@ lt_cv_sys_global_symbol_pipe \ |
3360 | lt_cv_sys_global_symbol_to_cdecl \ | 3361 | lt_cv_sys_global_symbol_to_cdecl \ |
3361 | lt_cv_sys_global_symbol_to_c_name_address \ | 3362 | lt_cv_sys_global_symbol_to_c_name_address \ |
3362 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 3363 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -3372,7 +3373,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3372 | DSYMUTIL \ | 3373 | DSYMUTIL \ |
3373 | NMEDIT \ | 3374 | NMEDIT \ |
3374 | LIPO \ | 3375 | LIPO \ |
3375 | @@ -16177,7 +16849,6 @@ no_undefined_flag \ | 3376 | @@ -16229,7 +16901,6 @@ no_undefined_flag \ |
3376 | hardcode_libdir_flag_spec \ | 3377 | hardcode_libdir_flag_spec \ |
3377 | hardcode_libdir_flag_spec_ld \ | 3378 | hardcode_libdir_flag_spec_ld \ |
3378 | hardcode_libdir_separator \ | 3379 | hardcode_libdir_separator \ |
@@ -3380,7 +3381,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3380 | exclude_expsyms \ | 3381 | exclude_expsyms \ |
3381 | include_expsyms \ | 3382 | include_expsyms \ |
3382 | file_list_spec \ | 3383 | file_list_spec \ |
3383 | @@ -16213,6 +16884,7 @@ module_cmds \ | 3384 | @@ -16265,6 +16936,7 @@ module_cmds \ |
3384 | module_expsym_cmds \ | 3385 | module_expsym_cmds \ |
3385 | export_symbols_cmds \ | 3386 | export_symbols_cmds \ |
3386 | prelink_cmds \ | 3387 | prelink_cmds \ |
@@ -3388,7 +3389,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3388 | postinstall_cmds \ | 3389 | postinstall_cmds \ |
3389 | postuninstall_cmds \ | 3390 | postuninstall_cmds \ |
3390 | finish_cmds \ | 3391 | finish_cmds \ |
3391 | @@ -16979,7 +17651,8 @@ $as_echo X"$file" | | 3392 | @@ -17031,7 +17703,8 @@ $as_echo X"$file" | |
3392 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 3393 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
3393 | # | 3394 | # |
3394 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 3395 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -3398,7 +3399,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3398 | # Written by Gordon Matzigkeit, 1996 | 3399 | # Written by Gordon Matzigkeit, 1996 |
3399 | # | 3400 | # |
3400 | # This file is part of GNU Libtool. | 3401 | # This file is part of GNU Libtool. |
3401 | @@ -17082,19 +17755,42 @@ SP2NL=$lt_lt_SP2NL | 3402 | @@ -17134,19 +17807,42 @@ SP2NL=$lt_lt_SP2NL |
3402 | # turn newlines into spaces. | 3403 | # turn newlines into spaces. |
3403 | NL2SP=$lt_lt_NL2SP | 3404 | NL2SP=$lt_lt_NL2SP |
3404 | 3405 | ||
@@ -3442,7 +3443,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3442 | # A symbol stripping program. | 3443 | # A symbol stripping program. |
3443 | STRIP=$lt_STRIP | 3444 | STRIP=$lt_STRIP |
3444 | 3445 | ||
3445 | @@ -17124,6 +17820,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 3446 | @@ -17176,6 +17872,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
3446 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 3447 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
3447 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 3448 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
3448 | 3449 | ||
@@ -3455,7 +3456,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3455 | # The name of the directory that contains temporary libtool files. | 3456 | # The name of the directory that contains temporary libtool files. |
3456 | objdir=$objdir | 3457 | objdir=$objdir |
3457 | 3458 | ||
3458 | @@ -17133,6 +17835,9 @@ MAGIC_CMD=$MAGIC_CMD | 3459 | @@ -17185,6 +17887,9 @@ MAGIC_CMD=$MAGIC_CMD |
3459 | # Must we lock files when doing compilation? | 3460 | # Must we lock files when doing compilation? |
3460 | need_locks=$lt_need_locks | 3461 | need_locks=$lt_need_locks |
3461 | 3462 | ||
@@ -3465,7 +3466,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3465 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 3466 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
3466 | DSYMUTIL=$lt_DSYMUTIL | 3467 | DSYMUTIL=$lt_DSYMUTIL |
3467 | 3468 | ||
3468 | @@ -17247,12 +17952,12 @@ with_gcc=$GCC | 3469 | @@ -17299,12 +18004,12 @@ with_gcc=$GCC |
3469 | # Compiler flag to turn off builtin functions. | 3470 | # Compiler flag to turn off builtin functions. |
3470 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 3471 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
3471 | 3472 | ||
@@ -3481,7 +3482,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3481 | # Compiler flag to prevent dynamic linking. | 3482 | # Compiler flag to prevent dynamic linking. |
3482 | link_static_flag=$lt_lt_prog_compiler_static | 3483 | link_static_flag=$lt_lt_prog_compiler_static |
3483 | 3484 | ||
3484 | @@ -17339,9 +18044,6 @@ inherit_rpath=$inherit_rpath | 3485 | @@ -17391,9 +18096,6 @@ inherit_rpath=$inherit_rpath |
3485 | # Whether libtool must link a program against all its dependency libraries. | 3486 | # Whether libtool must link a program against all its dependency libraries. |
3486 | link_all_deplibs=$link_all_deplibs | 3487 | link_all_deplibs=$link_all_deplibs |
3487 | 3488 | ||
@@ -3491,7 +3492,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3491 | # Set to "yes" if exported symbols are required. | 3492 | # Set to "yes" if exported symbols are required. |
3492 | always_export_symbols=$always_export_symbols | 3493 | always_export_symbols=$always_export_symbols |
3493 | 3494 | ||
3494 | @@ -17357,6 +18059,9 @@ include_expsyms=$lt_include_expsyms | 3495 | @@ -17409,6 +18111,9 @@ include_expsyms=$lt_include_expsyms |
3495 | # Commands necessary for linking programs (against libraries) with templates. | 3496 | # Commands necessary for linking programs (against libraries) with templates. |
3496 | prelink_cmds=$lt_prelink_cmds | 3497 | prelink_cmds=$lt_prelink_cmds |
3497 | 3498 | ||
@@ -3501,7 +3502,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3501 | # Specify filename containing input files. | 3502 | # Specify filename containing input files. |
3502 | file_list_spec=$lt_file_list_spec | 3503 | file_list_spec=$lt_file_list_spec |
3503 | 3504 | ||
3504 | @@ -17389,210 +18094,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 3505 | @@ -17441,210 +18146,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
3505 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 3506 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
3506 | # text mode, it properly converts lines to CR/LF. This bash problem | 3507 | # text mode, it properly converts lines to CR/LF. This bash problem |
3507 | # is reportedly fixed, but why not run on old versions too? | 3508 | # is reportedly fixed, but why not run on old versions too? |
@@ -3876,7 +3877,7 @@ index a8dfd4bd68c..82316496953 100755 | |||
3876 | chmod +x "$ofile" | 3877 | chmod +x "$ofile" |
3877 | 3878 | ||
3878 | diff --git a/gas/configure b/gas/configure | 3879 | diff --git a/gas/configure b/gas/configure |
3879 | index 60c1a055ae2..0e0ce4c0e23 100755 | 3880 | index d4b13e6fc8b..dd5224c5c81 100755 |
3880 | --- a/gas/configure | 3881 | --- a/gas/configure |
3881 | +++ b/gas/configure | 3882 | +++ b/gas/configure |
3882 | @@ -681,8 +681,11 @@ OTOOL | 3883 | @@ -681,8 +681,11 @@ OTOOL |
@@ -5204,7 +5205,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5204 | int main () | 5205 | int main () |
5205 | { | 5206 | { |
5206 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 5207 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
5207 | @@ -15928,13 +16583,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 5208 | @@ -15981,13 +16636,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
5208 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 5209 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
5209 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 5210 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
5210 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 5211 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -5225,7 +5226,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5225 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 5226 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
5226 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 5227 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
5227 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 5228 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
5228 | @@ -15949,14 +16611,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 5229 | @@ -16002,14 +16664,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
5229 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 5230 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
5230 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 5231 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
5231 | 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"`' | 5232 | 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"`' |
@@ -5244,7 +5245,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5244 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 5245 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
5245 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 5246 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
5246 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 5247 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
5247 | @@ -15989,12 +16654,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 5248 | @@ -16042,12 +16707,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
5248 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 5249 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
5249 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 5250 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
5250 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 5251 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -5258,7 +5259,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5258 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 5259 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
5259 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 5260 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
5260 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 5261 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
5261 | @@ -16049,8 +16714,13 @@ reload_flag \ | 5262 | @@ -16102,8 +16767,13 @@ reload_flag \ |
5262 | OBJDUMP \ | 5263 | OBJDUMP \ |
5263 | deplibs_check_method \ | 5264 | deplibs_check_method \ |
5264 | file_magic_cmd \ | 5265 | file_magic_cmd \ |
@@ -5272,7 +5273,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5272 | STRIP \ | 5273 | STRIP \ |
5273 | RANLIB \ | 5274 | RANLIB \ |
5274 | CC \ | 5275 | CC \ |
5275 | @@ -16060,12 +16730,14 @@ lt_cv_sys_global_symbol_pipe \ | 5276 | @@ -16113,12 +16783,14 @@ lt_cv_sys_global_symbol_pipe \ |
5276 | lt_cv_sys_global_symbol_to_cdecl \ | 5277 | lt_cv_sys_global_symbol_to_cdecl \ |
5277 | lt_cv_sys_global_symbol_to_c_name_address \ | 5278 | lt_cv_sys_global_symbol_to_c_name_address \ |
5278 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 5279 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -5288,7 +5289,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5288 | DSYMUTIL \ | 5289 | DSYMUTIL \ |
5289 | NMEDIT \ | 5290 | NMEDIT \ |
5290 | LIPO \ | 5291 | LIPO \ |
5291 | @@ -16081,7 +16753,6 @@ no_undefined_flag \ | 5292 | @@ -16134,7 +16806,6 @@ no_undefined_flag \ |
5292 | hardcode_libdir_flag_spec \ | 5293 | hardcode_libdir_flag_spec \ |
5293 | hardcode_libdir_flag_spec_ld \ | 5294 | hardcode_libdir_flag_spec_ld \ |
5294 | hardcode_libdir_separator \ | 5295 | hardcode_libdir_separator \ |
@@ -5296,7 +5297,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5296 | exclude_expsyms \ | 5297 | exclude_expsyms \ |
5297 | include_expsyms \ | 5298 | include_expsyms \ |
5298 | file_list_spec \ | 5299 | file_list_spec \ |
5299 | @@ -16117,6 +16788,7 @@ module_cmds \ | 5300 | @@ -16170,6 +16841,7 @@ module_cmds \ |
5300 | module_expsym_cmds \ | 5301 | module_expsym_cmds \ |
5301 | export_symbols_cmds \ | 5302 | export_symbols_cmds \ |
5302 | prelink_cmds \ | 5303 | prelink_cmds \ |
@@ -5304,7 +5305,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5304 | postinstall_cmds \ | 5305 | postinstall_cmds \ |
5305 | postuninstall_cmds \ | 5306 | postuninstall_cmds \ |
5306 | finish_cmds \ | 5307 | finish_cmds \ |
5307 | @@ -16890,7 +17562,8 @@ $as_echo X"$file" | | 5308 | @@ -16943,7 +17615,8 @@ $as_echo X"$file" | |
5308 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 5309 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
5309 | # | 5310 | # |
5310 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 5311 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -5314,7 +5315,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5314 | # Written by Gordon Matzigkeit, 1996 | 5315 | # Written by Gordon Matzigkeit, 1996 |
5315 | # | 5316 | # |
5316 | # This file is part of GNU Libtool. | 5317 | # This file is part of GNU Libtool. |
5317 | @@ -16993,19 +17666,42 @@ SP2NL=$lt_lt_SP2NL | 5318 | @@ -17046,19 +17719,42 @@ SP2NL=$lt_lt_SP2NL |
5318 | # turn newlines into spaces. | 5319 | # turn newlines into spaces. |
5319 | NL2SP=$lt_lt_NL2SP | 5320 | NL2SP=$lt_lt_NL2SP |
5320 | 5321 | ||
@@ -5358,7 +5359,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5358 | # A symbol stripping program. | 5359 | # A symbol stripping program. |
5359 | STRIP=$lt_STRIP | 5360 | STRIP=$lt_STRIP |
5360 | 5361 | ||
5361 | @@ -17035,6 +17731,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 5362 | @@ -17088,6 +17784,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
5362 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 5363 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
5363 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 5364 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
5364 | 5365 | ||
@@ -5371,7 +5372,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5371 | # The name of the directory that contains temporary libtool files. | 5372 | # The name of the directory that contains temporary libtool files. |
5372 | objdir=$objdir | 5373 | objdir=$objdir |
5373 | 5374 | ||
5374 | @@ -17044,6 +17746,9 @@ MAGIC_CMD=$MAGIC_CMD | 5375 | @@ -17097,6 +17799,9 @@ MAGIC_CMD=$MAGIC_CMD |
5375 | # Must we lock files when doing compilation? | 5376 | # Must we lock files when doing compilation? |
5376 | need_locks=$lt_need_locks | 5377 | need_locks=$lt_need_locks |
5377 | 5378 | ||
@@ -5381,7 +5382,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5381 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 5382 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
5382 | DSYMUTIL=$lt_DSYMUTIL | 5383 | DSYMUTIL=$lt_DSYMUTIL |
5383 | 5384 | ||
5384 | @@ -17158,12 +17863,12 @@ with_gcc=$GCC | 5385 | @@ -17211,12 +17916,12 @@ with_gcc=$GCC |
5385 | # Compiler flag to turn off builtin functions. | 5386 | # Compiler flag to turn off builtin functions. |
5386 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 5387 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
5387 | 5388 | ||
@@ -5397,7 +5398,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5397 | # Compiler flag to prevent dynamic linking. | 5398 | # Compiler flag to prevent dynamic linking. |
5398 | link_static_flag=$lt_lt_prog_compiler_static | 5399 | link_static_flag=$lt_lt_prog_compiler_static |
5399 | 5400 | ||
5400 | @@ -17250,9 +17955,6 @@ inherit_rpath=$inherit_rpath | 5401 | @@ -17303,9 +18008,6 @@ inherit_rpath=$inherit_rpath |
5401 | # Whether libtool must link a program against all its dependency libraries. | 5402 | # Whether libtool must link a program against all its dependency libraries. |
5402 | link_all_deplibs=$link_all_deplibs | 5403 | link_all_deplibs=$link_all_deplibs |
5403 | 5404 | ||
@@ -5407,7 +5408,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5407 | # Set to "yes" if exported symbols are required. | 5408 | # Set to "yes" if exported symbols are required. |
5408 | always_export_symbols=$always_export_symbols | 5409 | always_export_symbols=$always_export_symbols |
5409 | 5410 | ||
5410 | @@ -17268,6 +17970,9 @@ include_expsyms=$lt_include_expsyms | 5411 | @@ -17321,6 +18023,9 @@ include_expsyms=$lt_include_expsyms |
5411 | # Commands necessary for linking programs (against libraries) with templates. | 5412 | # Commands necessary for linking programs (against libraries) with templates. |
5412 | prelink_cmds=$lt_prelink_cmds | 5413 | prelink_cmds=$lt_prelink_cmds |
5413 | 5414 | ||
@@ -5417,7 +5418,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5417 | # Specify filename containing input files. | 5418 | # Specify filename containing input files. |
5418 | file_list_spec=$lt_file_list_spec | 5419 | file_list_spec=$lt_file_list_spec |
5419 | 5420 | ||
5420 | @@ -17300,210 +18005,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 5421 | @@ -17353,210 +18058,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
5421 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 5422 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
5422 | # text mode, it properly converts lines to CR/LF. This bash problem | 5423 | # text mode, it properly converts lines to CR/LF. This bash problem |
5423 | # is reportedly fixed, but why not run on old versions too? | 5424 | # is reportedly fixed, but why not run on old versions too? |
@@ -5792,7 +5793,7 @@ index 60c1a055ae2..0e0ce4c0e23 100755 | |||
5792 | chmod +x "$ofile" | 5793 | chmod +x "$ofile" |
5793 | 5794 | ||
5794 | diff --git a/gprof/configure b/gprof/configure | 5795 | diff --git a/gprof/configure b/gprof/configure |
5795 | index c23692e5c3d..9f936a5b03d 100755 | 5796 | index 3cf41b79116..e5d57f52912 100755 |
5796 | --- a/gprof/configure | 5797 | --- a/gprof/configure |
5797 | +++ b/gprof/configure | 5798 | +++ b/gprof/configure |
5798 | @@ -662,8 +662,11 @@ OTOOL | 5799 | @@ -662,8 +662,11 @@ OTOOL |
@@ -7707,7 +7708,7 @@ index c23692e5c3d..9f936a5b03d 100755 | |||
7707 | chmod +x "$ofile" | 7708 | chmod +x "$ofile" |
7708 | 7709 | ||
7709 | diff --git a/ld/configure b/ld/configure | 7710 | diff --git a/ld/configure b/ld/configure |
7710 | index 811134a503b..f432f4637d0 100755 | 7711 | index 1c872c0db5f..fe938e6c99f 100755 |
7711 | --- a/ld/configure | 7712 | --- a/ld/configure |
7712 | +++ b/ld/configure | 7713 | +++ b/ld/configure |
7713 | @@ -691,8 +691,11 @@ OTOOL | 7714 | @@ -691,8 +691,11 @@ OTOOL |
@@ -7730,7 +7731,7 @@ index 811134a503b..f432f4637d0 100755 | |||
7730 | enable_libtool_lock | 7731 | enable_libtool_lock |
7731 | enable_plugins | 7732 | enable_plugins |
7732 | enable_largefile | 7733 | enable_largefile |
7733 | @@ -1512,6 +1516,8 @@ Optional Packages: | 7734 | @@ -1520,6 +1524,8 @@ Optional Packages: |
7734 | --with-pic try to use only PIC/non-PIC objects [default=use | 7735 | --with-pic try to use only PIC/non-PIC objects [default=use |
7735 | both] | 7736 | both] |
7736 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 7737 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -7739,7 +7740,7 @@ index 811134a503b..f432f4637d0 100755 | |||
7739 | --with-lib-path=dir1:dir2... set default LIB_PATH | 7740 | --with-lib-path=dir1:dir2... set default LIB_PATH |
7740 | --with-sysroot=DIR Search for usr/lib et al within DIR. | 7741 | --with-sysroot=DIR Search for usr/lib et al within DIR. |
7741 | --with-system-zlib use installed libz | 7742 | --with-system-zlib use installed libz |
7742 | @@ -5965,8 +5971,8 @@ esac | 7743 | @@ -5973,8 +5979,8 @@ esac |
7743 | 7744 | ||
7744 | 7745 | ||
7745 | 7746 | ||
@@ -7750,7 +7751,7 @@ index 811134a503b..f432f4637d0 100755 | |||
7750 | 7751 | ||
7751 | 7752 | ||
7752 | 7753 | ||
7753 | @@ -6006,7 +6012,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 7754 | @@ -6014,7 +6020,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
7754 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 7755 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
7755 | $as_echo_n "checking how to print strings... " >&6; } | 7756 | $as_echo_n "checking how to print strings... " >&6; } |
7756 | # Test print first, because it will be a builtin if present. | 7757 | # Test print first, because it will be a builtin if present. |
@@ -7759,7 +7760,7 @@ index 811134a503b..f432f4637d0 100755 | |||
7759 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 7760 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
7760 | ECHO='print -r --' | 7761 | ECHO='print -r --' |
7761 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 7762 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
7762 | @@ -6692,8 +6698,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 7763 | @@ -6700,8 +6706,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
7763 | # Try some XSI features | 7764 | # Try some XSI features |
7764 | xsi_shell=no | 7765 | xsi_shell=no |
7765 | ( _lt_dummy="a/b/c" | 7766 | ( _lt_dummy="a/b/c" |
@@ -7770,7 +7771,7 @@ index 811134a503b..f432f4637d0 100755 | |||
7770 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 7771 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
7771 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 7772 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
7772 | && xsi_shell=yes | 7773 | && xsi_shell=yes |
7773 | @@ -6742,6 +6748,80 @@ esac | 7774 | @@ -6750,6 +6756,80 @@ esac |
7774 | 7775 | ||
7775 | 7776 | ||
7776 | 7777 | ||
@@ -7851,7 +7852,7 @@ index 811134a503b..f432f4637d0 100755 | |||
7851 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 7852 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
7852 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 7853 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
7853 | if ${lt_cv_ld_reload_flag+:} false; then : | 7854 | if ${lt_cv_ld_reload_flag+:} false; then : |
7854 | @@ -6758,6 +6838,11 @@ case $reload_flag in | 7855 | @@ -6766,6 +6846,11 @@ case $reload_flag in |
7855 | esac | 7856 | esac |
7856 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 7857 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
7857 | case $host_os in | 7858 | case $host_os in |
@@ -7863,7 +7864,7 @@ index 811134a503b..f432f4637d0 100755 | |||
7863 | darwin*) | 7864 | darwin*) |
7864 | if test "$GCC" = yes; then | 7865 | if test "$GCC" = yes; then |
7865 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 7866 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
7866 | @@ -6926,7 +7011,8 @@ mingw* | pw32*) | 7867 | @@ -6934,7 +7019,8 @@ mingw* | pw32*) |
7867 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 7868 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
7868 | lt_cv_file_magic_cmd='func_win32_libid' | 7869 | lt_cv_file_magic_cmd='func_win32_libid' |
7869 | else | 7870 | else |
@@ -7873,7 +7874,7 @@ index 811134a503b..f432f4637d0 100755 | |||
7873 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 7874 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
7874 | fi | 7875 | fi |
7875 | ;; | 7876 | ;; |
7876 | @@ -7080,6 +7166,21 @@ esac | 7877 | @@ -7088,6 +7174,21 @@ esac |
7877 | fi | 7878 | fi |
7878 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 7879 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
7879 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 7880 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -7895,7 +7896,7 @@ index 811134a503b..f432f4637d0 100755 | |||
7895 | file_magic_cmd=$lt_cv_file_magic_cmd | 7896 | file_magic_cmd=$lt_cv_file_magic_cmd |
7896 | deplibs_check_method=$lt_cv_deplibs_check_method | 7897 | deplibs_check_method=$lt_cv_deplibs_check_method |
7897 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 7898 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
7898 | @@ -7095,9 +7196,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 7899 | @@ -7103,9 +7204,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
7899 | 7900 | ||
7900 | 7901 | ||
7901 | 7902 | ||
@@ -8060,7 +8061,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8060 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 8061 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
8061 | $as_echo_n "checking for $ac_word... " >&6; } | 8062 | $as_echo_n "checking for $ac_word... " >&6; } |
8062 | if ${ac_cv_prog_AR+:} false; then : | 8063 | if ${ac_cv_prog_AR+:} false; then : |
8063 | @@ -7113,7 +7367,7 @@ do | 8064 | @@ -7121,7 +7375,7 @@ do |
8064 | test -z "$as_dir" && as_dir=. | 8065 | test -z "$as_dir" && as_dir=. |
8065 | for ac_exec_ext in '' $ac_executable_extensions; do | 8066 | for ac_exec_ext in '' $ac_executable_extensions; do |
8066 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 8067 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -8069,7 +8070,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8069 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 8070 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
8070 | break 2 | 8071 | break 2 |
8071 | fi | 8072 | fi |
8072 | @@ -7133,11 +7387,15 @@ $as_echo "no" >&6; } | 8073 | @@ -7141,11 +7395,15 @@ $as_echo "no" >&6; } |
8073 | fi | 8074 | fi |
8074 | 8075 | ||
8075 | 8076 | ||
@@ -8088,7 +8089,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8088 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 8089 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
8089 | $as_echo_n "checking for $ac_word... " >&6; } | 8090 | $as_echo_n "checking for $ac_word... " >&6; } |
8090 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 8091 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
8091 | @@ -7153,7 +7411,7 @@ do | 8092 | @@ -7161,7 +7419,7 @@ do |
8092 | test -z "$as_dir" && as_dir=. | 8093 | test -z "$as_dir" && as_dir=. |
8093 | for ac_exec_ext in '' $ac_executable_extensions; do | 8094 | for ac_exec_ext in '' $ac_executable_extensions; do |
8094 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 8095 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -8097,7 +8098,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8097 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 8098 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
8098 | break 2 | 8099 | break 2 |
8099 | fi | 8100 | fi |
8100 | @@ -7172,6 +7430,10 @@ else | 8101 | @@ -7180,6 +7438,10 @@ else |
8101 | $as_echo "no" >&6; } | 8102 | $as_echo "no" >&6; } |
8102 | fi | 8103 | fi |
8103 | 8104 | ||
@@ -8108,7 +8109,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8108 | if test "x$ac_ct_AR" = x; then | 8109 | if test "x$ac_ct_AR" = x; then |
8109 | AR="false" | 8110 | AR="false" |
8110 | else | 8111 | else |
8111 | @@ -7183,12 +7445,12 @@ ac_tool_warned=yes ;; | 8112 | @@ -7191,12 +7453,12 @@ ac_tool_warned=yes ;; |
8112 | esac | 8113 | esac |
8113 | AR=$ac_ct_AR | 8114 | AR=$ac_ct_AR |
8114 | fi | 8115 | fi |
@@ -8125,7 +8126,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8125 | 8126 | ||
8126 | 8127 | ||
8127 | 8128 | ||
8128 | @@ -7198,6 +7460,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 8129 | @@ -7206,6 +7468,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
8129 | 8130 | ||
8130 | 8131 | ||
8131 | 8132 | ||
@@ -8188,7 +8189,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8188 | 8189 | ||
8189 | 8190 | ||
8190 | if test -n "$ac_tool_prefix"; then | 8191 | if test -n "$ac_tool_prefix"; then |
8191 | @@ -7534,8 +7852,8 @@ esac | 8192 | @@ -7542,8 +7860,8 @@ esac |
8192 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 8193 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
8193 | 8194 | ||
8194 | # Transform an extracted symbol line into symbol name and symbol address | 8195 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -8199,7 +8200,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8199 | 8200 | ||
8200 | # Handle CRLF in mingw tool chain | 8201 | # Handle CRLF in mingw tool chain |
8201 | opt_cr= | 8202 | opt_cr= |
8202 | @@ -7571,6 +7889,7 @@ for ac_symprfx in "" "_"; do | 8203 | @@ -7579,6 +7897,7 @@ for ac_symprfx in "" "_"; do |
8203 | else | 8204 | else |
8204 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 8205 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
8205 | fi | 8206 | fi |
@@ -8207,7 +8208,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8207 | 8208 | ||
8208 | # Check to see that the pipe works correctly. | 8209 | # Check to see that the pipe works correctly. |
8209 | pipe_works=no | 8210 | pipe_works=no |
8210 | @@ -7612,6 +7931,18 @@ _LT_EOF | 8211 | @@ -7620,6 +7939,18 @@ _LT_EOF |
8211 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 8212 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
8212 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 8213 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
8213 | cat <<_LT_EOF > conftest.$ac_ext | 8214 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -8226,7 +8227,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8226 | #ifdef __cplusplus | 8227 | #ifdef __cplusplus |
8227 | extern "C" { | 8228 | extern "C" { |
8228 | #endif | 8229 | #endif |
8229 | @@ -7623,7 +7954,7 @@ _LT_EOF | 8230 | @@ -7631,7 +7962,7 @@ _LT_EOF |
8230 | cat <<_LT_EOF >> conftest.$ac_ext | 8231 | cat <<_LT_EOF >> conftest.$ac_ext |
8231 | 8232 | ||
8232 | /* The mapping between symbol names and symbols. */ | 8233 | /* The mapping between symbol names and symbols. */ |
@@ -8235,7 +8236,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8235 | const char *name; | 8236 | const char *name; |
8236 | void *address; | 8237 | void *address; |
8237 | } | 8238 | } |
8238 | @@ -7649,8 +7980,8 @@ static const void *lt_preloaded_setup() { | 8239 | @@ -7657,8 +7988,8 @@ static const void *lt_preloaded_setup() { |
8239 | _LT_EOF | 8240 | _LT_EOF |
8240 | # Now try linking the two files. | 8241 | # Now try linking the two files. |
8241 | mv conftest.$ac_objext conftstm.$ac_objext | 8242 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -8246,7 +8247,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8246 | LIBS="conftstm.$ac_objext" | 8247 | LIBS="conftstm.$ac_objext" |
8247 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 8248 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
8248 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 8249 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
8249 | @@ -7660,8 +7991,8 @@ _LT_EOF | 8250 | @@ -7668,8 +7999,8 @@ _LT_EOF |
8250 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 8251 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
8251 | pipe_works=yes | 8252 | pipe_works=yes |
8252 | fi | 8253 | fi |
@@ -8257,7 +8258,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8257 | else | 8258 | else |
8258 | echo "cannot find nm_test_func in $nlist" >&5 | 8259 | echo "cannot find nm_test_func in $nlist" >&5 |
8259 | fi | 8260 | fi |
8260 | @@ -7698,6 +8029,19 @@ else | 8261 | @@ -7706,6 +8037,19 @@ else |
8261 | $as_echo "ok" >&6; } | 8262 | $as_echo "ok" >&6; } |
8262 | fi | 8263 | fi |
8263 | 8264 | ||
@@ -8277,7 +8278,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8277 | 8278 | ||
8278 | 8279 | ||
8279 | 8280 | ||
8280 | @@ -7714,6 +8058,42 @@ fi | 8281 | @@ -7722,6 +8066,42 @@ fi |
8281 | 8282 | ||
8282 | 8283 | ||
8283 | 8284 | ||
@@ -8320,7 +8321,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8320 | 8321 | ||
8321 | 8322 | ||
8322 | 8323 | ||
8323 | @@ -7925,6 +8305,123 @@ esac | 8324 | @@ -7933,6 +8313,123 @@ esac |
8324 | 8325 | ||
8325 | need_locks="$enable_libtool_lock" | 8326 | need_locks="$enable_libtool_lock" |
8326 | 8327 | ||
@@ -8444,7 +8445,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8444 | 8445 | ||
8445 | case $host_os in | 8446 | case $host_os in |
8446 | rhapsody* | darwin*) | 8447 | rhapsody* | darwin*) |
8447 | @@ -8488,6 +8985,8 @@ _LT_EOF | 8448 | @@ -8496,6 +8993,8 @@ _LT_EOF |
8448 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 8449 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
8449 | echo "$AR cru libconftest.a conftest.o" >&5 | 8450 | echo "$AR cru libconftest.a conftest.o" >&5 |
8450 | $AR cru libconftest.a conftest.o 2>&5 | 8451 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -8453,7 +8454,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8453 | cat > conftest.c << _LT_EOF | 8454 | cat > conftest.c << _LT_EOF |
8454 | int main() { return 0;} | 8455 | int main() { return 0;} |
8455 | _LT_EOF | 8456 | _LT_EOF |
8456 | @@ -8556,6 +9055,16 @@ done | 8457 | @@ -8564,6 +9063,16 @@ done |
8457 | 8458 | ||
8458 | 8459 | ||
8459 | 8460 | ||
@@ -8470,7 +8471,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8470 | 8471 | ||
8471 | 8472 | ||
8472 | # Set options | 8473 | # Set options |
8473 | @@ -8684,7 +9193,8 @@ fi | 8474 | @@ -8692,7 +9201,8 @@ fi |
8474 | LIBTOOL_DEPS="$ltmain" | 8475 | LIBTOOL_DEPS="$ltmain" |
8475 | 8476 | ||
8476 | # Always use our own libtool. | 8477 | # Always use our own libtool. |
@@ -8480,7 +8481,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8480 | 8481 | ||
8481 | 8482 | ||
8482 | 8483 | ||
8483 | @@ -8773,7 +9283,7 @@ aix3*) | 8484 | @@ -8781,7 +9291,7 @@ aix3*) |
8484 | esac | 8485 | esac |
8485 | 8486 | ||
8486 | # Global variables: | 8487 | # Global variables: |
@@ -8489,7 +8490,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8489 | can_build_shared=yes | 8490 | can_build_shared=yes |
8490 | 8491 | ||
8491 | # All known linkers require a `.a' archive for static linking (except MSVC, | 8492 | # All known linkers require a `.a' archive for static linking (except MSVC, |
8492 | @@ -9071,8 +9581,6 @@ fi | 8493 | @@ -9079,8 +9589,6 @@ fi |
8493 | lt_prog_compiler_pic= | 8494 | lt_prog_compiler_pic= |
8494 | lt_prog_compiler_static= | 8495 | lt_prog_compiler_static= |
8495 | 8496 | ||
@@ -8498,7 +8499,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8498 | 8499 | ||
8499 | if test "$GCC" = yes; then | 8500 | if test "$GCC" = yes; then |
8500 | lt_prog_compiler_wl='-Wl,' | 8501 | lt_prog_compiler_wl='-Wl,' |
8501 | @@ -9238,6 +9746,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 8502 | @@ -9246,6 +9754,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
8502 | lt_prog_compiler_pic='--shared' | 8503 | lt_prog_compiler_pic='--shared' |
8503 | lt_prog_compiler_static='--static' | 8504 | lt_prog_compiler_static='--static' |
8504 | ;; | 8505 | ;; |
@@ -8511,7 +8512,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8511 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 8512 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
8512 | # Portland Group compilers (*not* the Pentium gcc compiler, | 8513 | # Portland Group compilers (*not* the Pentium gcc compiler, |
8513 | # which looks to be a dead project) | 8514 | # which looks to be a dead project) |
8514 | @@ -9300,7 +9814,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 8515 | @@ -9308,7 +9822,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
8515 | lt_prog_compiler_pic='-KPIC' | 8516 | lt_prog_compiler_pic='-KPIC' |
8516 | lt_prog_compiler_static='-Bstatic' | 8517 | lt_prog_compiler_static='-Bstatic' |
8517 | case $cc_basename in | 8518 | case $cc_basename in |
@@ -8520,7 +8521,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8520 | lt_prog_compiler_wl='-Qoption ld ';; | 8521 | lt_prog_compiler_wl='-Qoption ld ';; |
8521 | *) | 8522 | *) |
8522 | lt_prog_compiler_wl='-Wl,';; | 8523 | lt_prog_compiler_wl='-Wl,';; |
8523 | @@ -9357,13 +9871,17 @@ case $host_os in | 8524 | @@ -9365,13 +9879,17 @@ case $host_os in |
8524 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 8525 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
8525 | ;; | 8526 | ;; |
8526 | esac | 8527 | esac |
@@ -8544,7 +8545,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8544 | 8545 | ||
8545 | # | 8546 | # |
8546 | # Check to make sure the PIC flag actually works. | 8547 | # Check to make sure the PIC flag actually works. |
8547 | @@ -9424,6 +9942,11 @@ fi | 8548 | @@ -9432,6 +9950,11 @@ fi |
8548 | 8549 | ||
8549 | 8550 | ||
8550 | 8551 | ||
@@ -8556,7 +8557,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8556 | # | 8557 | # |
8557 | # Check to make sure the static flag actually works. | 8558 | # Check to make sure the static flag actually works. |
8558 | # | 8559 | # |
8559 | @@ -9774,7 +10297,8 @@ _LT_EOF | 8560 | @@ -9782,7 +10305,8 @@ _LT_EOF |
8560 | allow_undefined_flag=unsupported | 8561 | allow_undefined_flag=unsupported |
8561 | always_export_symbols=no | 8562 | always_export_symbols=no |
8562 | enable_shared_with_static_runtimes=yes | 8563 | enable_shared_with_static_runtimes=yes |
@@ -8566,7 +8567,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8566 | 8567 | ||
8567 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 8568 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
8568 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 8569 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
8569 | @@ -9873,12 +10397,12 @@ _LT_EOF | 8570 | @@ -9881,12 +10405,12 @@ _LT_EOF |
8570 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 8571 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
8571 | hardcode_libdir_flag_spec= | 8572 | hardcode_libdir_flag_spec= |
8572 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 8573 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -8581,7 +8582,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8581 | fi | 8582 | fi |
8582 | ;; | 8583 | ;; |
8583 | esac | 8584 | esac |
8584 | @@ -9892,8 +10416,8 @@ _LT_EOF | 8585 | @@ -9900,8 +10424,8 @@ _LT_EOF |
8585 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 8586 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
8586 | wlarc= | 8587 | wlarc= |
8587 | else | 8588 | else |
@@ -8592,7 +8593,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8592 | fi | 8593 | fi |
8593 | ;; | 8594 | ;; |
8594 | 8595 | ||
8595 | @@ -9911,8 +10435,8 @@ _LT_EOF | 8596 | @@ -9919,8 +10443,8 @@ _LT_EOF |
8596 | 8597 | ||
8597 | _LT_EOF | 8598 | _LT_EOF |
8598 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 8599 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -8603,7 +8604,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8603 | else | 8604 | else |
8604 | ld_shlibs=no | 8605 | ld_shlibs=no |
8605 | fi | 8606 | fi |
8606 | @@ -9958,8 +10482,8 @@ _LT_EOF | 8607 | @@ -9966,8 +10490,8 @@ _LT_EOF |
8607 | 8608 | ||
8608 | *) | 8609 | *) |
8609 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 8610 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -8614,7 +8615,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8614 | else | 8615 | else |
8615 | ld_shlibs=no | 8616 | ld_shlibs=no |
8616 | fi | 8617 | fi |
8617 | @@ -10089,7 +10613,13 @@ _LT_EOF | 8618 | @@ -10097,7 +10621,13 @@ _LT_EOF |
8618 | allow_undefined_flag='-berok' | 8619 | allow_undefined_flag='-berok' |
8619 | # Determine the default libpath from the value encoded in an | 8620 | # Determine the default libpath from the value encoded in an |
8620 | # empty executable. | 8621 | # empty executable. |
@@ -8629,7 +8630,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8629 | /* end confdefs.h. */ | 8630 | /* end confdefs.h. */ |
8630 | 8631 | ||
8631 | int | 8632 | int |
8632 | @@ -10102,22 +10632,29 @@ main () | 8633 | @@ -10110,22 +10640,29 @@ main () |
8633 | _ACEOF | 8634 | _ACEOF |
8634 | if ac_fn_c_try_link "$LINENO"; then : | 8635 | if ac_fn_c_try_link "$LINENO"; then : |
8635 | 8636 | ||
@@ -8672,7 +8673,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8672 | 8673 | ||
8673 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 8674 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
8674 | 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" | 8675 | 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" |
8675 | @@ -10129,7 +10666,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 8676 | @@ -10137,7 +10674,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8676 | else | 8677 | else |
8677 | # Determine the default libpath from the value encoded in an | 8678 | # Determine the default libpath from the value encoded in an |
8678 | # empty executable. | 8679 | # empty executable. |
@@ -8687,7 +8688,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8687 | /* end confdefs.h. */ | 8688 | /* end confdefs.h. */ |
8688 | 8689 | ||
8689 | int | 8690 | int |
8690 | @@ -10142,22 +10685,29 @@ main () | 8691 | @@ -10150,22 +10693,29 @@ main () |
8691 | _ACEOF | 8692 | _ACEOF |
8692 | if ac_fn_c_try_link "$LINENO"; then : | 8693 | if ac_fn_c_try_link "$LINENO"; then : |
8693 | 8694 | ||
@@ -8730,7 +8731,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8730 | 8731 | ||
8731 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 8732 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
8732 | # Warning - without using the other run time loading flags, | 8733 | # Warning - without using the other run time loading flags, |
8733 | @@ -10201,21 +10751,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 8734 | @@ -10209,21 +10759,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8734 | # When not using gcc, we currently assume that we are using | 8735 | # When not using gcc, we currently assume that we are using |
8735 | # Microsoft Visual C++. | 8736 | # Microsoft Visual C++. |
8736 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 8737 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
@@ -8810,7 +8811,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8810 | ;; | 8811 | ;; |
8811 | 8812 | ||
8812 | darwin* | rhapsody*) | 8813 | darwin* | rhapsody*) |
8813 | @@ -10276,7 +10869,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 8814 | @@ -10284,7 +10877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8814 | 8815 | ||
8815 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 8816 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
8816 | freebsd* | dragonfly*) | 8817 | freebsd* | dragonfly*) |
@@ -8819,7 +8820,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8819 | hardcode_libdir_flag_spec='-R$libdir' | 8820 | hardcode_libdir_flag_spec='-R$libdir' |
8820 | hardcode_direct=yes | 8821 | hardcode_direct=yes |
8821 | hardcode_shlibpath_var=no | 8822 | hardcode_shlibpath_var=no |
8822 | @@ -10284,7 +10877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 8823 | @@ -10292,7 +10885,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8823 | 8824 | ||
8824 | hpux9*) | 8825 | hpux9*) |
8825 | if test "$GCC" = yes; then | 8826 | if test "$GCC" = yes; then |
@@ -8828,7 +8829,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8828 | else | 8829 | else |
8829 | 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' | 8830 | 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' |
8830 | fi | 8831 | fi |
8831 | @@ -10300,7 +10893,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 8832 | @@ -10308,7 +10901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8832 | 8833 | ||
8833 | hpux10*) | 8834 | hpux10*) |
8834 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 8835 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -8837,7 +8838,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8837 | else | 8838 | else |
8838 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 8839 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
8839 | fi | 8840 | fi |
8840 | @@ -10324,10 +10917,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 8841 | @@ -10332,10 +10925,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8841 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 8842 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
8842 | ;; | 8843 | ;; |
8843 | ia64*) | 8844 | ia64*) |
@@ -8850,7 +8851,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8850 | ;; | 8851 | ;; |
8851 | esac | 8852 | esac |
8852 | else | 8853 | else |
8853 | @@ -10406,23 +10999,36 @@ fi | 8854 | @@ -10414,23 +11007,36 @@ fi |
8854 | 8855 | ||
8855 | irix5* | irix6* | nonstopux*) | 8856 | irix5* | irix6* | nonstopux*) |
8856 | if test "$GCC" = yes; then | 8857 | if test "$GCC" = yes; then |
@@ -8895,7 +8896,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8895 | else | 8896 | else |
8896 | 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' | 8897 | 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' |
8897 | 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' | 8898 | 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' |
8898 | @@ -10507,7 +11113,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 8899 | @@ -10515,7 +11121,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
8899 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 8900 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
8900 | if test "$GCC" = yes; then | 8901 | if test "$GCC" = yes; then |
8901 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 8902 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -8904,7 +8905,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8904 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 8905 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
8905 | else | 8906 | else |
8906 | allow_undefined_flag=' -expect_unresolved \*' | 8907 | allow_undefined_flag=' -expect_unresolved \*' |
8907 | @@ -10526,9 +11132,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 8908 | @@ -10534,9 +11140,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
8908 | no_undefined_flag=' -z defs' | 8909 | no_undefined_flag=' -z defs' |
8909 | if test "$GCC" = yes; then | 8910 | if test "$GCC" = yes; then |
8910 | wlarc='${wl}' | 8911 | wlarc='${wl}' |
@@ -8916,7 +8917,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8916 | else | 8917 | else |
8917 | case `$CC -V 2>&1` in | 8918 | case `$CC -V 2>&1` in |
8918 | *"Compilers 5.0"*) | 8919 | *"Compilers 5.0"*) |
8919 | @@ -11104,8 +11710,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 8920 | @@ -11112,8 +11718,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
8920 | need_version=no | 8921 | need_version=no |
8921 | need_lib_prefix=no | 8922 | need_lib_prefix=no |
8922 | 8923 | ||
@@ -8928,7 +8929,7 @@ index 811134a503b..f432f4637d0 100755 | |||
8928 | library_names_spec='$libname.dll.a' | 8929 | library_names_spec='$libname.dll.a' |
8929 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 8930 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
8930 | postinstall_cmds='base_file=`basename \${file}`~ | 8931 | postinstall_cmds='base_file=`basename \${file}`~ |
8931 | @@ -11138,13 +11745,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 8932 | @@ -11146,13 +11753,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
8932 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 8933 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
8933 | ;; | 8934 | ;; |
8934 | esac | 8935 | esac |
@@ -9001,7 +9002,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9001 | # FIXME: first we should search . and the directory the executable is in | 9002 | # FIXME: first we should search . and the directory the executable is in |
9002 | shlibpath_var=PATH | 9003 | shlibpath_var=PATH |
9003 | ;; | 9004 | ;; |
9004 | @@ -11236,7 +11901,7 @@ haiku*) | 9005 | @@ -11244,7 +11909,7 @@ haiku*) |
9005 | soname_spec='${libname}${release}${shared_ext}$major' | 9006 | soname_spec='${libname}${release}${shared_ext}$major' |
9006 | shlibpath_var=LIBRARY_PATH | 9007 | shlibpath_var=LIBRARY_PATH |
9007 | shlibpath_overrides_runpath=yes | 9008 | shlibpath_overrides_runpath=yes |
@@ -9010,16 +9011,16 @@ index 811134a503b..f432f4637d0 100755 | |||
9010 | hardcode_into_libs=yes | 9011 | hardcode_into_libs=yes |
9011 | ;; | 9012 | ;; |
9012 | 9013 | ||
9013 | @@ -12032,7 +12697,7 @@ else | 9014 | @@ -12040,7 +12705,7 @@ else |
9014 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 9015 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
9015 | lt_status=$lt_dlunknown | 9016 | lt_status=$lt_dlunknown |
9016 | cat > conftest.$ac_ext <<_LT_EOF | 9017 | cat > conftest.$ac_ext <<_LT_EOF |
9017 | -#line 12035 "configure" | 9018 | -#line 12040 "configure" |
9018 | +#line $LINENO "configure" | 9019 | +#line $LINENO "configure" |
9019 | #include "confdefs.h" | 9020 | #include "confdefs.h" |
9020 | 9021 | ||
9021 | #if HAVE_DLFCN_H | 9022 | #if HAVE_DLFCN_H |
9022 | @@ -12076,10 +12741,10 @@ else | 9023 | @@ -12084,10 +12749,10 @@ else |
9023 | /* When -fvisbility=hidden is used, assume the code has been annotated | 9024 | /* When -fvisbility=hidden is used, assume the code has been annotated |
9024 | correspondingly for the symbols needed. */ | 9025 | correspondingly for the symbols needed. */ |
9025 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 9026 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -9032,16 +9033,16 @@ index 811134a503b..f432f4637d0 100755 | |||
9032 | int main () | 9033 | int main () |
9033 | { | 9034 | { |
9034 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 9035 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
9035 | @@ -12138,7 +12803,7 @@ else | 9036 | @@ -12146,7 +12811,7 @@ else |
9036 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 9037 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
9037 | lt_status=$lt_dlunknown | 9038 | lt_status=$lt_dlunknown |
9038 | cat > conftest.$ac_ext <<_LT_EOF | 9039 | cat > conftest.$ac_ext <<_LT_EOF |
9039 | -#line 12141 "configure" | 9040 | -#line 12146 "configure" |
9040 | +#line $LINENO "configure" | 9041 | +#line $LINENO "configure" |
9041 | #include "confdefs.h" | 9042 | #include "confdefs.h" |
9042 | 9043 | ||
9043 | #if HAVE_DLFCN_H | 9044 | #if HAVE_DLFCN_H |
9044 | @@ -12182,10 +12847,10 @@ else | 9045 | @@ -12190,10 +12855,10 @@ else |
9045 | /* When -fvisbility=hidden is used, assume the code has been annotated | 9046 | /* When -fvisbility=hidden is used, assume the code has been annotated |
9046 | correspondingly for the symbols needed. */ | 9047 | correspondingly for the symbols needed. */ |
9047 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 9048 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -9054,7 +9055,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9054 | int main () | 9055 | int main () |
9055 | { | 9056 | { |
9056 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 9057 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
9057 | @@ -12577,6 +13242,7 @@ $RM -r conftest* | 9058 | @@ -12585,6 +13250,7 @@ $RM -r conftest* |
9058 | 9059 | ||
9059 | # Allow CC to be a program name with arguments. | 9060 | # Allow CC to be a program name with arguments. |
9060 | lt_save_CC=$CC | 9061 | lt_save_CC=$CC |
@@ -9062,7 +9063,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9062 | lt_save_LD=$LD | 9063 | lt_save_LD=$LD |
9063 | lt_save_GCC=$GCC | 9064 | lt_save_GCC=$GCC |
9064 | GCC=$GXX | 9065 | GCC=$GXX |
9065 | @@ -12594,6 +13260,7 @@ $RM -r conftest* | 9066 | @@ -12602,6 +13268,7 @@ $RM -r conftest* |
9066 | fi | 9067 | fi |
9067 | test -z "${LDCXX+set}" || LD=$LDCXX | 9068 | test -z "${LDCXX+set}" || LD=$LDCXX |
9068 | CC=${CXX-"c++"} | 9069 | CC=${CXX-"c++"} |
@@ -9070,7 +9071,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9070 | compiler=$CC | 9071 | compiler=$CC |
9071 | compiler_CXX=$CC | 9072 | compiler_CXX=$CC |
9072 | for cc_temp in $compiler""; do | 9073 | for cc_temp in $compiler""; do |
9073 | @@ -12876,7 +13543,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | 9074 | @@ -12884,7 +13551,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
9074 | allow_undefined_flag_CXX='-berok' | 9075 | allow_undefined_flag_CXX='-berok' |
9075 | # Determine the default libpath from the value encoded in an empty | 9076 | # Determine the default libpath from the value encoded in an empty |
9076 | # executable. | 9077 | # executable. |
@@ -9085,7 +9086,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9085 | /* end confdefs.h. */ | 9086 | /* end confdefs.h. */ |
9086 | 9087 | ||
9087 | int | 9088 | int |
9088 | @@ -12889,22 +13562,29 @@ main () | 9089 | @@ -12897,22 +13570,29 @@ main () |
9089 | _ACEOF | 9090 | _ACEOF |
9090 | if ac_fn_cxx_try_link "$LINENO"; then : | 9091 | if ac_fn_cxx_try_link "$LINENO"; then : |
9091 | 9092 | ||
@@ -9128,7 +9129,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9128 | 9129 | ||
9129 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | 9130 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
9130 | 9131 | ||
9131 | @@ -12917,7 +13597,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9132 | @@ -12925,7 +13605,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9132 | else | 9133 | else |
9133 | # Determine the default libpath from the value encoded in an | 9134 | # Determine the default libpath from the value encoded in an |
9134 | # empty executable. | 9135 | # empty executable. |
@@ -9143,7 +9144,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9143 | /* end confdefs.h. */ | 9144 | /* end confdefs.h. */ |
9144 | 9145 | ||
9145 | int | 9146 | int |
9146 | @@ -12930,22 +13616,29 @@ main () | 9147 | @@ -12938,22 +13624,29 @@ main () |
9147 | _ACEOF | 9148 | _ACEOF |
9148 | if ac_fn_cxx_try_link "$LINENO"; then : | 9149 | if ac_fn_cxx_try_link "$LINENO"; then : |
9149 | 9150 | ||
@@ -9186,7 +9187,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9186 | 9187 | ||
9187 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | 9188 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
9188 | # Warning - without using the other run time loading flags, | 9189 | # Warning - without using the other run time loading flags, |
9189 | @@ -12988,29 +13681,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9190 | @@ -12996,29 +13689,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9190 | ;; | 9191 | ;; |
9191 | 9192 | ||
9192 | cygwin* | mingw* | pw32* | cegcc*) | 9193 | cygwin* | mingw* | pw32* | cegcc*) |
@@ -9285,7 +9286,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9285 | darwin* | rhapsody*) | 9286 | darwin* | rhapsody*) |
9286 | 9287 | ||
9287 | 9288 | ||
9288 | @@ -13116,7 +13855,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9289 | @@ -13124,7 +13863,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9289 | ;; | 9290 | ;; |
9290 | *) | 9291 | *) |
9291 | if test "$GXX" = yes; then | 9292 | if test "$GXX" = yes; then |
@@ -9294,7 +9295,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9294 | else | 9295 | else |
9295 | # FIXME: insert proper C++ library support | 9296 | # FIXME: insert proper C++ library support |
9296 | ld_shlibs_CXX=no | 9297 | ld_shlibs_CXX=no |
9297 | @@ -13187,10 +13926,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9298 | @@ -13195,10 +13934,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9298 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 9299 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
9299 | ;; | 9300 | ;; |
9300 | ia64*) | 9301 | ia64*) |
@@ -9307,7 +9308,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9307 | ;; | 9308 | ;; |
9308 | esac | 9309 | esac |
9309 | fi | 9310 | fi |
9310 | @@ -13231,9 +13970,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9311 | @@ -13239,9 +13978,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9311 | *) | 9312 | *) |
9312 | if test "$GXX" = yes; then | 9313 | if test "$GXX" = yes; then |
9313 | if test "$with_gnu_ld" = no; then | 9314 | if test "$with_gnu_ld" = no; then |
@@ -9319,7 +9320,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9319 | fi | 9320 | fi |
9320 | fi | 9321 | fi |
9321 | link_all_deplibs_CXX=yes | 9322 | link_all_deplibs_CXX=yes |
9322 | @@ -13303,20 +14042,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9323 | @@ -13311,20 +14050,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9323 | prelink_cmds_CXX='tpldir=Template.dir~ | 9324 | prelink_cmds_CXX='tpldir=Template.dir~ |
9324 | rm -rf $tpldir~ | 9325 | rm -rf $tpldir~ |
9325 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 9326 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
@@ -9344,7 +9345,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9344 | ;; | 9345 | ;; |
9345 | *) # Version 6 and above use weak symbols | 9346 | *) # Version 6 and above use weak symbols |
9346 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 9347 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
9347 | @@ -13511,7 +14250,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9348 | @@ -13519,7 +14258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9348 | archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 9349 | archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
9349 | ;; | 9350 | ;; |
9350 | *) | 9351 | *) |
@@ -9353,7 +9354,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9353 | ;; | 9354 | ;; |
9354 | esac | 9355 | esac |
9355 | 9356 | ||
9356 | @@ -13557,7 +14296,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9357 | @@ -13565,7 +14304,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9357 | 9358 | ||
9358 | solaris*) | 9359 | solaris*) |
9359 | case $cc_basename in | 9360 | case $cc_basename in |
@@ -9362,7 +9363,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9362 | # Sun C++ 4.2, 5.x and Centerline C++ | 9363 | # Sun C++ 4.2, 5.x and Centerline C++ |
9363 | archive_cmds_need_lc_CXX=yes | 9364 | archive_cmds_need_lc_CXX=yes |
9364 | no_undefined_flag_CXX=' -zdefs' | 9365 | no_undefined_flag_CXX=' -zdefs' |
9365 | @@ -13598,9 +14337,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9366 | @@ -13606,9 +14345,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9366 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 9367 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
9367 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' | 9368 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
9368 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 9369 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
@@ -9374,7 +9375,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9374 | 9375 | ||
9375 | # Commands to make compiler produce verbose output that lists | 9376 | # Commands to make compiler produce verbose output that lists |
9376 | # what "hidden" libraries, object files and flags are used when | 9377 | # what "hidden" libraries, object files and flags are used when |
9377 | @@ -13735,6 +14474,13 @@ private: | 9378 | @@ -13743,6 +14482,13 @@ private: |
9378 | }; | 9379 | }; |
9379 | _LT_EOF | 9380 | _LT_EOF |
9380 | 9381 | ||
@@ -9388,7 +9389,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9388 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 9389 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9389 | (eval $ac_compile) 2>&5 | 9390 | (eval $ac_compile) 2>&5 |
9390 | ac_status=$? | 9391 | ac_status=$? |
9391 | @@ -13748,7 +14494,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 9392 | @@ -13756,7 +14502,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9392 | pre_test_object_deps_done=no | 9393 | pre_test_object_deps_done=no |
9393 | 9394 | ||
9394 | for p in `eval "$output_verbose_link_cmd"`; do | 9395 | for p in `eval "$output_verbose_link_cmd"`; do |
@@ -9397,7 +9398,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9397 | 9398 | ||
9398 | -L* | -R* | -l*) | 9399 | -L* | -R* | -l*) |
9399 | # Some compilers place space between "-{L,R}" and the path. | 9400 | # Some compilers place space between "-{L,R}" and the path. |
9400 | @@ -13757,13 +14503,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 9401 | @@ -13765,13 +14511,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9401 | test $p = "-R"; then | 9402 | test $p = "-R"; then |
9402 | prev=$p | 9403 | prev=$p |
9403 | continue | 9404 | continue |
@@ -9424,7 +9425,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9424 | # Internal compiler library paths should come after those | 9425 | # Internal compiler library paths should come after those |
9425 | # provided the user. The postdeps already come after the | 9426 | # provided the user. The postdeps already come after the |
9426 | # user supplied libs so there is no need to process them. | 9427 | # user supplied libs so there is no need to process them. |
9427 | @@ -13783,8 +14538,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 9428 | @@ -13791,8 +14546,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9428 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" | 9429 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" |
9429 | fi | 9430 | fi |
9430 | fi | 9431 | fi |
@@ -9435,7 +9436,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9435 | *.$objext) | 9436 | *.$objext) |
9436 | # This assumes that the test object file only shows up | 9437 | # This assumes that the test object file only shows up |
9437 | # once in the compiler output. | 9438 | # once in the compiler output. |
9438 | @@ -13820,6 +14577,7 @@ else | 9439 | @@ -13828,6 +14585,7 @@ else |
9439 | fi | 9440 | fi |
9440 | 9441 | ||
9441 | $RM -f confest.$objext | 9442 | $RM -f confest.$objext |
@@ -9443,7 +9444,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9443 | 9444 | ||
9444 | # PORTME: override above test on systems where it is broken | 9445 | # PORTME: override above test on systems where it is broken |
9445 | case $host_os in | 9446 | case $host_os in |
9446 | @@ -13855,7 +14613,7 @@ linux*) | 9447 | @@ -13863,7 +14621,7 @@ linux*) |
9447 | 9448 | ||
9448 | solaris*) | 9449 | solaris*) |
9449 | case $cc_basename in | 9450 | case $cc_basename in |
@@ -9452,7 +9453,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9452 | # The more standards-conforming stlport4 library is | 9453 | # The more standards-conforming stlport4 library is |
9453 | # incompatible with the Cstd library. Avoid specifying | 9454 | # incompatible with the Cstd library. Avoid specifying |
9454 | # it if it's in CXXFLAGS. Ignore libCrun as | 9455 | # it if it's in CXXFLAGS. Ignore libCrun as |
9455 | @@ -13920,8 +14678,6 @@ fi | 9456 | @@ -13928,8 +14686,6 @@ fi |
9456 | lt_prog_compiler_pic_CXX= | 9457 | lt_prog_compiler_pic_CXX= |
9457 | lt_prog_compiler_static_CXX= | 9458 | lt_prog_compiler_static_CXX= |
9458 | 9459 | ||
@@ -9461,7 +9462,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9461 | 9462 | ||
9462 | # C++ specific cases for pic, static, wl, etc. | 9463 | # C++ specific cases for pic, static, wl, etc. |
9463 | if test "$GXX" = yes; then | 9464 | if test "$GXX" = yes; then |
9464 | @@ -14026,6 +14782,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 9465 | @@ -14034,6 +14790,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
9465 | ;; | 9466 | ;; |
9466 | esac | 9467 | esac |
9467 | ;; | 9468 | ;; |
@@ -9473,7 +9474,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9473 | dgux*) | 9474 | dgux*) |
9474 | case $cc_basename in | 9475 | case $cc_basename in |
9475 | ec++*) | 9476 | ec++*) |
9476 | @@ -14178,7 +14939,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 9477 | @@ -14186,7 +14947,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
9477 | ;; | 9478 | ;; |
9478 | solaris*) | 9479 | solaris*) |
9479 | case $cc_basename in | 9480 | case $cc_basename in |
@@ -9482,7 +9483,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9482 | # Sun C++ 4.2, 5.x and Centerline C++ | 9483 | # Sun C++ 4.2, 5.x and Centerline C++ |
9483 | lt_prog_compiler_pic_CXX='-KPIC' | 9484 | lt_prog_compiler_pic_CXX='-KPIC' |
9484 | lt_prog_compiler_static_CXX='-Bstatic' | 9485 | lt_prog_compiler_static_CXX='-Bstatic' |
9485 | @@ -14243,10 +15004,17 @@ case $host_os in | 9486 | @@ -14251,10 +15012,17 @@ case $host_os in |
9486 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" | 9487 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" |
9487 | ;; | 9488 | ;; |
9488 | esac | 9489 | esac |
@@ -9503,7 +9504,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9503 | 9504 | ||
9504 | # | 9505 | # |
9505 | # Check to make sure the PIC flag actually works. | 9506 | # Check to make sure the PIC flag actually works. |
9506 | @@ -14304,6 +15072,8 @@ fi | 9507 | @@ -14312,6 +15080,8 @@ fi |
9507 | 9508 | ||
9508 | 9509 | ||
9509 | 9510 | ||
@@ -9512,7 +9513,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9512 | # | 9513 | # |
9513 | # Check to make sure the static flag actually works. | 9514 | # Check to make sure the static flag actually works. |
9514 | # | 9515 | # |
9515 | @@ -14481,6 +15251,7 @@ fi | 9516 | @@ -14489,6 +15259,7 @@ fi |
9516 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } | 9517 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
9517 | 9518 | ||
9518 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 9519 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
@@ -9520,7 +9521,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9520 | case $host_os in | 9521 | case $host_os in |
9521 | aix[4-9]*) | 9522 | aix[4-9]*) |
9522 | # If we're using GNU nm, then we don't want the "-C" option. | 9523 | # If we're using GNU nm, then we don't want the "-C" option. |
9523 | @@ -14495,15 +15266,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie | 9524 | @@ -14503,15 +15274,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
9524 | ;; | 9525 | ;; |
9525 | pw32*) | 9526 | pw32*) |
9526 | export_symbols_cmds_CXX="$ltdll_cmds" | 9527 | export_symbols_cmds_CXX="$ltdll_cmds" |
@@ -9546,7 +9547,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9546 | 9547 | ||
9547 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 | 9548 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 |
9548 | $as_echo "$ld_shlibs_CXX" >&6; } | 9549 | $as_echo "$ld_shlibs_CXX" >&6; } |
9549 | @@ -14766,8 +15542,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 9550 | @@ -14774,8 +15550,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
9550 | need_version=no | 9551 | need_version=no |
9551 | need_lib_prefix=no | 9552 | need_lib_prefix=no |
9552 | 9553 | ||
@@ -9558,7 +9559,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9558 | library_names_spec='$libname.dll.a' | 9559 | library_names_spec='$libname.dll.a' |
9559 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 9560 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
9560 | postinstall_cmds='base_file=`basename \${file}`~ | 9561 | postinstall_cmds='base_file=`basename \${file}`~ |
9561 | @@ -14799,13 +15576,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 9562 | @@ -14807,13 +15584,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
9562 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 9563 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
9563 | ;; | 9564 | ;; |
9564 | esac | 9565 | esac |
@@ -9631,7 +9632,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9631 | # FIXME: first we should search . and the directory the executable is in | 9632 | # FIXME: first we should search . and the directory the executable is in |
9632 | shlibpath_var=PATH | 9633 | shlibpath_var=PATH |
9633 | ;; | 9634 | ;; |
9634 | @@ -14896,7 +15731,7 @@ haiku*) | 9635 | @@ -14904,7 +15739,7 @@ haiku*) |
9635 | soname_spec='${libname}${release}${shared_ext}$major' | 9636 | soname_spec='${libname}${release}${shared_ext}$major' |
9636 | shlibpath_var=LIBRARY_PATH | 9637 | shlibpath_var=LIBRARY_PATH |
9637 | shlibpath_overrides_runpath=yes | 9638 | shlibpath_overrides_runpath=yes |
@@ -9640,7 +9641,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9640 | hardcode_into_libs=yes | 9641 | hardcode_into_libs=yes |
9641 | ;; | 9642 | ;; |
9642 | 9643 | ||
9643 | @@ -15355,6 +16190,7 @@ fi | 9644 | @@ -15363,6 +16198,7 @@ fi |
9644 | fi # test -n "$compiler" | 9645 | fi # test -n "$compiler" |
9645 | 9646 | ||
9646 | CC=$lt_save_CC | 9647 | CC=$lt_save_CC |
@@ -9648,7 +9649,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9648 | LDCXX=$LD | 9649 | LDCXX=$LD |
9649 | LD=$lt_save_LD | 9650 | LD=$lt_save_LD |
9650 | GCC=$lt_save_GCC | 9651 | GCC=$lt_save_GCC |
9651 | @@ -18477,13 +19313,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 9652 | @@ -18554,13 +19390,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
9652 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 9653 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
9653 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 9654 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
9654 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 9655 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -9669,7 +9670,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9669 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 9670 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
9670 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 9671 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
9671 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 9672 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
9672 | @@ -18498,14 +19341,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 9673 | @@ -18575,14 +19418,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
9673 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 9674 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
9674 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 9675 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
9675 | 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"`' | 9676 | 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"`' |
@@ -9688,7 +9689,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9688 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 9689 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
9689 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 9690 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
9690 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 9691 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
9691 | @@ -18538,12 +19384,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 9692 | @@ -18615,12 +19461,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
9692 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 9693 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
9693 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 9694 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
9694 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 9695 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -9702,7 +9703,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9702 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 9703 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
9703 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 9704 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
9704 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 9705 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
9705 | @@ -18582,8 +19428,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote | 9706 | @@ -18659,8 +19505,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
9706 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' | 9707 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
9707 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' | 9708 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
9708 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' | 9709 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -9712,7 +9713,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9712 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' | 9713 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
9713 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' | 9714 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
9714 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' | 9715 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
9715 | @@ -18610,12 +19456,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ | 9716 | @@ -18687,12 +19533,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
9716 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' | 9717 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
9717 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' | 9718 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
9718 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' | 9719 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -9726,7 +9727,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9726 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' | 9727 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' |
9727 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' | 9728 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' |
9728 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' | 9729 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' |
9729 | @@ -18653,8 +19499,13 @@ reload_flag \ | 9730 | @@ -18730,8 +19576,13 @@ reload_flag \ |
9730 | OBJDUMP \ | 9731 | OBJDUMP \ |
9731 | deplibs_check_method \ | 9732 | deplibs_check_method \ |
9732 | file_magic_cmd \ | 9733 | file_magic_cmd \ |
@@ -9740,7 +9741,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9740 | STRIP \ | 9741 | STRIP \ |
9741 | RANLIB \ | 9742 | RANLIB \ |
9742 | CC \ | 9743 | CC \ |
9743 | @@ -18664,12 +19515,14 @@ lt_cv_sys_global_symbol_pipe \ | 9744 | @@ -18741,12 +19592,14 @@ lt_cv_sys_global_symbol_pipe \ |
9744 | lt_cv_sys_global_symbol_to_cdecl \ | 9745 | lt_cv_sys_global_symbol_to_cdecl \ |
9745 | lt_cv_sys_global_symbol_to_c_name_address \ | 9746 | lt_cv_sys_global_symbol_to_c_name_address \ |
9746 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 9747 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -9756,7 +9757,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9756 | DSYMUTIL \ | 9757 | DSYMUTIL \ |
9757 | NMEDIT \ | 9758 | NMEDIT \ |
9758 | LIPO \ | 9759 | LIPO \ |
9759 | @@ -18685,7 +19538,6 @@ no_undefined_flag \ | 9760 | @@ -18762,7 +19615,6 @@ no_undefined_flag \ |
9760 | hardcode_libdir_flag_spec \ | 9761 | hardcode_libdir_flag_spec \ |
9761 | hardcode_libdir_flag_spec_ld \ | 9762 | hardcode_libdir_flag_spec_ld \ |
9762 | hardcode_libdir_separator \ | 9763 | hardcode_libdir_separator \ |
@@ -9764,7 +9765,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9764 | exclude_expsyms \ | 9765 | exclude_expsyms \ |
9765 | include_expsyms \ | 9766 | include_expsyms \ |
9766 | file_list_spec \ | 9767 | file_list_spec \ |
9767 | @@ -18707,8 +19559,8 @@ LD_CXX \ | 9768 | @@ -18784,8 +19636,8 @@ LD_CXX \ |
9768 | reload_flag_CXX \ | 9769 | reload_flag_CXX \ |
9769 | compiler_CXX \ | 9770 | compiler_CXX \ |
9770 | lt_prog_compiler_no_builtin_flag_CXX \ | 9771 | lt_prog_compiler_no_builtin_flag_CXX \ |
@@ -9774,7 +9775,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9774 | lt_prog_compiler_static_CXX \ | 9775 | lt_prog_compiler_static_CXX \ |
9775 | lt_cv_prog_compiler_c_o_CXX \ | 9776 | lt_cv_prog_compiler_c_o_CXX \ |
9776 | export_dynamic_flag_spec_CXX \ | 9777 | export_dynamic_flag_spec_CXX \ |
9777 | @@ -18720,7 +19572,6 @@ no_undefined_flag_CXX \ | 9778 | @@ -18797,7 +19649,6 @@ no_undefined_flag_CXX \ |
9778 | hardcode_libdir_flag_spec_CXX \ | 9779 | hardcode_libdir_flag_spec_CXX \ |
9779 | hardcode_libdir_flag_spec_ld_CXX \ | 9780 | hardcode_libdir_flag_spec_ld_CXX \ |
9780 | hardcode_libdir_separator_CXX \ | 9781 | hardcode_libdir_separator_CXX \ |
@@ -9782,7 +9783,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9782 | exclude_expsyms_CXX \ | 9783 | exclude_expsyms_CXX \ |
9783 | include_expsyms_CXX \ | 9784 | include_expsyms_CXX \ |
9784 | file_list_spec_CXX \ | 9785 | file_list_spec_CXX \ |
9785 | @@ -18754,6 +19605,7 @@ module_cmds \ | 9786 | @@ -18831,6 +19682,7 @@ module_cmds \ |
9786 | module_expsym_cmds \ | 9787 | module_expsym_cmds \ |
9787 | export_symbols_cmds \ | 9788 | export_symbols_cmds \ |
9788 | prelink_cmds \ | 9789 | prelink_cmds \ |
@@ -9790,7 +9791,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9790 | postinstall_cmds \ | 9791 | postinstall_cmds \ |
9791 | postuninstall_cmds \ | 9792 | postuninstall_cmds \ |
9792 | finish_cmds \ | 9793 | finish_cmds \ |
9793 | @@ -18768,7 +19620,8 @@ archive_expsym_cmds_CXX \ | 9794 | @@ -18845,7 +19697,8 @@ archive_expsym_cmds_CXX \ |
9794 | module_cmds_CXX \ | 9795 | module_cmds_CXX \ |
9795 | module_expsym_cmds_CXX \ | 9796 | module_expsym_cmds_CXX \ |
9796 | export_symbols_cmds_CXX \ | 9797 | export_symbols_cmds_CXX \ |
@@ -9800,7 +9801,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9800 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | 9801 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
9801 | *[\\\\\\\`\\"\\\$]*) | 9802 | *[\\\\\\\`\\"\\\$]*) |
9802 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 9803 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
9803 | @@ -19533,7 +20386,8 @@ $as_echo X"$file" | | 9804 | @@ -19610,7 +20463,8 @@ $as_echo X"$file" | |
9804 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 9805 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
9805 | # | 9806 | # |
9806 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 9807 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -9810,7 +9811,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9810 | # Written by Gordon Matzigkeit, 1996 | 9811 | # Written by Gordon Matzigkeit, 1996 |
9811 | # | 9812 | # |
9812 | # This file is part of GNU Libtool. | 9813 | # This file is part of GNU Libtool. |
9813 | @@ -19636,19 +20490,42 @@ SP2NL=$lt_lt_SP2NL | 9814 | @@ -19713,19 +20567,42 @@ SP2NL=$lt_lt_SP2NL |
9814 | # turn newlines into spaces. | 9815 | # turn newlines into spaces. |
9815 | NL2SP=$lt_lt_NL2SP | 9816 | NL2SP=$lt_lt_NL2SP |
9816 | 9817 | ||
@@ -9854,7 +9855,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9854 | # A symbol stripping program. | 9855 | # A symbol stripping program. |
9855 | STRIP=$lt_STRIP | 9856 | STRIP=$lt_STRIP |
9856 | 9857 | ||
9857 | @@ -19678,6 +20555,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 9858 | @@ -19755,6 +20632,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
9858 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 9859 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
9859 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 9860 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
9860 | 9861 | ||
@@ -9867,7 +9868,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9867 | # The name of the directory that contains temporary libtool files. | 9868 | # The name of the directory that contains temporary libtool files. |
9868 | objdir=$objdir | 9869 | objdir=$objdir |
9869 | 9870 | ||
9870 | @@ -19687,6 +20570,9 @@ MAGIC_CMD=$MAGIC_CMD | 9871 | @@ -19764,6 +20647,9 @@ MAGIC_CMD=$MAGIC_CMD |
9871 | # Must we lock files when doing compilation? | 9872 | # Must we lock files when doing compilation? |
9872 | need_locks=$lt_need_locks | 9873 | need_locks=$lt_need_locks |
9873 | 9874 | ||
@@ -9877,7 +9878,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9877 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 9878 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
9878 | DSYMUTIL=$lt_DSYMUTIL | 9879 | DSYMUTIL=$lt_DSYMUTIL |
9879 | 9880 | ||
9880 | @@ -19801,12 +20687,12 @@ with_gcc=$GCC | 9881 | @@ -19878,12 +20764,12 @@ with_gcc=$GCC |
9881 | # Compiler flag to turn off builtin functions. | 9882 | # Compiler flag to turn off builtin functions. |
9882 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 9883 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
9883 | 9884 | ||
@@ -9893,7 +9894,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9893 | # Compiler flag to prevent dynamic linking. | 9894 | # Compiler flag to prevent dynamic linking. |
9894 | link_static_flag=$lt_lt_prog_compiler_static | 9895 | link_static_flag=$lt_lt_prog_compiler_static |
9895 | 9896 | ||
9896 | @@ -19893,9 +20779,6 @@ inherit_rpath=$inherit_rpath | 9897 | @@ -19970,9 +20856,6 @@ inherit_rpath=$inherit_rpath |
9897 | # Whether libtool must link a program against all its dependency libraries. | 9898 | # Whether libtool must link a program against all its dependency libraries. |
9898 | link_all_deplibs=$link_all_deplibs | 9899 | link_all_deplibs=$link_all_deplibs |
9899 | 9900 | ||
@@ -9903,7 +9904,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9903 | # Set to "yes" if exported symbols are required. | 9904 | # Set to "yes" if exported symbols are required. |
9904 | always_export_symbols=$always_export_symbols | 9905 | always_export_symbols=$always_export_symbols |
9905 | 9906 | ||
9906 | @@ -19911,6 +20794,9 @@ include_expsyms=$lt_include_expsyms | 9907 | @@ -19988,6 +20871,9 @@ include_expsyms=$lt_include_expsyms |
9907 | # Commands necessary for linking programs (against libraries) with templates. | 9908 | # Commands necessary for linking programs (against libraries) with templates. |
9908 | prelink_cmds=$lt_prelink_cmds | 9909 | prelink_cmds=$lt_prelink_cmds |
9909 | 9910 | ||
@@ -9913,7 +9914,7 @@ index 811134a503b..f432f4637d0 100755 | |||
9913 | # Specify filename containing input files. | 9914 | # Specify filename containing input files. |
9914 | file_list_spec=$lt_file_list_spec | 9915 | file_list_spec=$lt_file_list_spec |
9915 | 9916 | ||
9916 | @@ -19957,210 +20843,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 9917 | @@ -20034,210 +20920,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
9917 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 9918 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
9918 | # text mode, it properly converts lines to CR/LF. This bash problem | 9919 | # text mode, it properly converts lines to CR/LF. This bash problem |
9919 | # is reportedly fixed, but why not run on old versions too? | 9920 | # is reportedly fixed, but why not run on old versions too? |
@@ -10287,7 +10288,7 @@ index 811134a503b..f432f4637d0 100755 | |||
10287 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 10288 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
10288 | chmod +x "$ofile" | 10289 | chmod +x "$ofile" |
10289 | 10290 | ||
10290 | @@ -20188,12 +21033,12 @@ with_gcc=$GCC_CXX | 10291 | @@ -20265,12 +21110,12 @@ with_gcc=$GCC_CXX |
10291 | # Compiler flag to turn off builtin functions. | 10292 | # Compiler flag to turn off builtin functions. |
10292 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX | 10293 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
10293 | 10294 | ||
@@ -10303,7 +10304,7 @@ index 811134a503b..f432f4637d0 100755 | |||
10303 | # Compiler flag to prevent dynamic linking. | 10304 | # Compiler flag to prevent dynamic linking. |
10304 | link_static_flag=$lt_lt_prog_compiler_static_CXX | 10305 | link_static_flag=$lt_lt_prog_compiler_static_CXX |
10305 | 10306 | ||
10306 | @@ -20280,9 +21125,6 @@ inherit_rpath=$inherit_rpath_CXX | 10307 | @@ -20357,9 +21202,6 @@ inherit_rpath=$inherit_rpath_CXX |
10307 | # Whether libtool must link a program against all its dependency libraries. | 10308 | # Whether libtool must link a program against all its dependency libraries. |
10308 | link_all_deplibs=$link_all_deplibs_CXX | 10309 | link_all_deplibs=$link_all_deplibs_CXX |
10309 | 10310 | ||
@@ -10313,7 +10314,7 @@ index 811134a503b..f432f4637d0 100755 | |||
10313 | # Set to "yes" if exported symbols are required. | 10314 | # Set to "yes" if exported symbols are required. |
10314 | always_export_symbols=$always_export_symbols_CXX | 10315 | always_export_symbols=$always_export_symbols_CXX |
10315 | 10316 | ||
10316 | @@ -20298,6 +21140,9 @@ include_expsyms=$lt_include_expsyms_CXX | 10317 | @@ -20375,6 +21217,9 @@ include_expsyms=$lt_include_expsyms_CXX |
10317 | # Commands necessary for linking programs (against libraries) with templates. | 10318 | # Commands necessary for linking programs (against libraries) with templates. |
10318 | prelink_cmds=$lt_prelink_cmds_CXX | 10319 | prelink_cmds=$lt_prelink_cmds_CXX |
10319 | 10320 | ||
@@ -10324,7 +10325,7 @@ index 811134a503b..f432f4637d0 100755 | |||
10324 | file_list_spec=$lt_file_list_spec_CXX | 10325 | file_list_spec=$lt_file_list_spec_CXX |
10325 | 10326 | ||
10326 | diff --git a/libctf/configure b/libctf/configure | 10327 | diff --git a/libctf/configure b/libctf/configure |
10327 | index e5493b31691..9977e4f7a42 100755 | 10328 | index 1dc1b65fac3..c5c2f36bbc0 100755 |
10328 | --- a/libctf/configure | 10329 | --- a/libctf/configure |
10329 | +++ b/libctf/configure | 10330 | +++ b/libctf/configure |
10330 | @@ -663,6 +663,8 @@ OTOOL | 10331 | @@ -663,6 +663,8 @@ OTOOL |
@@ -10336,7 +10337,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10336 | OBJDUMP | 10337 | OBJDUMP |
10337 | LN_S | 10338 | LN_S |
10338 | NM | 10339 | NM |
10339 | @@ -778,6 +780,7 @@ enable_static | 10340 | @@ -790,6 +792,7 @@ enable_static |
10340 | with_pic | 10341 | with_pic |
10341 | enable_fast_install | 10342 | enable_fast_install |
10342 | with_gnu_ld | 10343 | with_gnu_ld |
@@ -10344,7 +10345,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10344 | enable_libtool_lock | 10345 | enable_libtool_lock |
10345 | enable_largefile | 10346 | enable_largefile |
10346 | enable_werror_always | 10347 | enable_werror_always |
10347 | @@ -1436,6 +1439,8 @@ Optional Packages: | 10348 | @@ -1448,6 +1451,8 @@ Optional Packages: |
10348 | --with-pic try to use only PIC/non-PIC objects [default=use | 10349 | --with-pic try to use only PIC/non-PIC objects [default=use |
10349 | both] | 10350 | both] |
10350 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 10351 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -10353,7 +10354,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10353 | --with-system-zlib use installed libz | 10354 | --with-system-zlib use installed libz |
10354 | 10355 | ||
10355 | Some influential environment variables: | 10356 | Some influential environment variables: |
10356 | @@ -5324,8 +5329,8 @@ esac | 10357 | @@ -5406,8 +5411,8 @@ esac |
10357 | 10358 | ||
10358 | 10359 | ||
10359 | 10360 | ||
@@ -10364,7 +10365,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10364 | 10365 | ||
10365 | 10366 | ||
10366 | 10367 | ||
10367 | @@ -5436,7 +5441,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 10368 | @@ -5518,7 +5523,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
10368 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 10369 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
10369 | $as_echo_n "checking how to print strings... " >&6; } | 10370 | $as_echo_n "checking how to print strings... " >&6; } |
10370 | # Test print first, because it will be a builtin if present. | 10371 | # Test print first, because it will be a builtin if present. |
@@ -10373,7 +10374,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10373 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 10374 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
10374 | ECHO='print -r --' | 10375 | ECHO='print -r --' |
10375 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 10376 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
10376 | @@ -6122,8 +6127,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | 10377 | @@ -6204,8 +6209,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
10377 | # Try some XSI features | 10378 | # Try some XSI features |
10378 | xsi_shell=no | 10379 | xsi_shell=no |
10379 | ( _lt_dummy="a/b/c" | 10380 | ( _lt_dummy="a/b/c" |
@@ -10384,7 +10385,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10384 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 10385 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
10385 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 10386 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
10386 | && xsi_shell=yes | 10387 | && xsi_shell=yes |
10387 | @@ -6172,6 +6177,80 @@ esac | 10388 | @@ -6254,6 +6259,80 @@ esac |
10388 | 10389 | ||
10389 | 10390 | ||
10390 | 10391 | ||
@@ -10465,7 +10466,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10465 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 10466 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
10466 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 10467 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
10467 | if ${lt_cv_ld_reload_flag+:} false; then : | 10468 | if ${lt_cv_ld_reload_flag+:} false; then : |
10468 | @@ -6188,6 +6267,11 @@ case $reload_flag in | 10469 | @@ -6270,6 +6349,11 @@ case $reload_flag in |
10469 | esac | 10470 | esac |
10470 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 10471 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
10471 | case $host_os in | 10472 | case $host_os in |
@@ -10477,7 +10478,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10477 | darwin*) | 10478 | darwin*) |
10478 | if test "$GCC" = yes; then | 10479 | if test "$GCC" = yes; then |
10479 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 10480 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
10480 | @@ -6356,7 +6440,8 @@ mingw* | pw32*) | 10481 | @@ -6438,7 +6522,8 @@ mingw* | pw32*) |
10481 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 10482 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
10482 | lt_cv_file_magic_cmd='func_win32_libid' | 10483 | lt_cv_file_magic_cmd='func_win32_libid' |
10483 | else | 10484 | else |
@@ -10487,7 +10488,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10487 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 10488 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
10488 | fi | 10489 | fi |
10489 | ;; | 10490 | ;; |
10490 | @@ -6510,6 +6595,21 @@ esac | 10491 | @@ -6592,6 +6677,21 @@ esac |
10491 | fi | 10492 | fi |
10492 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 10493 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
10493 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 10494 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -10509,7 +10510,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10509 | file_magic_cmd=$lt_cv_file_magic_cmd | 10510 | file_magic_cmd=$lt_cv_file_magic_cmd |
10510 | deplibs_check_method=$lt_cv_deplibs_check_method | 10511 | deplibs_check_method=$lt_cv_deplibs_check_method |
10511 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 10512 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
10512 | @@ -6525,9 +6625,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | 10513 | @@ -6607,9 +6707,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
10513 | 10514 | ||
10514 | 10515 | ||
10515 | 10516 | ||
@@ -10674,7 +10675,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10674 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 10675 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
10675 | $as_echo_n "checking for $ac_word... " >&6; } | 10676 | $as_echo_n "checking for $ac_word... " >&6; } |
10676 | if ${ac_cv_prog_AR+:} false; then : | 10677 | if ${ac_cv_prog_AR+:} false; then : |
10677 | @@ -6543,7 +6796,7 @@ do | 10678 | @@ -6625,7 +6878,7 @@ do |
10678 | test -z "$as_dir" && as_dir=. | 10679 | test -z "$as_dir" && as_dir=. |
10679 | for ac_exec_ext in '' $ac_executable_extensions; do | 10680 | for ac_exec_ext in '' $ac_executable_extensions; do |
10680 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 10681 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -10683,7 +10684,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10683 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 10684 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10684 | break 2 | 10685 | break 2 |
10685 | fi | 10686 | fi |
10686 | @@ -6563,11 +6816,15 @@ $as_echo "no" >&6; } | 10687 | @@ -6645,11 +6898,15 @@ $as_echo "no" >&6; } |
10687 | fi | 10688 | fi |
10688 | 10689 | ||
10689 | 10690 | ||
@@ -10702,7 +10703,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10702 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 10703 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
10703 | $as_echo_n "checking for $ac_word... " >&6; } | 10704 | $as_echo_n "checking for $ac_word... " >&6; } |
10704 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 10705 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
10705 | @@ -6583,7 +6840,7 @@ do | 10706 | @@ -6665,7 +6922,7 @@ do |
10706 | test -z "$as_dir" && as_dir=. | 10707 | test -z "$as_dir" && as_dir=. |
10707 | for ac_exec_ext in '' $ac_executable_extensions; do | 10708 | for ac_exec_ext in '' $ac_executable_extensions; do |
10708 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 10709 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -10711,7 +10712,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10711 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 10712 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10712 | break 2 | 10713 | break 2 |
10713 | fi | 10714 | fi |
10714 | @@ -6602,6 +6859,10 @@ else | 10715 | @@ -6684,6 +6941,10 @@ else |
10715 | $as_echo "no" >&6; } | 10716 | $as_echo "no" >&6; } |
10716 | fi | 10717 | fi |
10717 | 10718 | ||
@@ -10722,7 +10723,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10722 | if test "x$ac_ct_AR" = x; then | 10723 | if test "x$ac_ct_AR" = x; then |
10723 | AR="false" | 10724 | AR="false" |
10724 | else | 10725 | else |
10725 | @@ -6613,16 +6874,72 @@ ac_tool_warned=yes ;; | 10726 | @@ -6695,16 +6956,72 @@ ac_tool_warned=yes ;; |
10726 | esac | 10727 | esac |
10727 | AR=$ac_ct_AR | 10728 | AR=$ac_ct_AR |
10728 | fi | 10729 | fi |
@@ -10799,7 +10800,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10799 | 10800 | ||
10800 | 10801 | ||
10801 | 10802 | ||
10802 | @@ -6964,8 +7281,8 @@ esac | 10803 | @@ -7046,8 +7363,8 @@ esac |
10803 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 10804 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
10804 | 10805 | ||
10805 | # Transform an extracted symbol line into symbol name and symbol address | 10806 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -10810,7 +10811,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10810 | 10811 | ||
10811 | # Handle CRLF in mingw tool chain | 10812 | # Handle CRLF in mingw tool chain |
10812 | opt_cr= | 10813 | opt_cr= |
10813 | @@ -7001,6 +7318,7 @@ for ac_symprfx in "" "_"; do | 10814 | @@ -7083,6 +7400,7 @@ for ac_symprfx in "" "_"; do |
10814 | else | 10815 | else |
10815 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 10816 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
10816 | fi | 10817 | fi |
@@ -10818,7 +10819,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10818 | 10819 | ||
10819 | # Check to see that the pipe works correctly. | 10820 | # Check to see that the pipe works correctly. |
10820 | pipe_works=no | 10821 | pipe_works=no |
10821 | @@ -7042,6 +7360,18 @@ _LT_EOF | 10822 | @@ -7124,6 +7442,18 @@ _LT_EOF |
10822 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 10823 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
10823 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 10824 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
10824 | cat <<_LT_EOF > conftest.$ac_ext | 10825 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -10837,7 +10838,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10837 | #ifdef __cplusplus | 10838 | #ifdef __cplusplus |
10838 | extern "C" { | 10839 | extern "C" { |
10839 | #endif | 10840 | #endif |
10840 | @@ -7053,7 +7383,7 @@ _LT_EOF | 10841 | @@ -7135,7 +7465,7 @@ _LT_EOF |
10841 | cat <<_LT_EOF >> conftest.$ac_ext | 10842 | cat <<_LT_EOF >> conftest.$ac_ext |
10842 | 10843 | ||
10843 | /* The mapping between symbol names and symbols. */ | 10844 | /* The mapping between symbol names and symbols. */ |
@@ -10846,7 +10847,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10846 | const char *name; | 10847 | const char *name; |
10847 | void *address; | 10848 | void *address; |
10848 | } | 10849 | } |
10849 | @@ -7079,8 +7409,8 @@ static const void *lt_preloaded_setup() { | 10850 | @@ -7161,8 +7491,8 @@ static const void *lt_preloaded_setup() { |
10850 | _LT_EOF | 10851 | _LT_EOF |
10851 | # Now try linking the two files. | 10852 | # Now try linking the two files. |
10852 | mv conftest.$ac_objext conftstm.$ac_objext | 10853 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -10857,7 +10858,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10857 | LIBS="conftstm.$ac_objext" | 10858 | LIBS="conftstm.$ac_objext" |
10858 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 10859 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
10859 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 10860 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
10860 | @@ -7090,8 +7420,8 @@ _LT_EOF | 10861 | @@ -7172,8 +7502,8 @@ _LT_EOF |
10861 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 10862 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
10862 | pipe_works=yes | 10863 | pipe_works=yes |
10863 | fi | 10864 | fi |
@@ -10868,7 +10869,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10868 | else | 10869 | else |
10869 | echo "cannot find nm_test_func in $nlist" >&5 | 10870 | echo "cannot find nm_test_func in $nlist" >&5 |
10870 | fi | 10871 | fi |
10871 | @@ -7128,6 +7458,16 @@ else | 10872 | @@ -7210,6 +7540,16 @@ else |
10872 | $as_echo "ok" >&6; } | 10873 | $as_echo "ok" >&6; } |
10873 | fi | 10874 | fi |
10874 | 10875 | ||
@@ -10885,7 +10886,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10885 | 10886 | ||
10886 | 10887 | ||
10887 | 10888 | ||
10888 | @@ -7144,6 +7484,45 @@ fi | 10889 | @@ -7226,6 +7566,45 @@ fi |
10889 | 10890 | ||
10890 | 10891 | ||
10891 | 10892 | ||
@@ -10931,7 +10932,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
10931 | 10932 | ||
10932 | 10933 | ||
10933 | 10934 | ||
10934 | @@ -7355,6 +7734,123 @@ esac | 10935 | @@ -7437,6 +7816,123 @@ esac |
10935 | 10936 | ||
10936 | need_locks="$enable_libtool_lock" | 10937 | need_locks="$enable_libtool_lock" |
10937 | 10938 | ||
@@ -11055,7 +11056,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11055 | 11056 | ||
11056 | case $host_os in | 11057 | case $host_os in |
11057 | rhapsody* | darwin*) | 11058 | rhapsody* | darwin*) |
11058 | @@ -7918,6 +8414,8 @@ _LT_EOF | 11059 | @@ -8000,6 +8496,8 @@ _LT_EOF |
11059 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 11060 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
11060 | echo "$AR cru libconftest.a conftest.o" >&5 | 11061 | echo "$AR cru libconftest.a conftest.o" >&5 |
11061 | $AR cru libconftest.a conftest.o 2>&5 | 11062 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -11064,7 +11065,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11064 | cat > conftest.c << _LT_EOF | 11065 | cat > conftest.c << _LT_EOF |
11065 | int main() { return 0;} | 11066 | int main() { return 0;} |
11066 | _LT_EOF | 11067 | _LT_EOF |
11067 | @@ -8083,7 +8581,8 @@ fi | 11068 | @@ -8165,7 +8663,8 @@ fi |
11068 | LIBTOOL_DEPS="$ltmain" | 11069 | LIBTOOL_DEPS="$ltmain" |
11069 | 11070 | ||
11070 | # Always use our own libtool. | 11071 | # Always use our own libtool. |
@@ -11074,7 +11075,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11074 | 11075 | ||
11075 | 11076 | ||
11076 | 11077 | ||
11077 | @@ -8172,7 +8671,7 @@ aix3*) | 11078 | @@ -8254,7 +8753,7 @@ aix3*) |
11078 | esac | 11079 | esac |
11079 | 11080 | ||
11080 | # Global variables: | 11081 | # Global variables: |
@@ -11083,7 +11084,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11083 | can_build_shared=yes | 11084 | can_build_shared=yes |
11084 | 11085 | ||
11085 | # All known linkers require a `.a' archive for static linking (except MSVC, | 11086 | # All known linkers require a `.a' archive for static linking (except MSVC, |
11086 | @@ -8470,8 +8969,6 @@ fi | 11087 | @@ -8552,8 +9051,6 @@ fi |
11087 | lt_prog_compiler_pic= | 11088 | lt_prog_compiler_pic= |
11088 | lt_prog_compiler_static= | 11089 | lt_prog_compiler_static= |
11089 | 11090 | ||
@@ -11092,7 +11093,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11092 | 11093 | ||
11093 | if test "$GCC" = yes; then | 11094 | if test "$GCC" = yes; then |
11094 | lt_prog_compiler_wl='-Wl,' | 11095 | lt_prog_compiler_wl='-Wl,' |
11095 | @@ -8637,6 +9134,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 11096 | @@ -8719,6 +9216,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
11096 | lt_prog_compiler_pic='--shared' | 11097 | lt_prog_compiler_pic='--shared' |
11097 | lt_prog_compiler_static='--static' | 11098 | lt_prog_compiler_static='--static' |
11098 | ;; | 11099 | ;; |
@@ -11105,7 +11106,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11105 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 11106 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
11106 | # Portland Group compilers (*not* the Pentium gcc compiler, | 11107 | # Portland Group compilers (*not* the Pentium gcc compiler, |
11107 | # which looks to be a dead project) | 11108 | # which looks to be a dead project) |
11108 | @@ -8699,7 +9202,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 11109 | @@ -8781,7 +9284,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
11109 | lt_prog_compiler_pic='-KPIC' | 11110 | lt_prog_compiler_pic='-KPIC' |
11110 | lt_prog_compiler_static='-Bstatic' | 11111 | lt_prog_compiler_static='-Bstatic' |
11111 | case $cc_basename in | 11112 | case $cc_basename in |
@@ -11114,7 +11115,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11114 | lt_prog_compiler_wl='-Qoption ld ';; | 11115 | lt_prog_compiler_wl='-Qoption ld ';; |
11115 | *) | 11116 | *) |
11116 | lt_prog_compiler_wl='-Wl,';; | 11117 | lt_prog_compiler_wl='-Wl,';; |
11117 | @@ -8756,13 +9259,17 @@ case $host_os in | 11118 | @@ -8838,13 +9341,17 @@ case $host_os in |
11118 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 11119 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
11119 | ;; | 11120 | ;; |
11120 | esac | 11121 | esac |
@@ -11138,7 +11139,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11138 | 11139 | ||
11139 | # | 11140 | # |
11140 | # Check to make sure the PIC flag actually works. | 11141 | # Check to make sure the PIC flag actually works. |
11141 | @@ -8823,6 +9330,11 @@ fi | 11142 | @@ -8905,6 +9412,11 @@ fi |
11142 | 11143 | ||
11143 | 11144 | ||
11144 | 11145 | ||
@@ -11150,7 +11151,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11150 | # | 11151 | # |
11151 | # Check to make sure the static flag actually works. | 11152 | # Check to make sure the static flag actually works. |
11152 | # | 11153 | # |
11153 | @@ -9173,7 +9685,8 @@ _LT_EOF | 11154 | @@ -9255,7 +9767,8 @@ _LT_EOF |
11154 | allow_undefined_flag=unsupported | 11155 | allow_undefined_flag=unsupported |
11155 | always_export_symbols=no | 11156 | always_export_symbols=no |
11156 | enable_shared_with_static_runtimes=yes | 11157 | enable_shared_with_static_runtimes=yes |
@@ -11160,7 +11161,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11160 | 11161 | ||
11161 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 11162 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
11162 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 11163 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
11163 | @@ -9272,12 +9785,12 @@ _LT_EOF | 11164 | @@ -9354,12 +9867,12 @@ _LT_EOF |
11164 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 11165 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
11165 | hardcode_libdir_flag_spec= | 11166 | hardcode_libdir_flag_spec= |
11166 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 11167 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -11175,7 +11176,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11175 | fi | 11176 | fi |
11176 | ;; | 11177 | ;; |
11177 | esac | 11178 | esac |
11178 | @@ -9291,8 +9804,8 @@ _LT_EOF | 11179 | @@ -9373,8 +9886,8 @@ _LT_EOF |
11179 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 11180 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
11180 | wlarc= | 11181 | wlarc= |
11181 | else | 11182 | else |
@@ -11186,7 +11187,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11186 | fi | 11187 | fi |
11187 | ;; | 11188 | ;; |
11188 | 11189 | ||
11189 | @@ -9310,8 +9823,8 @@ _LT_EOF | 11190 | @@ -9392,8 +9905,8 @@ _LT_EOF |
11190 | 11191 | ||
11191 | _LT_EOF | 11192 | _LT_EOF |
11192 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 11193 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -11197,7 +11198,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11197 | else | 11198 | else |
11198 | ld_shlibs=no | 11199 | ld_shlibs=no |
11199 | fi | 11200 | fi |
11200 | @@ -9357,8 +9870,8 @@ _LT_EOF | 11201 | @@ -9439,8 +9952,8 @@ _LT_EOF |
11201 | 11202 | ||
11202 | *) | 11203 | *) |
11203 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 11204 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -11208,7 +11209,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11208 | else | 11209 | else |
11209 | ld_shlibs=no | 11210 | ld_shlibs=no |
11210 | fi | 11211 | fi |
11211 | @@ -9488,7 +10001,13 @@ _LT_EOF | 11212 | @@ -9570,7 +10083,13 @@ _LT_EOF |
11212 | allow_undefined_flag='-berok' | 11213 | allow_undefined_flag='-berok' |
11213 | # Determine the default libpath from the value encoded in an | 11214 | # Determine the default libpath from the value encoded in an |
11214 | # empty executable. | 11215 | # empty executable. |
@@ -11223,7 +11224,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11223 | /* end confdefs.h. */ | 11224 | /* end confdefs.h. */ |
11224 | 11225 | ||
11225 | int | 11226 | int |
11226 | @@ -9501,22 +10020,29 @@ main () | 11227 | @@ -9583,22 +10102,29 @@ main () |
11227 | _ACEOF | 11228 | _ACEOF |
11228 | if ac_fn_c_try_link "$LINENO"; then : | 11229 | if ac_fn_c_try_link "$LINENO"; then : |
11229 | 11230 | ||
@@ -11266,7 +11267,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11266 | 11267 | ||
11267 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 11268 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
11268 | 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" | 11269 | 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" |
11269 | @@ -9528,7 +10054,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11270 | @@ -9610,7 +10136,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11270 | else | 11271 | else |
11271 | # Determine the default libpath from the value encoded in an | 11272 | # Determine the default libpath from the value encoded in an |
11272 | # empty executable. | 11273 | # empty executable. |
@@ -11281,7 +11282,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11281 | /* end confdefs.h. */ | 11282 | /* end confdefs.h. */ |
11282 | 11283 | ||
11283 | int | 11284 | int |
11284 | @@ -9541,22 +10073,29 @@ main () | 11285 | @@ -9623,22 +10155,29 @@ main () |
11285 | _ACEOF | 11286 | _ACEOF |
11286 | if ac_fn_c_try_link "$LINENO"; then : | 11287 | if ac_fn_c_try_link "$LINENO"; then : |
11287 | 11288 | ||
@@ -11324,7 +11325,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11324 | 11325 | ||
11325 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 11326 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
11326 | # Warning - without using the other run time loading flags, | 11327 | # Warning - without using the other run time loading flags, |
11327 | @@ -9601,20 +10140,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11328 | @@ -9683,20 +10222,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11328 | # Microsoft Visual C++. | 11329 | # Microsoft Visual C++. |
11329 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 11330 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
11330 | # no search path for DLLs. | 11331 | # no search path for DLLs. |
@@ -11402,7 +11403,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11402 | ;; | 11403 | ;; |
11403 | 11404 | ||
11404 | darwin* | rhapsody*) | 11405 | darwin* | rhapsody*) |
11405 | @@ -9675,7 +10257,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11406 | @@ -9757,7 +10339,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11406 | 11407 | ||
11407 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 11408 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
11408 | freebsd* | dragonfly*) | 11409 | freebsd* | dragonfly*) |
@@ -11411,7 +11412,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11411 | hardcode_libdir_flag_spec='-R$libdir' | 11412 | hardcode_libdir_flag_spec='-R$libdir' |
11412 | hardcode_direct=yes | 11413 | hardcode_direct=yes |
11413 | hardcode_shlibpath_var=no | 11414 | hardcode_shlibpath_var=no |
11414 | @@ -9683,7 +10265,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11415 | @@ -9765,7 +10347,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11415 | 11416 | ||
11416 | hpux9*) | 11417 | hpux9*) |
11417 | if test "$GCC" = yes; then | 11418 | if test "$GCC" = yes; then |
@@ -11420,7 +11421,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11420 | else | 11421 | else |
11421 | 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' | 11422 | 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' |
11422 | fi | 11423 | fi |
11423 | @@ -9699,7 +10281,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11424 | @@ -9781,7 +10363,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11424 | 11425 | ||
11425 | hpux10*) | 11426 | hpux10*) |
11426 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 11427 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -11429,7 +11430,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11429 | else | 11430 | else |
11430 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 11431 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
11431 | fi | 11432 | fi |
11432 | @@ -9723,10 +10305,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 11433 | @@ -9805,10 +10387,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
11433 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 11434 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
11434 | ;; | 11435 | ;; |
11435 | ia64*) | 11436 | ia64*) |
@@ -11442,7 +11443,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11442 | ;; | 11443 | ;; |
11443 | esac | 11444 | esac |
11444 | else | 11445 | else |
11445 | @@ -9805,23 +10387,36 @@ fi | 11446 | @@ -9887,23 +10469,36 @@ fi |
11446 | 11447 | ||
11447 | irix5* | irix6* | nonstopux*) | 11448 | irix5* | irix6* | nonstopux*) |
11448 | if test "$GCC" = yes; then | 11449 | if test "$GCC" = yes; then |
@@ -11487,7 +11488,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11487 | else | 11488 | else |
11488 | 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' | 11489 | 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' |
11489 | 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' | 11490 | 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' |
11490 | @@ -9906,7 +10501,7 @@ rm -f core conftest.err conftest.$ac_objext \ | 11491 | @@ -9988,7 +10583,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
11491 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 11492 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
11492 | if test "$GCC" = yes; then | 11493 | if test "$GCC" = yes; then |
11493 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 11494 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -11496,7 +11497,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11496 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 11497 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
11497 | else | 11498 | else |
11498 | allow_undefined_flag=' -expect_unresolved \*' | 11499 | allow_undefined_flag=' -expect_unresolved \*' |
11499 | @@ -9925,9 +10520,9 @@ rm -f core conftest.err conftest.$ac_objext \ | 11500 | @@ -10007,9 +10602,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
11500 | no_undefined_flag=' -z defs' | 11501 | no_undefined_flag=' -z defs' |
11501 | if test "$GCC" = yes; then | 11502 | if test "$GCC" = yes; then |
11502 | wlarc='${wl}' | 11503 | wlarc='${wl}' |
@@ -11508,7 +11509,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11508 | else | 11509 | else |
11509 | case `$CC -V 2>&1` in | 11510 | case `$CC -V 2>&1` in |
11510 | *"Compilers 5.0"*) | 11511 | *"Compilers 5.0"*) |
11511 | @@ -10503,8 +11098,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 11512 | @@ -10585,8 +11180,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
11512 | need_version=no | 11513 | need_version=no |
11513 | need_lib_prefix=no | 11514 | need_lib_prefix=no |
11514 | 11515 | ||
@@ -11520,7 +11521,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11520 | library_names_spec='$libname.dll.a' | 11521 | library_names_spec='$libname.dll.a' |
11521 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 11522 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
11522 | postinstall_cmds='base_file=`basename \${file}`~ | 11523 | postinstall_cmds='base_file=`basename \${file}`~ |
11523 | @@ -10537,13 +11133,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 11524 | @@ -10619,13 +11215,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
11524 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 11525 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
11525 | ;; | 11526 | ;; |
11526 | esac | 11527 | esac |
@@ -11593,7 +11594,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11593 | # FIXME: first we should search . and the directory the executable is in | 11594 | # FIXME: first we should search . and the directory the executable is in |
11594 | shlibpath_var=PATH | 11595 | shlibpath_var=PATH |
11595 | ;; | 11596 | ;; |
11596 | @@ -10635,7 +11289,7 @@ haiku*) | 11597 | @@ -10717,7 +11371,7 @@ haiku*) |
11597 | soname_spec='${libname}${release}${shared_ext}$major' | 11598 | soname_spec='${libname}${release}${shared_ext}$major' |
11598 | shlibpath_var=LIBRARY_PATH | 11599 | shlibpath_var=LIBRARY_PATH |
11599 | shlibpath_overrides_runpath=yes | 11600 | shlibpath_overrides_runpath=yes |
@@ -11602,16 +11603,16 @@ index e5493b31691..9977e4f7a42 100755 | |||
11602 | hardcode_into_libs=yes | 11603 | hardcode_into_libs=yes |
11603 | ;; | 11604 | ;; |
11604 | 11605 | ||
11605 | @@ -11431,7 +12085,7 @@ else | 11606 | @@ -11513,7 +12167,7 @@ else |
11606 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11607 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
11607 | lt_status=$lt_dlunknown | 11608 | lt_status=$lt_dlunknown |
11608 | cat > conftest.$ac_ext <<_LT_EOF | 11609 | cat > conftest.$ac_ext <<_LT_EOF |
11609 | -#line 11434 "configure" | 11610 | -#line 11516 "configure" |
11610 | +#line $LINENO "configure" | 11611 | +#line $LINENO "configure" |
11611 | #include "confdefs.h" | 11612 | #include "confdefs.h" |
11612 | 11613 | ||
11613 | #if HAVE_DLFCN_H | 11614 | #if HAVE_DLFCN_H |
11614 | @@ -11475,10 +12129,10 @@ else | 11615 | @@ -11557,10 +12211,10 @@ else |
11615 | /* When -fvisbility=hidden is used, assume the code has been annotated | 11616 | /* When -fvisbility=hidden is used, assume the code has been annotated |
11616 | correspondingly for the symbols needed. */ | 11617 | correspondingly for the symbols needed. */ |
11617 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 11618 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -11624,16 +11625,16 @@ index e5493b31691..9977e4f7a42 100755 | |||
11624 | int main () | 11625 | int main () |
11625 | { | 11626 | { |
11626 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 11627 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
11627 | @@ -11537,7 +12191,7 @@ else | 11628 | @@ -11619,7 +12273,7 @@ else |
11628 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11629 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
11629 | lt_status=$lt_dlunknown | 11630 | lt_status=$lt_dlunknown |
11630 | cat > conftest.$ac_ext <<_LT_EOF | 11631 | cat > conftest.$ac_ext <<_LT_EOF |
11631 | -#line 11540 "configure" | 11632 | -#line 11622 "configure" |
11632 | +#line $LINENO "configure" | 11633 | +#line $LINENO "configure" |
11633 | #include "confdefs.h" | 11634 | #include "confdefs.h" |
11634 | 11635 | ||
11635 | #if HAVE_DLFCN_H | 11636 | #if HAVE_DLFCN_H |
11636 | @@ -11581,10 +12235,10 @@ else | 11637 | @@ -11663,10 +12317,10 @@ else |
11637 | /* When -fvisbility=hidden is used, assume the code has been annotated | 11638 | /* When -fvisbility=hidden is used, assume the code has been annotated |
11638 | correspondingly for the symbols needed. */ | 11639 | correspondingly for the symbols needed. */ |
11639 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 11640 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -11646,7 +11647,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11646 | int main () | 11647 | int main () |
11647 | { | 11648 | { |
11648 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 11649 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
11649 | @@ -13994,13 +14648,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | 11650 | @@ -14110,13 +14764,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
11650 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 11651 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
11651 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 11652 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
11652 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 11653 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -11667,7 +11668,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11667 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 11668 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
11668 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 11669 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
11669 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 11670 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
11670 | @@ -14015,14 +14676,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | 11671 | @@ -14131,14 +14792,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
11671 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 11672 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
11672 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 11673 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
11673 | 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"`' | 11674 | 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"`' |
@@ -11686,7 +11687,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11686 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 11687 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
11687 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 11688 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
11688 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 11689 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
11689 | @@ -14055,12 +14719,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | 11690 | @@ -14171,12 +14835,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
11690 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 11691 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
11691 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 11692 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
11692 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 11693 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -11700,7 +11701,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11700 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 11701 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
11701 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 11702 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
11702 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 11703 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
11703 | @@ -14115,8 +14779,13 @@ reload_flag \ | 11704 | @@ -14231,8 +14895,13 @@ reload_flag \ |
11704 | OBJDUMP \ | 11705 | OBJDUMP \ |
11705 | deplibs_check_method \ | 11706 | deplibs_check_method \ |
11706 | file_magic_cmd \ | 11707 | file_magic_cmd \ |
@@ -11714,7 +11715,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11714 | STRIP \ | 11715 | STRIP \ |
11715 | RANLIB \ | 11716 | RANLIB \ |
11716 | CC \ | 11717 | CC \ |
11717 | @@ -14126,12 +14795,14 @@ lt_cv_sys_global_symbol_pipe \ | 11718 | @@ -14242,12 +14911,14 @@ lt_cv_sys_global_symbol_pipe \ |
11718 | lt_cv_sys_global_symbol_to_cdecl \ | 11719 | lt_cv_sys_global_symbol_to_cdecl \ |
11719 | lt_cv_sys_global_symbol_to_c_name_address \ | 11720 | lt_cv_sys_global_symbol_to_c_name_address \ |
11720 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 11721 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -11730,7 +11731,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11730 | DSYMUTIL \ | 11731 | DSYMUTIL \ |
11731 | NMEDIT \ | 11732 | NMEDIT \ |
11732 | LIPO \ | 11733 | LIPO \ |
11733 | @@ -14147,7 +14818,6 @@ no_undefined_flag \ | 11734 | @@ -14263,7 +14934,6 @@ no_undefined_flag \ |
11734 | hardcode_libdir_flag_spec \ | 11735 | hardcode_libdir_flag_spec \ |
11735 | hardcode_libdir_flag_spec_ld \ | 11736 | hardcode_libdir_flag_spec_ld \ |
11736 | hardcode_libdir_separator \ | 11737 | hardcode_libdir_separator \ |
@@ -11738,7 +11739,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11738 | exclude_expsyms \ | 11739 | exclude_expsyms \ |
11739 | include_expsyms \ | 11740 | include_expsyms \ |
11740 | file_list_spec \ | 11741 | file_list_spec \ |
11741 | @@ -14183,6 +14853,7 @@ module_cmds \ | 11742 | @@ -14299,6 +14969,7 @@ module_cmds \ |
11742 | module_expsym_cmds \ | 11743 | module_expsym_cmds \ |
11743 | export_symbols_cmds \ | 11744 | export_symbols_cmds \ |
11744 | prelink_cmds \ | 11745 | prelink_cmds \ |
@@ -11746,7 +11747,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11746 | postinstall_cmds \ | 11747 | postinstall_cmds \ |
11747 | postuninstall_cmds \ | 11748 | postuninstall_cmds \ |
11748 | finish_cmds \ | 11749 | finish_cmds \ |
11749 | @@ -14939,7 +15610,8 @@ $as_echo X"$file" | | 11750 | @@ -15055,7 +15726,8 @@ $as_echo X"$file" | |
11750 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 11751 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
11751 | # | 11752 | # |
11752 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 11753 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -11756,7 +11757,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11756 | # Written by Gordon Matzigkeit, 1996 | 11757 | # Written by Gordon Matzigkeit, 1996 |
11757 | # | 11758 | # |
11758 | # This file is part of GNU Libtool. | 11759 | # This file is part of GNU Libtool. |
11759 | @@ -15042,19 +15714,42 @@ SP2NL=$lt_lt_SP2NL | 11760 | @@ -15158,19 +15830,42 @@ SP2NL=$lt_lt_SP2NL |
11760 | # turn newlines into spaces. | 11761 | # turn newlines into spaces. |
11761 | NL2SP=$lt_lt_NL2SP | 11762 | NL2SP=$lt_lt_NL2SP |
11762 | 11763 | ||
@@ -11800,7 +11801,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11800 | # A symbol stripping program. | 11801 | # A symbol stripping program. |
11801 | STRIP=$lt_STRIP | 11802 | STRIP=$lt_STRIP |
11802 | 11803 | ||
11803 | @@ -15084,6 +15779,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | 11804 | @@ -15200,6 +15895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
11804 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 11805 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
11805 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 11806 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
11806 | 11807 | ||
@@ -11813,7 +11814,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11813 | # The name of the directory that contains temporary libtool files. | 11814 | # The name of the directory that contains temporary libtool files. |
11814 | objdir=$objdir | 11815 | objdir=$objdir |
11815 | 11816 | ||
11816 | @@ -15093,6 +15794,9 @@ MAGIC_CMD=$MAGIC_CMD | 11817 | @@ -15209,6 +15910,9 @@ MAGIC_CMD=$MAGIC_CMD |
11817 | # Must we lock files when doing compilation? | 11818 | # Must we lock files when doing compilation? |
11818 | need_locks=$lt_need_locks | 11819 | need_locks=$lt_need_locks |
11819 | 11820 | ||
@@ -11823,7 +11824,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11823 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 11824 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
11824 | DSYMUTIL=$lt_DSYMUTIL | 11825 | DSYMUTIL=$lt_DSYMUTIL |
11825 | 11826 | ||
11826 | @@ -15207,12 +15911,12 @@ with_gcc=$GCC | 11827 | @@ -15323,12 +16027,12 @@ with_gcc=$GCC |
11827 | # Compiler flag to turn off builtin functions. | 11828 | # Compiler flag to turn off builtin functions. |
11828 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 11829 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
11829 | 11830 | ||
@@ -11839,7 +11840,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11839 | # Compiler flag to prevent dynamic linking. | 11840 | # Compiler flag to prevent dynamic linking. |
11840 | link_static_flag=$lt_lt_prog_compiler_static | 11841 | link_static_flag=$lt_lt_prog_compiler_static |
11841 | 11842 | ||
11842 | @@ -15299,9 +16003,6 @@ inherit_rpath=$inherit_rpath | 11843 | @@ -15415,9 +16119,6 @@ inherit_rpath=$inherit_rpath |
11843 | # Whether libtool must link a program against all its dependency libraries. | 11844 | # Whether libtool must link a program against all its dependency libraries. |
11844 | link_all_deplibs=$link_all_deplibs | 11845 | link_all_deplibs=$link_all_deplibs |
11845 | 11846 | ||
@@ -11849,7 +11850,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11849 | # Set to "yes" if exported symbols are required. | 11850 | # Set to "yes" if exported symbols are required. |
11850 | always_export_symbols=$always_export_symbols | 11851 | always_export_symbols=$always_export_symbols |
11851 | 11852 | ||
11852 | @@ -15317,6 +16018,9 @@ include_expsyms=$lt_include_expsyms | 11853 | @@ -15433,6 +16134,9 @@ include_expsyms=$lt_include_expsyms |
11853 | # Commands necessary for linking programs (against libraries) with templates. | 11854 | # Commands necessary for linking programs (against libraries) with templates. |
11854 | prelink_cmds=$lt_prelink_cmds | 11855 | prelink_cmds=$lt_prelink_cmds |
11855 | 11856 | ||
@@ -11859,7 +11860,7 @@ index e5493b31691..9977e4f7a42 100755 | |||
11859 | # Specify filename containing input files. | 11860 | # Specify filename containing input files. |
11860 | file_list_spec=$lt_file_list_spec | 11861 | file_list_spec=$lt_file_list_spec |
11861 | 11862 | ||
11862 | @@ -15349,210 +16053,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 11863 | @@ -15465,210 +16169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
11863 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 11864 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
11864 | # text mode, it properly converts lines to CR/LF. This bash problem | 11865 | # text mode, it properly converts lines to CR/LF. This bash problem |
11865 | # is reportedly fixed, but why not run on old versions too? | 11866 | # is reportedly fixed, but why not run on old versions too? |
@@ -19317,7 +19318,7 @@ index bf92b5e0790..c573da90c5c 100644 | |||
19317 | # These exist entirely to fool aclocal when bootstrapping libtool. | 19318 | # These exist entirely to fool aclocal when bootstrapping libtool. |
19318 | # | 19319 | # |
19319 | diff --git a/opcodes/configure b/opcodes/configure | 19320 | diff --git a/opcodes/configure b/opcodes/configure |
19320 | index 4723dcdc1e8..006ccdaa458 100755 | 19321 | index 8d1e561c942..a0291dfbfa7 100755 |
19321 | --- a/opcodes/configure | 19322 | --- a/opcodes/configure |
19322 | +++ b/opcodes/configure | 19323 | +++ b/opcodes/configure |
19323 | @@ -680,6 +680,9 @@ OTOOL | 19324 | @@ -680,6 +680,9 @@ OTOOL |
@@ -21229,6 +21230,1924 @@ index 4723dcdc1e8..006ccdaa458 100755 | |||
21229 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 21230 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
21230 | chmod +x "$ofile" | 21231 | chmod +x "$ofile" |
21231 | 21232 | ||
21233 | diff --git a/zlib/configure b/zlib/configure | ||
21234 | index de6fa7e9960..cce448b6a53 100755 | ||
21235 | --- a/zlib/configure | ||
21236 | +++ b/zlib/configure | ||
21237 | @@ -646,8 +646,11 @@ OTOOL | ||
21238 | LIPO | ||
21239 | NMEDIT | ||
21240 | DSYMUTIL | ||
21241 | +MANIFEST_TOOL | ||
21242 | RANLIB | ||
21243 | +ac_ct_AR | ||
21244 | AR | ||
21245 | +DLLTOOL | ||
21246 | OBJDUMP | ||
21247 | LN_S | ||
21248 | NM | ||
21249 | @@ -774,6 +777,7 @@ enable_static | ||
21250 | with_pic | ||
21251 | enable_fast_install | ||
21252 | with_gnu_ld | ||
21253 | +with_libtool_sysroot | ||
21254 | enable_libtool_lock | ||
21255 | enable_host_shared | ||
21256 | ' | ||
21257 | @@ -1428,6 +1432,8 @@ Optional Packages: | ||
21258 | --with-pic try to use only PIC/non-PIC objects [default=use | ||
21259 | both] | ||
21260 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | ||
21261 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR | ||
21262 | + (or the compiler's sysroot if not specified). | ||
21263 | |||
21264 | Some influential environment variables: | ||
21265 | CC C compiler command | ||
21266 | @@ -4147,8 +4153,8 @@ esac | ||
21267 | |||
21268 | |||
21269 | |||
21270 | -macro_version='2.2.7a' | ||
21271 | -macro_revision='1.3134' | ||
21272 | +macro_version='2.4' | ||
21273 | +macro_revision='1.3293' | ||
21274 | |||
21275 | |||
21276 | |||
21277 | @@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
21278 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
21279 | $as_echo_n "checking how to print strings... " >&6; } | ||
21280 | # Test print first, because it will be a builtin if present. | ||
21281 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | ||
21282 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
21283 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
21284 | ECHO='print -r --' | ||
21285 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
21286 | @@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; | ||
21287 | # Try some XSI features | ||
21288 | xsi_shell=no | ||
21289 | ( _lt_dummy="a/b/c" | ||
21290 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | ||
21291 | - = c,a/b,, \ | ||
21292 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | ||
21293 | + = c,a/b,b/c, \ | ||
21294 | && eval 'test $(( 1 + 1 )) -eq 2 \ | ||
21295 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | ||
21296 | && xsi_shell=yes | ||
21297 | @@ -5054,6 +5060,80 @@ esac | ||
21298 | |||
21299 | |||
21300 | |||
21301 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
21302 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
21303 | +if ${lt_cv_to_host_file_cmd+:} false; then : | ||
21304 | + $as_echo_n "(cached) " >&6 | ||
21305 | +else | ||
21306 | + case $host in | ||
21307 | + *-*-mingw* ) | ||
21308 | + case $build in | ||
21309 | + *-*-mingw* ) # actually msys | ||
21310 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
21311 | + ;; | ||
21312 | + *-*-cygwin* ) | ||
21313 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
21314 | + ;; | ||
21315 | + * ) # otherwise, assume *nix | ||
21316 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
21317 | + ;; | ||
21318 | + esac | ||
21319 | + ;; | ||
21320 | + *-*-cygwin* ) | ||
21321 | + case $build in | ||
21322 | + *-*-mingw* ) # actually msys | ||
21323 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
21324 | + ;; | ||
21325 | + *-*-cygwin* ) | ||
21326 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
21327 | + ;; | ||
21328 | + * ) # otherwise, assume *nix | ||
21329 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
21330 | + ;; | ||
21331 | + esac | ||
21332 | + ;; | ||
21333 | + * ) # unhandled hosts (and "normal" native builds) | ||
21334 | + lt_cv_to_host_file_cmd=func_convert_file_noop | ||
21335 | + ;; | ||
21336 | +esac | ||
21337 | + | ||
21338 | +fi | ||
21339 | + | ||
21340 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
21341 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
21342 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
21343 | + | ||
21344 | + | ||
21345 | + | ||
21346 | + | ||
21347 | + | ||
21348 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
21349 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
21350 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
21351 | + $as_echo_n "(cached) " >&6 | ||
21352 | +else | ||
21353 | + #assume ordinary cross tools, or native build. | ||
21354 | +lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
21355 | +case $host in | ||
21356 | + *-*-mingw* ) | ||
21357 | + case $build in | ||
21358 | + *-*-mingw* ) # actually msys | ||
21359 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
21360 | + ;; | ||
21361 | + esac | ||
21362 | + ;; | ||
21363 | +esac | ||
21364 | + | ||
21365 | +fi | ||
21366 | + | ||
21367 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
21368 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
21369 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
21370 | + | ||
21371 | + | ||
21372 | + | ||
21373 | + | ||
21374 | + | ||
21375 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | ||
21376 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | ||
21377 | if ${lt_cv_ld_reload_flag+:} false; then : | ||
21378 | @@ -5070,6 +5150,11 @@ case $reload_flag in | ||
21379 | esac | ||
21380 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | ||
21381 | case $host_os in | ||
21382 | + cygwin* | mingw* | pw32* | cegcc*) | ||
21383 | + if test "$GCC" != yes; then | ||
21384 | + reload_cmds=false | ||
21385 | + fi | ||
21386 | + ;; | ||
21387 | darwin*) | ||
21388 | if test "$GCC" = yes; then | ||
21389 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | ||
21390 | @@ -5238,7 +5323,8 @@ mingw* | pw32*) | ||
21391 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | ||
21392 | lt_cv_file_magic_cmd='func_win32_libid' | ||
21393 | else | ||
21394 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | ||
21395 | + # Keep this pattern in sync with the one in func_win32_libid. | ||
21396 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
21397 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
21398 | fi | ||
21399 | ;; | ||
21400 | @@ -5392,6 +5478,21 @@ esac | ||
21401 | fi | ||
21402 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | ||
21403 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | ||
21404 | + | ||
21405 | +file_magic_glob= | ||
21406 | +want_nocaseglob=no | ||
21407 | +if test "$build" = "$host"; then | ||
21408 | + case $host_os in | ||
21409 | + mingw* | pw32*) | ||
21410 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
21411 | + want_nocaseglob=yes | ||
21412 | + else | ||
21413 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
21414 | + fi | ||
21415 | + ;; | ||
21416 | + esac | ||
21417 | +fi | ||
21418 | + | ||
21419 | file_magic_cmd=$lt_cv_file_magic_cmd | ||
21420 | deplibs_check_method=$lt_cv_deplibs_check_method | ||
21421 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
21422 | @@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | ||
21423 | |||
21424 | |||
21425 | |||
21426 | + | ||
21427 | + | ||
21428 | + | ||
21429 | + | ||
21430 | + | ||
21431 | + | ||
21432 | + | ||
21433 | + | ||
21434 | + | ||
21435 | + | ||
21436 | |||
21437 | |||
21438 | if test -n "$ac_tool_prefix"; then | ||
21439 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
21440 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
21441 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
21442 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
21443 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21444 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21445 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
21446 | + $as_echo_n "(cached) " >&6 | ||
21447 | +else | ||
21448 | + if test -n "$DLLTOOL"; then | ||
21449 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
21450 | +else | ||
21451 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21452 | +for as_dir in $PATH | ||
21453 | +do | ||
21454 | + IFS=$as_save_IFS | ||
21455 | + test -z "$as_dir" && as_dir=. | ||
21456 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21457 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21458 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
21459 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21460 | + break 2 | ||
21461 | + fi | ||
21462 | +done | ||
21463 | + done | ||
21464 | +IFS=$as_save_IFS | ||
21465 | + | ||
21466 | +fi | ||
21467 | +fi | ||
21468 | +DLLTOOL=$ac_cv_prog_DLLTOOL | ||
21469 | +if test -n "$DLLTOOL"; then | ||
21470 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
21471 | +$as_echo "$DLLTOOL" >&6; } | ||
21472 | +else | ||
21473 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21474 | +$as_echo "no" >&6; } | ||
21475 | +fi | ||
21476 | + | ||
21477 | + | ||
21478 | +fi | ||
21479 | +if test -z "$ac_cv_prog_DLLTOOL"; then | ||
21480 | + ac_ct_DLLTOOL=$DLLTOOL | ||
21481 | + # Extract the first word of "dlltool", so it can be a program name with args. | ||
21482 | +set dummy dlltool; ac_word=$2 | ||
21483 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21484 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21485 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
21486 | + $as_echo_n "(cached) " >&6 | ||
21487 | +else | ||
21488 | + if test -n "$ac_ct_DLLTOOL"; then | ||
21489 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
21490 | +else | ||
21491 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21492 | +for as_dir in $PATH | ||
21493 | +do | ||
21494 | + IFS=$as_save_IFS | ||
21495 | + test -z "$as_dir" && as_dir=. | ||
21496 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21497 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21498 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
21499 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21500 | + break 2 | ||
21501 | + fi | ||
21502 | +done | ||
21503 | + done | ||
21504 | +IFS=$as_save_IFS | ||
21505 | + | ||
21506 | +fi | ||
21507 | +fi | ||
21508 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
21509 | +if test -n "$ac_ct_DLLTOOL"; then | ||
21510 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
21511 | +$as_echo "$ac_ct_DLLTOOL" >&6; } | ||
21512 | +else | ||
21513 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21514 | +$as_echo "no" >&6; } | ||
21515 | +fi | ||
21516 | + | ||
21517 | + if test "x$ac_ct_DLLTOOL" = x; then | ||
21518 | + DLLTOOL="false" | ||
21519 | + else | ||
21520 | + case $cross_compiling:$ac_tool_warned in | ||
21521 | +yes:) | ||
21522 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
21523 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
21524 | +ac_tool_warned=yes ;; | ||
21525 | +esac | ||
21526 | + DLLTOOL=$ac_ct_DLLTOOL | ||
21527 | + fi | ||
21528 | +else | ||
21529 | + DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
21530 | +fi | ||
21531 | + | ||
21532 | +test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
21533 | + | ||
21534 | + | ||
21535 | + | ||
21536 | + | ||
21537 | + | ||
21538 | + | ||
21539 | + | ||
21540 | + | ||
21541 | + | ||
21542 | + | ||
21543 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
21544 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
21545 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
21546 | + $as_echo_n "(cached) " >&6 | ||
21547 | +else | ||
21548 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
21549 | + | ||
21550 | +case $host_os in | ||
21551 | +cygwin* | mingw* | pw32* | cegcc*) | ||
21552 | + # two different shell functions defined in ltmain.sh | ||
21553 | + # decide which to use based on capabilities of $DLLTOOL | ||
21554 | + case `$DLLTOOL --help 2>&1` in | ||
21555 | + *--identify-strict*) | ||
21556 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
21557 | + ;; | ||
21558 | + *) | ||
21559 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
21560 | + ;; | ||
21561 | + esac | ||
21562 | + ;; | ||
21563 | +*) | ||
21564 | + # fallback: assume linklib IS sharedlib | ||
21565 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
21566 | + ;; | ||
21567 | +esac | ||
21568 | + | ||
21569 | +fi | ||
21570 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
21571 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
21572 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
21573 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
21574 | + | ||
21575 | + | ||
21576 | + | ||
21577 | + | ||
21578 | + | ||
21579 | + | ||
21580 | + | ||
21581 | + | ||
21582 | +if test -n "$ac_tool_prefix"; then | ||
21583 | + for ac_prog in ar | ||
21584 | + do | ||
21585 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
21586 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
21587 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21588 | $as_echo_n "checking for $ac_word... " >&6; } | ||
21589 | if ${ac_cv_prog_AR+:} false; then : | ||
21590 | @@ -5425,7 +5680,7 @@ do | ||
21591 | test -z "$as_dir" && as_dir=. | ||
21592 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
21593 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21594 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
21595 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | ||
21596 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21597 | break 2 | ||
21598 | fi | ||
21599 | @@ -5445,11 +5700,15 @@ $as_echo "no" >&6; } | ||
21600 | fi | ||
21601 | |||
21602 | |||
21603 | + test -n "$AR" && break | ||
21604 | + done | ||
21605 | fi | ||
21606 | -if test -z "$ac_cv_prog_AR"; then | ||
21607 | +if test -z "$AR"; then | ||
21608 | ac_ct_AR=$AR | ||
21609 | - # Extract the first word of "ar", so it can be a program name with args. | ||
21610 | -set dummy ar; ac_word=$2 | ||
21611 | + for ac_prog in ar | ||
21612 | +do | ||
21613 | + # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
21614 | +set dummy $ac_prog; ac_word=$2 | ||
21615 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21616 | $as_echo_n "checking for $ac_word... " >&6; } | ||
21617 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | ||
21618 | @@ -5465,7 +5724,7 @@ do | ||
21619 | test -z "$as_dir" && as_dir=. | ||
21620 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
21621 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21622 | - ac_cv_prog_ac_ct_AR="ar" | ||
21623 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
21624 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21625 | break 2 | ||
21626 | fi | ||
21627 | @@ -5484,6 +5743,10 @@ else | ||
21628 | $as_echo "no" >&6; } | ||
21629 | fi | ||
21630 | |||
21631 | + | ||
21632 | + test -n "$ac_ct_AR" && break | ||
21633 | +done | ||
21634 | + | ||
21635 | if test "x$ac_ct_AR" = x; then | ||
21636 | AR="false" | ||
21637 | else | ||
21638 | @@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; | ||
21639 | esac | ||
21640 | AR=$ac_ct_AR | ||
21641 | fi | ||
21642 | -else | ||
21643 | - AR="$ac_cv_prog_AR" | ||
21644 | fi | ||
21645 | |||
21646 | -test -z "$AR" && AR=ar | ||
21647 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
21648 | +: ${AR=ar} | ||
21649 | +: ${AR_FLAGS=cru} | ||
21650 | + | ||
21651 | + | ||
21652 | + | ||
21653 | + | ||
21654 | + | ||
21655 | + | ||
21656 | + | ||
21657 | + | ||
21658 | + | ||
21659 | + | ||
21660 | + | ||
21661 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
21662 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | ||
21663 | +if ${lt_cv_ar_at_file+:} false; then : | ||
21664 | + $as_echo_n "(cached) " >&6 | ||
21665 | +else | ||
21666 | + lt_cv_ar_at_file=no | ||
21667 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
21668 | +/* end confdefs.h. */ | ||
21669 | + | ||
21670 | +int | ||
21671 | +main () | ||
21672 | +{ | ||
21673 | |||
21674 | + ; | ||
21675 | + return 0; | ||
21676 | +} | ||
21677 | +_ACEOF | ||
21678 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
21679 | + echo conftest.$ac_objext > conftest.lst | ||
21680 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
21681 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
21682 | + (eval $lt_ar_try) 2>&5 | ||
21683 | + ac_status=$? | ||
21684 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
21685 | + test $ac_status = 0; } | ||
21686 | + if test "$ac_status" -eq 0; then | ||
21687 | + # Ensure the archiver fails upon bogus file names. | ||
21688 | + rm -f conftest.$ac_objext libconftest.a | ||
21689 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
21690 | + (eval $lt_ar_try) 2>&5 | ||
21691 | + ac_status=$? | ||
21692 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
21693 | + test $ac_status = 0; } | ||
21694 | + if test "$ac_status" -ne 0; then | ||
21695 | + lt_cv_ar_at_file=@ | ||
21696 | + fi | ||
21697 | + fi | ||
21698 | + rm -f conftest.* libconftest.a | ||
21699 | |||
21700 | +fi | ||
21701 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21702 | |||
21703 | +fi | ||
21704 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
21705 | +$as_echo "$lt_cv_ar_at_file" >&6; } | ||
21706 | |||
21707 | +if test "x$lt_cv_ar_at_file" = xno; then | ||
21708 | + archiver_list_spec= | ||
21709 | +else | ||
21710 | + archiver_list_spec=$lt_cv_ar_at_file | ||
21711 | +fi | ||
21712 | |||
21713 | |||
21714 | |||
21715 | @@ -5846,8 +6165,8 @@ esac | ||
21716 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | ||
21717 | |||
21718 | # Transform an extracted symbol line into symbol name and symbol address | ||
21719 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
21720 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" | ||
21721 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | ||
21722 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" | ||
21723 | |||
21724 | # Handle CRLF in mingw tool chain | ||
21725 | opt_cr= | ||
21726 | @@ -5883,6 +6202,7 @@ for ac_symprfx in "" "_"; do | ||
21727 | else | ||
21728 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | ||
21729 | fi | ||
21730 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
21731 | |||
21732 | # Check to see that the pipe works correctly. | ||
21733 | pipe_works=no | ||
21734 | @@ -5924,6 +6244,18 @@ _LT_EOF | ||
21735 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | ||
21736 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | ||
21737 | cat <<_LT_EOF > conftest.$ac_ext | ||
21738 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
21739 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
21740 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
21741 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
21742 | +# define LT_DLSYM_CONST | ||
21743 | +#elif defined(__osf__) | ||
21744 | +/* This system does not cope well with relocations in const data. */ | ||
21745 | +# define LT_DLSYM_CONST | ||
21746 | +#else | ||
21747 | +# define LT_DLSYM_CONST const | ||
21748 | +#endif | ||
21749 | + | ||
21750 | #ifdef __cplusplus | ||
21751 | extern "C" { | ||
21752 | #endif | ||
21753 | @@ -5935,7 +6267,7 @@ _LT_EOF | ||
21754 | cat <<_LT_EOF >> conftest.$ac_ext | ||
21755 | |||
21756 | /* The mapping between symbol names and symbols. */ | ||
21757 | -const struct { | ||
21758 | +LT_DLSYM_CONST struct { | ||
21759 | const char *name; | ||
21760 | void *address; | ||
21761 | } | ||
21762 | @@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { | ||
21763 | _LT_EOF | ||
21764 | # Now try linking the two files. | ||
21765 | mv conftest.$ac_objext conftstm.$ac_objext | ||
21766 | - lt_save_LIBS="$LIBS" | ||
21767 | - lt_save_CFLAGS="$CFLAGS" | ||
21768 | + lt_globsym_save_LIBS=$LIBS | ||
21769 | + lt_globsym_save_CFLAGS=$CFLAGS | ||
21770 | LIBS="conftstm.$ac_objext" | ||
21771 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | ||
21772 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | ||
21773 | @@ -5972,8 +6304,8 @@ _LT_EOF | ||
21774 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | ||
21775 | pipe_works=yes | ||
21776 | fi | ||
21777 | - LIBS="$lt_save_LIBS" | ||
21778 | - CFLAGS="$lt_save_CFLAGS" | ||
21779 | + LIBS=$lt_globsym_save_LIBS | ||
21780 | + CFLAGS=$lt_globsym_save_CFLAGS | ||
21781 | else | ||
21782 | echo "cannot find nm_test_func in $nlist" >&5 | ||
21783 | fi | ||
21784 | @@ -6010,6 +6342,19 @@ else | ||
21785 | $as_echo "ok" >&6; } | ||
21786 | fi | ||
21787 | |||
21788 | +# Response file support. | ||
21789 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
21790 | + nm_file_list_spec='@' | ||
21791 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | ||
21792 | + nm_file_list_spec='@' | ||
21793 | +fi | ||
21794 | + | ||
21795 | + | ||
21796 | + | ||
21797 | + | ||
21798 | + | ||
21799 | + | ||
21800 | + | ||
21801 | |||
21802 | |||
21803 | |||
21804 | @@ -6027,6 +6372,41 @@ fi | ||
21805 | |||
21806 | |||
21807 | |||
21808 | + | ||
21809 | + | ||
21810 | + | ||
21811 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
21812 | +$as_echo_n "checking for sysroot... " >&6; } | ||
21813 | + | ||
21814 | +# Check whether --with-libtool-sysroot was given. | ||
21815 | +if test "${with_libtool_sysroot+set}" = set; then : | ||
21816 | + withval=$with_libtool_sysroot; | ||
21817 | +else | ||
21818 | + with_libtool_sysroot=no | ||
21819 | +fi | ||
21820 | + | ||
21821 | + | ||
21822 | +lt_sysroot= | ||
21823 | +case ${with_libtool_sysroot} in #( | ||
21824 | + yes) | ||
21825 | + if test "$GCC" = yes; then | ||
21826 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
21827 | + fi | ||
21828 | + ;; #( | ||
21829 | + /*) | ||
21830 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` | ||
21831 | + ;; #( | ||
21832 | + no|'') | ||
21833 | + ;; #( | ||
21834 | + *) | ||
21835 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | ||
21836 | +$as_echo "${with_libtool_sysroot}" >&6; } | ||
21837 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
21838 | + ;; | ||
21839 | +esac | ||
21840 | + | ||
21841 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
21842 | +$as_echo "${lt_sysroot:-no}" >&6; } | ||
21843 | |||
21844 | |||
21845 | |||
21846 | @@ -6241,6 +6621,123 @@ esac | ||
21847 | |||
21848 | need_locks="$enable_libtool_lock" | ||
21849 | |||
21850 | +if test -n "$ac_tool_prefix"; then | ||
21851 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
21852 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
21853 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21854 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21855 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
21856 | + $as_echo_n "(cached) " >&6 | ||
21857 | +else | ||
21858 | + if test -n "$MANIFEST_TOOL"; then | ||
21859 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
21860 | +else | ||
21861 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21862 | +for as_dir in $PATH | ||
21863 | +do | ||
21864 | + IFS=$as_save_IFS | ||
21865 | + test -z "$as_dir" && as_dir=. | ||
21866 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21867 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21868 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
21869 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21870 | + break 2 | ||
21871 | + fi | ||
21872 | +done | ||
21873 | + done | ||
21874 | +IFS=$as_save_IFS | ||
21875 | + | ||
21876 | +fi | ||
21877 | +fi | ||
21878 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
21879 | +if test -n "$MANIFEST_TOOL"; then | ||
21880 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
21881 | +$as_echo "$MANIFEST_TOOL" >&6; } | ||
21882 | +else | ||
21883 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21884 | +$as_echo "no" >&6; } | ||
21885 | +fi | ||
21886 | + | ||
21887 | + | ||
21888 | +fi | ||
21889 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
21890 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
21891 | + # Extract the first word of "mt", so it can be a program name with args. | ||
21892 | +set dummy mt; ac_word=$2 | ||
21893 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
21894 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
21895 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
21896 | + $as_echo_n "(cached) " >&6 | ||
21897 | +else | ||
21898 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
21899 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
21900 | +else | ||
21901 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
21902 | +for as_dir in $PATH | ||
21903 | +do | ||
21904 | + IFS=$as_save_IFS | ||
21905 | + test -z "$as_dir" && as_dir=. | ||
21906 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
21907 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
21908 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
21909 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
21910 | + break 2 | ||
21911 | + fi | ||
21912 | +done | ||
21913 | + done | ||
21914 | +IFS=$as_save_IFS | ||
21915 | + | ||
21916 | +fi | ||
21917 | +fi | ||
21918 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
21919 | +if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
21920 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
21921 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
21922 | +else | ||
21923 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21924 | +$as_echo "no" >&6; } | ||
21925 | +fi | ||
21926 | + | ||
21927 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
21928 | + MANIFEST_TOOL=":" | ||
21929 | + else | ||
21930 | + case $cross_compiling:$ac_tool_warned in | ||
21931 | +yes:) | ||
21932 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
21933 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
21934 | +ac_tool_warned=yes ;; | ||
21935 | +esac | ||
21936 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
21937 | + fi | ||
21938 | +else | ||
21939 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
21940 | +fi | ||
21941 | + | ||
21942 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
21943 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
21944 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
21945 | +if ${lt_cv_path_mainfest_tool+:} false; then : | ||
21946 | + $as_echo_n "(cached) " >&6 | ||
21947 | +else | ||
21948 | + lt_cv_path_mainfest_tool=no | ||
21949 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
21950 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
21951 | + cat conftest.err >&5 | ||
21952 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
21953 | + lt_cv_path_mainfest_tool=yes | ||
21954 | + fi | ||
21955 | + rm -f conftest* | ||
21956 | +fi | ||
21957 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
21958 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
21959 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
21960 | + MANIFEST_TOOL=: | ||
21961 | +fi | ||
21962 | + | ||
21963 | + | ||
21964 | + | ||
21965 | + | ||
21966 | + | ||
21967 | |||
21968 | case $host_os in | ||
21969 | rhapsody* | darwin*) | ||
21970 | @@ -6807,6 +7304,8 @@ _LT_EOF | ||
21971 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
21972 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
21973 | $AR cru libconftest.a conftest.o 2>&5 | ||
21974 | + echo "$RANLIB libconftest.a" >&5 | ||
21975 | + $RANLIB libconftest.a 2>&5 | ||
21976 | cat > conftest.c << _LT_EOF | ||
21977 | int main() { return 0;} | ||
21978 | _LT_EOF | ||
21979 | @@ -7269,7 +7768,8 @@ fi | ||
21980 | LIBTOOL_DEPS="$ltmain" | ||
21981 | |||
21982 | # Always use our own libtool. | ||
21983 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' | ||
21984 | +LIBTOOL='$(SHELL) $(top_builddir)' | ||
21985 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" | ||
21986 | |||
21987 | |||
21988 | |||
21989 | @@ -7358,7 +7858,7 @@ aix3*) | ||
21990 | esac | ||
21991 | |||
21992 | # Global variables: | ||
21993 | -ofile=libtool | ||
21994 | +ofile=${host_alias}-libtool | ||
21995 | can_build_shared=yes | ||
21996 | |||
21997 | # All known linkers require a `.a' archive for static linking (except MSVC, | ||
21998 | @@ -7656,8 +8156,6 @@ fi | ||
21999 | lt_prog_compiler_pic= | ||
22000 | lt_prog_compiler_static= | ||
22001 | |||
22002 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
22003 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
22004 | |||
22005 | if test "$GCC" = yes; then | ||
22006 | lt_prog_compiler_wl='-Wl,' | ||
22007 | @@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
22008 | lt_prog_compiler_pic='--shared' | ||
22009 | lt_prog_compiler_static='--static' | ||
22010 | ;; | ||
22011 | + nagfor*) | ||
22012 | + # NAG Fortran compiler | ||
22013 | + lt_prog_compiler_wl='-Wl,-Wl,,' | ||
22014 | + lt_prog_compiler_pic='-PIC' | ||
22015 | + lt_prog_compiler_static='-Bstatic' | ||
22016 | + ;; | ||
22017 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
22018 | # Portland Group compilers (*not* the Pentium gcc compiler, | ||
22019 | # which looks to be a dead project) | ||
22020 | @@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
22021 | lt_prog_compiler_pic='-KPIC' | ||
22022 | lt_prog_compiler_static='-Bstatic' | ||
22023 | case $cc_basename in | ||
22024 | - f77* | f90* | f95*) | ||
22025 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | ||
22026 | lt_prog_compiler_wl='-Qoption ld ';; | ||
22027 | *) | ||
22028 | lt_prog_compiler_wl='-Wl,';; | ||
22029 | @@ -7942,13 +8446,17 @@ case $host_os in | ||
22030 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | ||
22031 | ;; | ||
22032 | esac | ||
22033 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | ||
22034 | -$as_echo "$lt_prog_compiler_pic" >&6; } | ||
22035 | - | ||
22036 | - | ||
22037 | - | ||
22038 | - | ||
22039 | |||
22040 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
22041 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
22042 | +if ${lt_cv_prog_compiler_pic+:} false; then : | ||
22043 | + $as_echo_n "(cached) " >&6 | ||
22044 | +else | ||
22045 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | ||
22046 | +fi | ||
22047 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
22048 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
22049 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
22050 | |||
22051 | # | ||
22052 | # Check to make sure the PIC flag actually works. | ||
22053 | @@ -8009,6 +8517,11 @@ fi | ||
22054 | |||
22055 | |||
22056 | |||
22057 | + | ||
22058 | + | ||
22059 | + | ||
22060 | + | ||
22061 | + | ||
22062 | # | ||
22063 | # Check to make sure the static flag actually works. | ||
22064 | # | ||
22065 | @@ -8359,7 +8872,8 @@ _LT_EOF | ||
22066 | allow_undefined_flag=unsupported | ||
22067 | always_export_symbols=no | ||
22068 | enable_shared_with_static_runtimes=yes | ||
22069 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
22070 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | ||
22071 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
22072 | |||
22073 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
22074 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
22075 | @@ -8458,12 +8972,12 @@ _LT_EOF | ||
22076 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | ||
22077 | hardcode_libdir_flag_spec= | ||
22078 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | ||
22079 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
22080 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | ||
22081 | if test "x$supports_anon_versioning" = xyes; then | ||
22082 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | ||
22083 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | ||
22084 | echo "local: *; };" >> $output_objdir/$libname.ver~ | ||
22085 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
22086 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | ||
22087 | fi | ||
22088 | ;; | ||
22089 | esac | ||
22090 | @@ -8477,8 +8991,8 @@ _LT_EOF | ||
22091 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | ||
22092 | wlarc= | ||
22093 | else | ||
22094 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22095 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22096 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22097 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22098 | fi | ||
22099 | ;; | ||
22100 | |||
22101 | @@ -8496,8 +9010,8 @@ _LT_EOF | ||
22102 | |||
22103 | _LT_EOF | ||
22104 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
22105 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22106 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22107 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22108 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22109 | else | ||
22110 | ld_shlibs=no | ||
22111 | fi | ||
22112 | @@ -8543,8 +9057,8 @@ _LT_EOF | ||
22113 | |||
22114 | *) | ||
22115 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | ||
22116 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22117 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22118 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
22119 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||
22120 | else | ||
22121 | ld_shlibs=no | ||
22122 | fi | ||
22123 | @@ -8674,7 +9188,13 @@ _LT_EOF | ||
22124 | allow_undefined_flag='-berok' | ||
22125 | # Determine the default libpath from the value encoded in an | ||
22126 | # empty executable. | ||
22127 | - if test x$gcc_no_link = xyes; then | ||
22128 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
22129 | + aix_libpath=$lt_cv_aix_libpath | ||
22130 | +else | ||
22131 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
22132 | + $as_echo_n "(cached) " >&6 | ||
22133 | +else | ||
22134 | + if test x$gcc_no_link = xyes; then | ||
22135 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | ||
22136 | fi | ||
22137 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22138 | @@ -8690,22 +9210,29 @@ main () | ||
22139 | _ACEOF | ||
22140 | if ac_fn_c_try_link "$LINENO"; then : | ||
22141 | |||
22142 | -lt_aix_libpath_sed=' | ||
22143 | - /Import File Strings/,/^$/ { | ||
22144 | - /^0/ { | ||
22145 | - s/^0 *\(.*\)$/\1/ | ||
22146 | - p | ||
22147 | - } | ||
22148 | - }' | ||
22149 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22150 | -# Check for a 64-bit object if we didn't find anything. | ||
22151 | -if test -z "$aix_libpath"; then | ||
22152 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22153 | -fi | ||
22154 | + lt_aix_libpath_sed=' | ||
22155 | + /Import File Strings/,/^$/ { | ||
22156 | + /^0/ { | ||
22157 | + s/^0 *\([^ ]*\) *$/\1/ | ||
22158 | + p | ||
22159 | + } | ||
22160 | + }' | ||
22161 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22162 | + # Check for a 64-bit object if we didn't find anything. | ||
22163 | + if test -z "$lt_cv_aix_libpath_"; then | ||
22164 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22165 | + fi | ||
22166 | fi | ||
22167 | rm -f core conftest.err conftest.$ac_objext \ | ||
22168 | conftest$ac_exeext conftest.$ac_ext | ||
22169 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22170 | + if test -z "$lt_cv_aix_libpath_"; then | ||
22171 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
22172 | + fi | ||
22173 | + | ||
22174 | +fi | ||
22175 | + | ||
22176 | + aix_libpath=$lt_cv_aix_libpath_ | ||
22177 | +fi | ||
22178 | |||
22179 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
22180 | 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" | ||
22181 | @@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22182 | else | ||
22183 | # Determine the default libpath from the value encoded in an | ||
22184 | # empty executable. | ||
22185 | - if test x$gcc_no_link = xyes; then | ||
22186 | + if test "${lt_cv_aix_libpath+set}" = set; then | ||
22187 | + aix_libpath=$lt_cv_aix_libpath | ||
22188 | +else | ||
22189 | + if ${lt_cv_aix_libpath_+:} false; then : | ||
22190 | + $as_echo_n "(cached) " >&6 | ||
22191 | +else | ||
22192 | + if test x$gcc_no_link = xyes; then | ||
22193 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | ||
22194 | fi | ||
22195 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22196 | @@ -8733,22 +9266,29 @@ main () | ||
22197 | _ACEOF | ||
22198 | if ac_fn_c_try_link "$LINENO"; then : | ||
22199 | |||
22200 | -lt_aix_libpath_sed=' | ||
22201 | - /Import File Strings/,/^$/ { | ||
22202 | - /^0/ { | ||
22203 | - s/^0 *\(.*\)$/\1/ | ||
22204 | - p | ||
22205 | - } | ||
22206 | - }' | ||
22207 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22208 | -# Check for a 64-bit object if we didn't find anything. | ||
22209 | -if test -z "$aix_libpath"; then | ||
22210 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22211 | -fi | ||
22212 | + lt_aix_libpath_sed=' | ||
22213 | + /Import File Strings/,/^$/ { | ||
22214 | + /^0/ { | ||
22215 | + s/^0 *\([^ ]*\) *$/\1/ | ||
22216 | + p | ||
22217 | + } | ||
22218 | + }' | ||
22219 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22220 | + # Check for a 64-bit object if we didn't find anything. | ||
22221 | + if test -z "$lt_cv_aix_libpath_"; then | ||
22222 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
22223 | + fi | ||
22224 | fi | ||
22225 | rm -f core conftest.err conftest.$ac_objext \ | ||
22226 | conftest$ac_exeext conftest.$ac_ext | ||
22227 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22228 | + if test -z "$lt_cv_aix_libpath_"; then | ||
22229 | + lt_cv_aix_libpath_="/usr/lib:/lib" | ||
22230 | + fi | ||
22231 | + | ||
22232 | +fi | ||
22233 | + | ||
22234 | + aix_libpath=$lt_cv_aix_libpath_ | ||
22235 | +fi | ||
22236 | |||
22237 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | ||
22238 | # Warning - without using the other run time loading flags, | ||
22239 | @@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22240 | # Microsoft Visual C++. | ||
22241 | # hardcode_libdir_flag_spec is actually meaningless, as there is | ||
22242 | # no search path for DLLs. | ||
22243 | - hardcode_libdir_flag_spec=' ' | ||
22244 | - allow_undefined_flag=unsupported | ||
22245 | - # Tell ltmain to make .lib files, not .a files. | ||
22246 | - libext=lib | ||
22247 | - # Tell ltmain to make .dll files, not .so files. | ||
22248 | - shrext_cmds=".dll" | ||
22249 | - # FIXME: Setting linknames here is a bad hack. | ||
22250 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
22251 | - # The linker will automatically build a .lib file if we build a DLL. | ||
22252 | - old_archive_from_new_cmds='true' | ||
22253 | - # FIXME: Should let the user specify the lib program. | ||
22254 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
22255 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | ||
22256 | - enable_shared_with_static_runtimes=yes | ||
22257 | + case $cc_basename in | ||
22258 | + cl*) | ||
22259 | + # Native MSVC | ||
22260 | + hardcode_libdir_flag_spec=' ' | ||
22261 | + allow_undefined_flag=unsupported | ||
22262 | + always_export_symbols=yes | ||
22263 | + file_list_spec='@' | ||
22264 | + # Tell ltmain to make .lib files, not .a files. | ||
22265 | + libext=lib | ||
22266 | + # Tell ltmain to make .dll files, not .so files. | ||
22267 | + shrext_cmds=".dll" | ||
22268 | + # FIXME: Setting linknames here is a bad hack. | ||
22269 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | ||
22270 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
22271 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
22272 | + else | ||
22273 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
22274 | + fi~ | ||
22275 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
22276 | + linknames=' | ||
22277 | + # The linker will not automatically build a static lib if we build a DLL. | ||
22278 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
22279 | + enable_shared_with_static_runtimes=yes | ||
22280 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
22281 | + # Don't use ranlib | ||
22282 | + old_postinstall_cmds='chmod 644 $oldlib' | ||
22283 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
22284 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
22285 | + case $lt_outputfile in | ||
22286 | + *.exe|*.EXE) ;; | ||
22287 | + *) | ||
22288 | + lt_outputfile="$lt_outputfile.exe" | ||
22289 | + lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
22290 | + ;; | ||
22291 | + esac~ | ||
22292 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
22293 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
22294 | + $RM "$lt_outputfile.manifest"; | ||
22295 | + fi' | ||
22296 | + ;; | ||
22297 | + *) | ||
22298 | + # Assume MSVC wrapper | ||
22299 | + hardcode_libdir_flag_spec=' ' | ||
22300 | + allow_undefined_flag=unsupported | ||
22301 | + # Tell ltmain to make .lib files, not .a files. | ||
22302 | + libext=lib | ||
22303 | + # Tell ltmain to make .dll files, not .so files. | ||
22304 | + shrext_cmds=".dll" | ||
22305 | + # FIXME: Setting linknames here is a bad hack. | ||
22306 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
22307 | + # The linker will automatically build a .lib file if we build a DLL. | ||
22308 | + old_archive_from_new_cmds='true' | ||
22309 | + # FIXME: Should let the user specify the lib program. | ||
22310 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
22311 | + enable_shared_with_static_runtimes=yes | ||
22312 | + ;; | ||
22313 | + esac | ||
22314 | ;; | ||
22315 | |||
22316 | darwin* | rhapsody*) | ||
22317 | @@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22318 | |||
22319 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | ||
22320 | freebsd* | dragonfly*) | ||
22321 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
22322 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | ||
22323 | hardcode_libdir_flag_spec='-R$libdir' | ||
22324 | hardcode_direct=yes | ||
22325 | hardcode_shlibpath_var=no | ||
22326 | @@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22327 | |||
22328 | hpux9*) | ||
22329 | if test "$GCC" = yes; then | ||
22330 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
22331 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | ||
22332 | else | ||
22333 | 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' | ||
22334 | fi | ||
22335 | @@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22336 | |||
22337 | hpux10*) | ||
22338 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | ||
22339 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
22340 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
22341 | else | ||
22342 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
22343 | fi | ||
22344 | @@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | ||
22345 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
22346 | ;; | ||
22347 | ia64*) | ||
22348 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
22349 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | ||
22350 | ;; | ||
22351 | *) | ||
22352 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
22353 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
22354 | ;; | ||
22355 | esac | ||
22356 | else | ||
22357 | @@ -8997,26 +9580,39 @@ fi | ||
22358 | |||
22359 | irix5* | irix6* | nonstopux*) | ||
22360 | if test "$GCC" = yes; then | ||
22361 | - archive_cmds='$CC -shared $libobjs $deplibs $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' | ||
22362 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $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' | ||
22363 | # Try to use the -exported_symbol ld option, if it does not | ||
22364 | # work, assume that -exports_file does not work either and | ||
22365 | # implicitly export all symbols. | ||
22366 | - save_LDFLAGS="$LDFLAGS" | ||
22367 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
22368 | - if test x$gcc_no_link = xyes; then | ||
22369 | + # This should be the same for all languages, so no per-tag cache variable. | ||
22370 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | ||
22371 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | ||
22372 | +if ${lt_cv_irix_exported_symbol+:} false; then : | ||
22373 | + $as_echo_n "(cached) " >&6 | ||
22374 | +else | ||
22375 | + save_LDFLAGS="$LDFLAGS" | ||
22376 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
22377 | + if test x$gcc_no_link = xyes; then | ||
22378 | as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | ||
22379 | fi | ||
22380 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
22381 | /* end confdefs.h. */ | ||
22382 | -int foo(void) {} | ||
22383 | +int foo (void) { return 0; } | ||
22384 | _ACEOF | ||
22385 | if ac_fn_c_try_link "$LINENO"; then : | ||
22386 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $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 ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
22387 | - | ||
22388 | + lt_cv_irix_exported_symbol=yes | ||
22389 | +else | ||
22390 | + lt_cv_irix_exported_symbol=no | ||
22391 | fi | ||
22392 | rm -f core conftest.err conftest.$ac_objext \ | ||
22393 | conftest$ac_exeext conftest.$ac_ext | ||
22394 | - LDFLAGS="$save_LDFLAGS" | ||
22395 | + LDFLAGS="$save_LDFLAGS" | ||
22396 | +fi | ||
22397 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
22398 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
22399 | + if test "$lt_cv_irix_exported_symbol" = yes; then | ||
22400 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $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 ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
22401 | + fi | ||
22402 | else | ||
22403 | 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' | ||
22404 | 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' | ||
22405 | @@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
22406 | osf4* | osf5*) # as osf3* with the addition of -msym flag | ||
22407 | if test "$GCC" = yes; then | ||
22408 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | ||
22409 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${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' | ||
22410 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${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' | ||
22411 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
22412 | else | ||
22413 | allow_undefined_flag=' -expect_unresolved \*' | ||
22414 | @@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ | ||
22415 | no_undefined_flag=' -z defs' | ||
22416 | if test "$GCC" = yes; then | ||
22417 | wlarc='${wl}' | ||
22418 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
22419 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | ||
22420 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | ||
22421 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
22422 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | ||
22423 | else | ||
22424 | case `$CC -V 2>&1` in | ||
22425 | *"Compilers 5.0"*) | ||
22426 | @@ -9698,8 +10294,9 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
22427 | need_version=no | ||
22428 | need_lib_prefix=no | ||
22429 | |||
22430 | - case $GCC,$host_os in | ||
22431 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | ||
22432 | + case $GCC,$cc_basename in | ||
22433 | + yes,*) | ||
22434 | + # gcc | ||
22435 | library_names_spec='$libname.dll.a' | ||
22436 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
22437 | postinstall_cmds='base_file=`basename \${file}`~ | ||
22438 | @@ -9732,13 +10329,71 @@ cygwin* | mingw* | pw32* | cegcc*) | ||
22439 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
22440 | ;; | ||
22441 | esac | ||
22442 | + dynamic_linker='Win32 ld.exe' | ||
22443 | + ;; | ||
22444 | + | ||
22445 | + *,cl*) | ||
22446 | + # Native MSVC | ||
22447 | + libname_spec='$name' | ||
22448 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
22449 | + library_names_spec='${libname}.dll.lib' | ||
22450 | + | ||
22451 | + case $build_os in | ||
22452 | + mingw*) | ||
22453 | + sys_lib_search_path_spec= | ||
22454 | + lt_save_ifs=$IFS | ||
22455 | + IFS=';' | ||
22456 | + for lt_path in $LIB | ||
22457 | + do | ||
22458 | + IFS=$lt_save_ifs | ||
22459 | + # Let DOS variable expansion print the short 8.3 style file name. | ||
22460 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
22461 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
22462 | + done | ||
22463 | + IFS=$lt_save_ifs | ||
22464 | + # Convert to MSYS style. | ||
22465 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | ||
22466 | + ;; | ||
22467 | + cygwin*) | ||
22468 | + # Convert to unix form, then to dos form, then back to unix form | ||
22469 | + # but this time dos style (no spaces!) so that the unix form looks | ||
22470 | + # like /cygdrive/c/PROGRA~1:/cygdr... | ||
22471 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
22472 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
22473 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
22474 | + ;; | ||
22475 | + *) | ||
22476 | + sys_lib_search_path_spec="$LIB" | ||
22477 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
22478 | + # It is most probably a Windows format PATH. | ||
22479 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
22480 | + else | ||
22481 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
22482 | + fi | ||
22483 | + # FIXME: find the short name or the path components, as spaces are | ||
22484 | + # common. (e.g. "Program Files" -> "PROGRA~1") | ||
22485 | + ;; | ||
22486 | + esac | ||
22487 | + | ||
22488 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
22489 | + postinstall_cmds='base_file=`basename \${file}`~ | ||
22490 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
22491 | + dldir=$destdir/`dirname \$dlpath`~ | ||
22492 | + test -d \$dldir || mkdir -p \$dldir~ | ||
22493 | + $install_prog $dir/$dlname \$dldir/$dlname' | ||
22494 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
22495 | + dlpath=$dir/\$dldll~ | ||
22496 | + $RM \$dlpath' | ||
22497 | + shlibpath_overrides_runpath=yes | ||
22498 | + dynamic_linker='Win32 link.exe' | ||
22499 | ;; | ||
22500 | |||
22501 | *) | ||
22502 | + # Assume MSVC wrapper | ||
22503 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | ||
22504 | + dynamic_linker='Win32 ld.exe' | ||
22505 | ;; | ||
22506 | esac | ||
22507 | - dynamic_linker='Win32 ld.exe' | ||
22508 | # FIXME: first we should search . and the directory the executable is in | ||
22509 | shlibpath_var=PATH | ||
22510 | ;; | ||
22511 | @@ -9830,7 +10485,7 @@ haiku*) | ||
22512 | soname_spec='${libname}${release}${shared_ext}$major' | ||
22513 | shlibpath_var=LIBRARY_PATH | ||
22514 | shlibpath_overrides_runpath=yes | ||
22515 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | ||
22516 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
22517 | hardcode_into_libs=yes | ||
22518 | ;; | ||
22519 | |||
22520 | @@ -10644,7 +11299,7 @@ else | ||
22521 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
22522 | lt_status=$lt_dlunknown | ||
22523 | cat > conftest.$ac_ext <<_LT_EOF | ||
22524 | -#line 10647 "configure" | ||
22525 | +#line $LINENO "configure" | ||
22526 | #include "confdefs.h" | ||
22527 | |||
22528 | #if HAVE_DLFCN_H | ||
22529 | @@ -10688,10 +11343,10 @@ else | ||
22530 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
22531 | correspondingly for the symbols needed. */ | ||
22532 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
22533 | -void fnord () __attribute__((visibility("default"))); | ||
22534 | +int fnord () __attribute__((visibility("default"))); | ||
22535 | #endif | ||
22536 | |||
22537 | -void fnord () { int i=42; } | ||
22538 | +int fnord () { return 42; } | ||
22539 | int main () | ||
22540 | { | ||
22541 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
22542 | @@ -10750,7 +11405,7 @@ else | ||
22543 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
22544 | lt_status=$lt_dlunknown | ||
22545 | cat > conftest.$ac_ext <<_LT_EOF | ||
22546 | -#line 10753 "configure" | ||
22547 | +#line $LINENO "configure" | ||
22548 | #include "confdefs.h" | ||
22549 | |||
22550 | #if HAVE_DLFCN_H | ||
22551 | @@ -10794,10 +11449,10 @@ else | ||
22552 | /* When -fvisbility=hidden is used, assume the code has been annotated | ||
22553 | correspondingly for the symbols needed. */ | ||
22554 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
22555 | -void fnord () __attribute__((visibility("default"))); | ||
22556 | +int fnord () __attribute__((visibility("default"))); | ||
22557 | #endif | ||
22558 | |||
22559 | -void fnord () { int i=42; } | ||
22560 | +int fnord () { return 42; } | ||
22561 | int main () | ||
22562 | { | ||
22563 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | ||
22564 | @@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' | ||
22565 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | ||
22566 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | ||
22567 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | ||
22568 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
22569 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | ||
22570 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | ||
22571 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | ||
22572 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | ||
22573 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | ||
22574 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | ||
22575 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | ||
22576 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | ||
22577 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | ||
22578 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | ||
22579 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | ||
22580 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | ||
22581 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | ||
22582 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | ||
22583 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | ||
22584 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
22585 | @@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de | ||
22586 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | ||
22587 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | ||
22588 | 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"`' | ||
22589 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
22590 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' | ||
22591 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' | ||
22592 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' | ||
22593 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' | ||
22594 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
22595 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | ||
22596 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | ||
22597 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | ||
22598 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | ||
22599 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | ||
22600 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | ||
22601 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | ||
22602 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | ||
22603 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | ||
22604 | @@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q | ||
22605 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | ||
22606 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | ||
22607 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | ||
22608 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | ||
22609 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | ||
22610 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | ||
22611 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | ||
22612 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | ||
22613 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | ||
22614 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | ||
22615 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | ||
22616 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | ||
22617 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | ||
22618 | @@ -12388,8 +13053,13 @@ reload_flag \ | ||
22619 | OBJDUMP \ | ||
22620 | deplibs_check_method \ | ||
22621 | file_magic_cmd \ | ||
22622 | +file_magic_glob \ | ||
22623 | +want_nocaseglob \ | ||
22624 | +DLLTOOL \ | ||
22625 | +sharedlib_from_linklib_cmd \ | ||
22626 | AR \ | ||
22627 | AR_FLAGS \ | ||
22628 | +archiver_list_spec \ | ||
22629 | STRIP \ | ||
22630 | RANLIB \ | ||
22631 | CC \ | ||
22632 | @@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ | ||
22633 | lt_cv_sys_global_symbol_to_cdecl \ | ||
22634 | lt_cv_sys_global_symbol_to_c_name_address \ | ||
22635 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | ||
22636 | +nm_file_list_spec \ | ||
22637 | lt_prog_compiler_no_builtin_flag \ | ||
22638 | -lt_prog_compiler_wl \ | ||
22639 | lt_prog_compiler_pic \ | ||
22640 | +lt_prog_compiler_wl \ | ||
22641 | lt_prog_compiler_static \ | ||
22642 | lt_cv_prog_compiler_c_o \ | ||
22643 | need_locks \ | ||
22644 | +MANIFEST_TOOL \ | ||
22645 | DSYMUTIL \ | ||
22646 | NMEDIT \ | ||
22647 | LIPO \ | ||
22648 | @@ -12420,7 +13092,6 @@ no_undefined_flag \ | ||
22649 | hardcode_libdir_flag_spec \ | ||
22650 | hardcode_libdir_flag_spec_ld \ | ||
22651 | hardcode_libdir_separator \ | ||
22652 | -fix_srcfile_path \ | ||
22653 | exclude_expsyms \ | ||
22654 | include_expsyms \ | ||
22655 | file_list_spec \ | ||
22656 | @@ -12456,6 +13127,7 @@ module_cmds \ | ||
22657 | module_expsym_cmds \ | ||
22658 | export_symbols_cmds \ | ||
22659 | prelink_cmds \ | ||
22660 | +postlink_cmds \ | ||
22661 | postinstall_cmds \ | ||
22662 | postuninstall_cmds \ | ||
22663 | finish_cmds \ | ||
22664 | @@ -13054,7 +13726,8 @@ $as_echo X"$file" | | ||
22665 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
22666 | # | ||
22667 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | ||
22668 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | ||
22669 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, | ||
22670 | +# Inc. | ||
22671 | # Written by Gordon Matzigkeit, 1996 | ||
22672 | # | ||
22673 | # This file is part of GNU Libtool. | ||
22674 | @@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL | ||
22675 | # turn newlines into spaces. | ||
22676 | NL2SP=$lt_lt_NL2SP | ||
22677 | |||
22678 | +# convert \$build file names to \$host format. | ||
22679 | +to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
22680 | + | ||
22681 | +# convert \$build files to toolchain format. | ||
22682 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
22683 | + | ||
22684 | # An object symbol dumper. | ||
22685 | OBJDUMP=$lt_OBJDUMP | ||
22686 | |||
22687 | # Method to check whether dependent libraries are shared objects. | ||
22688 | deplibs_check_method=$lt_deplibs_check_method | ||
22689 | |||
22690 | -# Command to use when deplibs_check_method == "file_magic". | ||
22691 | +# Command to use when deplibs_check_method = "file_magic". | ||
22692 | file_magic_cmd=$lt_file_magic_cmd | ||
22693 | |||
22694 | +# How to find potential files when deplibs_check_method = "file_magic". | ||
22695 | +file_magic_glob=$lt_file_magic_glob | ||
22696 | + | ||
22697 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
22698 | +want_nocaseglob=$lt_want_nocaseglob | ||
22699 | + | ||
22700 | +# DLL creation program. | ||
22701 | +DLLTOOL=$lt_DLLTOOL | ||
22702 | + | ||
22703 | +# Command to associate shared and link libraries. | ||
22704 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
22705 | + | ||
22706 | # The archiver. | ||
22707 | AR=$lt_AR | ||
22708 | + | ||
22709 | +# Flags to create an archive. | ||
22710 | AR_FLAGS=$lt_AR_FLAGS | ||
22711 | |||
22712 | +# How to feed a file listing to the archiver. | ||
22713 | +archiver_list_spec=$lt_archiver_list_spec | ||
22714 | + | ||
22715 | # A symbol stripping program. | ||
22716 | STRIP=$lt_STRIP | ||
22717 | |||
22718 | @@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address | ||
22719 | # Transform the output of nm in a C name address pair when lib prefix is needed. | ||
22720 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | ||
22721 | |||
22722 | +# Specify filename containing input files for \$NM. | ||
22723 | +nm_file_list_spec=$lt_nm_file_list_spec | ||
22724 | + | ||
22725 | +# The root where to search for dependent libraries,and in which our libraries should be installed. | ||
22726 | +lt_sysroot=$lt_sysroot | ||
22727 | + | ||
22728 | # The name of the directory that contains temporary libtool files. | ||
22729 | objdir=$objdir | ||
22730 | |||
22731 | @@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD | ||
22732 | # Must we lock files when doing compilation? | ||
22733 | need_locks=$lt_need_locks | ||
22734 | |||
22735 | +# Manifest tool. | ||
22736 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
22737 | + | ||
22738 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | ||
22739 | DSYMUTIL=$lt_DSYMUTIL | ||
22740 | |||
22741 | @@ -13322,12 +14027,12 @@ with_gcc=$GCC | ||
22742 | # Compiler flag to turn off builtin functions. | ||
22743 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | ||
22744 | |||
22745 | -# How to pass a linker flag through the compiler. | ||
22746 | -wl=$lt_lt_prog_compiler_wl | ||
22747 | - | ||
22748 | # Additional compiler flags for building library objects. | ||
22749 | pic_flag=$lt_lt_prog_compiler_pic | ||
22750 | |||
22751 | +# How to pass a linker flag through the compiler. | ||
22752 | +wl=$lt_lt_prog_compiler_wl | ||
22753 | + | ||
22754 | # Compiler flag to prevent dynamic linking. | ||
22755 | link_static_flag=$lt_lt_prog_compiler_static | ||
22756 | |||
22757 | @@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath | ||
22758 | # Whether libtool must link a program against all its dependency libraries. | ||
22759 | link_all_deplibs=$link_all_deplibs | ||
22760 | |||
22761 | -# Fix the shell variable \$srcfile for the compiler. | ||
22762 | -fix_srcfile_path=$lt_fix_srcfile_path | ||
22763 | - | ||
22764 | # Set to "yes" if exported symbols are required. | ||
22765 | always_export_symbols=$always_export_symbols | ||
22766 | |||
22767 | @@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms | ||
22768 | # Commands necessary for linking programs (against libraries) with templates. | ||
22769 | prelink_cmds=$lt_prelink_cmds | ||
22770 | |||
22771 | +# Commands necessary for finishing linking programs. | ||
22772 | +postlink_cmds=$lt_postlink_cmds | ||
22773 | + | ||
22774 | # Specify filename containing input files. | ||
22775 | file_list_spec=$lt_file_list_spec | ||
22776 | |||
22777 | @@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | ||
22778 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | ||
22779 | # text mode, it properly converts lines to CR/LF. This bash problem | ||
22780 | # is reportedly fixed, but why not run on old versions too? | ||
22781 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | ||
22782 | - || (rm -f "$cfgfile"; exit 1) | ||
22783 | - | ||
22784 | - case $xsi_shell in | ||
22785 | - yes) | ||
22786 | - cat << \_LT_EOF >> "$cfgfile" | ||
22787 | - | ||
22788 | -# func_dirname file append nondir_replacement | ||
22789 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
22790 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
22791 | -func_dirname () | ||
22792 | -{ | ||
22793 | - case ${1} in | ||
22794 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
22795 | - * ) func_dirname_result="${3}" ;; | ||
22796 | - esac | ||
22797 | -} | ||
22798 | - | ||
22799 | -# func_basename file | ||
22800 | -func_basename () | ||
22801 | -{ | ||
22802 | - func_basename_result="${1##*/}" | ||
22803 | -} | ||
22804 | - | ||
22805 | -# func_dirname_and_basename file append nondir_replacement | ||
22806 | -# perform func_basename and func_dirname in a single function | ||
22807 | -# call: | ||
22808 | -# dirname: Compute the dirname of FILE. If nonempty, | ||
22809 | -# add APPEND to the result, otherwise set result | ||
22810 | -# to NONDIR_REPLACEMENT. | ||
22811 | -# value returned in "$func_dirname_result" | ||
22812 | -# basename: Compute filename of FILE. | ||
22813 | -# value retuned in "$func_basename_result" | ||
22814 | -# Implementation must be kept synchronized with func_dirname | ||
22815 | -# and func_basename. For efficiency, we do not delegate to | ||
22816 | -# those functions but instead duplicate the functionality here. | ||
22817 | -func_dirname_and_basename () | ||
22818 | -{ | ||
22819 | - case ${1} in | ||
22820 | - */*) func_dirname_result="${1%/*}${2}" ;; | ||
22821 | - * ) func_dirname_result="${3}" ;; | ||
22822 | - esac | ||
22823 | - func_basename_result="${1##*/}" | ||
22824 | -} | ||
22825 | - | ||
22826 | -# func_stripname prefix suffix name | ||
22827 | -# strip PREFIX and SUFFIX off of NAME. | ||
22828 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
22829 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
22830 | -# dot (in which case that matches only a dot). | ||
22831 | -func_stripname () | ||
22832 | -{ | ||
22833 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
22834 | - # positional parameters, so assign one to ordinary parameter first. | ||
22835 | - func_stripname_result=${3} | ||
22836 | - func_stripname_result=${func_stripname_result#"${1}"} | ||
22837 | - func_stripname_result=${func_stripname_result%"${2}"} | ||
22838 | -} | ||
22839 | - | ||
22840 | -# func_opt_split | ||
22841 | -func_opt_split () | ||
22842 | -{ | ||
22843 | - func_opt_split_opt=${1%%=*} | ||
22844 | - func_opt_split_arg=${1#*=} | ||
22845 | -} | ||
22846 | - | ||
22847 | -# func_lo2o object | ||
22848 | -func_lo2o () | ||
22849 | -{ | ||
22850 | - case ${1} in | ||
22851 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
22852 | - *) func_lo2o_result=${1} ;; | ||
22853 | - esac | ||
22854 | -} | ||
22855 | - | ||
22856 | -# func_xform libobj-or-source | ||
22857 | -func_xform () | ||
22858 | -{ | ||
22859 | - func_xform_result=${1%.*}.lo | ||
22860 | -} | ||
22861 | - | ||
22862 | -# func_arith arithmetic-term... | ||
22863 | -func_arith () | ||
22864 | -{ | ||
22865 | - func_arith_result=$(( $* )) | ||
22866 | -} | ||
22867 | - | ||
22868 | -# func_len string | ||
22869 | -# STRING may not start with a hyphen. | ||
22870 | -func_len () | ||
22871 | -{ | ||
22872 | - func_len_result=${#1} | ||
22873 | -} | ||
22874 | - | ||
22875 | -_LT_EOF | ||
22876 | - ;; | ||
22877 | - *) # Bourne compatible functions. | ||
22878 | - cat << \_LT_EOF >> "$cfgfile" | ||
22879 | - | ||
22880 | -# func_dirname file append nondir_replacement | ||
22881 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
22882 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
22883 | -func_dirname () | ||
22884 | -{ | ||
22885 | - # Extract subdirectory from the argument. | ||
22886 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
22887 | - if test "X$func_dirname_result" = "X${1}"; then | ||
22888 | - func_dirname_result="${3}" | ||
22889 | - else | ||
22890 | - func_dirname_result="$func_dirname_result${2}" | ||
22891 | - fi | ||
22892 | -} | ||
22893 | - | ||
22894 | -# func_basename file | ||
22895 | -func_basename () | ||
22896 | -{ | ||
22897 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
22898 | -} | ||
22899 | - | ||
22900 | - | ||
22901 | -# func_stripname prefix suffix name | ||
22902 | -# strip PREFIX and SUFFIX off of NAME. | ||
22903 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
22904 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
22905 | -# dot (in which case that matches only a dot). | ||
22906 | -# func_strip_suffix prefix name | ||
22907 | -func_stripname () | ||
22908 | -{ | ||
22909 | - case ${2} in | ||
22910 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
22911 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
22912 | - esac | ||
22913 | -} | ||
22914 | - | ||
22915 | -# sed scripts: | ||
22916 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
22917 | -my_sed_long_arg='1s/^-[^=]*=//' | ||
22918 | - | ||
22919 | -# func_opt_split | ||
22920 | -func_opt_split () | ||
22921 | -{ | ||
22922 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | ||
22923 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | ||
22924 | -} | ||
22925 | - | ||
22926 | -# func_lo2o object | ||
22927 | -func_lo2o () | ||
22928 | -{ | ||
22929 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | ||
22930 | -} | ||
22931 | - | ||
22932 | -# func_xform libobj-or-source | ||
22933 | -func_xform () | ||
22934 | -{ | ||
22935 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | ||
22936 | -} | ||
22937 | - | ||
22938 | -# func_arith arithmetic-term... | ||
22939 | -func_arith () | ||
22940 | -{ | ||
22941 | - func_arith_result=`expr "$@"` | ||
22942 | -} | ||
22943 | - | ||
22944 | -# func_len string | ||
22945 | -# STRING may not start with a hyphen. | ||
22946 | -func_len () | ||
22947 | -{ | ||
22948 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
22949 | -} | ||
22950 | - | ||
22951 | -_LT_EOF | ||
22952 | -esac | ||
22953 | - | ||
22954 | -case $lt_shell_append in | ||
22955 | - yes) | ||
22956 | - cat << \_LT_EOF >> "$cfgfile" | ||
22957 | - | ||
22958 | -# func_append var value | ||
22959 | -# Append VALUE to the end of shell variable VAR. | ||
22960 | -func_append () | ||
22961 | -{ | ||
22962 | - eval "$1+=\$2" | ||
22963 | -} | ||
22964 | -_LT_EOF | ||
22965 | - ;; | ||
22966 | - *) | ||
22967 | - cat << \_LT_EOF >> "$cfgfile" | ||
22968 | - | ||
22969 | -# func_append var value | ||
22970 | -# Append VALUE to the end of shell variable VAR. | ||
22971 | -func_append () | ||
22972 | -{ | ||
22973 | - eval "$1=\$$1\$2" | ||
22974 | -} | ||
22975 | - | ||
22976 | -_LT_EOF | ||
22977 | - ;; | ||
22978 | - esac | ||
22979 | - | ||
22980 | - | ||
22981 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
22982 | - || (rm -f "$cfgfile"; exit 1) | ||
22983 | - | ||
22984 | - mv -f "$cfgfile" "$ofile" || | ||
22985 | + sed '$q' "$ltmain" >> "$cfgfile" \ | ||
22986 | + || (rm -f "$cfgfile"; exit 1) | ||
22987 | + | ||
22988 | + if test x"$xsi_shell" = xyes; then | ||
22989 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | ||
22990 | +func_dirname ()\ | ||
22991 | +{\ | ||
22992 | +\ case ${1} in\ | ||
22993 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
22994 | +\ * ) func_dirname_result="${3}" ;;\ | ||
22995 | +\ esac\ | ||
22996 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
22997 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
22998 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
22999 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23000 | + | ||
23001 | + | ||
23002 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ | ||
23003 | +func_basename ()\ | ||
23004 | +{\ | ||
23005 | +\ func_basename_result="${1##*/}"\ | ||
23006 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23007 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23008 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23009 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23010 | + | ||
23011 | + | ||
23012 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ | ||
23013 | +func_dirname_and_basename ()\ | ||
23014 | +{\ | ||
23015 | +\ case ${1} in\ | ||
23016 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ | ||
23017 | +\ * ) func_dirname_result="${3}" ;;\ | ||
23018 | +\ esac\ | ||
23019 | +\ func_basename_result="${1##*/}"\ | ||
23020 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23021 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23022 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23023 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23024 | + | ||
23025 | + | ||
23026 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ | ||
23027 | +func_stripname ()\ | ||
23028 | +{\ | ||
23029 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ | ||
23030 | +\ # positional parameters, so assign one to ordinary parameter first.\ | ||
23031 | +\ func_stripname_result=${3}\ | ||
23032 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ | ||
23033 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ | ||
23034 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23035 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23036 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23037 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23038 | + | ||
23039 | + | ||
23040 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ | ||
23041 | +func_split_long_opt ()\ | ||
23042 | +{\ | ||
23043 | +\ func_split_long_opt_name=${1%%=*}\ | ||
23044 | +\ func_split_long_opt_arg=${1#*=}\ | ||
23045 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23046 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23047 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23048 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23049 | + | ||
23050 | + | ||
23051 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ | ||
23052 | +func_split_short_opt ()\ | ||
23053 | +{\ | ||
23054 | +\ func_split_short_opt_arg=${1#??}\ | ||
23055 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ | ||
23056 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23057 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23058 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23059 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23060 | + | ||
23061 | + | ||
23062 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ | ||
23063 | +func_lo2o ()\ | ||
23064 | +{\ | ||
23065 | +\ case ${1} in\ | ||
23066 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ | ||
23067 | +\ *) func_lo2o_result=${1} ;;\ | ||
23068 | +\ esac\ | ||
23069 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23070 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23071 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23072 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23073 | + | ||
23074 | + | ||
23075 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ | ||
23076 | +func_xform ()\ | ||
23077 | +{\ | ||
23078 | + func_xform_result=${1%.*}.lo\ | ||
23079 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23080 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23081 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23082 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23083 | + | ||
23084 | + | ||
23085 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ | ||
23086 | +func_arith ()\ | ||
23087 | +{\ | ||
23088 | + func_arith_result=$(( $* ))\ | ||
23089 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23090 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23091 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23092 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23093 | + | ||
23094 | + | ||
23095 | + sed -e '/^func_len ()$/,/^} # func_len /c\ | ||
23096 | +func_len ()\ | ||
23097 | +{\ | ||
23098 | + func_len_result=${#1}\ | ||
23099 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23100 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23101 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23102 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23103 | + | ||
23104 | +fi | ||
23105 | + | ||
23106 | +if test x"$lt_shell_append" = xyes; then | ||
23107 | + sed -e '/^func_append ()$/,/^} # func_append /c\ | ||
23108 | +func_append ()\ | ||
23109 | +{\ | ||
23110 | + eval "${1}+=\\${2}"\ | ||
23111 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23112 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23113 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23114 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23115 | + | ||
23116 | + | ||
23117 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ | ||
23118 | +func_append_quoted ()\ | ||
23119 | +{\ | ||
23120 | +\ func_quote_for_eval "${2}"\ | ||
23121 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ | ||
23122 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ | ||
23123 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23124 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23125 | +test 0 -eq $? || _lt_function_replace_fail=: | ||
23126 | + | ||
23127 | + | ||
23128 | + # Save a `func_append' function call where possible by direct use of '+=' | ||
23129 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | ||
23130 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23131 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23132 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
23133 | +else | ||
23134 | + # Save a `func_append' function call even when '+=' is not available | ||
23135 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
23136 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
23137 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
23138 | + test 0 -eq $? || _lt_function_replace_fail=: | ||
23139 | +fi | ||
23140 | + | ||
23141 | +if test x"$_lt_function_replace_fail" = x":"; then | ||
23142 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | ||
23143 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | ||
23144 | +fi | ||
23145 | + | ||
23146 | + | ||
23147 | + mv -f "$cfgfile" "$ofile" || | ||
23148 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | ||
23149 | chmod +x "$ofile" | ||
23150 | |||
21232 | -- | 23151 | -- |
21233 | 2.26.0 | 23152 | 2.28.0 |
21234 | 23153 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch deleted file mode 100644 index 463de80638..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From ef4ad1cb9ff1b5a871ffa792a71b3ad6d14eb3dc Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhenhua Luo <zhenhua.luo@nxp.com> | ||
3 | Date: Sat, 11 Jun 2016 22:08:29 -0500 | ||
4 | Subject: [PATCH] fix the incorrect assembling for ppc wait mnemonic | ||
5 | |||
6 | Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | --- | ||
10 | opcodes/ppc-opc.c | 3 +-- | ||
11 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c | ||
14 | index 7ef91d819b..145953d3c4 100644 | ||
15 | --- a/opcodes/ppc-opc.c | ||
16 | +++ b/opcodes/ppc-opc.c | ||
17 | @@ -5709,7 +5709,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { | ||
18 | {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, | ||
19 | |||
20 | {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, | ||
21 | -{"wait", X(31,30), XWC_MASK, POWER9, 0, {WC}}, | ||
22 | |||
23 | {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, | ||
24 | |||
25 | @@ -5763,7 +5762,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { | ||
26 | |||
27 | {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | ||
28 | {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | ||
29 | -{"wait", X(31,62), XWC_MASK, E500MC|PPCA2, 0, {WC}}, | ||
30 | +{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|POWER9, 0, {WC}}, | ||
31 | |||
32 | {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, | ||
33 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index f4f1a068cb..69a2383782 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 70f3f2d9e912ea777fa113e02cdbc3465a66e40d Mon Sep 17 00:00:00 2001 | 1 | From f791a5d84475c02356f16679b7f4ee9c9c3408aa Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 01:42:38 +0000 | 3 | Date: Mon, 2 Mar 2015 01:42:38 +0000 |
4 | Subject: [PATCH] Fix rpath in libtool when sysroot is enabled | 4 | Subject: [PATCH 14/17] Fix rpath in libtool when sysroot is enabled |
5 | 5 | ||
6 | Enabling sysroot support in libtool exposed a bug where the final | 6 | Enabling sysroot support in libtool exposed a bug where the final |
7 | library had an RPATH encoded into it which still pointed to the | 7 | library had an RPATH encoded into it which still pointed to the |
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | 1 file changed, 8 insertions(+), 2 deletions(-) | 19 | 1 file changed, 8 insertions(+), 2 deletions(-) |
20 | 20 | ||
21 | diff --git a/ltmain.sh b/ltmain.sh | 21 | diff --git a/ltmain.sh b/ltmain.sh |
22 | index 70e856e065..11ee684ccc 100644 | 22 | index 70e856e0659..11ee684cccf 100644 |
23 | --- a/ltmain.sh | 23 | --- a/ltmain.sh |
24 | +++ b/ltmain.sh | 24 | +++ b/ltmain.sh |
25 | @@ -8035,9 +8035,11 @@ EOF | 25 | @@ -8035,9 +8035,11 @@ EOF |
@@ -47,3 +47,6 @@ index 70e856e065..11ee684ccc 100644 | |||
47 | if test -n "$hardcode_libdir_separator"; then | 47 | if test -n "$hardcode_libdir_separator"; then |
48 | if test -z "$hardcode_libdirs"; then | 48 | if test -z "$hardcode_libdirs"; then |
49 | hardcode_libdirs="$libdir" | 49 | hardcode_libdirs="$libdir" |
50 | -- | ||
51 | 2.28.0 | ||
52 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch index a794719bd2..e848f146b0 100644 --- a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 392d474a72d37b669f53ab9f0fa913b958af93f6 Mon Sep 17 00:00:00 2001 | 1 | From e087f96e219d47c4d2244c3f32397e56d41bfdec Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Mon, 6 Mar 2017 23:33:27 -0800 | 3 | Date: Mon, 6 Mar 2017 23:33:27 -0800 |
4 | Subject: [PATCH] sync with OE libtool changes | 4 | Subject: [PATCH 15/17] sync with OE libtool changes |
5 | 5 | ||
6 | Apply these patches from our libtool patches as not only are redundant RPATHs a | 6 | Apply these patches from our libtool patches as not only are redundant RPATHs a |
7 | waste of space but they can cause incorrect linking when native packages are | 7 | waste of space but they can cause incorrect linking when native packages are |
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
26 | 1 file changed, 28 insertions(+), 6 deletions(-) | 26 | 1 file changed, 28 insertions(+), 6 deletions(-) |
27 | 27 | ||
28 | diff --git a/ltmain.sh b/ltmain.sh | 28 | diff --git a/ltmain.sh b/ltmain.sh |
29 | index 11ee684ccc..3b19ac1532 100644 | 29 | index 11ee684cccf..3b19ac15328 100644 |
30 | --- a/ltmain.sh | 30 | --- a/ltmain.sh |
31 | +++ b/ltmain.sh | 31 | +++ b/ltmain.sh |
32 | @@ -8053,8 +8053,16 @@ EOF | 32 | @@ -8053,8 +8053,16 @@ EOF |
@@ -84,3 +84,6 @@ index 11ee684ccc..3b19ac1532 100644 | |||
84 | fi | 84 | fi |
85 | elif test -n "$runpath_var"; then | 85 | elif test -n "$runpath_var"; then |
86 | case "$finalize_perm_rpath " in | 86 | case "$finalize_perm_rpath " in |
87 | -- | ||
88 | 2.28.0 | ||
89 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch b/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch index c694b42dc3..400b79823f 100644 --- a/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch +++ b/meta/recipes-devtools/binutils/binutils/0016-Check-for-clang-before-checking-gcc-version.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 67590a44c1256491fa674426f0170d5d05377d05 Mon Sep 17 00:00:00 2001 | 1 | From ae5a7d622dc9addb2ca9fc85889c45964c025a9c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 15 Apr 2020 14:17:20 -0700 | 3 | Date: Wed, 15 Apr 2020 14:17:20 -0700 |
4 | Subject: [PATCH 16/16] Check for clang before checking gcc version | 4 | Subject: [PATCH 16/17] Check for clang before checking gcc version |
5 | 5 | ||
6 | Clang advertises itself to be gcc 4.2.1, so when compiling this test | 6 | Clang advertises itself to be gcc 4.2.1, so when compiling this test |
7 | here fails since gcc < 4.4.5 did not support -static-libstdc++ but thats | 7 | here fails since gcc < 4.4.5 did not support -static-libstdc++ but thats |
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
18 | 2 files changed, 2 insertions(+), 2 deletions(-) | 18 | 2 files changed, 2 insertions(+), 2 deletions(-) |
19 | 19 | ||
20 | diff --git a/configure b/configure | 20 | diff --git a/configure b/configure |
21 | index 590b03c2da0..46f116fdb54 100755 | 21 | index 6782f8b6ab8..72f5766b363 100755 |
22 | --- a/configure | 22 | --- a/configure |
23 | +++ b/configure | 23 | +++ b/configure |
24 | @@ -5140,7 +5140,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | 24 | @@ -5143,7 +5143,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
25 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 25 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
26 | /* end confdefs.h. */ | 26 | /* end confdefs.h. */ |
27 | 27 | ||
@@ -31,10 +31,10 @@ index 590b03c2da0..46f116fdb54 100755 | |||
31 | #endif | 31 | #endif |
32 | int main() {} | 32 | int main() {} |
33 | diff --git a/configure.ac b/configure.ac | 33 | diff --git a/configure.ac b/configure.ac |
34 | index d3f85e6f5d5..c0eb1343121 100644 | 34 | index 55beb1dea46..3f9e613e2d9 100644 |
35 | --- a/configure.ac | 35 | --- a/configure.ac |
36 | +++ b/configure.ac | 36 | +++ b/configure.ac |
37 | @@ -1309,7 +1309,7 @@ if test "$GCC" = yes; then | 37 | @@ -1312,7 +1312,7 @@ if test "$GCC" = yes; then |
38 | AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) | 38 | AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) |
39 | AC_LANG_PUSH(C++) | 39 | AC_LANG_PUSH(C++) |
40 | AC_LINK_IFELSE([AC_LANG_SOURCE([ | 40 | AC_LINK_IFELSE([AC_LANG_SOURCE([ |
@@ -44,5 +44,5 @@ index d3f85e6f5d5..c0eb1343121 100644 | |||
44 | #endif | 44 | #endif |
45 | int main() {}])], | 45 | int main() {}])], |
46 | -- | 46 | -- |
47 | 2.26.1 | 47 | 2.28.0 |
48 | 48 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch b/meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch new file mode 100644 index 0000000000..99bb38eb67 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0017-Do-not-emit-R_RISCV_NONE-reloc-in-the-extra-unused-r.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 5b61c40c34c3db699de723c3128ba704501ccdac Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 Apr 2020 14:23:57 -0700 | ||
4 | Subject: [PATCH 17/17] Do not emit R_RISCV_NONE reloc in the extra unused | ||
5 | reloc space. | ||
6 | |||
7 | Redundant R_RISCV_DTPMOD* R_RISCV_DTPREL* results from Global Dynamic -> Local Exec relaxation | ||
8 | which generates | ||
9 | |||
10 | Patch from https://sourceware.org/bugzilla/show_bug.cgi?id=24673 | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | bfd/elfnn-riscv.c | 5 +++-- | ||
17 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c | ||
20 | index a5fa415309a..1e582052aa9 100644 | ||
21 | --- a/bfd/elfnn-riscv.c | ||
22 | +++ b/bfd/elfnn-riscv.c | ||
23 | @@ -2090,13 +2090,14 @@ riscv_elf_relocate_section (bfd *output_bfd, | ||
24 | pic = bfd_link_pic (info); | ||
25 | |||
26 | if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h) | ||
27 | - && (!pic || !SYMBOL_REFERENCES_LOCAL (info, h))) | ||
28 | + && (bfd_link_dll (info) | ||
29 | + || !SYMBOL_REFERENCES_LOCAL (info, h))) | ||
30 | indx = h->dynindx; | ||
31 | } | ||
32 | |||
33 | /* The GOT entries have not been initialized yet. Do it | ||
34 | now, and emit any relocations. */ | ||
35 | - if ((bfd_link_pic (info) || indx != 0) | ||
36 | + if ((bfd_link_dll (info) || indx != 0) | ||
37 | && (h == NULL | ||
38 | || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT | ||
39 | || h->root.type != bfd_link_hash_undefweak)) | ||
40 | -- | ||
41 | 2.28.0 | ||
42 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0017-binutils-drop-redundant-program_name-definition-fno-.patch b/meta/recipes-devtools/binutils/binutils/0017-binutils-drop-redundant-program_name-definition-fno-.patch deleted file mode 100644 index be59f9dca0..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0017-binutils-drop-redundant-program_name-definition-fno-.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From 57a3e055605b28a9449b1b27eda7125737c42b00 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergei Trofimovich <siarheit@google.com> | ||
3 | Date: Sat, 1 Feb 2020 23:16:11 +0000 | ||
4 | Subject: [PATCH] binutils: drop redundant 'program_name' definition | ||
5 | (-fno-common) | ||
6 | |||
7 | * coffdump.c (program_name): Drop redundant definition. | ||
8 | * srconv.c (program_name): Likewise | ||
9 | * sysdump.c (program_name): Likewise | ||
10 | |||
11 | Upstream-Status: Backport (commit 0b398d69ac) | ||
12 | Signed-off-by: Sergei Trofimovich <siarheit@google.com> | ||
13 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
14 | --- | ||
15 | binutils/coffdump.c | 2 -- | ||
16 | binutils/srconv.c | 2 -- | ||
17 | binutils/sysdump.c | 2 -- | ||
18 | 3 files changed, 6 deletions(-) | ||
19 | |||
20 | diff --git a/binutils/coffdump.c b/binutils/coffdump.c | ||
21 | index 531a4e46c3..336da57ca2 100644 | ||
22 | --- a/binutils/coffdump.c | ||
23 | +++ b/binutils/coffdump.c | ||
24 | @@ -456,8 +456,6 @@ coff_dump (struct coff_ofile *ptr) | ||
25 | dump_coff_section (ptr->sections + i); | ||
26 | } | ||
27 | |||
28 | -char * program_name; | ||
29 | - | ||
30 | static void | ||
31 | show_usage (FILE *file, int status) | ||
32 | { | ||
33 | diff --git a/binutils/srconv.c b/binutils/srconv.c | ||
34 | index 5742b16759..f071794f0a 100644 | ||
35 | --- a/binutils/srconv.c | ||
36 | +++ b/binutils/srconv.c | ||
37 | @@ -1687,8 +1687,6 @@ prescan (struct coff_ofile *otree) | ||
38 | } | ||
39 | } | ||
40 | |||
41 | -char *program_name; | ||
42 | - | ||
43 | ATTRIBUTE_NORETURN static void | ||
44 | show_usage (FILE *ffile, int status) | ||
45 | { | ||
46 | diff --git a/binutils/sysdump.c b/binutils/sysdump.c | ||
47 | index d433e71ed9..7eebbd61d3 100644 | ||
48 | --- a/binutils/sysdump.c | ||
49 | +++ b/binutils/sysdump.c | ||
50 | @@ -633,8 +633,6 @@ module (void) | ||
51 | } | ||
52 | } | ||
53 | |||
54 | -char *program_name; | ||
55 | - | ||
56 | ATTRIBUTE_NORETURN static void | ||
57 | show_usage (FILE *ffile, int status) | ||
58 | { | ||
59 | -- | ||
60 | 2.26.2 | ||
61 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2020-0551.patch b/meta/recipes-devtools/binutils/binutils/CVE-2020-0551.patch deleted file mode 100644 index 53e3caf445..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2020-0551.patch +++ /dev/null | |||
@@ -1,549 +0,0 @@ | |||
1 | From ae531041c7c5956672342f89c486a011c84f027f Mon Sep 17 00:00:00 2001 | ||
2 | From: "H.J. Lu" <hjl.tools@gmail.com> | ||
3 | Date: Wed, 11 Mar 2020 09:46:19 -0700 | ||
4 | Subject: [PATCH 1/1] i386: Generate lfence with load/indirect branch/ret | ||
5 | [CVE-2020-0551] | ||
6 | |||
7 | Add 3 command-line options to generate lfence for load, indirect near | ||
8 | branch and ret to help mitigate: | ||
9 | |||
10 | https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00334.html | ||
11 | http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0551 | ||
12 | |||
13 | 1. -mlfence-after-load=[no|yes]: | ||
14 | -mlfence-after-load=yes generates lfence after load instructions. | ||
15 | 2. -mlfence-before-indirect-branch=[none|all|memory|register]: | ||
16 | a. -mlfence-before-indirect-branch=all generates lfence before indirect | ||
17 | near branches via register and a warning before indirect near branches | ||
18 | via memory. | ||
19 | b. -mlfence-before-indirect-branch=memory issue a warning before | ||
20 | indirect near branches via memory. | ||
21 | c. -mlfence-before-indirect-branch=register generates lfence before | ||
22 | indirect near branches via register. | ||
23 | Note that lfence won't be generated before indirect near branches via | ||
24 | register with -mlfence-after-load=yes since lfence will be generated | ||
25 | after loading branch target register. | ||
26 | 3. -mlfence-before-ret=[none|or|not] | ||
27 | a. -mlfence-before-ret=or generates or with lfence before ret. | ||
28 | b. -mlfence-before-ret=not generates not with lfence before ret. | ||
29 | |||
30 | A warning will be issued and lfence won't be generated before indirect | ||
31 | near branch and ret if the previous item is a prefix or a constant | ||
32 | directive, which may be used to hardcode an instruction, since there | ||
33 | is no clear instruction boundary. | ||
34 | |||
35 | * config/tc-i386.c (lfence_after_load): New. | ||
36 | (lfence_before_indirect_branch_kind): New. | ||
37 | (lfence_before_indirect_branch): New. | ||
38 | (lfence_before_ret_kind): New. | ||
39 | (lfence_before_ret): New. | ||
40 | (last_insn): New. | ||
41 | (load_insn_p): New. | ||
42 | (insert_lfence_after): New. | ||
43 | (insert_lfence_before): New. | ||
44 | (md_assemble): Call insert_lfence_before and insert_lfence_after. | ||
45 | Set last_insn. | ||
46 | (OPTION_MLFENCE_AFTER_LOAD): New. | ||
47 | (OPTION_MLFENCE_BEFORE_INDIRECT_BRANCH): New. | ||
48 | (OPTION_MLFENCE_BEFORE_RET): New. | ||
49 | (md_longopts): Add -mlfence-after-load=, | ||
50 | -mlfence-before-indirect-branch= and -mlfence-before-ret=. | ||
51 | (md_parse_option): Handle -mlfence-after-load=, | ||
52 | -mlfence-before-indirect-branch= and -mlfence-before-ret=. | ||
53 | (md_show_usage): Display -mlfence-after-load=, | ||
54 | -mlfence-before-indirect-branch= and -mlfence-before-ret=. | ||
55 | (i386_cons_align): New. | ||
56 | * config/tc-i386.h (i386_cons_align): New. | ||
57 | (md_cons_align): New. | ||
58 | * doc/c-i386.texi: Document -mlfence-after-load=, | ||
59 | -mlfence-before-indirect-branch= and -mlfence-before-ret=. | ||
60 | |||
61 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
62 | Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ae531041c7c5956672342f89c486a011c84f027f] | ||
63 | CVE: CVE-2020-0551 | ||
64 | --- | ||
65 | diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c | ||
66 | index b020f39c863..09063f784b7 100644 | ||
67 | --- a/gas/config/tc-i386.c | ||
68 | +++ b/gas/config/tc-i386.c | ||
69 | @@ -629,7 +629,29 @@ static int omit_lock_prefix = 0; | ||
70 | "lock addl $0, (%{re}sp)". */ | ||
71 | static int avoid_fence = 0; | ||
72 | |||
73 | -/* Type of the previous instruction. */ | ||
74 | +/* 1 if lfence should be inserted after every load. */ | ||
75 | +static int lfence_after_load = 0; | ||
76 | + | ||
77 | +/* Non-zero if lfence should be inserted before indirect branch. */ | ||
78 | +static enum lfence_before_indirect_branch_kind | ||
79 | + { | ||
80 | + lfence_branch_none = 0, | ||
81 | + lfence_branch_register, | ||
82 | + lfence_branch_memory, | ||
83 | + lfence_branch_all | ||
84 | + } | ||
85 | +lfence_before_indirect_branch; | ||
86 | + | ||
87 | +/* Non-zero if lfence should be inserted before ret. */ | ||
88 | +static enum lfence_before_ret_kind | ||
89 | + { | ||
90 | + lfence_before_ret_none = 0, | ||
91 | + lfence_before_ret_not, | ||
92 | + lfence_before_ret_or | ||
93 | + } | ||
94 | +lfence_before_ret; | ||
95 | + | ||
96 | +/* Types of previous instruction is .byte or prefix. */ | ||
97 | static struct | ||
98 | { | ||
99 | segT seg; | ||
100 | @@ -4311,6 +4333,283 @@ optimize_encoding (void) | ||
101 | } | ||
102 | } | ||
103 | |||
104 | +/* Return non-zero for load instruction. */ | ||
105 | + | ||
106 | +static int | ||
107 | +load_insn_p (void) | ||
108 | +{ | ||
109 | + unsigned int dest; | ||
110 | + int any_vex_p = is_any_vex_encoding (&i.tm); | ||
111 | + unsigned int base_opcode = i.tm.base_opcode | 1; | ||
112 | + | ||
113 | + if (!any_vex_p) | ||
114 | + { | ||
115 | + /* lea */ | ||
116 | + if (i.tm.base_opcode == 0x8d) | ||
117 | + return 0; | ||
118 | + | ||
119 | + /* pop */ | ||
120 | + if ((i.tm.base_opcode & ~7) == 0x58 | ||
121 | + || (i.tm.base_opcode == 0x8f && i.tm.extension_opcode == 0)) | ||
122 | + return 1; | ||
123 | + | ||
124 | + /* movs, cmps, lods, scas. */ | ||
125 | + if ((i.tm.base_opcode | 0xb) == 0xaf) | ||
126 | + return 1; | ||
127 | + | ||
128 | + /* outs */ | ||
129 | + if (base_opcode == 0x6f) | ||
130 | + return 1; | ||
131 | + } | ||
132 | + | ||
133 | + /* No memory operand. */ | ||
134 | + if (!i.mem_operands) | ||
135 | + return 0; | ||
136 | + | ||
137 | + if (any_vex_p) | ||
138 | + { | ||
139 | + /* vldmxcsr. */ | ||
140 | + if (i.tm.base_opcode == 0xae | ||
141 | + && i.tm.opcode_modifier.vex | ||
142 | + && i.tm.opcode_modifier.vexopcode == VEX0F | ||
143 | + && i.tm.extension_opcode == 2) | ||
144 | + return 1; | ||
145 | + } | ||
146 | + else | ||
147 | + { | ||
148 | + /* test, not, neg, mul, imul, div, idiv. */ | ||
149 | + if ((i.tm.base_opcode == 0xf6 || i.tm.base_opcode == 0xf7) | ||
150 | + && i.tm.extension_opcode != 1) | ||
151 | + return 1; | ||
152 | + | ||
153 | + /* inc, dec. */ | ||
154 | + if (base_opcode == 0xff && i.tm.extension_opcode <= 1) | ||
155 | + return 1; | ||
156 | + | ||
157 | + /* add, or, adc, sbb, and, sub, xor, cmp. */ | ||
158 | + if (i.tm.base_opcode >= 0x80 && i.tm.base_opcode <= 0x83) | ||
159 | + return 1; | ||
160 | + | ||
161 | + /* bt, bts, btr, btc. */ | ||
162 | + if (i.tm.base_opcode == 0xfba | ||
163 | + && (i.tm.extension_opcode >= 4 && i.tm.extension_opcode <= 7)) | ||
164 | + return 1; | ||
165 | + | ||
166 | + /* rol, ror, rcl, rcr, shl/sal, shr, sar. */ | ||
167 | + if ((base_opcode == 0xc1 | ||
168 | + || (i.tm.base_opcode >= 0xd0 && i.tm.base_opcode <= 0xd3)) | ||
169 | + && i.tm.extension_opcode != 6) | ||
170 | + return 1; | ||
171 | + | ||
172 | + /* cmpxchg8b, cmpxchg16b, xrstors. */ | ||
173 | + if (i.tm.base_opcode == 0xfc7 | ||
174 | + && (i.tm.extension_opcode == 1 || i.tm.extension_opcode == 3)) | ||
175 | + return 1; | ||
176 | + | ||
177 | + /* fxrstor, ldmxcsr, xrstor. */ | ||
178 | + if (i.tm.base_opcode == 0xfae | ||
179 | + && (i.tm.extension_opcode == 1 | ||
180 | + || i.tm.extension_opcode == 2 | ||
181 | + || i.tm.extension_opcode == 5)) | ||
182 | + return 1; | ||
183 | + | ||
184 | + /* lgdt, lidt, lmsw. */ | ||
185 | + if (i.tm.base_opcode == 0xf01 | ||
186 | + && (i.tm.extension_opcode == 2 | ||
187 | + || i.tm.extension_opcode == 3 | ||
188 | + || i.tm.extension_opcode == 6)) | ||
189 | + return 1; | ||
190 | + | ||
191 | + /* vmptrld */ | ||
192 | + if (i.tm.base_opcode == 0xfc7 | ||
193 | + && i.tm.extension_opcode == 6) | ||
194 | + return 1; | ||
195 | + | ||
196 | + /* Check for x87 instructions. */ | ||
197 | + if (i.tm.base_opcode >= 0xd8 && i.tm.base_opcode <= 0xdf) | ||
198 | + { | ||
199 | + /* Skip fst, fstp, fstenv, fstcw. */ | ||
200 | + if (i.tm.base_opcode == 0xd9 | ||
201 | + && (i.tm.extension_opcode == 2 | ||
202 | + || i.tm.extension_opcode == 3 | ||
203 | + || i.tm.extension_opcode == 6 | ||
204 | + || i.tm.extension_opcode == 7)) | ||
205 | + return 0; | ||
206 | + | ||
207 | + /* Skip fisttp, fist, fistp, fstp. */ | ||
208 | + if (i.tm.base_opcode == 0xdb | ||
209 | + && (i.tm.extension_opcode == 1 | ||
210 | + || i.tm.extension_opcode == 2 | ||
211 | + || i.tm.extension_opcode == 3 | ||
212 | + || i.tm.extension_opcode == 7)) | ||
213 | + return 0; | ||
214 | + | ||
215 | + /* Skip fisttp, fst, fstp, fsave, fstsw. */ | ||
216 | + if (i.tm.base_opcode == 0xdd | ||
217 | + && (i.tm.extension_opcode == 1 | ||
218 | + || i.tm.extension_opcode == 2 | ||
219 | + || i.tm.extension_opcode == 3 | ||
220 | + || i.tm.extension_opcode == 6 | ||
221 | + || i.tm.extension_opcode == 7)) | ||
222 | + return 0; | ||
223 | + | ||
224 | + /* Skip fisttp, fist, fistp, fbstp, fistp. */ | ||
225 | + if (i.tm.base_opcode == 0xdf | ||
226 | + && (i.tm.extension_opcode == 1 | ||
227 | + || i.tm.extension_opcode == 2 | ||
228 | + || i.tm.extension_opcode == 3 | ||
229 | + || i.tm.extension_opcode == 6 | ||
230 | + || i.tm.extension_opcode == 7)) | ||
231 | + return 0; | ||
232 | + | ||
233 | + return 1; | ||
234 | + } | ||
235 | + } | ||
236 | + | ||
237 | + dest = i.operands - 1; | ||
238 | + | ||
239 | + /* Check fake imm8 operand and 3 source operands. */ | ||
240 | + if ((i.tm.opcode_modifier.immext | ||
241 | + || i.tm.opcode_modifier.vexsources == VEX3SOURCES) | ||
242 | + && i.types[dest].bitfield.imm8) | ||
243 | + dest--; | ||
244 | + | ||
245 | + /* add, or, adc, sbb, and, sub, xor, cmp, test, xchg, xadd */ | ||
246 | + if (!any_vex_p | ||
247 | + && (base_opcode == 0x1 | ||
248 | + || base_opcode == 0x9 | ||
249 | + || base_opcode == 0x11 | ||
250 | + || base_opcode == 0x19 | ||
251 | + || base_opcode == 0x21 | ||
252 | + || base_opcode == 0x29 | ||
253 | + || base_opcode == 0x31 | ||
254 | + || base_opcode == 0x39 | ||
255 | + || (i.tm.base_opcode >= 0x84 && i.tm.base_opcode <= 0x87) | ||
256 | + || base_opcode == 0xfc1)) | ||
257 | + return 1; | ||
258 | + | ||
259 | + /* Check for load instruction. */ | ||
260 | + return (i.types[dest].bitfield.class != ClassNone | ||
261 | + || i.types[dest].bitfield.instance == Accum); | ||
262 | +} | ||
263 | + | ||
264 | +/* Output lfence, 0xfaee8, after instruction. */ | ||
265 | + | ||
266 | +static void | ||
267 | +insert_lfence_after (void) | ||
268 | +{ | ||
269 | + if (lfence_after_load && load_insn_p ()) | ||
270 | + { | ||
271 | + char *p = frag_more (3); | ||
272 | + *p++ = 0xf; | ||
273 | + *p++ = 0xae; | ||
274 | + *p = 0xe8; | ||
275 | + } | ||
276 | +} | ||
277 | + | ||
278 | +/* Output lfence, 0xfaee8, before instruction. */ | ||
279 | + | ||
280 | +static void | ||
281 | +insert_lfence_before (void) | ||
282 | +{ | ||
283 | + char *p; | ||
284 | + | ||
285 | + if (is_any_vex_encoding (&i.tm)) | ||
286 | + return; | ||
287 | + | ||
288 | + if (i.tm.base_opcode == 0xff | ||
289 | + && (i.tm.extension_opcode == 2 || i.tm.extension_opcode == 4)) | ||
290 | + { | ||
291 | + /* Insert lfence before indirect branch if needed. */ | ||
292 | + | ||
293 | + if (lfence_before_indirect_branch == lfence_branch_none) | ||
294 | + return; | ||
295 | + | ||
296 | + if (i.operands != 1) | ||
297 | + abort (); | ||
298 | + | ||
299 | + if (i.reg_operands == 1) | ||
300 | + { | ||
301 | + /* Indirect branch via register. Don't insert lfence with | ||
302 | + -mlfence-after-load=yes. */ | ||
303 | + if (lfence_after_load | ||
304 | + || lfence_before_indirect_branch == lfence_branch_memory) | ||
305 | + return; | ||
306 | + } | ||
307 | + else if (i.mem_operands == 1 | ||
308 | + && lfence_before_indirect_branch != lfence_branch_register) | ||
309 | + { | ||
310 | + as_warn (_("indirect `%s` with memory operand should be avoided"), | ||
311 | + i.tm.name); | ||
312 | + return; | ||
313 | + } | ||
314 | + else | ||
315 | + return; | ||
316 | + | ||
317 | + if (last_insn.kind != last_insn_other | ||
318 | + && last_insn.seg == now_seg) | ||
319 | + { | ||
320 | + as_warn_where (last_insn.file, last_insn.line, | ||
321 | + _("`%s` skips -mlfence-before-indirect-branch on `%s`"), | ||
322 | + last_insn.name, i.tm.name); | ||
323 | + return; | ||
324 | + } | ||
325 | + | ||
326 | + p = frag_more (3); | ||
327 | + *p++ = 0xf; | ||
328 | + *p++ = 0xae; | ||
329 | + *p = 0xe8; | ||
330 | + return; | ||
331 | + } | ||
332 | + | ||
333 | + /* Output or/not and lfence before ret. */ | ||
334 | + if (lfence_before_ret != lfence_before_ret_none | ||
335 | + && (i.tm.base_opcode == 0xc2 | ||
336 | + || i.tm.base_opcode == 0xc3 | ||
337 | + || i.tm.base_opcode == 0xca | ||
338 | + || i.tm.base_opcode == 0xcb)) | ||
339 | + { | ||
340 | + if (last_insn.kind != last_insn_other | ||
341 | + && last_insn.seg == now_seg) | ||
342 | + { | ||
343 | + as_warn_where (last_insn.file, last_insn.line, | ||
344 | + _("`%s` skips -mlfence-before-ret on `%s`"), | ||
345 | + last_insn.name, i.tm.name); | ||
346 | + return; | ||
347 | + } | ||
348 | + if (lfence_before_ret == lfence_before_ret_or) | ||
349 | + { | ||
350 | + /* orl: 0x830c2400. */ | ||
351 | + p = frag_more ((flag_code == CODE_64BIT ? 1 : 0) + 4 + 3); | ||
352 | + if (flag_code == CODE_64BIT) | ||
353 | + *p++ = 0x48; | ||
354 | + *p++ = 0x83; | ||
355 | + *p++ = 0xc; | ||
356 | + *p++ = 0x24; | ||
357 | + *p++ = 0x0; | ||
358 | + } | ||
359 | + else | ||
360 | + { | ||
361 | + p = frag_more ((flag_code == CODE_64BIT ? 2 : 0) + 6 + 3); | ||
362 | + /* notl: 0xf71424. */ | ||
363 | + if (flag_code == CODE_64BIT) | ||
364 | + *p++ = 0x48; | ||
365 | + *p++ = 0xf7; | ||
366 | + *p++ = 0x14; | ||
367 | + *p++ = 0x24; | ||
368 | + /* notl: 0xf71424. */ | ||
369 | + if (flag_code == CODE_64BIT) | ||
370 | + *p++ = 0x48; | ||
371 | + *p++ = 0xf7; | ||
372 | + *p++ = 0x14; | ||
373 | + *p++ = 0x24; | ||
374 | + } | ||
375 | + *p++ = 0xf; | ||
376 | + *p++ = 0xae; | ||
377 | + *p = 0xe8; | ||
378 | + } | ||
379 | +} | ||
380 | + | ||
381 | /* This is the guts of the machine-dependent assembler. LINE points to a | ||
382 | machine dependent instruction. This function is supposed to emit | ||
383 | the frags/bytes it assembles to. */ | ||
384 | @@ -4628,9 +4927,13 @@ md_assemble (char *line) | ||
385 | if (i.rex != 0) | ||
386 | add_prefix (REX_OPCODE | i.rex); | ||
387 | |||
388 | + insert_lfence_before (); | ||
389 | + | ||
390 | /* We are ready to output the insn. */ | ||
391 | output_insn (); | ||
392 | |||
393 | + insert_lfence_after (); | ||
394 | + | ||
395 | last_insn.seg = now_seg; | ||
396 | |||
397 | if (i.tm.opcode_modifier.isprefix) | ||
398 | @@ -12250,6 +12553,9 @@ const char *md_shortopts = "qnO::"; | ||
399 | #define OPTION_MALIGN_BRANCH_PREFIX_SIZE (OPTION_MD_BASE + 28) | ||
400 | #define OPTION_MALIGN_BRANCH (OPTION_MD_BASE + 29) | ||
401 | #define OPTION_MBRANCHES_WITH_32B_BOUNDARIES (OPTION_MD_BASE + 30) | ||
402 | +#define OPTION_MLFENCE_AFTER_LOAD (OPTION_MD_BASE + 31) | ||
403 | +#define OPTION_MLFENCE_BEFORE_INDIRECT_BRANCH (OPTION_MD_BASE + 32) | ||
404 | +#define OPTION_MLFENCE_BEFORE_RET (OPTION_MD_BASE + 33) | ||
405 | |||
406 | struct option md_longopts[] = | ||
407 | { | ||
408 | @@ -12289,6 +12595,10 @@ struct option md_longopts[] = | ||
409 | {"malign-branch-prefix-size", required_argument, NULL, OPTION_MALIGN_BRANCH_PREFIX_SIZE}, | ||
410 | {"malign-branch", required_argument, NULL, OPTION_MALIGN_BRANCH}, | ||
411 | {"mbranches-within-32B-boundaries", no_argument, NULL, OPTION_MBRANCHES_WITH_32B_BOUNDARIES}, | ||
412 | + {"mlfence-after-load", required_argument, NULL, OPTION_MLFENCE_AFTER_LOAD}, | ||
413 | + {"mlfence-before-indirect-branch", required_argument, NULL, | ||
414 | + OPTION_MLFENCE_BEFORE_INDIRECT_BRANCH}, | ||
415 | + {"mlfence-before-ret", required_argument, NULL, OPTION_MLFENCE_BEFORE_RET}, | ||
416 | {"mamd64", no_argument, NULL, OPTION_MAMD64}, | ||
417 | {"mintel64", no_argument, NULL, OPTION_MINTEL64}, | ||
418 | {NULL, no_argument, NULL, 0} | ||
419 | @@ -12668,6 +12978,41 @@ md_parse_option (int c, const char *arg) | ||
420 | as_fatal (_("invalid -mfence-as-lock-add= option: `%s'"), arg); | ||
421 | break; | ||
422 | |||
423 | + case OPTION_MLFENCE_AFTER_LOAD: | ||
424 | + if (strcasecmp (arg, "yes") == 0) | ||
425 | + lfence_after_load = 1; | ||
426 | + else if (strcasecmp (arg, "no") == 0) | ||
427 | + lfence_after_load = 0; | ||
428 | + else | ||
429 | + as_fatal (_("invalid -mlfence-after-load= option: `%s'"), arg); | ||
430 | + break; | ||
431 | + | ||
432 | + case OPTION_MLFENCE_BEFORE_INDIRECT_BRANCH: | ||
433 | + if (strcasecmp (arg, "all") == 0) | ||
434 | + lfence_before_indirect_branch = lfence_branch_all; | ||
435 | + else if (strcasecmp (arg, "memory") == 0) | ||
436 | + lfence_before_indirect_branch = lfence_branch_memory; | ||
437 | + else if (strcasecmp (arg, "register") == 0) | ||
438 | + lfence_before_indirect_branch = lfence_branch_register; | ||
439 | + else if (strcasecmp (arg, "none") == 0) | ||
440 | + lfence_before_indirect_branch = lfence_branch_none; | ||
441 | + else | ||
442 | + as_fatal (_("invalid -mlfence-before-indirect-branch= option: `%s'"), | ||
443 | + arg); | ||
444 | + break; | ||
445 | + | ||
446 | + case OPTION_MLFENCE_BEFORE_RET: | ||
447 | + if (strcasecmp (arg, "or") == 0) | ||
448 | + lfence_before_ret = lfence_before_ret_or; | ||
449 | + else if (strcasecmp (arg, "not") == 0) | ||
450 | + lfence_before_ret = lfence_before_ret_not; | ||
451 | + else if (strcasecmp (arg, "none") == 0) | ||
452 | + lfence_before_ret = lfence_before_ret_none; | ||
453 | + else | ||
454 | + as_fatal (_("invalid -mlfence-before-ret= option: `%s'"), | ||
455 | + arg); | ||
456 | + break; | ||
457 | + | ||
458 | case OPTION_MRELAX_RELOCATIONS: | ||
459 | if (strcasecmp (arg, "yes") == 0) | ||
460 | generate_relax_relocations = 1; | ||
461 | @@ -13025,6 +13370,15 @@ md_show_usage (FILE *stream) | ||
462 | -mbranches-within-32B-boundaries\n\ | ||
463 | align branches within 32 byte boundary\n")); | ||
464 | fprintf (stream, _("\ | ||
465 | + -mlfence-after-load=[no|yes] (default: no)\n\ | ||
466 | + generate lfence after load\n")); | ||
467 | + fprintf (stream, _("\ | ||
468 | + -mlfence-before-indirect-branch=[none|all|register|memory] (default: none)\n\ | ||
469 | + generate lfence before indirect near branch\n")); | ||
470 | + fprintf (stream, _("\ | ||
471 | + -mlfence-before-ret=[none|or|not] (default: none)\n\ | ||
472 | + generate lfence before ret\n")); | ||
473 | + fprintf (stream, _("\ | ||
474 | -mamd64 accept only AMD64 ISA [default]\n")); | ||
475 | fprintf (stream, _("\ | ||
476 | -mintel64 accept only Intel64 ISA\n")); | ||
477 | @@ -13254,6 +13608,16 @@ i386_cons_align (int ignore ATTRIBUTE_UNUSED) | ||
478 | last_insn.kind = last_insn_directive; | ||
479 | last_insn.name = "constant directive"; | ||
480 | last_insn.file = as_where (&last_insn.line); | ||
481 | + if (lfence_before_ret != lfence_before_ret_none) | ||
482 | + { | ||
483 | + if (lfence_before_indirect_branch != lfence_branch_none) | ||
484 | + as_warn (_("constant directive skips -mlfence-before-ret " | ||
485 | + "and -mlfence-before-indirect-branch")); | ||
486 | + else | ||
487 | + as_warn (_("constant directive skips -mlfence-before-ret")); | ||
488 | + } | ||
489 | + else if (lfence_before_indirect_branch != lfence_branch_none) | ||
490 | + as_warn (_("constant directive skips -mlfence-before-indirect-branch")); | ||
491 | } | ||
492 | } | ||
493 | |||
494 | diff --git a/gas/doc/c-i386.texi b/gas/doc/c-i386.texi | ||
495 | index c536759cb38..1dd99f91bb0 100644 | ||
496 | --- a/gas/doc/c-i386.texi | ||
497 | +++ b/gas/doc/c-i386.texi | ||
498 | @@ -464,6 +464,49 @@ on an instruction. It is equivalent to | ||
499 | @option{-malign-branch-prefix-size=5}. | ||
500 | The default doesn't align branches. | ||
501 | |||
502 | +@cindex @samp{-mlfence-after-load=} option, i386 | ||
503 | +@cindex @samp{-mlfence-after-load=} option, x86-64 | ||
504 | +@item -mlfence-after-load=@var{no} | ||
505 | +@itemx -mlfence-after-load=@var{yes} | ||
506 | +These options control whether the assembler should generate lfence | ||
507 | +after load instructions. @option{-mlfence-after-load=@var{yes}} will | ||
508 | +generate lfence. @option{-mlfence-after-load=@var{no}} will not generate | ||
509 | +lfence, which is the default. | ||
510 | + | ||
511 | +@cindex @samp{-mlfence-before-indirect-branch=} option, i386 | ||
512 | +@cindex @samp{-mlfence-before-indirect-branch=} option, x86-64 | ||
513 | +@item -mlfence-before-indirect-branch=@var{none} | ||
514 | +@item -mlfence-before-indirect-branch=@var{all} | ||
515 | +@item -mlfence-before-indirect-branch=@var{register} | ||
516 | +@itemx -mlfence-before-indirect-branch=@var{memory} | ||
517 | +These options control whether the assembler should generate lfence | ||
518 | +after indirect near branch instructions. | ||
519 | +@option{-mlfence-before-indirect-branch=@var{all}} will generate lfence | ||
520 | +after indirect near branch via register and issue a warning before | ||
521 | +indirect near branch via memory. | ||
522 | +@option{-mlfence-before-indirect-branch=@var{register}} will generate | ||
523 | +lfence after indirect near branch via register. | ||
524 | +@option{-mlfence-before-indirect-branch=@var{memory}} will issue a | ||
525 | +warning before indirect near branch via memory. | ||
526 | +@option{-mlfence-before-indirect-branch=@var{none}} will not generate | ||
527 | +lfence nor issue warning, which is the default. Note that lfence won't | ||
528 | +be generated before indirect near branch via register with | ||
529 | +@option{-mlfence-after-load=@var{yes}} since lfence will be generated | ||
530 | +after loading branch target register. | ||
531 | + | ||
532 | +@cindex @samp{-mlfence-before-ret=} option, i386 | ||
533 | +@cindex @samp{-mlfence-before-ret=} option, x86-64 | ||
534 | +@item -mlfence-before-ret=@var{none} | ||
535 | +@item -mlfence-before-ret=@var{or} | ||
536 | +@itemx -mlfence-before-ret=@var{not} | ||
537 | +These options control whether the assembler should generate lfence | ||
538 | +before ret. @option{-mlfence-before-ret=@var{or}} will generate | ||
539 | +generate or instruction with lfence. | ||
540 | +@option{-mlfence-before-ret=@var{not}} will generate not instruction | ||
541 | +with lfence. | ||
542 | +@option{-mlfence-before-ret=@var{none}} will not generate lfence, | ||
543 | +which is the default. | ||
544 | + | ||
545 | @cindex @samp{-mx86-used-note=} option, i386 | ||
546 | @cindex @samp{-mx86-used-note=} option, x86-64 | ||
547 | @item -mx86-used-note=@var{no} | ||
548 | -- | ||
549 | 2.18.2 | ||
diff --git a/meta/recipes-devtools/binutils/binutils_2.34.bb b/meta/recipes-devtools/binutils/binutils_2.35.bb index 2e645e1ed8..2e645e1ed8 100644 --- a/meta/recipes-devtools/binutils/binutils_2.34.bb +++ b/meta/recipes-devtools/binutils/binutils_2.35.bb | |||