diff options
Diffstat (limited to 'meta/recipes-devtools/binutils')
30 files changed, 857 insertions, 2003 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.31.inc b/meta/recipes-devtools/binutils/binutils-2.32.inc index 62acec500e..7423986815 100644 --- a/meta/recipes-devtools/binutils/binutils-2.31.inc +++ b/meta/recipes-devtools/binutils/binutils-2.32.inc | |||
@@ -14,38 +14,30 @@ def binutils_branch_version(d): | |||
14 | pvsplit = d.getVar('PV').split('.') | 14 | pvsplit = d.getVar('PV').split('.') |
15 | return pvsplit[0] + "_" + pvsplit[1] | 15 | return pvsplit[0] + "_" + pvsplit[1] |
16 | 16 | ||
17 | PV = "2.32.0" | ||
17 | BINUPV = "${@binutils_branch_version(d)}" | 18 | BINUPV = "${@binutils_branch_version(d)}" |
18 | PV .= ".1" | 19 | #BRANCH = "binutils-${BINUPV}-branch" |
20 | BRANCH ?= "binutils-2_32-branch" | ||
19 | 21 | ||
20 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" | 22 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" |
21 | 23 | ||
22 | SRCREV ?= "c909e7afdc4710851a53e86ebed8cea3879b26e5" | 24 | SRCREV ?= "b8c1f608db9ef3edd483d21a921d1fbedc71df6f" |
23 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git" | 25 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" |
24 | SRC_URI = "\ | 26 | SRC_URI = "\ |
25 | ${BINUTILS_GIT_URI} \ | 27 | ${BINUTILS_GIT_URI} \ |
26 | file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ | 28 | file://0003-configure-widen-the-regexp-for-SH-architectures.patch \ |
27 | file://0004-Point-scripts-location-to-libdir.patch \ | 29 | file://0004-Point-scripts-location-to-libdir.patch \ |
28 | file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ | 30 | file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ |
29 | file://0006-Use-libtool-2.4.patch \ | 31 | file://0006-Use-libtool-2.4.patch \ |
30 | file://0007-Add-the-armv5e-architecture-to-binutils.patch \ | 32 | file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ |
31 | file://0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ | 33 | file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \ |
32 | file://0009-warn-for-uses-of-system-directories-when-cross-linki.patch \ | 34 | file://0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ |
33 | file://0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \ | 35 | file://0010-Change-default-emulation-for-mips64-linux.patch \ |
34 | file://0011-Change-default-emulation-for-mips64-linux.patch \ | 36 | file://0011-Add-support-for-Netlogic-XLP.patch \ |
35 | file://0012-Add-support-for-Netlogic-XLP.patch \ | 37 | file://0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ |
36 | file://0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \ | 38 | file://0013-Detect-64-bit-MIPS-targets.patch \ |
37 | file://0014-Detect-64-bit-MIPS-targets.patch \ | 39 | file://0014-sync-with-OE-libtool-changes.patch \ |
38 | file://0015-sync-with-OE-libtool-changes.patch \ | 40 | file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \ |
39 | file://0016-add-i386pep-emulation-for-x86_64.patch \ | ||
40 | file://0022-Handle-ELF-compressed-header-alignment-correctly-by-.patch \ | ||
41 | file://0023-gold-Get-alignment-of-uncompressed-section-from-ch_a.patch \ | ||
42 | file://clang-bfd-fix.patch \ | ||
43 | file://CVE-2018-17358.patch \ | ||
44 | file://CVE-2018-17360.patch \ | ||
45 | file://CVE-2018-18309.patch \ | ||
46 | file://CVE-2018-18605.patch \ | ||
47 | file://CVE-2018-18606.patch \ | ||
48 | file://CVE-2018-18607.patch \ | ||
49 | " | 41 | " |
50 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |
51 | 43 | ||
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.31.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.32.bb index 5dbaa03017..5dbaa03017 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.31.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.32.bb | |||
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.31.bb b/meta/recipes-devtools/binutils/binutils-cross_2.32.bb index fbd1f7d25a..fbd1f7d25a 100644 --- a/meta/recipes-devtools/binutils/binutils-cross_2.31.bb +++ b/meta/recipes-devtools/binutils/binutils-cross_2.32.bb | |||
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.31.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.32.bb index 37f4d6d2e9..37f4d6d2e9 100644 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.31.bb +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.32.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 6bdb407b1e..6581bad119 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,4 +1,4 @@ | |||
1 | From 4a99f058030c86794bb96b582a7dbd631f963b06 Mon Sep 17 00:00:00 2001 | 1 | From 5bcd884f8af5106d0fa380c42cffe07f3c993ed2 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 01/15] binutils-crosssdk: Generate relocatable SDKs | 4 | Subject: [PATCH 01/15] binutils-crosssdk: Generate relocatable SDKs |
@@ -18,10 +18,10 @@ 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 370b22269d..a5c367aa8f 100755 | 21 | index 77ddbbc8f8..d789e77943 100755 |
22 | --- a/ld/genscripts.sh | 22 | --- a/ld/genscripts.sh |
23 | +++ b/ld/genscripts.sh | 23 | +++ b/ld/genscripts.sh |
24 | @@ -279,6 +279,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" | 24 | @@ -310,6 +310,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}" |
25 | LD_FLAG=r | 25 | LD_FLAG=r |
26 | DATA_ALIGNMENT=${DATA_ALIGNMENT_r} | 26 | DATA_ALIGNMENT=${DATA_ALIGNMENT_r} |
27 | DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" | 27 | DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" |
@@ -29,7 +29,7 @@ index 370b22269d..a5c367aa8f 100755 | |||
29 | ( echo "/* Script for ld -r: link without relocation */" | 29 | ( echo "/* Script for ld -r: link without relocation */" |
30 | . ${CUSTOMIZER_SCRIPT} | 30 | . ${CUSTOMIZER_SCRIPT} |
31 | . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc | 31 | . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc |
32 | @@ -287,10 +288,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" | 32 | @@ -318,10 +319,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})" |
33 | LD_FLAG=u | 33 | LD_FLAG=u |
34 | DATA_ALIGNMENT=${DATA_ALIGNMENT_u} | 34 | DATA_ALIGNMENT=${DATA_ALIGNMENT_u} |
35 | CONSTRUCTING=" " | 35 | CONSTRUCTING=" " |
@@ -43,7 +43,7 @@ index 370b22269d..a5c367aa8f 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 444aef2942..afa99f736d 100644 | 46 | index bd7584120e..8bbe052d4b 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 | @@ -139,8 +139,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then | 49 | @@ -139,8 +139,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then |
@@ -58,5 +58,5 @@ index 444aef2942..afa99f736d 100644 | |||
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 | -- | 60 | -- |
61 | 2.18.0 | 61 | 2.20.1 |
62 | 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 0208213832..32537d4b58 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,4 +1,4 @@ | |||
1 | From 6e78b1c88c040a742b7af82542ac7eb92eddda3d Mon Sep 17 00:00:00 2001 | 1 | From 11927913560fc5a5d51af3bc5eb8ad62a86c9840 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 02/15] binutils-cross: Do not generate linker script | 4 | Subject: [PATCH 02/15] binutils-cross: Do not generate linker script |
@@ -23,10 +23,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
23 | 1 file changed, 25 deletions(-) | 23 | 1 file changed, 25 deletions(-) |
24 | 24 | ||
25 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh | 25 | diff --git a/ld/genscripts.sh b/ld/genscripts.sh |
26 | index a5c367aa8f..6cc9eed976 100755 | 26 | index d789e77943..144e2e8736 100755 |
27 | --- a/ld/genscripts.sh | 27 | --- a/ld/genscripts.sh |
28 | +++ b/ld/genscripts.sh | 28 | +++ b/ld/genscripts.sh |
29 | @@ -189,31 +189,6 @@ append_to_lib_path() | 29 | @@ -220,31 +220,6 @@ append_to_lib_path() |
30 | fi | 30 | fi |
31 | } | 31 | } |
32 | 32 | ||
@@ -59,5 +59,5 @@ index a5c367aa8f..6cc9eed976 100755 | |||
59 | libs=${NATIVE_LIB_DIRS} | 59 | libs=${NATIVE_LIB_DIRS} |
60 | if [ "x${NATIVE}" = "xyes" ] ; then | 60 | if [ "x${NATIVE}" = "xyes" ] ; then |
61 | -- | 61 | -- |
62 | 2.18.0 | 62 | 2.20.1 |
63 | 63 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch index 15193c10a6..a30138295a 100644 --- a/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch +++ b/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4c6fd8f5eb9bc7c0d02f1a98ad86e395d4d2ab3b Mon Sep 17 00:00:00 2001 | 1 | From da3939de6fb36da2c6484f14f08a37be195d9dc3 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 03/15] configure: widen the regexp for SH architectures | 4 | Subject: [PATCH 03/15] configure: widen the regexp for SH architectures |
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 2 files changed, 6 insertions(+), 1 deletion(-) | 14 | 2 files changed, 6 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/configure b/configure | 16 | diff --git a/configure b/configure |
17 | index 08dd35c3ea..815e74ddb7 100755 | 17 | index 3747645961..78b5240101 100755 |
18 | --- a/configure | 18 | --- a/configure |
19 | +++ b/configure | 19 | +++ b/configure |
20 | @@ -3855,7 +3855,7 @@ case "${target}" in | 20 | @@ -3861,7 +3861,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,7 +27,7 @@ index 08dd35c3ea..815e74ddb7 100755 | |||
27 | sh*-*-elf) | 27 | sh*-*-elf) |
28 | ;; | 28 | ;; |
29 | diff --git a/gprof/configure b/gprof/configure | 29 | diff --git a/gprof/configure b/gprof/configure |
30 | index 447cea7884..a730e20509 100755 | 30 | index f84efaba20..ab32bab2b6 100755 |
31 | --- a/gprof/configure | 31 | --- a/gprof/configure |
32 | +++ b/gprof/configure | 32 | +++ b/gprof/configure |
33 | @@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) | 33 | @@ -6162,6 +6162,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) |
@@ -43,5 +43,5 @@ index 447cea7884..a730e20509 100755 | |||
43 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 43 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
44 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | 44 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
45 | -- | 45 | -- |
46 | 2.18.0 | 46 | 2.20.1 |
47 | 47 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch index bf1c1be27d..f8e352228f 100644 --- a/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch +++ b/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 48ad5292b10408d4e5d5739022753a7183a1cbb3 Mon Sep 17 00:00:00 2001 | 1 | From fc1ff860fd88fa2d0584bd19181c880a76331a8d 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 04/15] Point scripts location to libdir | 4 | Subject: [PATCH 04/15] Point scripts location to libdir |
@@ -12,7 +12,7 @@ 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 d86ad0940c..c95b0ef025 100644 | 15 | index c2c798b4fe..d7faf19271 100644 |
16 | --- a/ld/Makefile.am | 16 | --- a/ld/Makefile.am |
17 | +++ b/ld/Makefile.am | 17 | +++ b/ld/Makefile.am |
18 | @@ -57,7 +57,7 @@ endif | 18 | @@ -57,7 +57,7 @@ endif |
@@ -25,7 +25,7 @@ index d86ad0940c..c95b0ef025 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 4792b2b013..789df2d01b 100644 | 28 | index fc687fc516..8b14f5236c 100644 |
29 | --- a/ld/Makefile.in | 29 | --- a/ld/Makefile.in |
30 | +++ b/ld/Makefile.in | 30 | +++ b/ld/Makefile.in |
31 | @@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) | 31 | @@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) |
@@ -38,5 +38,5 @@ index 4792b2b013..789df2d01b 100644 | |||
38 | BFDDIR = $(BASEDIR)/bfd | 38 | BFDDIR = $(BASEDIR)/bfd |
39 | INCDIR = $(BASEDIR)/include | 39 | INCDIR = $(BASEDIR)/include |
40 | -- | 40 | -- |
41 | 2.18.0 | 41 | 2.20.1 |
42 | 42 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch index 1f589718ed..1bad53175e 100644 --- a/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch +++ b/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 79e53510b1f9e16a21db312698fb1c1c442481e7 Mon Sep 17 00:00:00 2001 | 1 | From 66861bff389434e3454c7650ee29fade7a1cc5ed 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 05/15] Only generate an RPATH entry if LD_RUN_PATH is not | 4 | Subject: [PATCH 05/15] Only generate an RPATH entry if LD_RUN_PATH is not |
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 4 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
16 | 16 | ||
17 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em | 17 | diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em |
18 | index 1ad9d6b6fa..6a025a45b4 100644 | 18 | index f4f7ad6b4e..cfd787ff28 100644 |
19 | --- a/ld/emultempl/elf32.em | 19 | --- a/ld/emultempl/elf32.em |
20 | +++ b/ld/emultempl/elf32.em | 20 | +++ b/ld/emultempl/elf32.em |
21 | @@ -1471,6 +1471,8 @@ fragment <<EOF | 21 | @@ -1471,6 +1471,8 @@ fragment <<EOF |
@@ -27,7 +27,7 @@ index 1ad9d6b6fa..6a025a45b4 100644 | |||
27 | if (path | 27 | if (path |
28 | && gld${EMULATION_NAME}_search_needed (path, &n, force)) | 28 | && gld${EMULATION_NAME}_search_needed (path, &n, force)) |
29 | break; | 29 | break; |
30 | @@ -1751,6 +1753,8 @@ gld${EMULATION_NAME}_before_allocation (void) | 30 | @@ -1746,6 +1748,8 @@ gld${EMULATION_NAME}_before_allocation (void) |
31 | rpath = command_line.rpath; | 31 | rpath = command_line.rpath; |
32 | if (rpath == NULL) | 32 | if (rpath == NULL) |
33 | rpath = (const char *) getenv ("LD_RUN_PATH"); | 33 | rpath = (const char *) getenv ("LD_RUN_PATH"); |
@@ -37,5 +37,5 @@ index 1ad9d6b6fa..6a025a45b4 100644 | |||
37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) | 37 | for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) |
38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) | 38 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) |
39 | -- | 39 | -- |
40 | 2.18.0 | 40 | 2.20.1 |
41 | 41 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch index 8550df0cb0..f0c4d251bd 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 11f6d2889725ad592ab789534ca9b858073df4d1 Mon Sep 17 00:00:00 2001 | 1 | From 418527a2971d4e77a87085400397090d89fc5c94 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 06/15] Use libtool 2.4 | 4 | Subject: [PATCH 06/15] Use libtool 2.4 |
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | bfd/configure.ac | 2 +- | 13 | bfd/configure.ac | 2 +- |
14 | binutils/configure | 1320 ++++++++++++++----- | 14 | binutils/configure | 1320 ++++++++++++++----- |
15 | gas/configure | 1320 ++++++++++++++----- | 15 | gas/configure | 1320 ++++++++++++++----- |
16 | gprof/configure | 1327 ++++++++++++++----- | 16 | gprof/configure | 1321 ++++++++++++++----- |
17 | ld/configure | 1695 ++++++++++++++++++------ | 17 | ld/configure | 1695 ++++++++++++++++++------ |
18 | libtool.m4 | 1080 +++++++++++----- | 18 | libtool.m4 | 1080 +++++++++++----- |
19 | ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- | 19 | ltmain.sh | 2925 ++++++++++++++++++++++++++++-------------- |
@@ -23,12 +23,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
23 | opcodes/configure | 1322 ++++++++++++++----- | 23 | opcodes/configure | 1322 ++++++++++++++----- |
24 | opcodes/configure.ac | 2 +- | 24 | opcodes/configure.ac | 2 +- |
25 | zlib/configure | 1320 ++++++++++++++----- | 25 | zlib/configure | 1320 ++++++++++++++----- |
26 | 14 files changed, 9948 insertions(+), 3703 deletions(-) | 26 | 14 files changed, 9940 insertions(+), 3705 deletions(-) |
27 | 27 | ||
28 | Index: git/bfd/configure | 28 | diff --git a/bfd/configure b/bfd/configure |
29 | =================================================================== | 29 | index 17960684f8..925fb401f2 100755 |
30 | --- git.orig/bfd/configure | 30 | --- a/bfd/configure |
31 | +++ git/bfd/configure | 31 | +++ b/bfd/configure |
32 | @@ -704,6 +704,9 @@ OTOOL | 32 | @@ -704,6 +704,9 @@ OTOOL |
33 | LIPO | 33 | LIPO |
34 | NMEDIT | 34 | NMEDIT |
@@ -76,7 +76,7 @@ Index: git/bfd/configure | |||
76 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 76 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
77 | ECHO='print -r --' | 77 | ECHO='print -r --' |
78 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 78 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
79 | @@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell u | 79 | @@ -6420,8 +6426,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
80 | # Try some XSI features | 80 | # Try some XSI features |
81 | xsi_shell=no | 81 | xsi_shell=no |
82 | ( _lt_dummy="a/b/c" | 82 | ( _lt_dummy="a/b/c" |
@@ -212,7 +212,7 @@ Index: git/bfd/configure | |||
212 | file_magic_cmd=$lt_cv_file_magic_cmd | 212 | file_magic_cmd=$lt_cv_file_magic_cmd |
213 | deplibs_check_method=$lt_cv_deplibs_check_method | 213 | deplibs_check_method=$lt_cv_deplibs_check_method |
214 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 214 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
215 | @@ -6823,9 +6924,162 @@ test -z "$deplibs_check_method" && depli | 215 | @@ -6821,11 +6922,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
216 | 216 | ||
217 | 217 | ||
218 | 218 | ||
@@ -226,6 +226,8 @@ Index: git/bfd/configure | |||
226 | + | 226 | + |
227 | + | 227 | + |
228 | + | 228 | + |
229 | |||
230 | |||
229 | if test -n "$ac_tool_prefix"; then | 231 | if test -n "$ac_tool_prefix"; then |
230 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 232 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
231 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | 233 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
@@ -447,7 +449,7 @@ Index: git/bfd/configure | |||
447 | + | 449 | + |
448 | + | 450 | + |
449 | + | 451 | + |
450 | 452 | + | |
451 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 453 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
452 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 454 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
453 | +if ${lt_cv_ar_at_file+:} false; then : | 455 | +if ${lt_cv_ar_at_file+:} false; then : |
@@ -456,7 +458,7 @@ Index: git/bfd/configure | |||
456 | + lt_cv_ar_at_file=no | 458 | + lt_cv_ar_at_file=no |
457 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 459 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
458 | +/* end confdefs.h. */ | 460 | +/* end confdefs.h. */ |
459 | 461 | + | |
460 | +int | 462 | +int |
461 | +main () | 463 | +main () |
462 | +{ | 464 | +{ |
@@ -489,11 +491,11 @@ Index: git/bfd/configure | |||
489 | 491 | ||
490 | +fi | 492 | +fi |
491 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 493 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
492 | + | 494 | |
493 | +fi | 495 | +fi |
494 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 496 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
495 | +$as_echo "$lt_cv_ar_at_file" >&6; } | 497 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
496 | + | 498 | |
497 | +if test "x$lt_cv_ar_at_file" = xno; then | 499 | +if test "x$lt_cv_ar_at_file" = xno; then |
498 | + archiver_list_spec= | 500 | + archiver_list_spec= |
499 | +else | 501 | +else |
@@ -549,7 +551,7 @@ Index: git/bfd/configure | |||
549 | const char *name; | 551 | const char *name; |
550 | void *address; | 552 | void *address; |
551 | } | 553 | } |
552 | @@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() | 554 | @@ -7377,8 +7708,8 @@ static const void *lt_preloaded_setup() { |
553 | _LT_EOF | 555 | _LT_EOF |
554 | # Now try linking the two files. | 556 | # Now try linking the two files. |
555 | mv conftest.$ac_objext conftstm.$ac_objext | 557 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -571,7 +573,7 @@ Index: git/bfd/configure | |||
571 | else | 573 | else |
572 | echo "cannot find nm_test_func in $nlist" >&5 | 574 | echo "cannot find nm_test_func in $nlist" >&5 |
573 | fi | 575 | fi |
574 | @@ -7426,6 +7757,20 @@ else | 576 | @@ -7426,6 +7757,16 @@ else |
575 | $as_echo "ok" >&6; } | 577 | $as_echo "ok" >&6; } |
576 | fi | 578 | fi |
577 | 579 | ||
@@ -585,17 +587,20 @@ Index: git/bfd/configure | |||
585 | + | 587 | + |
586 | + | 588 | + |
587 | + | 589 | + |
588 | + | ||
589 | + | ||
590 | + | ||
591 | + | ||
592 | 590 | ||
593 | 591 | ||
594 | 592 | ||
595 | @@ -7445,6 +7790,41 @@ fi | 593 | @@ -7442,6 +7783,45 @@ fi |
596 | 594 | ||
597 | 595 | ||
598 | 596 | ||
597 | + | ||
598 | + | ||
599 | + | ||
600 | + | ||
601 | + | ||
602 | + | ||
603 | + | ||
599 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 604 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
600 | +$as_echo_n "checking for sysroot... " >&6; } | 605 | +$as_echo_n "checking for sysroot... " >&6; } |
601 | + | 606 | + |
@@ -628,12 +633,9 @@ Index: git/bfd/configure | |||
628 | + | 633 | + |
629 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 634 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
630 | +$as_echo "${lt_sysroot:-no}" >&6; } | 635 | +$as_echo "${lt_sysroot:-no}" >&6; } |
631 | + | ||
632 | + | ||
633 | + | ||
634 | 636 | ||
635 | 637 | ||
636 | # Check whether --enable-libtool-lock was given. | 638 | |
637 | @@ -7653,6 +8033,123 @@ esac | 639 | @@ -7653,6 +8033,123 @@ esac |
638 | 640 | ||
639 | need_locks="$enable_libtool_lock" | 641 | need_locks="$enable_libtool_lock" |
@@ -795,7 +797,7 @@ Index: git/bfd/configure | |||
795 | 797 | ||
796 | if test "$GCC" = yes; then | 798 | if test "$GCC" = yes; then |
797 | lt_prog_compiler_wl='-Wl,' | 799 | lt_prog_compiler_wl='-Wl,' |
798 | @@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler optio | 800 | @@ -8934,6 +9432,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
799 | lt_prog_compiler_pic='--shared' | 801 | lt_prog_compiler_pic='--shared' |
800 | lt_prog_compiler_static='--static' | 802 | lt_prog_compiler_static='--static' |
801 | ;; | 803 | ;; |
@@ -808,7 +810,7 @@ Index: git/bfd/configure | |||
808 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 810 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
809 | # Portland Group compilers (*not* the Pentium gcc compiler, | 811 | # Portland Group compilers (*not* the Pentium gcc compiler, |
810 | # which looks to be a dead project) | 812 | # which looks to be a dead project) |
811 | @@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler optio | 813 | @@ -8996,7 +9500,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
812 | lt_prog_compiler_pic='-KPIC' | 814 | lt_prog_compiler_pic='-KPIC' |
813 | lt_prog_compiler_static='-Bstatic' | 815 | lt_prog_compiler_static='-Bstatic' |
814 | case $cc_basename in | 816 | case $cc_basename in |
@@ -969,7 +971,7 @@ Index: git/bfd/configure | |||
969 | 971 | ||
970 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 972 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
971 | 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" | 973 | 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" |
972 | @@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libp | 974 | @@ -9825,7 +10352,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
973 | else | 975 | else |
974 | # Determine the default libpath from the value encoded in an | 976 | # Determine the default libpath from the value encoded in an |
975 | # empty executable. | 977 | # empty executable. |
@@ -1027,7 +1029,7 @@ Index: git/bfd/configure | |||
1027 | 1029 | ||
1028 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 1030 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
1029 | # Warning - without using the other run time loading flags, | 1031 | # Warning - without using the other run time loading flags, |
1030 | @@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libp | 1032 | @@ -9898,20 +10438,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1031 | # Microsoft Visual C++. | 1033 | # Microsoft Visual C++. |
1032 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 1034 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
1033 | # no search path for DLLs. | 1035 | # no search path for DLLs. |
@@ -1105,7 +1107,7 @@ Index: git/bfd/configure | |||
1105 | ;; | 1107 | ;; |
1106 | 1108 | ||
1107 | darwin* | rhapsody*) | 1109 | darwin* | rhapsody*) |
1108 | @@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libp | 1110 | @@ -9972,7 +10555,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1109 | 1111 | ||
1110 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 1112 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
1111 | freebsd* | dragonfly*) | 1113 | freebsd* | dragonfly*) |
@@ -1114,7 +1116,7 @@ Index: git/bfd/configure | |||
1114 | hardcode_libdir_flag_spec='-R$libdir' | 1116 | hardcode_libdir_flag_spec='-R$libdir' |
1115 | hardcode_direct=yes | 1117 | hardcode_direct=yes |
1116 | hardcode_shlibpath_var=no | 1118 | hardcode_shlibpath_var=no |
1117 | @@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libp | 1119 | @@ -9980,7 +10563,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1118 | 1120 | ||
1119 | hpux9*) | 1121 | hpux9*) |
1120 | if test "$GCC" = yes; then | 1122 | if test "$GCC" = yes; then |
@@ -1123,7 +1125,7 @@ Index: git/bfd/configure | |||
1123 | else | 1125 | else |
1124 | 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' | 1126 | 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' |
1125 | fi | 1127 | fi |
1126 | @@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libp | 1128 | @@ -9996,7 +10579,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1127 | 1129 | ||
1128 | hpux10*) | 1130 | hpux10*) |
1129 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 1131 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -1132,7 +1134,7 @@ Index: git/bfd/configure | |||
1132 | else | 1134 | else |
1133 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 1135 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
1134 | fi | 1136 | fi |
1135 | @@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libp | 1137 | @@ -10020,10 +10603,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1136 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 1138 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
1137 | ;; | 1139 | ;; |
1138 | ia64*) | 1140 | ia64*) |
@@ -1190,7 +1192,7 @@ Index: git/bfd/configure | |||
1190 | else | 1192 | else |
1191 | 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' | 1193 | 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' |
1192 | 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' | 1194 | 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' |
1193 | @@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_obj | 1195 | @@ -10203,7 +10799,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
1194 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 1196 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
1195 | if test "$GCC" = yes; then | 1197 | if test "$GCC" = yes; then |
1196 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 1198 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -1199,7 +1201,7 @@ Index: git/bfd/configure | |||
1199 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 1201 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
1200 | else | 1202 | else |
1201 | allow_undefined_flag=' -expect_unresolved \*' | 1203 | allow_undefined_flag=' -expect_unresolved \*' |
1202 | @@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_obj | 1204 | @@ -10222,9 +10818,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
1203 | no_undefined_flag=' -z defs' | 1205 | no_undefined_flag=' -z defs' |
1204 | if test "$GCC" = yes; then | 1206 | if test "$GCC" = yes; then |
1205 | wlarc='${wl}' | 1207 | wlarc='${wl}' |
@@ -1358,7 +1360,7 @@ Index: git/bfd/configure | |||
1358 | fi | 1360 | fi |
1359 | 1361 | ||
1360 | # More hacks to build DLLs on Windows. | 1362 | # More hacks to build DLLs on Windows. |
1361 | @@ -17139,13 +17794,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 1363 | @@ -17142,13 +17797,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
1362 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 1364 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
1363 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 1365 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
1364 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 1366 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -1379,7 +1381,7 @@ Index: git/bfd/configure | |||
1379 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 1381 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
1380 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 1382 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
1381 | 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"`' |
1382 | @@ -17160,14 +17822,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 1384 | @@ -17163,14 +17825,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
1383 | 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"`' |
1384 | 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"`' |
1385 | 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"`' |
@@ -1398,7 +1400,7 @@ Index: git/bfd/configure | |||
1398 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 1400 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
1399 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 1401 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
1400 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 1402 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
1401 | @@ -17200,12 +17865,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 1403 | @@ -17203,12 +17868,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
1402 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 1404 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
1403 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 1405 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
1404 | 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"`' |
@@ -1412,7 +1414,7 @@ Index: git/bfd/configure | |||
1412 | 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"`' |
1413 | 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"`' |
1414 | 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"`' |
1415 | @@ -17260,8 +17925,13 @@ reload_flag \ | 1417 | @@ -17263,8 +17928,13 @@ reload_flag \ |
1416 | OBJDUMP \ | 1418 | OBJDUMP \ |
1417 | deplibs_check_method \ | 1419 | deplibs_check_method \ |
1418 | file_magic_cmd \ | 1420 | file_magic_cmd \ |
@@ -1426,7 +1428,7 @@ Index: git/bfd/configure | |||
1426 | STRIP \ | 1428 | STRIP \ |
1427 | RANLIB \ | 1429 | RANLIB \ |
1428 | CC \ | 1430 | CC \ |
1429 | @@ -17271,12 +17941,14 @@ lt_cv_sys_global_symbol_pipe \ | 1431 | @@ -17274,12 +17944,14 @@ lt_cv_sys_global_symbol_pipe \ |
1430 | lt_cv_sys_global_symbol_to_cdecl \ | 1432 | lt_cv_sys_global_symbol_to_cdecl \ |
1431 | lt_cv_sys_global_symbol_to_c_name_address \ | 1433 | lt_cv_sys_global_symbol_to_c_name_address \ |
1432 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 1434 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -1442,7 +1444,7 @@ Index: git/bfd/configure | |||
1442 | DSYMUTIL \ | 1444 | DSYMUTIL \ |
1443 | NMEDIT \ | 1445 | NMEDIT \ |
1444 | LIPO \ | 1446 | LIPO \ |
1445 | @@ -17292,7 +17964,6 @@ no_undefined_flag \ | 1447 | @@ -17295,7 +17967,6 @@ no_undefined_flag \ |
1446 | hardcode_libdir_flag_spec \ | 1448 | hardcode_libdir_flag_spec \ |
1447 | hardcode_libdir_flag_spec_ld \ | 1449 | hardcode_libdir_flag_spec_ld \ |
1448 | hardcode_libdir_separator \ | 1450 | hardcode_libdir_separator \ |
@@ -1450,7 +1452,7 @@ Index: git/bfd/configure | |||
1450 | exclude_expsyms \ | 1452 | exclude_expsyms \ |
1451 | include_expsyms \ | 1453 | include_expsyms \ |
1452 | file_list_spec \ | 1454 | file_list_spec \ |
1453 | @@ -17328,6 +17999,7 @@ module_cmds \ | 1455 | @@ -17331,6 +18002,7 @@ module_cmds \ |
1454 | module_expsym_cmds \ | 1456 | module_expsym_cmds \ |
1455 | export_symbols_cmds \ | 1457 | export_symbols_cmds \ |
1456 | prelink_cmds \ | 1458 | prelink_cmds \ |
@@ -1458,7 +1460,7 @@ Index: git/bfd/configure | |||
1458 | postinstall_cmds \ | 1460 | postinstall_cmds \ |
1459 | postuninstall_cmds \ | 1461 | postuninstall_cmds \ |
1460 | finish_cmds \ | 1462 | finish_cmds \ |
1461 | @@ -18116,7 +18788,8 @@ $as_echo X"$file" | | 1463 | @@ -18119,7 +18791,8 @@ $as_echo X"$file" | |
1462 | # 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. |
1463 | # | 1465 | # |
1464 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 1466 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -1468,7 +1470,7 @@ Index: git/bfd/configure | |||
1468 | # Written by Gordon Matzigkeit, 1996 | 1470 | # Written by Gordon Matzigkeit, 1996 |
1469 | # | 1471 | # |
1470 | # This file is part of GNU Libtool. | 1472 | # This file is part of GNU Libtool. |
1471 | @@ -18219,19 +18892,42 @@ SP2NL=$lt_lt_SP2NL | 1473 | @@ -18222,19 +18895,42 @@ SP2NL=$lt_lt_SP2NL |
1472 | # turn newlines into spaces. | 1474 | # turn newlines into spaces. |
1473 | NL2SP=$lt_lt_NL2SP | 1475 | NL2SP=$lt_lt_NL2SP |
1474 | 1476 | ||
@@ -1512,7 +1514,7 @@ Index: git/bfd/configure | |||
1512 | # A symbol stripping program. | 1514 | # A symbol stripping program. |
1513 | STRIP=$lt_STRIP | 1515 | STRIP=$lt_STRIP |
1514 | 1516 | ||
1515 | @@ -18261,6 +18957,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 1517 | @@ -18264,6 +18960,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
1516 | # 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. |
1517 | 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 |
1518 | 1520 | ||
@@ -1525,7 +1527,7 @@ Index: git/bfd/configure | |||
1525 | # The name of the directory that contains temporary libtool files. | 1527 | # The name of the directory that contains temporary libtool files. |
1526 | objdir=$objdir | 1528 | objdir=$objdir |
1527 | 1529 | ||
1528 | @@ -18270,6 +18972,9 @@ MAGIC_CMD=$MAGIC_CMD | 1530 | @@ -18273,6 +18975,9 @@ MAGIC_CMD=$MAGIC_CMD |
1529 | # Must we lock files when doing compilation? | 1531 | # Must we lock files when doing compilation? |
1530 | need_locks=$lt_need_locks | 1532 | need_locks=$lt_need_locks |
1531 | 1533 | ||
@@ -1535,7 +1537,7 @@ Index: git/bfd/configure | |||
1535 | # 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. |
1536 | DSYMUTIL=$lt_DSYMUTIL | 1538 | DSYMUTIL=$lt_DSYMUTIL |
1537 | 1539 | ||
1538 | @@ -18384,12 +19089,12 @@ with_gcc=$GCC | 1540 | @@ -18387,12 +19092,12 @@ with_gcc=$GCC |
1539 | # Compiler flag to turn off builtin functions. | 1541 | # Compiler flag to turn off builtin functions. |
1540 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 1542 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
1541 | 1543 | ||
@@ -1551,7 +1553,7 @@ Index: git/bfd/configure | |||
1551 | # Compiler flag to prevent dynamic linking. | 1553 | # Compiler flag to prevent dynamic linking. |
1552 | link_static_flag=$lt_lt_prog_compiler_static | 1554 | link_static_flag=$lt_lt_prog_compiler_static |
1553 | 1555 | ||
1554 | @@ -18476,9 +19181,6 @@ inherit_rpath=$inherit_rpath | 1556 | @@ -18479,9 +19184,6 @@ inherit_rpath=$inherit_rpath |
1555 | # Whether libtool must link a program against all its dependency libraries. | 1557 | # Whether libtool must link a program against all its dependency libraries. |
1556 | link_all_deplibs=$link_all_deplibs | 1558 | link_all_deplibs=$link_all_deplibs |
1557 | 1559 | ||
@@ -1561,7 +1563,7 @@ Index: git/bfd/configure | |||
1561 | # Set to "yes" if exported symbols are required. | 1563 | # Set to "yes" if exported symbols are required. |
1562 | always_export_symbols=$always_export_symbols | 1564 | always_export_symbols=$always_export_symbols |
1563 | 1565 | ||
1564 | @@ -18494,6 +19196,9 @@ include_expsyms=$lt_include_expsyms | 1566 | @@ -18497,6 +19199,9 @@ include_expsyms=$lt_include_expsyms |
1565 | # Commands necessary for linking programs (against libraries) with templates. | 1567 | # Commands necessary for linking programs (against libraries) with templates. |
1566 | prelink_cmds=$lt_prelink_cmds | 1568 | prelink_cmds=$lt_prelink_cmds |
1567 | 1569 | ||
@@ -1571,7 +1573,7 @@ Index: git/bfd/configure | |||
1571 | # Specify filename containing input files. | 1573 | # Specify filename containing input files. |
1572 | file_list_spec=$lt_file_list_spec | 1574 | file_list_spec=$lt_file_list_spec |
1573 | 1575 | ||
1574 | @@ -18526,210 +19231,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 1576 | @@ -18529,210 +19234,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
1575 | # 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 |
1576 | # 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 |
1577 | # is reportedly fixed, but why not run on old versions too? | 1579 | # is reportedly fixed, but why not run on old versions too? |
@@ -1773,9 +1775,15 @@ Index: git/bfd/configure | |||
1773 | -_LT_EOF | 1775 | -_LT_EOF |
1774 | - ;; | 1776 | - ;; |
1775 | - esac | 1777 | - esac |
1778 | - | ||
1779 | - | ||
1780 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
1781 | - || (rm -f "$cfgfile"; exit 1) | ||
1782 | - | ||
1783 | - mv -f "$cfgfile" "$ofile" || | ||
1776 | + sed '$q' "$ltmain" >> "$cfgfile" \ | 1784 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
1777 | + || (rm -f "$cfgfile"; exit 1) | 1785 | + || (rm -f "$cfgfile"; exit 1) |
1778 | 1786 | + | |
1779 | + if test x"$xsi_shell" = xyes; then | 1787 | + if test x"$xsi_shell" = xyes; then |
1780 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | 1788 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
1781 | +func_dirname ()\ | 1789 | +func_dirname ()\ |
@@ -1933,19 +1941,16 @@ Index: git/bfd/configure | |||
1933 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | 1941 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
1934 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | 1942 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
1935 | +fi | 1943 | +fi |
1936 | 1944 | + | |
1937 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 1945 | + |
1938 | - || (rm -f "$cfgfile"; exit 1) | ||
1939 | |||
1940 | - mv -f "$cfgfile" "$ofile" || | ||
1941 | + mv -f "$cfgfile" "$ofile" || | 1946 | + mv -f "$cfgfile" "$ofile" || |
1942 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 1947 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
1943 | chmod +x "$ofile" | 1948 | chmod +x "$ofile" |
1944 | 1949 | ||
1945 | Index: git/bfd/configure.ac | 1950 | diff --git a/bfd/configure.ac b/bfd/configure.ac |
1946 | =================================================================== | 1951 | index eda38ea086..7cdf9c8146 100644 |
1947 | --- git.orig/bfd/configure.ac | 1952 | --- a/bfd/configure.ac |
1948 | +++ git/bfd/configure.ac | 1953 | +++ b/bfd/configure.ac |
1949 | @@ -293,7 +293,7 @@ changequote(,)dnl | 1954 | @@ -293,7 +293,7 @@ changequote(,)dnl |
1950 | 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'` |
1951 | changequote([,])dnl | 1956 | changequote([,])dnl |
@@ -1955,11 +1960,11 @@ Index: git/bfd/configure.ac | |||
1955 | fi | 1960 | fi |
1956 | 1961 | ||
1957 | # More hacks to build DLLs on Windows. | 1962 | # More hacks to build DLLs on Windows. |
1958 | Index: git/binutils/configure | 1963 | diff --git a/binutils/configure b/binutils/configure |
1959 | =================================================================== | 1964 | index 38128e146d..c74f797996 100755 |
1960 | --- git.orig/binutils/configure | 1965 | --- a/binutils/configure |
1961 | +++ git/binutils/configure | 1966 | +++ b/binutils/configure |
1962 | @@ -688,8 +688,11 @@ OTOOL | 1967 | @@ -689,8 +689,11 @@ OTOOL |
1963 | LIPO | 1968 | LIPO |
1964 | NMEDIT | 1969 | NMEDIT |
1965 | DSYMUTIL | 1970 | DSYMUTIL |
@@ -1971,7 +1976,7 @@ Index: git/binutils/configure | |||
1971 | OBJDUMP | 1976 | OBJDUMP |
1972 | LN_S | 1977 | LN_S |
1973 | NM | 1978 | NM |
1974 | @@ -806,6 +809,7 @@ enable_static | 1979 | @@ -807,6 +810,7 @@ enable_static |
1975 | with_pic | 1980 | with_pic |
1976 | enable_fast_install | 1981 | enable_fast_install |
1977 | with_gnu_ld | 1982 | with_gnu_ld |
@@ -1979,7 +1984,7 @@ Index: git/binutils/configure | |||
1979 | enable_libtool_lock | 1984 | enable_libtool_lock |
1980 | enable_plugins | 1985 | enable_plugins |
1981 | enable_largefile | 1986 | enable_largefile |
1982 | @@ -1482,6 +1486,8 @@ Optional Packages: | 1987 | @@ -1483,6 +1487,8 @@ Optional Packages: |
1983 | --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 |
1984 | both] | 1989 | both] |
1985 | --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] |
@@ -1988,7 +1993,7 @@ Index: git/binutils/configure | |||
1988 | --with-system-zlib use installed libz | 1993 | --with-system-zlib use installed libz |
1989 | --with-gnu-ld assume the C compiler uses GNU ld default=no | 1994 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
1990 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib | 1995 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
1991 | @@ -5453,8 +5459,8 @@ esac | 1996 | @@ -5457,8 +5463,8 @@ esac |
1992 | 1997 | ||
1993 | 1998 | ||
1994 | 1999 | ||
@@ -1999,7 +2004,7 @@ Index: git/binutils/configure | |||
1999 | 2004 | ||
2000 | 2005 | ||
2001 | 2006 | ||
2002 | @@ -5494,7 +5500,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 2007 | @@ -5498,7 +5504,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2003 | { $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 |
2004 | $as_echo_n "checking how to print strings... " >&6; } | 2009 | $as_echo_n "checking how to print strings... " >&6; } |
2005 | # Test print first, because it will be a builtin if present. | 2010 | # Test print first, because it will be a builtin if present. |
@@ -2008,7 +2013,7 @@ Index: git/binutils/configure | |||
2008 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 2013 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2009 | ECHO='print -r --' | 2014 | ECHO='print -r --' |
2010 | 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 |
2011 | @@ -6180,8 +6186,8 @@ $as_echo_n "checking whether the shell u | 2016 | @@ -6184,8 +6190,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
2012 | # Try some XSI features | 2017 | # Try some XSI features |
2013 | xsi_shell=no | 2018 | xsi_shell=no |
2014 | ( _lt_dummy="a/b/c" | 2019 | ( _lt_dummy="a/b/c" |
@@ -2019,7 +2024,7 @@ Index: git/binutils/configure | |||
2019 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 2024 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
2020 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 2025 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
2021 | && xsi_shell=yes | 2026 | && xsi_shell=yes |
2022 | @@ -6230,6 +6236,80 @@ esac | 2027 | @@ -6234,6 +6240,80 @@ esac |
2023 | 2028 | ||
2024 | 2029 | ||
2025 | 2030 | ||
@@ -2100,7 +2105,7 @@ Index: git/binutils/configure | |||
2100 | { $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 |
2101 | $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; } |
2102 | if ${lt_cv_ld_reload_flag+:} false; then : | 2107 | if ${lt_cv_ld_reload_flag+:} false; then : |
2103 | @@ -6246,6 +6326,11 @@ case $reload_flag in | 2108 | @@ -6250,6 +6330,11 @@ case $reload_flag in |
2104 | esac | 2109 | esac |
2105 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 2110 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2106 | case $host_os in | 2111 | case $host_os in |
@@ -2112,7 +2117,7 @@ Index: git/binutils/configure | |||
2112 | darwin*) | 2117 | darwin*) |
2113 | if test "$GCC" = yes; then | 2118 | if test "$GCC" = yes; then |
2114 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 2119 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
2115 | @@ -6414,7 +6499,8 @@ mingw* | pw32*) | 2120 | @@ -6418,7 +6503,8 @@ mingw* | pw32*) |
2116 | 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' |
2117 | lt_cv_file_magic_cmd='func_win32_libid' | 2122 | lt_cv_file_magic_cmd='func_win32_libid' |
2118 | else | 2123 | else |
@@ -2122,7 +2127,7 @@ Index: git/binutils/configure | |||
2122 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 2127 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2123 | fi | 2128 | fi |
2124 | ;; | 2129 | ;; |
2125 | @@ -6568,6 +6654,21 @@ esac | 2130 | @@ -6572,6 +6658,21 @@ esac |
2126 | fi | 2131 | fi |
2127 | { $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 |
2128 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 2133 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -2144,7 +2149,7 @@ Index: git/binutils/configure | |||
2144 | file_magic_cmd=$lt_cv_file_magic_cmd | 2149 | file_magic_cmd=$lt_cv_file_magic_cmd |
2145 | deplibs_check_method=$lt_cv_deplibs_check_method | 2150 | deplibs_check_method=$lt_cv_deplibs_check_method |
2146 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 2151 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2147 | @@ -6583,9 +6684,162 @@ test -z "$deplibs_check_method" && depli | 2152 | @@ -6587,9 +6688,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2148 | 2153 | ||
2149 | 2154 | ||
2150 | 2155 | ||
@@ -2309,7 +2314,7 @@ Index: git/binutils/configure | |||
2309 | { $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 |
2310 | $as_echo_n "checking for $ac_word... " >&6; } | 2315 | $as_echo_n "checking for $ac_word... " >&6; } |
2311 | if ${ac_cv_prog_AR+:} false; then : | 2316 | if ${ac_cv_prog_AR+:} false; then : |
2312 | @@ -6601,7 +6855,7 @@ do | 2317 | @@ -6605,7 +6859,7 @@ do |
2313 | test -z "$as_dir" && as_dir=. | 2318 | test -z "$as_dir" && as_dir=. |
2314 | for ac_exec_ext in '' $ac_executable_extensions; do | 2319 | for ac_exec_ext in '' $ac_executable_extensions; do |
2315 | 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 |
@@ -2318,7 +2323,7 @@ Index: git/binutils/configure | |||
2318 | $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 |
2319 | break 2 | 2324 | break 2 |
2320 | fi | 2325 | fi |
2321 | @@ -6621,11 +6875,15 @@ $as_echo "no" >&6; } | 2326 | @@ -6625,11 +6879,15 @@ $as_echo "no" >&6; } |
2322 | fi | 2327 | fi |
2323 | 2328 | ||
2324 | 2329 | ||
@@ -2337,7 +2342,7 @@ Index: git/binutils/configure | |||
2337 | { $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 |
2338 | $as_echo_n "checking for $ac_word... " >&6; } | 2343 | $as_echo_n "checking for $ac_word... " >&6; } |
2339 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 2344 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
2340 | @@ -6641,7 +6899,7 @@ do | 2345 | @@ -6645,7 +6903,7 @@ do |
2341 | test -z "$as_dir" && as_dir=. | 2346 | test -z "$as_dir" && as_dir=. |
2342 | for ac_exec_ext in '' $ac_executable_extensions; do | 2347 | for ac_exec_ext in '' $ac_executable_extensions; do |
2343 | 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 |
@@ -2346,7 +2351,7 @@ Index: git/binutils/configure | |||
2346 | $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 |
2347 | break 2 | 2352 | break 2 |
2348 | fi | 2353 | fi |
2349 | @@ -6660,6 +6918,10 @@ else | 2354 | @@ -6664,6 +6922,10 @@ else |
2350 | $as_echo "no" >&6; } | 2355 | $as_echo "no" >&6; } |
2351 | fi | 2356 | fi |
2352 | 2357 | ||
@@ -2357,7 +2362,7 @@ Index: git/binutils/configure | |||
2357 | if test "x$ac_ct_AR" = x; then | 2362 | if test "x$ac_ct_AR" = x; then |
2358 | AR="false" | 2363 | AR="false" |
2359 | else | 2364 | else |
2360 | @@ -6671,12 +6933,10 @@ ac_tool_warned=yes ;; | 2365 | @@ -6675,12 +6937,10 @@ ac_tool_warned=yes ;; |
2361 | esac | 2366 | esac |
2362 | AR=$ac_ct_AR | 2367 | AR=$ac_ct_AR |
2363 | fi | 2368 | fi |
@@ -2372,7 +2377,7 @@ Index: git/binutils/configure | |||
2372 | 2377 | ||
2373 | 2378 | ||
2374 | 2379 | ||
2375 | @@ -6688,6 +6948,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 2380 | @@ -6692,6 +6952,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
2376 | 2381 | ||
2377 | 2382 | ||
2378 | 2383 | ||
@@ -2437,7 +2442,7 @@ Index: git/binutils/configure | |||
2437 | if test -n "$ac_tool_prefix"; then | 2442 | if test -n "$ac_tool_prefix"; then |
2438 | # 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. |
2439 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 2444 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
2440 | @@ -7022,8 +7340,8 @@ esac | 2445 | @@ -7026,8 +7344,8 @@ esac |
2441 | 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'" |
2442 | 2447 | ||
2443 | # Transform an extracted symbol line into symbol name and symbol address | 2448 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -2448,7 +2453,7 @@ Index: git/binutils/configure | |||
2448 | 2453 | ||
2449 | # Handle CRLF in mingw tool chain | 2454 | # Handle CRLF in mingw tool chain |
2450 | opt_cr= | 2455 | opt_cr= |
2451 | @@ -7059,6 +7377,7 @@ for ac_symprfx in "" "_"; do | 2456 | @@ -7063,6 +7381,7 @@ for ac_symprfx in "" "_"; do |
2452 | else | 2457 | else |
2453 | 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'" |
2454 | fi | 2459 | fi |
@@ -2456,7 +2461,7 @@ Index: git/binutils/configure | |||
2456 | 2461 | ||
2457 | # Check to see that the pipe works correctly. | 2462 | # Check to see that the pipe works correctly. |
2458 | pipe_works=no | 2463 | pipe_works=no |
2459 | @@ -7100,6 +7419,18 @@ _LT_EOF | 2464 | @@ -7104,6 +7423,18 @@ _LT_EOF |
2460 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 2465 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
2461 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 2466 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
2462 | cat <<_LT_EOF > conftest.$ac_ext | 2467 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -2475,7 +2480,7 @@ Index: git/binutils/configure | |||
2475 | #ifdef __cplusplus | 2480 | #ifdef __cplusplus |
2476 | extern "C" { | 2481 | extern "C" { |
2477 | #endif | 2482 | #endif |
2478 | @@ -7111,7 +7442,7 @@ _LT_EOF | 2483 | @@ -7115,7 +7446,7 @@ _LT_EOF |
2479 | cat <<_LT_EOF >> conftest.$ac_ext | 2484 | cat <<_LT_EOF >> conftest.$ac_ext |
2480 | 2485 | ||
2481 | /* The mapping between symbol names and symbols. */ | 2486 | /* The mapping between symbol names and symbols. */ |
@@ -2484,7 +2489,7 @@ Index: git/binutils/configure | |||
2484 | const char *name; | 2489 | const char *name; |
2485 | void *address; | 2490 | void *address; |
2486 | } | 2491 | } |
2487 | @@ -7137,8 +7468,8 @@ static const void *lt_preloaded_setup() | 2492 | @@ -7141,8 +7472,8 @@ static const void *lt_preloaded_setup() { |
2488 | _LT_EOF | 2493 | _LT_EOF |
2489 | # Now try linking the two files. | 2494 | # Now try linking the two files. |
2490 | mv conftest.$ac_objext conftstm.$ac_objext | 2495 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -2495,7 +2500,7 @@ Index: git/binutils/configure | |||
2495 | LIBS="conftstm.$ac_objext" | 2500 | LIBS="conftstm.$ac_objext" |
2496 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 2501 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
2497 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 2502 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
2498 | @@ -7148,8 +7479,8 @@ _LT_EOF | 2503 | @@ -7152,8 +7483,8 @@ _LT_EOF |
2499 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 2504 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
2500 | pipe_works=yes | 2505 | pipe_works=yes |
2501 | fi | 2506 | fi |
@@ -2506,7 +2511,7 @@ Index: git/binutils/configure | |||
2506 | else | 2511 | else |
2507 | echo "cannot find nm_test_func in $nlist" >&5 | 2512 | echo "cannot find nm_test_func in $nlist" >&5 |
2508 | fi | 2513 | fi |
2509 | @@ -7186,6 +7517,18 @@ else | 2514 | @@ -7190,6 +7521,21 @@ else |
2510 | $as_echo "ok" >&6; } | 2515 | $as_echo "ok" >&6; } |
2511 | fi | 2516 | fi |
2512 | 2517 | ||
@@ -2522,13 +2527,18 @@ Index: git/binutils/configure | |||
2522 | + | 2527 | + |
2523 | + | 2528 | + |
2524 | + | 2529 | + |
2530 | + | ||
2531 | + | ||
2532 | + | ||
2525 | 2533 | ||
2526 | 2534 | ||
2527 | 2535 | ||
2528 | @@ -7207,6 +7550,43 @@ fi | 2536 | @@ -7206,6 +7552,40 @@ fi |
2529 | 2537 | ||
2530 | 2538 | ||
2531 | 2539 | ||
2540 | + | ||
2541 | + | ||
2532 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 2542 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
2533 | +$as_echo_n "checking for sysroot... " >&6; } | 2543 | +$as_echo_n "checking for sysroot... " >&6; } |
2534 | + | 2544 | + |
@@ -2561,15 +2571,10 @@ Index: git/binutils/configure | |||
2561 | + | 2571 | + |
2562 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 2572 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
2563 | +$as_echo "${lt_sysroot:-no}" >&6; } | 2573 | +$as_echo "${lt_sysroot:-no}" >&6; } |
2564 | + | 2574 | |
2565 | + | 2575 | |
2566 | + | 2576 | |
2567 | + | 2577 | @@ -7417,6 +7797,123 @@ esac |
2568 | + | ||
2569 | # Check whether --enable-libtool-lock was given. | ||
2570 | if test "${enable_libtool_lock+set}" = set; then : | ||
2571 | enableval=$enable_libtool_lock; | ||
2572 | @@ -7413,6 +7793,123 @@ esac | ||
2573 | 2578 | ||
2574 | need_locks="$enable_libtool_lock" | 2579 | need_locks="$enable_libtool_lock" |
2575 | 2580 | ||
@@ -2693,7 +2698,7 @@ Index: git/binutils/configure | |||
2693 | 2698 | ||
2694 | case $host_os in | 2699 | case $host_os in |
2695 | rhapsody* | darwin*) | 2700 | rhapsody* | darwin*) |
2696 | @@ -7976,6 +8473,8 @@ _LT_EOF | 2701 | @@ -7980,6 +8477,8 @@ _LT_EOF |
2697 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 2702 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
2698 | echo "$AR cru libconftest.a conftest.o" >&5 | 2703 | echo "$AR cru libconftest.a conftest.o" >&5 |
2699 | $AR cru libconftest.a conftest.o 2>&5 | 2704 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -2702,7 +2707,7 @@ Index: git/binutils/configure | |||
2702 | cat > conftest.c << _LT_EOF | 2707 | cat > conftest.c << _LT_EOF |
2703 | int main() { return 0;} | 2708 | int main() { return 0;} |
2704 | _LT_EOF | 2709 | _LT_EOF |
2705 | @@ -8171,7 +8670,8 @@ fi | 2710 | @@ -8175,7 +8674,8 @@ fi |
2706 | LIBTOOL_DEPS="$ltmain" | 2711 | LIBTOOL_DEPS="$ltmain" |
2707 | 2712 | ||
2708 | # Always use our own libtool. | 2713 | # Always use our own libtool. |
@@ -2712,7 +2717,7 @@ Index: git/binutils/configure | |||
2712 | 2717 | ||
2713 | 2718 | ||
2714 | 2719 | ||
2715 | @@ -8260,7 +8760,7 @@ aix3*) | 2720 | @@ -8264,7 +8764,7 @@ aix3*) |
2716 | esac | 2721 | esac |
2717 | 2722 | ||
2718 | # Global variables: | 2723 | # Global variables: |
@@ -2721,7 +2726,7 @@ Index: git/binutils/configure | |||
2721 | can_build_shared=yes | 2726 | can_build_shared=yes |
2722 | 2727 | ||
2723 | # 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, |
2724 | @@ -8558,8 +9058,6 @@ fi | 2729 | @@ -8562,8 +9062,6 @@ fi |
2725 | lt_prog_compiler_pic= | 2730 | lt_prog_compiler_pic= |
2726 | lt_prog_compiler_static= | 2731 | lt_prog_compiler_static= |
2727 | 2732 | ||
@@ -2730,7 +2735,7 @@ Index: git/binutils/configure | |||
2730 | 2735 | ||
2731 | if test "$GCC" = yes; then | 2736 | if test "$GCC" = yes; then |
2732 | lt_prog_compiler_wl='-Wl,' | 2737 | lt_prog_compiler_wl='-Wl,' |
2733 | @@ -8725,6 +9223,12 @@ $as_echo_n "checking for $compiler optio | 2738 | @@ -8729,6 +9227,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
2734 | lt_prog_compiler_pic='--shared' | 2739 | lt_prog_compiler_pic='--shared' |
2735 | lt_prog_compiler_static='--static' | 2740 | lt_prog_compiler_static='--static' |
2736 | ;; | 2741 | ;; |
@@ -2743,7 +2748,7 @@ Index: git/binutils/configure | |||
2743 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 2748 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
2744 | # Portland Group compilers (*not* the Pentium gcc compiler, | 2749 | # Portland Group compilers (*not* the Pentium gcc compiler, |
2745 | # which looks to be a dead project) | 2750 | # which looks to be a dead project) |
2746 | @@ -8787,7 +9291,7 @@ $as_echo_n "checking for $compiler optio | 2751 | @@ -8791,7 +9295,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
2747 | lt_prog_compiler_pic='-KPIC' | 2752 | lt_prog_compiler_pic='-KPIC' |
2748 | lt_prog_compiler_static='-Bstatic' | 2753 | lt_prog_compiler_static='-Bstatic' |
2749 | case $cc_basename in | 2754 | case $cc_basename in |
@@ -2752,7 +2757,7 @@ Index: git/binutils/configure | |||
2752 | lt_prog_compiler_wl='-Qoption ld ';; | 2757 | lt_prog_compiler_wl='-Qoption ld ';; |
2753 | *) | 2758 | *) |
2754 | lt_prog_compiler_wl='-Wl,';; | 2759 | lt_prog_compiler_wl='-Wl,';; |
2755 | @@ -8844,13 +9348,17 @@ case $host_os in | 2760 | @@ -8848,13 +9352,17 @@ case $host_os in |
2756 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 2761 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
2757 | ;; | 2762 | ;; |
2758 | esac | 2763 | esac |
@@ -2776,7 +2781,7 @@ Index: git/binutils/configure | |||
2776 | 2781 | ||
2777 | # | 2782 | # |
2778 | # Check to make sure the PIC flag actually works. | 2783 | # Check to make sure the PIC flag actually works. |
2779 | @@ -8911,6 +9419,11 @@ fi | 2784 | @@ -8915,6 +9423,11 @@ fi |
2780 | 2785 | ||
2781 | 2786 | ||
2782 | 2787 | ||
@@ -2788,7 +2793,7 @@ Index: git/binutils/configure | |||
2788 | # | 2793 | # |
2789 | # Check to make sure the static flag actually works. | 2794 | # Check to make sure the static flag actually works. |
2790 | # | 2795 | # |
2791 | @@ -9261,7 +9774,8 @@ _LT_EOF | 2796 | @@ -9265,7 +9778,8 @@ _LT_EOF |
2792 | allow_undefined_flag=unsupported | 2797 | allow_undefined_flag=unsupported |
2793 | always_export_symbols=no | 2798 | always_export_symbols=no |
2794 | enable_shared_with_static_runtimes=yes | 2799 | enable_shared_with_static_runtimes=yes |
@@ -2798,7 +2803,7 @@ Index: git/binutils/configure | |||
2798 | 2803 | ||
2799 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 2804 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
2800 | 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' |
2801 | @@ -9360,12 +9874,12 @@ _LT_EOF | 2806 | @@ -9364,12 +9878,12 @@ _LT_EOF |
2802 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 2807 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
2803 | hardcode_libdir_flag_spec= | 2808 | hardcode_libdir_flag_spec= |
2804 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 2809 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -2813,7 +2818,7 @@ Index: git/binutils/configure | |||
2813 | fi | 2818 | fi |
2814 | ;; | 2819 | ;; |
2815 | esac | 2820 | esac |
2816 | @@ -9379,8 +9893,8 @@ _LT_EOF | 2821 | @@ -9383,8 +9897,8 @@ _LT_EOF |
2817 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 2822 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
2818 | wlarc= | 2823 | wlarc= |
2819 | else | 2824 | else |
@@ -2824,7 +2829,7 @@ Index: git/binutils/configure | |||
2824 | fi | 2829 | fi |
2825 | ;; | 2830 | ;; |
2826 | 2831 | ||
2827 | @@ -9398,8 +9912,8 @@ _LT_EOF | 2832 | @@ -9402,8 +9916,8 @@ _LT_EOF |
2828 | 2833 | ||
2829 | _LT_EOF | 2834 | _LT_EOF |
2830 | 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 |
@@ -2835,7 +2840,7 @@ Index: git/binutils/configure | |||
2835 | else | 2840 | else |
2836 | ld_shlibs=no | 2841 | ld_shlibs=no |
2837 | fi | 2842 | fi |
2838 | @@ -9445,8 +9959,8 @@ _LT_EOF | 2843 | @@ -9449,8 +9963,8 @@ _LT_EOF |
2839 | 2844 | ||
2840 | *) | 2845 | *) |
2841 | 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 |
@@ -2846,7 +2851,7 @@ Index: git/binutils/configure | |||
2846 | else | 2851 | else |
2847 | ld_shlibs=no | 2852 | ld_shlibs=no |
2848 | fi | 2853 | fi |
2849 | @@ -9576,7 +10090,13 @@ _LT_EOF | 2854 | @@ -9580,7 +10094,13 @@ _LT_EOF |
2850 | allow_undefined_flag='-berok' | 2855 | allow_undefined_flag='-berok' |
2851 | # Determine the default libpath from the value encoded in an | 2856 | # Determine the default libpath from the value encoded in an |
2852 | # empty executable. | 2857 | # empty executable. |
@@ -2861,7 +2866,7 @@ Index: git/binutils/configure | |||
2861 | /* end confdefs.h. */ | 2866 | /* end confdefs.h. */ |
2862 | 2867 | ||
2863 | int | 2868 | int |
2864 | @@ -9589,22 +10109,29 @@ main () | 2869 | @@ -9593,22 +10113,29 @@ main () |
2865 | _ACEOF | 2870 | _ACEOF |
2866 | if ac_fn_c_try_link "$LINENO"; then : | 2871 | if ac_fn_c_try_link "$LINENO"; then : |
2867 | 2872 | ||
@@ -2904,7 +2909,7 @@ Index: git/binutils/configure | |||
2904 | 2909 | ||
2905 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 2910 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2906 | 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" |
2907 | @@ -9616,7 +10143,13 @@ if test -z "$aix_libpath"; then aix_libp | 2912 | @@ -9620,7 +10147,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2908 | else | 2913 | else |
2909 | # Determine the default libpath from the value encoded in an | 2914 | # Determine the default libpath from the value encoded in an |
2910 | # empty executable. | 2915 | # empty executable. |
@@ -2919,7 +2924,7 @@ Index: git/binutils/configure | |||
2919 | /* end confdefs.h. */ | 2924 | /* end confdefs.h. */ |
2920 | 2925 | ||
2921 | int | 2926 | int |
2922 | @@ -9629,22 +10162,29 @@ main () | 2927 | @@ -9633,22 +10166,29 @@ main () |
2923 | _ACEOF | 2928 | _ACEOF |
2924 | if ac_fn_c_try_link "$LINENO"; then : | 2929 | if ac_fn_c_try_link "$LINENO"; then : |
2925 | 2930 | ||
@@ -2962,7 +2967,7 @@ Index: git/binutils/configure | |||
2962 | 2967 | ||
2963 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 2968 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
2964 | # Warning - without using the other run time loading flags, | 2969 | # Warning - without using the other run time loading flags, |
2965 | @@ -9689,20 +10229,63 @@ if test -z "$aix_libpath"; then aix_libp | 2970 | @@ -9693,20 +10233,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2966 | # Microsoft Visual C++. | 2971 | # Microsoft Visual C++. |
2967 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 2972 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
2968 | # no search path for DLLs. | 2973 | # no search path for DLLs. |
@@ -3040,7 +3045,7 @@ Index: git/binutils/configure | |||
3040 | ;; | 3045 | ;; |
3041 | 3046 | ||
3042 | darwin* | rhapsody*) | 3047 | darwin* | rhapsody*) |
3043 | @@ -9763,7 +10346,7 @@ if test -z "$aix_libpath"; then aix_libp | 3048 | @@ -9767,7 +10350,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3044 | 3049 | ||
3045 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 3050 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
3046 | freebsd* | dragonfly*) | 3051 | freebsd* | dragonfly*) |
@@ -3049,7 +3054,7 @@ Index: git/binutils/configure | |||
3049 | hardcode_libdir_flag_spec='-R$libdir' | 3054 | hardcode_libdir_flag_spec='-R$libdir' |
3050 | hardcode_direct=yes | 3055 | hardcode_direct=yes |
3051 | hardcode_shlibpath_var=no | 3056 | hardcode_shlibpath_var=no |
3052 | @@ -9771,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libp | 3057 | @@ -9775,7 +10358,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3053 | 3058 | ||
3054 | hpux9*) | 3059 | hpux9*) |
3055 | if test "$GCC" = yes; then | 3060 | if test "$GCC" = yes; then |
@@ -3058,7 +3063,7 @@ Index: git/binutils/configure | |||
3058 | else | 3063 | else |
3059 | 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' |
3060 | fi | 3065 | fi |
3061 | @@ -9787,7 +10370,7 @@ if test -z "$aix_libpath"; then aix_libp | 3066 | @@ -9791,7 +10374,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3062 | 3067 | ||
3063 | hpux10*) | 3068 | hpux10*) |
3064 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 3069 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -3067,7 +3072,7 @@ Index: git/binutils/configure | |||
3067 | else | 3072 | else |
3068 | 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' |
3069 | fi | 3074 | fi |
3070 | @@ -9811,10 +10394,10 @@ if test -z "$aix_libpath"; then aix_libp | 3075 | @@ -9815,10 +10398,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3071 | 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' |
3072 | ;; | 3077 | ;; |
3073 | ia64*) | 3078 | ia64*) |
@@ -3080,7 +3085,7 @@ Index: git/binutils/configure | |||
3080 | ;; | 3085 | ;; |
3081 | esac | 3086 | esac |
3082 | else | 3087 | else |
3083 | @@ -9893,23 +10476,36 @@ fi | 3088 | @@ -9897,23 +10480,36 @@ fi |
3084 | 3089 | ||
3085 | irix5* | irix6* | nonstopux*) | 3090 | irix5* | irix6* | nonstopux*) |
3086 | if test "$GCC" = yes; then | 3091 | if test "$GCC" = yes; then |
@@ -3125,7 +3130,7 @@ Index: git/binutils/configure | |||
3125 | else | 3130 | else |
3126 | 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' |
3127 | 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' |
3128 | @@ -9994,7 +10590,7 @@ rm -f core conftest.err conftest.$ac_obj | 3133 | @@ -9998,7 +10594,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
3129 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 3134 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3130 | if test "$GCC" = yes; then | 3135 | if test "$GCC" = yes; then |
3131 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 3136 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -3134,7 +3139,7 @@ Index: git/binutils/configure | |||
3134 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 3139 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3135 | else | 3140 | else |
3136 | allow_undefined_flag=' -expect_unresolved \*' | 3141 | allow_undefined_flag=' -expect_unresolved \*' |
3137 | @@ -10013,9 +10609,9 @@ rm -f core conftest.err conftest.$ac_obj | 3142 | @@ -10017,9 +10613,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
3138 | no_undefined_flag=' -z defs' | 3143 | no_undefined_flag=' -z defs' |
3139 | if test "$GCC" = yes; then | 3144 | if test "$GCC" = yes; then |
3140 | wlarc='${wl}' | 3145 | wlarc='${wl}' |
@@ -3146,7 +3151,7 @@ Index: git/binutils/configure | |||
3146 | else | 3151 | else |
3147 | case `$CC -V 2>&1` in | 3152 | case `$CC -V 2>&1` in |
3148 | *"Compilers 5.0"*) | 3153 | *"Compilers 5.0"*) |
3149 | @@ -10591,8 +11187,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 3154 | @@ -10595,8 +11191,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
3150 | need_version=no | 3155 | need_version=no |
3151 | need_lib_prefix=no | 3156 | need_lib_prefix=no |
3152 | 3157 | ||
@@ -3158,7 +3163,7 @@ Index: git/binutils/configure | |||
3158 | library_names_spec='$libname.dll.a' | 3163 | library_names_spec='$libname.dll.a' |
3159 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 3164 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3160 | postinstall_cmds='base_file=`basename \${file}`~ | 3165 | postinstall_cmds='base_file=`basename \${file}`~ |
3161 | @@ -10625,13 +11222,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 3166 | @@ -10629,13 +11226,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
3162 | 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}' |
3163 | ;; | 3168 | ;; |
3164 | esac | 3169 | esac |
@@ -3231,7 +3236,7 @@ Index: git/binutils/configure | |||
3231 | # 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 |
3232 | shlibpath_var=PATH | 3237 | shlibpath_var=PATH |
3233 | ;; | 3238 | ;; |
3234 | @@ -10723,7 +11378,7 @@ haiku*) | 3239 | @@ -10727,7 +11382,7 @@ haiku*) |
3235 | soname_spec='${libname}${release}${shared_ext}$major' | 3240 | soname_spec='${libname}${release}${shared_ext}$major' |
3236 | shlibpath_var=LIBRARY_PATH | 3241 | shlibpath_var=LIBRARY_PATH |
3237 | shlibpath_overrides_runpath=yes | 3242 | shlibpath_overrides_runpath=yes |
@@ -3240,16 +3245,16 @@ Index: git/binutils/configure | |||
3240 | hardcode_into_libs=yes | 3245 | hardcode_into_libs=yes |
3241 | ;; | 3246 | ;; |
3242 | 3247 | ||
3243 | @@ -11519,7 +12174,7 @@ else | 3248 | @@ -11523,7 +12178,7 @@ else |
3244 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 3249 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
3245 | lt_status=$lt_dlunknown | 3250 | lt_status=$lt_dlunknown |
3246 | cat > conftest.$ac_ext <<_LT_EOF | 3251 | cat > conftest.$ac_ext <<_LT_EOF |
3247 | -#line 11522 "configure" | 3252 | -#line 11526 "configure" |
3248 | +#line $LINENO "configure" | 3253 | +#line $LINENO "configure" |
3249 | #include "confdefs.h" | 3254 | #include "confdefs.h" |
3250 | 3255 | ||
3251 | #if HAVE_DLFCN_H | 3256 | #if HAVE_DLFCN_H |
3252 | @@ -11563,10 +12218,10 @@ else | 3257 | @@ -11567,10 +12222,10 @@ else |
3253 | /* When -fvisbility=hidden is used, assume the code has been annotated | 3258 | /* When -fvisbility=hidden is used, assume the code has been annotated |
3254 | correspondingly for the symbols needed. */ | 3259 | correspondingly for the symbols needed. */ |
3255 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 3260 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -3262,16 +3267,16 @@ Index: git/binutils/configure | |||
3262 | int main () | 3267 | int main () |
3263 | { | 3268 | { |
3264 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 3269 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
3265 | @@ -11625,7 +12280,7 @@ else | 3270 | @@ -11629,7 +12284,7 @@ else |
3266 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 3271 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
3267 | lt_status=$lt_dlunknown | 3272 | lt_status=$lt_dlunknown |
3268 | cat > conftest.$ac_ext <<_LT_EOF | 3273 | cat > conftest.$ac_ext <<_LT_EOF |
3269 | -#line 11628 "configure" | 3274 | -#line 11632 "configure" |
3270 | +#line $LINENO "configure" | 3275 | +#line $LINENO "configure" |
3271 | #include "confdefs.h" | 3276 | #include "confdefs.h" |
3272 | 3277 | ||
3273 | #if HAVE_DLFCN_H | 3278 | #if HAVE_DLFCN_H |
3274 | @@ -11669,10 +12324,10 @@ else | 3279 | @@ -11673,10 +12328,10 @@ else |
3275 | /* When -fvisbility=hidden is used, assume the code has been annotated | 3280 | /* When -fvisbility=hidden is used, assume the code has been annotated |
3276 | correspondingly for the symbols needed. */ | 3281 | correspondingly for the symbols needed. */ |
3277 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 3282 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -3284,7 +3289,7 @@ Index: git/binutils/configure | |||
3284 | int main () | 3289 | int main () |
3285 | { | 3290 | { |
3286 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 3291 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
3287 | @@ -15731,13 +16386,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 3292 | @@ -15936,13 +16591,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
3288 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 3293 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
3289 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 3294 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
3290 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 3295 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -3305,7 +3310,7 @@ Index: git/binutils/configure | |||
3305 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 3310 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
3306 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 3311 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
3307 | 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"`' |
3308 | @@ -15752,14 +16414,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 3313 | @@ -15957,14 +16619,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
3309 | 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"`' |
3310 | 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"`' |
3311 | 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"`' |
@@ -3324,7 +3329,7 @@ Index: git/binutils/configure | |||
3324 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 3329 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
3325 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 3330 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
3326 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 3331 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
3327 | @@ -15792,12 +16457,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 3332 | @@ -15997,12 +16662,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
3328 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 3333 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
3329 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 3334 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
3330 | 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"`' |
@@ -3338,7 +3343,7 @@ Index: git/binutils/configure | |||
3338 | 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"`' |
3339 | 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"`' |
3340 | 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"`' |
3341 | @@ -15852,8 +16517,13 @@ reload_flag \ | 3346 | @@ -16057,8 +16722,13 @@ reload_flag \ |
3342 | OBJDUMP \ | 3347 | OBJDUMP \ |
3343 | deplibs_check_method \ | 3348 | deplibs_check_method \ |
3344 | file_magic_cmd \ | 3349 | file_magic_cmd \ |
@@ -3352,7 +3357,7 @@ Index: git/binutils/configure | |||
3352 | STRIP \ | 3357 | STRIP \ |
3353 | RANLIB \ | 3358 | RANLIB \ |
3354 | CC \ | 3359 | CC \ |
3355 | @@ -15863,12 +16533,14 @@ lt_cv_sys_global_symbol_pipe \ | 3360 | @@ -16068,12 +16738,14 @@ lt_cv_sys_global_symbol_pipe \ |
3356 | lt_cv_sys_global_symbol_to_cdecl \ | 3361 | lt_cv_sys_global_symbol_to_cdecl \ |
3357 | lt_cv_sys_global_symbol_to_c_name_address \ | 3362 | lt_cv_sys_global_symbol_to_c_name_address \ |
3358 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 3363 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -3368,7 +3373,7 @@ Index: git/binutils/configure | |||
3368 | DSYMUTIL \ | 3373 | DSYMUTIL \ |
3369 | NMEDIT \ | 3374 | NMEDIT \ |
3370 | LIPO \ | 3375 | LIPO \ |
3371 | @@ -15884,7 +16556,6 @@ no_undefined_flag \ | 3376 | @@ -16089,7 +16761,6 @@ no_undefined_flag \ |
3372 | hardcode_libdir_flag_spec \ | 3377 | hardcode_libdir_flag_spec \ |
3373 | hardcode_libdir_flag_spec_ld \ | 3378 | hardcode_libdir_flag_spec_ld \ |
3374 | hardcode_libdir_separator \ | 3379 | hardcode_libdir_separator \ |
@@ -3376,7 +3381,7 @@ Index: git/binutils/configure | |||
3376 | exclude_expsyms \ | 3381 | exclude_expsyms \ |
3377 | include_expsyms \ | 3382 | include_expsyms \ |
3378 | file_list_spec \ | 3383 | file_list_spec \ |
3379 | @@ -15920,6 +16591,7 @@ module_cmds \ | 3384 | @@ -16125,6 +16796,7 @@ module_cmds \ |
3380 | module_expsym_cmds \ | 3385 | module_expsym_cmds \ |
3381 | export_symbols_cmds \ | 3386 | export_symbols_cmds \ |
3382 | prelink_cmds \ | 3387 | prelink_cmds \ |
@@ -3384,7 +3389,7 @@ Index: git/binutils/configure | |||
3384 | postinstall_cmds \ | 3389 | postinstall_cmds \ |
3385 | postuninstall_cmds \ | 3390 | postuninstall_cmds \ |
3386 | finish_cmds \ | 3391 | finish_cmds \ |
3387 | @@ -16686,7 +17358,8 @@ $as_echo X"$file" | | 3392 | @@ -16891,7 +17563,8 @@ $as_echo X"$file" | |
3388 | # 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. |
3389 | # | 3394 | # |
3390 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 3395 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -3394,7 +3399,7 @@ Index: git/binutils/configure | |||
3394 | # Written by Gordon Matzigkeit, 1996 | 3399 | # Written by Gordon Matzigkeit, 1996 |
3395 | # | 3400 | # |
3396 | # This file is part of GNU Libtool. | 3401 | # This file is part of GNU Libtool. |
3397 | @@ -16789,19 +17462,42 @@ SP2NL=$lt_lt_SP2NL | 3402 | @@ -16994,19 +17667,42 @@ SP2NL=$lt_lt_SP2NL |
3398 | # turn newlines into spaces. | 3403 | # turn newlines into spaces. |
3399 | NL2SP=$lt_lt_NL2SP | 3404 | NL2SP=$lt_lt_NL2SP |
3400 | 3405 | ||
@@ -3438,7 +3443,7 @@ Index: git/binutils/configure | |||
3438 | # A symbol stripping program. | 3443 | # A symbol stripping program. |
3439 | STRIP=$lt_STRIP | 3444 | STRIP=$lt_STRIP |
3440 | 3445 | ||
3441 | @@ -16831,6 +17527,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 3446 | @@ -17036,6 +17732,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
3442 | # 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. |
3443 | 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 |
3444 | 3449 | ||
@@ -3451,7 +3456,7 @@ Index: git/binutils/configure | |||
3451 | # The name of the directory that contains temporary libtool files. | 3456 | # The name of the directory that contains temporary libtool files. |
3452 | objdir=$objdir | 3457 | objdir=$objdir |
3453 | 3458 | ||
3454 | @@ -16840,6 +17542,9 @@ MAGIC_CMD=$MAGIC_CMD | 3459 | @@ -17045,6 +17747,9 @@ MAGIC_CMD=$MAGIC_CMD |
3455 | # Must we lock files when doing compilation? | 3460 | # Must we lock files when doing compilation? |
3456 | need_locks=$lt_need_locks | 3461 | need_locks=$lt_need_locks |
3457 | 3462 | ||
@@ -3461,7 +3466,7 @@ Index: git/binutils/configure | |||
3461 | # 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. |
3462 | DSYMUTIL=$lt_DSYMUTIL | 3467 | DSYMUTIL=$lt_DSYMUTIL |
3463 | 3468 | ||
3464 | @@ -16954,12 +17659,12 @@ with_gcc=$GCC | 3469 | @@ -17159,12 +17864,12 @@ with_gcc=$GCC |
3465 | # Compiler flag to turn off builtin functions. | 3470 | # Compiler flag to turn off builtin functions. |
3466 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 3471 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
3467 | 3472 | ||
@@ -3477,7 +3482,7 @@ Index: git/binutils/configure | |||
3477 | # Compiler flag to prevent dynamic linking. | 3482 | # Compiler flag to prevent dynamic linking. |
3478 | link_static_flag=$lt_lt_prog_compiler_static | 3483 | link_static_flag=$lt_lt_prog_compiler_static |
3479 | 3484 | ||
3480 | @@ -17046,9 +17751,6 @@ inherit_rpath=$inherit_rpath | 3485 | @@ -17251,9 +17956,6 @@ inherit_rpath=$inherit_rpath |
3481 | # Whether libtool must link a program against all its dependency libraries. | 3486 | # Whether libtool must link a program against all its dependency libraries. |
3482 | link_all_deplibs=$link_all_deplibs | 3487 | link_all_deplibs=$link_all_deplibs |
3483 | 3488 | ||
@@ -3487,7 +3492,7 @@ Index: git/binutils/configure | |||
3487 | # Set to "yes" if exported symbols are required. | 3492 | # Set to "yes" if exported symbols are required. |
3488 | always_export_symbols=$always_export_symbols | 3493 | always_export_symbols=$always_export_symbols |
3489 | 3494 | ||
3490 | @@ -17064,6 +17766,9 @@ include_expsyms=$lt_include_expsyms | 3495 | @@ -17269,6 +17971,9 @@ include_expsyms=$lt_include_expsyms |
3491 | # Commands necessary for linking programs (against libraries) with templates. | 3496 | # Commands necessary for linking programs (against libraries) with templates. |
3492 | prelink_cmds=$lt_prelink_cmds | 3497 | prelink_cmds=$lt_prelink_cmds |
3493 | 3498 | ||
@@ -3497,7 +3502,7 @@ Index: git/binutils/configure | |||
3497 | # Specify filename containing input files. | 3502 | # Specify filename containing input files. |
3498 | file_list_spec=$lt_file_list_spec | 3503 | file_list_spec=$lt_file_list_spec |
3499 | 3504 | ||
3500 | @@ -17096,210 +17801,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 3505 | @@ -17301,210 +18006,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
3501 | # 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 |
3502 | # 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 |
3503 | # is reportedly fixed, but why not run on old versions too? | 3508 | # is reportedly fixed, but why not run on old versions too? |
@@ -3699,9 +3704,15 @@ Index: git/binutils/configure | |||
3699 | -_LT_EOF | 3704 | -_LT_EOF |
3700 | - ;; | 3705 | - ;; |
3701 | - esac | 3706 | - esac |
3707 | - | ||
3708 | - | ||
3709 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
3710 | - || (rm -f "$cfgfile"; exit 1) | ||
3711 | - | ||
3712 | - mv -f "$cfgfile" "$ofile" || | ||
3702 | + sed '$q' "$ltmain" >> "$cfgfile" \ | 3713 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
3703 | + || (rm -f "$cfgfile"; exit 1) | 3714 | + || (rm -f "$cfgfile"; exit 1) |
3704 | 3715 | + | |
3705 | + if test x"$xsi_shell" = xyes; then | 3716 | + if test x"$xsi_shell" = xyes; then |
3706 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | 3717 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
3707 | +func_dirname ()\ | 3718 | +func_dirname ()\ |
@@ -3859,19 +3870,16 @@ Index: git/binutils/configure | |||
3859 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | 3870 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
3860 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | 3871 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
3861 | +fi | 3872 | +fi |
3862 | 3873 | + | |
3863 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 3874 | + |
3864 | - || (rm -f "$cfgfile"; exit 1) | ||
3865 | |||
3866 | - mv -f "$cfgfile" "$ofile" || | ||
3867 | + mv -f "$cfgfile" "$ofile" || | 3875 | + mv -f "$cfgfile" "$ofile" || |
3868 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 3876 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
3869 | chmod +x "$ofile" | 3877 | chmod +x "$ofile" |
3870 | 3878 | ||
3871 | Index: git/gas/configure | 3879 | diff --git a/gas/configure b/gas/configure |
3872 | =================================================================== | 3880 | index 64de9f19da..a82fde7fa8 100755 |
3873 | --- git.orig/gas/configure | 3881 | --- a/gas/configure |
3874 | +++ git/gas/configure | 3882 | +++ b/gas/configure |
3875 | @@ -681,8 +681,11 @@ OTOOL | 3883 | @@ -681,8 +681,11 @@ OTOOL |
3876 | LIPO | 3884 | LIPO |
3877 | NMEDIT | 3885 | NMEDIT |
@@ -3892,7 +3900,7 @@ Index: git/gas/configure | |||
3892 | enable_libtool_lock | 3900 | enable_libtool_lock |
3893 | enable_plugins | 3901 | enable_plugins |
3894 | enable_largefile | 3902 | enable_largefile |
3895 | @@ -1482,6 +1486,8 @@ Optional Packages: | 3903 | @@ -1487,6 +1491,8 @@ Optional Packages: |
3896 | --with-pic try to use only PIC/non-PIC objects [default=use | 3904 | --with-pic try to use only PIC/non-PIC objects [default=use |
3897 | both] | 3905 | both] |
3898 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 3906 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -3901,7 +3909,7 @@ Index: git/gas/configure | |||
3901 | --with-cpu=CPU default cpu variant is CPU (currently only supported | 3909 | --with-cpu=CPU default cpu variant is CPU (currently only supported |
3902 | on ARC) | 3910 | on ARC) |
3903 | --with-system-zlib use installed libz | 3911 | --with-system-zlib use installed libz |
3904 | @@ -5269,8 +5275,8 @@ esac | 3912 | @@ -5274,8 +5280,8 @@ esac |
3905 | 3913 | ||
3906 | 3914 | ||
3907 | 3915 | ||
@@ -3912,7 +3920,7 @@ Index: git/gas/configure | |||
3912 | 3920 | ||
3913 | 3921 | ||
3914 | 3922 | ||
3915 | @@ -5310,7 +5316,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 3923 | @@ -5315,7 +5321,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
3916 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 3924 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
3917 | $as_echo_n "checking how to print strings... " >&6; } | 3925 | $as_echo_n "checking how to print strings... " >&6; } |
3918 | # Test print first, because it will be a builtin if present. | 3926 | # Test print first, because it will be a builtin if present. |
@@ -3921,7 +3929,7 @@ Index: git/gas/configure | |||
3921 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 3929 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
3922 | ECHO='print -r --' | 3930 | ECHO='print -r --' |
3923 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 3931 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
3924 | @@ -5996,8 +6002,8 @@ $as_echo_n "checking whether the shell u | 3932 | @@ -6001,8 +6007,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
3925 | # Try some XSI features | 3933 | # Try some XSI features |
3926 | xsi_shell=no | 3934 | xsi_shell=no |
3927 | ( _lt_dummy="a/b/c" | 3935 | ( _lt_dummy="a/b/c" |
@@ -3932,7 +3940,7 @@ Index: git/gas/configure | |||
3932 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 3940 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
3933 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 3941 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
3934 | && xsi_shell=yes | 3942 | && xsi_shell=yes |
3935 | @@ -6046,6 +6052,80 @@ esac | 3943 | @@ -6051,6 +6057,80 @@ esac |
3936 | 3944 | ||
3937 | 3945 | ||
3938 | 3946 | ||
@@ -4013,7 +4021,7 @@ Index: git/gas/configure | |||
4013 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 4021 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
4014 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 4022 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
4015 | if ${lt_cv_ld_reload_flag+:} false; then : | 4023 | if ${lt_cv_ld_reload_flag+:} false; then : |
4016 | @@ -6062,6 +6142,11 @@ case $reload_flag in | 4024 | @@ -6067,6 +6147,11 @@ case $reload_flag in |
4017 | esac | 4025 | esac |
4018 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 4026 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
4019 | case $host_os in | 4027 | case $host_os in |
@@ -4025,7 +4033,7 @@ Index: git/gas/configure | |||
4025 | darwin*) | 4033 | darwin*) |
4026 | if test "$GCC" = yes; then | 4034 | if test "$GCC" = yes; then |
4027 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 4035 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
4028 | @@ -6230,7 +6315,8 @@ mingw* | pw32*) | 4036 | @@ -6235,7 +6320,8 @@ mingw* | pw32*) |
4029 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 4037 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
4030 | lt_cv_file_magic_cmd='func_win32_libid' | 4038 | lt_cv_file_magic_cmd='func_win32_libid' |
4031 | else | 4039 | else |
@@ -4035,7 +4043,7 @@ Index: git/gas/configure | |||
4035 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 4043 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
4036 | fi | 4044 | fi |
4037 | ;; | 4045 | ;; |
4038 | @@ -6384,6 +6470,21 @@ esac | 4046 | @@ -6389,6 +6475,21 @@ esac |
4039 | fi | 4047 | fi |
4040 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 4048 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
4041 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 4049 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -4057,7 +4065,7 @@ Index: git/gas/configure | |||
4057 | file_magic_cmd=$lt_cv_file_magic_cmd | 4065 | file_magic_cmd=$lt_cv_file_magic_cmd |
4058 | deplibs_check_method=$lt_cv_deplibs_check_method | 4066 | deplibs_check_method=$lt_cv_deplibs_check_method |
4059 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 4067 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
4060 | @@ -6399,9 +6500,162 @@ test -z "$deplibs_check_method" && depli | 4068 | @@ -6404,9 +6505,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
4061 | 4069 | ||
4062 | 4070 | ||
4063 | 4071 | ||
@@ -4071,9 +4079,7 @@ Index: git/gas/configure | |||
4071 | + | 4079 | + |
4072 | + | 4080 | + |
4073 | + | 4081 | + |
4074 | if test -n "$ac_tool_prefix"; then | 4082 | +if test -n "$ac_tool_prefix"; then |
4075 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
4076 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
4077 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | 4083 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
4078 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | 4084 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
4079 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 4085 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
@@ -4214,7 +4220,9 @@ Index: git/gas/configure | |||
4214 | + | 4220 | + |
4215 | + | 4221 | + |
4216 | + | 4222 | + |
4217 | +if test -n "$ac_tool_prefix"; then | 4223 | if test -n "$ac_tool_prefix"; then |
4224 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
4225 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
4218 | + for ac_prog in ar | 4226 | + for ac_prog in ar |
4219 | + do | 4227 | + do |
4220 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 4228 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
@@ -4222,7 +4230,7 @@ Index: git/gas/configure | |||
4222 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 4230 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4223 | $as_echo_n "checking for $ac_word... " >&6; } | 4231 | $as_echo_n "checking for $ac_word... " >&6; } |
4224 | if ${ac_cv_prog_AR+:} false; then : | 4232 | if ${ac_cv_prog_AR+:} false; then : |
4225 | @@ -6417,7 +6671,7 @@ do | 4233 | @@ -6422,7 +6676,7 @@ do |
4226 | test -z "$as_dir" && as_dir=. | 4234 | test -z "$as_dir" && as_dir=. |
4227 | for ac_exec_ext in '' $ac_executable_extensions; do | 4235 | for ac_exec_ext in '' $ac_executable_extensions; do |
4228 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 4236 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -4231,7 +4239,7 @@ Index: git/gas/configure | |||
4231 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4239 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4232 | break 2 | 4240 | break 2 |
4233 | fi | 4241 | fi |
4234 | @@ -6437,11 +6691,15 @@ $as_echo "no" >&6; } | 4242 | @@ -6442,11 +6696,15 @@ $as_echo "no" >&6; } |
4235 | fi | 4243 | fi |
4236 | 4244 | ||
4237 | 4245 | ||
@@ -4250,7 +4258,7 @@ Index: git/gas/configure | |||
4250 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 4258 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4251 | $as_echo_n "checking for $ac_word... " >&6; } | 4259 | $as_echo_n "checking for $ac_word... " >&6; } |
4252 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 4260 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
4253 | @@ -6457,7 +6715,7 @@ do | 4261 | @@ -6462,7 +6720,7 @@ do |
4254 | test -z "$as_dir" && as_dir=. | 4262 | test -z "$as_dir" && as_dir=. |
4255 | for ac_exec_ext in '' $ac_executable_extensions; do | 4263 | for ac_exec_ext in '' $ac_executable_extensions; do |
4256 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 4264 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -4259,7 +4267,7 @@ Index: git/gas/configure | |||
4259 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 4267 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4260 | break 2 | 4268 | break 2 |
4261 | fi | 4269 | fi |
4262 | @@ -6476,6 +6734,10 @@ else | 4270 | @@ -6481,6 +6739,10 @@ else |
4263 | $as_echo "no" >&6; } | 4271 | $as_echo "no" >&6; } |
4264 | fi | 4272 | fi |
4265 | 4273 | ||
@@ -4270,7 +4278,7 @@ Index: git/gas/configure | |||
4270 | if test "x$ac_ct_AR" = x; then | 4278 | if test "x$ac_ct_AR" = x; then |
4271 | AR="false" | 4279 | AR="false" |
4272 | else | 4280 | else |
4273 | @@ -6487,12 +6749,10 @@ ac_tool_warned=yes ;; | 4281 | @@ -6492,12 +6754,10 @@ ac_tool_warned=yes ;; |
4274 | esac | 4282 | esac |
4275 | AR=$ac_ct_AR | 4283 | AR=$ac_ct_AR |
4276 | fi | 4284 | fi |
@@ -4285,7 +4293,7 @@ Index: git/gas/configure | |||
4285 | 4293 | ||
4286 | 4294 | ||
4287 | 4295 | ||
4288 | @@ -6504,6 +6764,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 4296 | @@ -6509,6 +6769,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
4289 | 4297 | ||
4290 | 4298 | ||
4291 | 4299 | ||
@@ -4350,7 +4358,7 @@ Index: git/gas/configure | |||
4350 | if test -n "$ac_tool_prefix"; then | 4358 | if test -n "$ac_tool_prefix"; then |
4351 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 4359 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
4352 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | 4360 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
4353 | @@ -6838,8 +7156,8 @@ esac | 4361 | @@ -6843,8 +7161,8 @@ esac |
4354 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 4362 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
4355 | 4363 | ||
4356 | # Transform an extracted symbol line into symbol name and symbol address | 4364 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -4361,7 +4369,7 @@ Index: git/gas/configure | |||
4361 | 4369 | ||
4362 | # Handle CRLF in mingw tool chain | 4370 | # Handle CRLF in mingw tool chain |
4363 | opt_cr= | 4371 | opt_cr= |
4364 | @@ -6875,6 +7193,7 @@ for ac_symprfx in "" "_"; do | 4372 | @@ -6880,6 +7198,7 @@ for ac_symprfx in "" "_"; do |
4365 | else | 4373 | else |
4366 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 4374 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
4367 | fi | 4375 | fi |
@@ -4369,7 +4377,7 @@ Index: git/gas/configure | |||
4369 | 4377 | ||
4370 | # Check to see that the pipe works correctly. | 4378 | # Check to see that the pipe works correctly. |
4371 | pipe_works=no | 4379 | pipe_works=no |
4372 | @@ -6916,6 +7235,18 @@ _LT_EOF | 4380 | @@ -6921,6 +7240,18 @@ _LT_EOF |
4373 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 4381 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
4374 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 4382 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
4375 | cat <<_LT_EOF > conftest.$ac_ext | 4383 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -4388,7 +4396,7 @@ Index: git/gas/configure | |||
4388 | #ifdef __cplusplus | 4396 | #ifdef __cplusplus |
4389 | extern "C" { | 4397 | extern "C" { |
4390 | #endif | 4398 | #endif |
4391 | @@ -6927,7 +7258,7 @@ _LT_EOF | 4399 | @@ -6932,7 +7263,7 @@ _LT_EOF |
4392 | cat <<_LT_EOF >> conftest.$ac_ext | 4400 | cat <<_LT_EOF >> conftest.$ac_ext |
4393 | 4401 | ||
4394 | /* The mapping between symbol names and symbols. */ | 4402 | /* The mapping between symbol names and symbols. */ |
@@ -4397,7 +4405,7 @@ Index: git/gas/configure | |||
4397 | const char *name; | 4405 | const char *name; |
4398 | void *address; | 4406 | void *address; |
4399 | } | 4407 | } |
4400 | @@ -6953,8 +7284,8 @@ static const void *lt_preloaded_setup() | 4408 | @@ -6958,8 +7289,8 @@ static const void *lt_preloaded_setup() { |
4401 | _LT_EOF | 4409 | _LT_EOF |
4402 | # Now try linking the two files. | 4410 | # Now try linking the two files. |
4403 | mv conftest.$ac_objext conftstm.$ac_objext | 4411 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -4408,7 +4416,7 @@ Index: git/gas/configure | |||
4408 | LIBS="conftstm.$ac_objext" | 4416 | LIBS="conftstm.$ac_objext" |
4409 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 4417 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
4410 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 4418 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
4411 | @@ -6964,8 +7295,8 @@ _LT_EOF | 4419 | @@ -6969,8 +7300,8 @@ _LT_EOF |
4412 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 4420 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
4413 | pipe_works=yes | 4421 | pipe_works=yes |
4414 | fi | 4422 | fi |
@@ -4419,7 +4427,7 @@ Index: git/gas/configure | |||
4419 | else | 4427 | else |
4420 | echo "cannot find nm_test_func in $nlist" >&5 | 4428 | echo "cannot find nm_test_func in $nlist" >&5 |
4421 | fi | 4429 | fi |
4422 | @@ -7002,6 +7333,19 @@ else | 4430 | @@ -7007,6 +7338,21 @@ else |
4423 | $as_echo "ok" >&6; } | 4431 | $as_echo "ok" >&6; } |
4424 | fi | 4432 | fi |
4425 | 4433 | ||
@@ -4436,13 +4444,17 @@ Index: git/gas/configure | |||
4436 | + | 4444 | + |
4437 | + | 4445 | + |
4438 | + | 4446 | + |
4447 | + | ||
4448 | + | ||
4439 | 4449 | ||
4440 | 4450 | ||
4441 | 4451 | ||
4442 | @@ -7022,6 +7366,42 @@ fi | 4452 | @@ -7023,6 +7369,40 @@ fi |
4443 | 4453 | ||
4444 | 4454 | ||
4445 | 4455 | ||
4456 | + | ||
4457 | + | ||
4446 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 4458 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
4447 | +$as_echo_n "checking for sysroot... " >&6; } | 4459 | +$as_echo_n "checking for sysroot... " >&6; } |
4448 | + | 4460 | + |
@@ -4475,14 +4487,10 @@ Index: git/gas/configure | |||
4475 | + | 4487 | + |
4476 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 4488 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
4477 | +$as_echo "${lt_sysroot:-no}" >&6; } | 4489 | +$as_echo "${lt_sysroot:-no}" >&6; } |
4478 | + | ||
4479 | + | ||
4480 | + | ||
4481 | + | ||
4482 | 4490 | ||
4483 | # Check whether --enable-libtool-lock was given. | 4491 | |
4484 | if test "${enable_libtool_lock+set}" = set; then : | 4492 | |
4485 | @@ -7229,6 +7609,123 @@ esac | 4493 | @@ -7234,6 +7614,123 @@ esac |
4486 | 4494 | ||
4487 | need_locks="$enable_libtool_lock" | 4495 | need_locks="$enable_libtool_lock" |
4488 | 4496 | ||
@@ -4606,7 +4614,7 @@ Index: git/gas/configure | |||
4606 | 4614 | ||
4607 | case $host_os in | 4615 | case $host_os in |
4608 | rhapsody* | darwin*) | 4616 | rhapsody* | darwin*) |
4609 | @@ -7792,6 +8289,8 @@ _LT_EOF | 4617 | @@ -7797,6 +8294,8 @@ _LT_EOF |
4610 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 4618 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
4611 | echo "$AR cru libconftest.a conftest.o" >&5 | 4619 | echo "$AR cru libconftest.a conftest.o" >&5 |
4612 | $AR cru libconftest.a conftest.o 2>&5 | 4620 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -4615,7 +4623,7 @@ Index: git/gas/configure | |||
4615 | cat > conftest.c << _LT_EOF | 4623 | cat > conftest.c << _LT_EOF |
4616 | int main() { return 0;} | 4624 | int main() { return 0;} |
4617 | _LT_EOF | 4625 | _LT_EOF |
4618 | @@ -7987,7 +8486,8 @@ fi | 4626 | @@ -7992,7 +8491,8 @@ fi |
4619 | LIBTOOL_DEPS="$ltmain" | 4627 | LIBTOOL_DEPS="$ltmain" |
4620 | 4628 | ||
4621 | # Always use our own libtool. | 4629 | # Always use our own libtool. |
@@ -4625,7 +4633,7 @@ Index: git/gas/configure | |||
4625 | 4633 | ||
4626 | 4634 | ||
4627 | 4635 | ||
4628 | @@ -8076,7 +8576,7 @@ aix3*) | 4636 | @@ -8081,7 +8581,7 @@ aix3*) |
4629 | esac | 4637 | esac |
4630 | 4638 | ||
4631 | # Global variables: | 4639 | # Global variables: |
@@ -4634,7 +4642,7 @@ Index: git/gas/configure | |||
4634 | can_build_shared=yes | 4642 | can_build_shared=yes |
4635 | 4643 | ||
4636 | # All known linkers require a `.a' archive for static linking (except MSVC, | 4644 | # All known linkers require a `.a' archive for static linking (except MSVC, |
4637 | @@ -8374,8 +8874,6 @@ fi | 4645 | @@ -8379,8 +8879,6 @@ fi |
4638 | lt_prog_compiler_pic= | 4646 | lt_prog_compiler_pic= |
4639 | lt_prog_compiler_static= | 4647 | lt_prog_compiler_static= |
4640 | 4648 | ||
@@ -4643,7 +4651,7 @@ Index: git/gas/configure | |||
4643 | 4651 | ||
4644 | if test "$GCC" = yes; then | 4652 | if test "$GCC" = yes; then |
4645 | lt_prog_compiler_wl='-Wl,' | 4653 | lt_prog_compiler_wl='-Wl,' |
4646 | @@ -8541,6 +9039,12 @@ $as_echo_n "checking for $compiler optio | 4654 | @@ -8546,6 +9044,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4647 | lt_prog_compiler_pic='--shared' | 4655 | lt_prog_compiler_pic='--shared' |
4648 | lt_prog_compiler_static='--static' | 4656 | lt_prog_compiler_static='--static' |
4649 | ;; | 4657 | ;; |
@@ -4656,7 +4664,7 @@ Index: git/gas/configure | |||
4656 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 4664 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
4657 | # Portland Group compilers (*not* the Pentium gcc compiler, | 4665 | # Portland Group compilers (*not* the Pentium gcc compiler, |
4658 | # which looks to be a dead project) | 4666 | # which looks to be a dead project) |
4659 | @@ -8603,7 +9107,7 @@ $as_echo_n "checking for $compiler optio | 4667 | @@ -8608,7 +9112,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4660 | lt_prog_compiler_pic='-KPIC' | 4668 | lt_prog_compiler_pic='-KPIC' |
4661 | lt_prog_compiler_static='-Bstatic' | 4669 | lt_prog_compiler_static='-Bstatic' |
4662 | case $cc_basename in | 4670 | case $cc_basename in |
@@ -4665,7 +4673,7 @@ Index: git/gas/configure | |||
4665 | lt_prog_compiler_wl='-Qoption ld ';; | 4673 | lt_prog_compiler_wl='-Qoption ld ';; |
4666 | *) | 4674 | *) |
4667 | lt_prog_compiler_wl='-Wl,';; | 4675 | lt_prog_compiler_wl='-Wl,';; |
4668 | @@ -8660,13 +9164,17 @@ case $host_os in | 4676 | @@ -8665,13 +9169,17 @@ case $host_os in |
4669 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 4677 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
4670 | ;; | 4678 | ;; |
4671 | esac | 4679 | esac |
@@ -4689,7 +4697,7 @@ Index: git/gas/configure | |||
4689 | 4697 | ||
4690 | # | 4698 | # |
4691 | # Check to make sure the PIC flag actually works. | 4699 | # Check to make sure the PIC flag actually works. |
4692 | @@ -8727,6 +9235,11 @@ fi | 4700 | @@ -8732,6 +9240,11 @@ fi |
4693 | 4701 | ||
4694 | 4702 | ||
4695 | 4703 | ||
@@ -4701,7 +4709,7 @@ Index: git/gas/configure | |||
4701 | # | 4709 | # |
4702 | # Check to make sure the static flag actually works. | 4710 | # Check to make sure the static flag actually works. |
4703 | # | 4711 | # |
4704 | @@ -9077,7 +9590,8 @@ _LT_EOF | 4712 | @@ -9082,7 +9595,8 @@ _LT_EOF |
4705 | allow_undefined_flag=unsupported | 4713 | allow_undefined_flag=unsupported |
4706 | always_export_symbols=no | 4714 | always_export_symbols=no |
4707 | enable_shared_with_static_runtimes=yes | 4715 | enable_shared_with_static_runtimes=yes |
@@ -4711,7 +4719,7 @@ Index: git/gas/configure | |||
4711 | 4719 | ||
4712 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 4720 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4713 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 4721 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4714 | @@ -9176,12 +9690,12 @@ _LT_EOF | 4722 | @@ -9181,12 +9695,12 @@ _LT_EOF |
4715 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 4723 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
4716 | hardcode_libdir_flag_spec= | 4724 | hardcode_libdir_flag_spec= |
4717 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 4725 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -4726,7 +4734,7 @@ Index: git/gas/configure | |||
4726 | fi | 4734 | fi |
4727 | ;; | 4735 | ;; |
4728 | esac | 4736 | esac |
4729 | @@ -9195,8 +9709,8 @@ _LT_EOF | 4737 | @@ -9200,8 +9714,8 @@ _LT_EOF |
4730 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 4738 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4731 | wlarc= | 4739 | wlarc= |
4732 | else | 4740 | else |
@@ -4737,7 +4745,7 @@ Index: git/gas/configure | |||
4737 | fi | 4745 | fi |
4738 | ;; | 4746 | ;; |
4739 | 4747 | ||
4740 | @@ -9214,8 +9728,8 @@ _LT_EOF | 4748 | @@ -9219,8 +9733,8 @@ _LT_EOF |
4741 | 4749 | ||
4742 | _LT_EOF | 4750 | _LT_EOF |
4743 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4751 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -4748,7 +4756,7 @@ Index: git/gas/configure | |||
4748 | else | 4756 | else |
4749 | ld_shlibs=no | 4757 | ld_shlibs=no |
4750 | fi | 4758 | fi |
4751 | @@ -9261,8 +9775,8 @@ _LT_EOF | 4759 | @@ -9266,8 +9780,8 @@ _LT_EOF |
4752 | 4760 | ||
4753 | *) | 4761 | *) |
4754 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4762 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -4759,7 +4767,7 @@ Index: git/gas/configure | |||
4759 | else | 4767 | else |
4760 | ld_shlibs=no | 4768 | ld_shlibs=no |
4761 | fi | 4769 | fi |
4762 | @@ -9392,7 +9906,13 @@ _LT_EOF | 4770 | @@ -9397,7 +9911,13 @@ _LT_EOF |
4763 | allow_undefined_flag='-berok' | 4771 | allow_undefined_flag='-berok' |
4764 | # Determine the default libpath from the value encoded in an | 4772 | # Determine the default libpath from the value encoded in an |
4765 | # empty executable. | 4773 | # empty executable. |
@@ -4774,7 +4782,7 @@ Index: git/gas/configure | |||
4774 | /* end confdefs.h. */ | 4782 | /* end confdefs.h. */ |
4775 | 4783 | ||
4776 | int | 4784 | int |
4777 | @@ -9405,22 +9925,29 @@ main () | 4785 | @@ -9410,22 +9930,29 @@ main () |
4778 | _ACEOF | 4786 | _ACEOF |
4779 | if ac_fn_c_try_link "$LINENO"; then : | 4787 | if ac_fn_c_try_link "$LINENO"; then : |
4780 | 4788 | ||
@@ -4817,7 +4825,7 @@ Index: git/gas/configure | |||
4817 | 4825 | ||
4818 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 4826 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4819 | 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" | 4827 | 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" |
4820 | @@ -9432,7 +9959,13 @@ if test -z "$aix_libpath"; then aix_libp | 4828 | @@ -9437,7 +9964,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4821 | else | 4829 | else |
4822 | # Determine the default libpath from the value encoded in an | 4830 | # Determine the default libpath from the value encoded in an |
4823 | # empty executable. | 4831 | # empty executable. |
@@ -4832,7 +4840,7 @@ Index: git/gas/configure | |||
4832 | /* end confdefs.h. */ | 4840 | /* end confdefs.h. */ |
4833 | 4841 | ||
4834 | int | 4842 | int |
4835 | @@ -9445,22 +9978,29 @@ main () | 4843 | @@ -9450,22 +9983,29 @@ main () |
4836 | _ACEOF | 4844 | _ACEOF |
4837 | if ac_fn_c_try_link "$LINENO"; then : | 4845 | if ac_fn_c_try_link "$LINENO"; then : |
4838 | 4846 | ||
@@ -4875,7 +4883,7 @@ Index: git/gas/configure | |||
4875 | 4883 | ||
4876 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 4884 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4877 | # Warning - without using the other run time loading flags, | 4885 | # Warning - without using the other run time loading flags, |
4878 | @@ -9505,20 +10045,63 @@ if test -z "$aix_libpath"; then aix_libp | 4886 | @@ -9510,20 +10050,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4879 | # Microsoft Visual C++. | 4887 | # Microsoft Visual C++. |
4880 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 4888 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
4881 | # no search path for DLLs. | 4889 | # no search path for DLLs. |
@@ -4953,7 +4961,7 @@ Index: git/gas/configure | |||
4953 | ;; | 4961 | ;; |
4954 | 4962 | ||
4955 | darwin* | rhapsody*) | 4963 | darwin* | rhapsody*) |
4956 | @@ -9579,7 +10162,7 @@ if test -z "$aix_libpath"; then aix_libp | 4964 | @@ -9584,7 +10167,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4957 | 4965 | ||
4958 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 4966 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
4959 | freebsd* | dragonfly*) | 4967 | freebsd* | dragonfly*) |
@@ -4962,7 +4970,7 @@ Index: git/gas/configure | |||
4962 | hardcode_libdir_flag_spec='-R$libdir' | 4970 | hardcode_libdir_flag_spec='-R$libdir' |
4963 | hardcode_direct=yes | 4971 | hardcode_direct=yes |
4964 | hardcode_shlibpath_var=no | 4972 | hardcode_shlibpath_var=no |
4965 | @@ -9587,7 +10170,7 @@ if test -z "$aix_libpath"; then aix_libp | 4973 | @@ -9592,7 +10175,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4966 | 4974 | ||
4967 | hpux9*) | 4975 | hpux9*) |
4968 | if test "$GCC" = yes; then | 4976 | if test "$GCC" = yes; then |
@@ -4971,7 +4979,7 @@ Index: git/gas/configure | |||
4971 | else | 4979 | else |
4972 | 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' | 4980 | 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' |
4973 | fi | 4981 | fi |
4974 | @@ -9603,7 +10186,7 @@ if test -z "$aix_libpath"; then aix_libp | 4982 | @@ -9608,7 +10191,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4975 | 4983 | ||
4976 | hpux10*) | 4984 | hpux10*) |
4977 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 4985 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -4980,7 +4988,7 @@ Index: git/gas/configure | |||
4980 | else | 4988 | else |
4981 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 4989 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
4982 | fi | 4990 | fi |
4983 | @@ -9627,10 +10210,10 @@ if test -z "$aix_libpath"; then aix_libp | 4991 | @@ -9632,10 +10215,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4984 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 4992 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4985 | ;; | 4993 | ;; |
4986 | ia64*) | 4994 | ia64*) |
@@ -4993,7 +5001,7 @@ Index: git/gas/configure | |||
4993 | ;; | 5001 | ;; |
4994 | esac | 5002 | esac |
4995 | else | 5003 | else |
4996 | @@ -9709,23 +10292,36 @@ fi | 5004 | @@ -9714,23 +10297,36 @@ fi |
4997 | 5005 | ||
4998 | irix5* | irix6* | nonstopux*) | 5006 | irix5* | irix6* | nonstopux*) |
4999 | if test "$GCC" = yes; then | 5007 | if test "$GCC" = yes; then |
@@ -5038,7 +5046,7 @@ Index: git/gas/configure | |||
5038 | else | 5046 | else |
5039 | 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' | 5047 | 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' |
5040 | 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' | 5048 | 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' |
5041 | @@ -9810,7 +10406,7 @@ rm -f core conftest.err conftest.$ac_obj | 5049 | @@ -9815,7 +10411,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
5042 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 5050 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
5043 | if test "$GCC" = yes; then | 5051 | if test "$GCC" = yes; then |
5044 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 5052 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -5047,7 +5055,7 @@ Index: git/gas/configure | |||
5047 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 5055 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
5048 | else | 5056 | else |
5049 | allow_undefined_flag=' -expect_unresolved \*' | 5057 | allow_undefined_flag=' -expect_unresolved \*' |
5050 | @@ -9829,9 +10425,9 @@ rm -f core conftest.err conftest.$ac_obj | 5058 | @@ -9834,9 +10430,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
5051 | no_undefined_flag=' -z defs' | 5059 | no_undefined_flag=' -z defs' |
5052 | if test "$GCC" = yes; then | 5060 | if test "$GCC" = yes; then |
5053 | wlarc='${wl}' | 5061 | wlarc='${wl}' |
@@ -5059,7 +5067,7 @@ Index: git/gas/configure | |||
5059 | else | 5067 | else |
5060 | case `$CC -V 2>&1` in | 5068 | case `$CC -V 2>&1` in |
5061 | *"Compilers 5.0"*) | 5069 | *"Compilers 5.0"*) |
5062 | @@ -10407,8 +11003,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 5070 | @@ -10412,8 +11008,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
5063 | need_version=no | 5071 | need_version=no |
5064 | need_lib_prefix=no | 5072 | need_lib_prefix=no |
5065 | 5073 | ||
@@ -5071,7 +5079,7 @@ Index: git/gas/configure | |||
5071 | library_names_spec='$libname.dll.a' | 5079 | library_names_spec='$libname.dll.a' |
5072 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 5080 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
5073 | postinstall_cmds='base_file=`basename \${file}`~ | 5081 | postinstall_cmds='base_file=`basename \${file}`~ |
5074 | @@ -10441,13 +11038,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 5082 | @@ -10446,13 +11043,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
5075 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 5083 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
5076 | ;; | 5084 | ;; |
5077 | esac | 5085 | esac |
@@ -5144,7 +5152,7 @@ Index: git/gas/configure | |||
5144 | # FIXME: first we should search . and the directory the executable is in | 5152 | # FIXME: first we should search . and the directory the executable is in |
5145 | shlibpath_var=PATH | 5153 | shlibpath_var=PATH |
5146 | ;; | 5154 | ;; |
5147 | @@ -10539,7 +11194,7 @@ haiku*) | 5155 | @@ -10544,7 +11199,7 @@ haiku*) |
5148 | soname_spec='${libname}${release}${shared_ext}$major' | 5156 | soname_spec='${libname}${release}${shared_ext}$major' |
5149 | shlibpath_var=LIBRARY_PATH | 5157 | shlibpath_var=LIBRARY_PATH |
5150 | shlibpath_overrides_runpath=yes | 5158 | shlibpath_overrides_runpath=yes |
@@ -5153,16 +5161,16 @@ Index: git/gas/configure | |||
5153 | hardcode_into_libs=yes | 5161 | hardcode_into_libs=yes |
5154 | ;; | 5162 | ;; |
5155 | 5163 | ||
5156 | @@ -11335,7 +11990,7 @@ else | 5164 | @@ -11340,7 +11995,7 @@ else |
5157 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 5165 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
5158 | lt_status=$lt_dlunknown | 5166 | lt_status=$lt_dlunknown |
5159 | cat > conftest.$ac_ext <<_LT_EOF | 5167 | cat > conftest.$ac_ext <<_LT_EOF |
5160 | -#line 11338 "configure" | 5168 | -#line 11343 "configure" |
5161 | +#line $LINENO "configure" | 5169 | +#line $LINENO "configure" |
5162 | #include "confdefs.h" | 5170 | #include "confdefs.h" |
5163 | 5171 | ||
5164 | #if HAVE_DLFCN_H | 5172 | #if HAVE_DLFCN_H |
5165 | @@ -11379,10 +12034,10 @@ else | 5173 | @@ -11384,10 +12039,10 @@ else |
5166 | /* When -fvisbility=hidden is used, assume the code has been annotated | 5174 | /* When -fvisbility=hidden is used, assume the code has been annotated |
5167 | correspondingly for the symbols needed. */ | 5175 | correspondingly for the symbols needed. */ |
5168 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 5176 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -5175,16 +5183,16 @@ Index: git/gas/configure | |||
5175 | int main () | 5183 | int main () |
5176 | { | 5184 | { |
5177 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 5185 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
5178 | @@ -11441,7 +12096,7 @@ else | 5186 | @@ -11446,7 +12101,7 @@ else |
5179 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 5187 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
5180 | lt_status=$lt_dlunknown | 5188 | lt_status=$lt_dlunknown |
5181 | cat > conftest.$ac_ext <<_LT_EOF | 5189 | cat > conftest.$ac_ext <<_LT_EOF |
5182 | -#line 11444 "configure" | 5190 | -#line 11449 "configure" |
5183 | +#line $LINENO "configure" | 5191 | +#line $LINENO "configure" |
5184 | #include "confdefs.h" | 5192 | #include "confdefs.h" |
5185 | 5193 | ||
5186 | #if HAVE_DLFCN_H | 5194 | #if HAVE_DLFCN_H |
5187 | @@ -11485,10 +12140,10 @@ else | 5195 | @@ -11490,10 +12145,10 @@ else |
5188 | /* When -fvisbility=hidden is used, assume the code has been annotated | 5196 | /* When -fvisbility=hidden is used, assume the code has been annotated |
5189 | correspondingly for the symbols needed. */ | 5197 | correspondingly for the symbols needed. */ |
5190 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 5198 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -5197,7 +5205,7 @@ Index: git/gas/configure | |||
5197 | int main () | 5205 | int main () |
5198 | { | 5206 | { |
5199 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 5207 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
5200 | @@ -15803,13 +16458,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 5208 | @@ -15896,13 +16551,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
5201 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 5209 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
5202 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 5210 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
5203 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 5211 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -5218,7 +5226,7 @@ Index: git/gas/configure | |||
5218 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 5226 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
5219 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 5227 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
5220 | 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"`' |
5221 | @@ -15824,14 +16486,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 5229 | @@ -15917,14 +16579,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
5222 | 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"`' |
5223 | 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"`' |
5224 | 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"`' |
@@ -5237,7 +5245,7 @@ Index: git/gas/configure | |||
5237 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 5245 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
5238 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 5246 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
5239 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 5247 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
5240 | @@ -15864,12 +16529,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 5248 | @@ -15957,12 +16622,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
5241 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 5249 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
5242 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 5250 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
5243 | 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"`' |
@@ -5251,7 +5259,7 @@ Index: git/gas/configure | |||
5251 | 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"`' |
5252 | 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"`' |
5253 | 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"`' |
5254 | @@ -15924,8 +16589,13 @@ reload_flag \ | 5262 | @@ -16017,8 +16682,13 @@ reload_flag \ |
5255 | OBJDUMP \ | 5263 | OBJDUMP \ |
5256 | deplibs_check_method \ | 5264 | deplibs_check_method \ |
5257 | file_magic_cmd \ | 5265 | file_magic_cmd \ |
@@ -5265,7 +5273,7 @@ Index: git/gas/configure | |||
5265 | STRIP \ | 5273 | STRIP \ |
5266 | RANLIB \ | 5274 | RANLIB \ |
5267 | CC \ | 5275 | CC \ |
5268 | @@ -15935,12 +16605,14 @@ lt_cv_sys_global_symbol_pipe \ | 5276 | @@ -16028,12 +16698,14 @@ lt_cv_sys_global_symbol_pipe \ |
5269 | lt_cv_sys_global_symbol_to_cdecl \ | 5277 | lt_cv_sys_global_symbol_to_cdecl \ |
5270 | lt_cv_sys_global_symbol_to_c_name_address \ | 5278 | lt_cv_sys_global_symbol_to_c_name_address \ |
5271 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 5279 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -5281,7 +5289,7 @@ Index: git/gas/configure | |||
5281 | DSYMUTIL \ | 5289 | DSYMUTIL \ |
5282 | NMEDIT \ | 5290 | NMEDIT \ |
5283 | LIPO \ | 5291 | LIPO \ |
5284 | @@ -15956,7 +16628,6 @@ no_undefined_flag \ | 5292 | @@ -16049,7 +16721,6 @@ no_undefined_flag \ |
5285 | hardcode_libdir_flag_spec \ | 5293 | hardcode_libdir_flag_spec \ |
5286 | hardcode_libdir_flag_spec_ld \ | 5294 | hardcode_libdir_flag_spec_ld \ |
5287 | hardcode_libdir_separator \ | 5295 | hardcode_libdir_separator \ |
@@ -5289,7 +5297,7 @@ Index: git/gas/configure | |||
5289 | exclude_expsyms \ | 5297 | exclude_expsyms \ |
5290 | include_expsyms \ | 5298 | include_expsyms \ |
5291 | file_list_spec \ | 5299 | file_list_spec \ |
5292 | @@ -15992,6 +16663,7 @@ module_cmds \ | 5300 | @@ -16085,6 +16756,7 @@ module_cmds \ |
5293 | module_expsym_cmds \ | 5301 | module_expsym_cmds \ |
5294 | export_symbols_cmds \ | 5302 | export_symbols_cmds \ |
5295 | prelink_cmds \ | 5303 | prelink_cmds \ |
@@ -5297,7 +5305,7 @@ Index: git/gas/configure | |||
5297 | postinstall_cmds \ | 5305 | postinstall_cmds \ |
5298 | postuninstall_cmds \ | 5306 | postuninstall_cmds \ |
5299 | finish_cmds \ | 5307 | finish_cmds \ |
5300 | @@ -16765,7 +17437,8 @@ $as_echo X"$file" | | 5308 | @@ -16858,7 +17530,8 @@ $as_echo X"$file" | |
5301 | # 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. |
5302 | # | 5310 | # |
5303 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 5311 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -5307,7 +5315,7 @@ Index: git/gas/configure | |||
5307 | # Written by Gordon Matzigkeit, 1996 | 5315 | # Written by Gordon Matzigkeit, 1996 |
5308 | # | 5316 | # |
5309 | # This file is part of GNU Libtool. | 5317 | # This file is part of GNU Libtool. |
5310 | @@ -16868,19 +17541,42 @@ SP2NL=$lt_lt_SP2NL | 5318 | @@ -16961,19 +17634,42 @@ SP2NL=$lt_lt_SP2NL |
5311 | # turn newlines into spaces. | 5319 | # turn newlines into spaces. |
5312 | NL2SP=$lt_lt_NL2SP | 5320 | NL2SP=$lt_lt_NL2SP |
5313 | 5321 | ||
@@ -5351,7 +5359,7 @@ Index: git/gas/configure | |||
5351 | # A symbol stripping program. | 5359 | # A symbol stripping program. |
5352 | STRIP=$lt_STRIP | 5360 | STRIP=$lt_STRIP |
5353 | 5361 | ||
5354 | @@ -16910,6 +17606,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 5362 | @@ -17003,6 +17699,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
5355 | # 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. |
5356 | 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 |
5357 | 5365 | ||
@@ -5364,7 +5372,7 @@ Index: git/gas/configure | |||
5364 | # The name of the directory that contains temporary libtool files. | 5372 | # The name of the directory that contains temporary libtool files. |
5365 | objdir=$objdir | 5373 | objdir=$objdir |
5366 | 5374 | ||
5367 | @@ -16919,6 +17621,9 @@ MAGIC_CMD=$MAGIC_CMD | 5375 | @@ -17012,6 +17714,9 @@ MAGIC_CMD=$MAGIC_CMD |
5368 | # Must we lock files when doing compilation? | 5376 | # Must we lock files when doing compilation? |
5369 | need_locks=$lt_need_locks | 5377 | need_locks=$lt_need_locks |
5370 | 5378 | ||
@@ -5374,7 +5382,7 @@ Index: git/gas/configure | |||
5374 | # 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. |
5375 | DSYMUTIL=$lt_DSYMUTIL | 5383 | DSYMUTIL=$lt_DSYMUTIL |
5376 | 5384 | ||
5377 | @@ -17033,12 +17738,12 @@ with_gcc=$GCC | 5385 | @@ -17126,12 +17831,12 @@ with_gcc=$GCC |
5378 | # Compiler flag to turn off builtin functions. | 5386 | # Compiler flag to turn off builtin functions. |
5379 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 5387 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
5380 | 5388 | ||
@@ -5390,7 +5398,7 @@ Index: git/gas/configure | |||
5390 | # Compiler flag to prevent dynamic linking. | 5398 | # Compiler flag to prevent dynamic linking. |
5391 | link_static_flag=$lt_lt_prog_compiler_static | 5399 | link_static_flag=$lt_lt_prog_compiler_static |
5392 | 5400 | ||
5393 | @@ -17125,9 +17830,6 @@ inherit_rpath=$inherit_rpath | 5401 | @@ -17218,9 +17923,6 @@ inherit_rpath=$inherit_rpath |
5394 | # Whether libtool must link a program against all its dependency libraries. | 5402 | # Whether libtool must link a program against all its dependency libraries. |
5395 | link_all_deplibs=$link_all_deplibs | 5403 | link_all_deplibs=$link_all_deplibs |
5396 | 5404 | ||
@@ -5400,7 +5408,7 @@ Index: git/gas/configure | |||
5400 | # Set to "yes" if exported symbols are required. | 5408 | # Set to "yes" if exported symbols are required. |
5401 | always_export_symbols=$always_export_symbols | 5409 | always_export_symbols=$always_export_symbols |
5402 | 5410 | ||
5403 | @@ -17143,6 +17845,9 @@ include_expsyms=$lt_include_expsyms | 5411 | @@ -17236,6 +17938,9 @@ include_expsyms=$lt_include_expsyms |
5404 | # Commands necessary for linking programs (against libraries) with templates. | 5412 | # Commands necessary for linking programs (against libraries) with templates. |
5405 | prelink_cmds=$lt_prelink_cmds | 5413 | prelink_cmds=$lt_prelink_cmds |
5406 | 5414 | ||
@@ -5410,7 +5418,7 @@ Index: git/gas/configure | |||
5410 | # Specify filename containing input files. | 5418 | # Specify filename containing input files. |
5411 | file_list_spec=$lt_file_list_spec | 5419 | file_list_spec=$lt_file_list_spec |
5412 | 5420 | ||
5413 | @@ -17175,210 +17880,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 5421 | @@ -17268,210 +17973,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
5414 | # 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 |
5415 | # 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 |
5416 | # is reportedly fixed, but why not run on old versions too? | 5424 | # is reportedly fixed, but why not run on old versions too? |
@@ -5612,9 +5620,15 @@ Index: git/gas/configure | |||
5612 | -_LT_EOF | 5620 | -_LT_EOF |
5613 | - ;; | 5621 | - ;; |
5614 | - esac | 5622 | - esac |
5623 | - | ||
5624 | - | ||
5625 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
5626 | - || (rm -f "$cfgfile"; exit 1) | ||
5627 | - | ||
5628 | - mv -f "$cfgfile" "$ofile" || | ||
5615 | + sed '$q' "$ltmain" >> "$cfgfile" \ | 5629 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
5616 | + || (rm -f "$cfgfile"; exit 1) | 5630 | + || (rm -f "$cfgfile"; exit 1) |
5617 | 5631 | + | |
5618 | + if test x"$xsi_shell" = xyes; then | 5632 | + if test x"$xsi_shell" = xyes; then |
5619 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | 5633 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
5620 | +func_dirname ()\ | 5634 | +func_dirname ()\ |
@@ -5772,19 +5786,16 @@ Index: git/gas/configure | |||
5772 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | 5786 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
5773 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | 5787 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
5774 | +fi | 5788 | +fi |
5775 | 5789 | + | |
5776 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 5790 | + |
5777 | - || (rm -f "$cfgfile"; exit 1) | ||
5778 | |||
5779 | - mv -f "$cfgfile" "$ofile" || | ||
5780 | + mv -f "$cfgfile" "$ofile" || | 5791 | + mv -f "$cfgfile" "$ofile" || |
5781 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 5792 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
5782 | chmod +x "$ofile" | 5793 | chmod +x "$ofile" |
5783 | 5794 | ||
5784 | Index: git/gprof/configure | 5795 | diff --git a/gprof/configure b/gprof/configure |
5785 | =================================================================== | 5796 | index ab32bab2b6..5119c6019f 100755 |
5786 | --- git.orig/gprof/configure | 5797 | --- a/gprof/configure |
5787 | +++ git/gprof/configure | 5798 | +++ b/gprof/configure |
5788 | @@ -662,8 +662,11 @@ OTOOL | 5799 | @@ -662,8 +662,11 @@ OTOOL |
5789 | LIPO | 5800 | LIPO |
5790 | NMEDIT | 5801 | NMEDIT |
@@ -5834,7 +5845,7 @@ Index: git/gprof/configure | |||
5834 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 5845 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
5835 | ECHO='print -r --' | 5846 | ECHO='print -r --' |
5836 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 5847 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
5837 | @@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell u | 5848 | @@ -5851,8 +5857,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
5838 | # Try some XSI features | 5849 | # Try some XSI features |
5839 | xsi_shell=no | 5850 | xsi_shell=no |
5840 | ( _lt_dummy="a/b/c" | 5851 | ( _lt_dummy="a/b/c" |
@@ -5851,7 +5862,7 @@ Index: git/gprof/configure | |||
5851 | 5862 | ||
5852 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | 5863 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
5853 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | 5864 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
5854 | +if ${lt_cv_to_host_file_cmd+:} false; then : | 5865 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
5855 | + $as_echo_n "(cached) " >&6 | 5866 | + $as_echo_n "(cached) " >&6 |
5856 | +else | 5867 | +else |
5857 | + case $host in | 5868 | + case $host in |
@@ -5898,7 +5909,7 @@ Index: git/gprof/configure | |||
5898 | + | 5909 | + |
5899 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | 5910 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
5900 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | 5911 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
5901 | +if ${lt_cv_to_tool_file_cmd+:} false; then : | 5912 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
5902 | + $as_echo_n "(cached) " >&6 | 5913 | + $as_echo_n "(cached) " >&6 |
5903 | +else | 5914 | +else |
5904 | + #assume ordinary cross tools, or native build. | 5915 | + #assume ordinary cross tools, or native build. |
@@ -5982,7 +5993,7 @@ Index: git/gprof/configure | |||
5982 | file_magic_cmd=$lt_cv_file_magic_cmd | 5993 | file_magic_cmd=$lt_cv_file_magic_cmd |
5983 | deplibs_check_method=$lt_cv_deplibs_check_method | 5994 | deplibs_check_method=$lt_cv_deplibs_check_method |
5984 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 5995 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
5985 | @@ -6259,9 +6355,162 @@ test -z "$deplibs_check_method" && depli | 5996 | @@ -6257,11 +6353,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
5986 | 5997 | ||
5987 | 5998 | ||
5988 | 5999 | ||
@@ -5996,6 +6007,8 @@ Index: git/gprof/configure | |||
5996 | + | 6007 | + |
5997 | + | 6008 | + |
5998 | + | 6009 | + |
6010 | |||
6011 | |||
5999 | if test -n "$ac_tool_prefix"; then | 6012 | if test -n "$ac_tool_prefix"; then |
6000 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 6013 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
6001 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | 6014 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
@@ -6003,7 +6016,7 @@ Index: git/gprof/configure | |||
6003 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | 6016 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
6004 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 6017 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
6005 | +$as_echo_n "checking for $ac_word... " >&6; } | 6018 | +$as_echo_n "checking for $ac_word... " >&6; } |
6006 | +if ${ac_cv_prog_DLLTOOL+:} false; then : | 6019 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
6007 | + $as_echo_n "(cached) " >&6 | 6020 | + $as_echo_n "(cached) " >&6 |
6008 | +else | 6021 | +else |
6009 | + if test -n "$DLLTOOL"; then | 6022 | + if test -n "$DLLTOOL"; then |
@@ -6015,7 +6028,7 @@ Index: git/gprof/configure | |||
6015 | + IFS=$as_save_IFS | 6028 | + IFS=$as_save_IFS |
6016 | + test -z "$as_dir" && as_dir=. | 6029 | + test -z "$as_dir" && as_dir=. |
6017 | + for ac_exec_ext in '' $ac_executable_extensions; do | 6030 | + for ac_exec_ext in '' $ac_executable_extensions; do |
6018 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 6031 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
6019 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | 6032 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
6020 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6033 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6021 | + break 2 | 6034 | + break 2 |
@@ -6043,7 +6056,7 @@ Index: git/gprof/configure | |||
6043 | +set dummy dlltool; ac_word=$2 | 6056 | +set dummy dlltool; ac_word=$2 |
6044 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 6057 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
6045 | +$as_echo_n "checking for $ac_word... " >&6; } | 6058 | +$as_echo_n "checking for $ac_word... " >&6; } |
6046 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | 6059 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
6047 | + $as_echo_n "(cached) " >&6 | 6060 | + $as_echo_n "(cached) " >&6 |
6048 | +else | 6061 | +else |
6049 | + if test -n "$ac_ct_DLLTOOL"; then | 6062 | + if test -n "$ac_ct_DLLTOOL"; then |
@@ -6055,7 +6068,7 @@ Index: git/gprof/configure | |||
6055 | + IFS=$as_save_IFS | 6068 | + IFS=$as_save_IFS |
6056 | + test -z "$as_dir" && as_dir=. | 6069 | + test -z "$as_dir" && as_dir=. |
6057 | + for ac_exec_ext in '' $ac_executable_extensions; do | 6070 | + for ac_exec_ext in '' $ac_executable_extensions; do |
6058 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 6071 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
6059 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" | 6072 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
6060 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6073 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6061 | + break 2 | 6074 | + break 2 |
@@ -6103,7 +6116,7 @@ Index: git/gprof/configure | |||
6103 | + | 6116 | + |
6104 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | 6117 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
6105 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | 6118 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
6106 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | 6119 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
6107 | + $as_echo_n "(cached) " >&6 | 6120 | + $as_echo_n "(cached) " >&6 |
6108 | +else | 6121 | +else |
6109 | + lt_cv_sharedlib_from_linklib_cmd='unknown' | 6122 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
@@ -6147,11 +6160,13 @@ Index: git/gprof/configure | |||
6147 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 6160 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
6148 | $as_echo_n "checking for $ac_word... " >&6; } | 6161 | $as_echo_n "checking for $ac_word... " >&6; } |
6149 | if ${ac_cv_prog_AR+:} false; then : | 6162 | if ${ac_cv_prog_AR+:} false; then : |
6150 | @@ -6277,7 +6526,7 @@ do | 6163 | @@ -6276,8 +6525,8 @@ do |
6164 | IFS=$as_save_IFS | ||
6151 | test -z "$as_dir" && as_dir=. | 6165 | test -z "$as_dir" && as_dir=. |
6152 | for ac_exec_ext in '' $ac_executable_extensions; do | 6166 | for ac_exec_ext in '' $ac_executable_extensions; do |
6153 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 6167 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
6154 | - ac_cv_prog_AR="${ac_tool_prefix}ar" | 6168 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
6169 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
6155 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | 6170 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
6156 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6171 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6157 | break 2 | 6172 | break 2 |
@@ -6175,15 +6190,6 @@ Index: git/gprof/configure | |||
6175 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 6190 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
6176 | $as_echo_n "checking for $ac_word... " >&6; } | 6191 | $as_echo_n "checking for $ac_word... " >&6; } |
6177 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 6192 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
6178 | @@ -6317,7 +6570,7 @@ do | ||
6179 | test -z "$as_dir" && as_dir=. | ||
6180 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
6181 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
6182 | - ac_cv_prog_ac_ct_AR="ar" | ||
6183 | + ac_cv_prog_ac_ct_AR="$ac_prog" | ||
6184 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
6185 | break 2 | ||
6186 | fi | ||
6187 | @@ -6336,6 +6589,10 @@ else | 6193 | @@ -6336,6 +6589,10 @@ else |
6188 | $as_echo "no" >&6; } | 6194 | $as_echo "no" >&6; } |
6189 | fi | 6195 | fi |
@@ -6220,7 +6226,7 @@ Index: git/gprof/configure | |||
6220 | + | 6226 | + |
6221 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 6227 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
6222 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 6228 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
6223 | +if ${lt_cv_ar_at_file+:} false; then : | 6229 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
6224 | + $as_echo_n "(cached) " >&6 | 6230 | + $as_echo_n "(cached) " >&6 |
6225 | +else | 6231 | +else |
6226 | + lt_cv_ar_at_file=no | 6232 | + lt_cv_ar_at_file=no |
@@ -6319,7 +6325,7 @@ Index: git/gprof/configure | |||
6319 | const char *name; | 6325 | const char *name; |
6320 | void *address; | 6326 | void *address; |
6321 | } | 6327 | } |
6322 | @@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() | 6328 | @@ -6813,8 +7139,8 @@ static const void *lt_preloaded_setup() { |
6323 | _LT_EOF | 6329 | _LT_EOF |
6324 | # Now try linking the two files. | 6330 | # Now try linking the two files. |
6325 | mv conftest.$ac_objext conftstm.$ac_objext | 6331 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -6341,7 +6347,7 @@ Index: git/gprof/configure | |||
6341 | else | 6347 | else |
6342 | echo "cannot find nm_test_func in $nlist" >&5 | 6348 | echo "cannot find nm_test_func in $nlist" >&5 |
6343 | fi | 6349 | fi |
6344 | @@ -6862,6 +7188,17 @@ else | 6350 | @@ -6862,6 +7188,18 @@ else |
6345 | $as_echo "ok" >&6; } | 6351 | $as_echo "ok" >&6; } |
6346 | fi | 6352 | fi |
6347 | 6353 | ||
@@ -6356,14 +6362,19 @@ Index: git/gprof/configure | |||
6356 | + | 6362 | + |
6357 | + | 6363 | + |
6358 | + | 6364 | + |
6365 | + | ||
6359 | 6366 | ||
6360 | 6367 | ||
6361 | 6368 | ||
6362 | @@ -6883,6 +7220,44 @@ fi | 6369 | @@ -6878,6 +7216,43 @@ fi |
6363 | 6370 | ||
6364 | 6371 | ||
6365 | 6372 | ||
6366 | + | 6373 | + |
6374 | + | ||
6375 | + | ||
6376 | + | ||
6377 | + | ||
6367 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 6378 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
6368 | +$as_echo_n "checking for sysroot... " >&6; } | 6379 | +$as_echo_n "checking for sysroot... " >&6; } |
6369 | + | 6380 | + |
@@ -6390,20 +6401,15 @@ Index: git/gprof/configure | |||
6390 | + *) | 6401 | + *) |
6391 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 | 6402 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
6392 | +$as_echo "${with_libtool_sysroot}" >&6; } | 6403 | +$as_echo "${with_libtool_sysroot}" >&6; } |
6393 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | 6404 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
6394 | + ;; | 6405 | + ;; |
6395 | +esac | 6406 | +esac |
6396 | + | 6407 | + |
6397 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 6408 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
6398 | +$as_echo "${lt_sysroot:-no}" >&6; } | 6409 | +$as_echo "${lt_sysroot:-no}" >&6; } |
6399 | + | 6410 | |
6400 | + | 6411 | |
6401 | + | 6412 | |
6402 | + | ||
6403 | + | ||
6404 | # Check whether --enable-libtool-lock was given. | ||
6405 | if test "${enable_libtool_lock+set}" = set; then : | ||
6406 | enableval=$enable_libtool_lock; | ||
6407 | @@ -7089,6 +7464,123 @@ esac | 6413 | @@ -7089,6 +7464,123 @@ esac |
6408 | 6414 | ||
6409 | need_locks="$enable_libtool_lock" | 6415 | need_locks="$enable_libtool_lock" |
@@ -6413,7 +6419,7 @@ Index: git/gprof/configure | |||
6413 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 | 6419 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
6414 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 6420 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
6415 | +$as_echo_n "checking for $ac_word... " >&6; } | 6421 | +$as_echo_n "checking for $ac_word... " >&6; } |
6416 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | 6422 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
6417 | + $as_echo_n "(cached) " >&6 | 6423 | + $as_echo_n "(cached) " >&6 |
6418 | +else | 6424 | +else |
6419 | + if test -n "$MANIFEST_TOOL"; then | 6425 | + if test -n "$MANIFEST_TOOL"; then |
@@ -6425,7 +6431,7 @@ Index: git/gprof/configure | |||
6425 | + IFS=$as_save_IFS | 6431 | + IFS=$as_save_IFS |
6426 | + test -z "$as_dir" && as_dir=. | 6432 | + test -z "$as_dir" && as_dir=. |
6427 | + for ac_exec_ext in '' $ac_executable_extensions; do | 6433 | + for ac_exec_ext in '' $ac_executable_extensions; do |
6428 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 6434 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
6429 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | 6435 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
6430 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6436 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6431 | + break 2 | 6437 | + break 2 |
@@ -6453,7 +6459,7 @@ Index: git/gprof/configure | |||
6453 | +set dummy mt; ac_word=$2 | 6459 | +set dummy mt; ac_word=$2 |
6454 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 6460 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
6455 | +$as_echo_n "checking for $ac_word... " >&6; } | 6461 | +$as_echo_n "checking for $ac_word... " >&6; } |
6456 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | 6462 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
6457 | + $as_echo_n "(cached) " >&6 | 6463 | + $as_echo_n "(cached) " >&6 |
6458 | +else | 6464 | +else |
6459 | + if test -n "$ac_ct_MANIFEST_TOOL"; then | 6465 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
@@ -6465,7 +6471,7 @@ Index: git/gprof/configure | |||
6465 | + IFS=$as_save_IFS | 6471 | + IFS=$as_save_IFS |
6466 | + test -z "$as_dir" && as_dir=. | 6472 | + test -z "$as_dir" && as_dir=. |
6467 | + for ac_exec_ext in '' $ac_executable_extensions; do | 6473 | + for ac_exec_ext in '' $ac_executable_extensions; do |
6468 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 6474 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
6469 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | 6475 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
6470 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 6476 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6471 | + break 2 | 6477 | + break 2 |
@@ -6503,7 +6509,7 @@ Index: git/gprof/configure | |||
6503 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | 6509 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
6504 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | 6510 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
6505 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | 6511 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
6506 | +if ${lt_cv_path_mainfest_tool+:} false; then : | 6512 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
6507 | + $as_echo_n "(cached) " >&6 | 6513 | + $as_echo_n "(cached) " >&6 |
6508 | +else | 6514 | +else |
6509 | + lt_cv_path_mainfest_tool=no | 6515 | + lt_cv_path_mainfest_tool=no |
@@ -6565,7 +6571,7 @@ Index: git/gprof/configure | |||
6565 | 6571 | ||
6566 | if test "$GCC" = yes; then | 6572 | if test "$GCC" = yes; then |
6567 | lt_prog_compiler_wl='-Wl,' | 6573 | lt_prog_compiler_wl='-Wl,' |
6568 | @@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler optio | 6574 | @@ -8401,6 +8894,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
6569 | lt_prog_compiler_pic='--shared' | 6575 | lt_prog_compiler_pic='--shared' |
6570 | lt_prog_compiler_static='--static' | 6576 | lt_prog_compiler_static='--static' |
6571 | ;; | 6577 | ;; |
@@ -6578,7 +6584,7 @@ Index: git/gprof/configure | |||
6578 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 6584 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
6579 | # Portland Group compilers (*not* the Pentium gcc compiler, | 6585 | # Portland Group compilers (*not* the Pentium gcc compiler, |
6580 | # which looks to be a dead project) | 6586 | # which looks to be a dead project) |
6581 | @@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler optio | 6587 | @@ -8463,7 +8962,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
6582 | lt_prog_compiler_pic='-KPIC' | 6588 | lt_prog_compiler_pic='-KPIC' |
6583 | lt_prog_compiler_static='-Bstatic' | 6589 | lt_prog_compiler_static='-Bstatic' |
6584 | case $cc_basename in | 6590 | case $cc_basename in |
@@ -6600,7 +6606,7 @@ Index: git/gprof/configure | |||
6600 | 6606 | ||
6601 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | 6607 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
6602 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | 6608 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
6603 | +if ${lt_cv_prog_compiler_pic+:} false; then : | 6609 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
6604 | + $as_echo_n "(cached) " >&6 | 6610 | + $as_echo_n "(cached) " >&6 |
6605 | +else | 6611 | +else |
6606 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | 6612 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
@@ -6689,7 +6695,7 @@ Index: git/gprof/configure | |||
6689 | + if test "${lt_cv_aix_libpath+set}" = set; then | 6695 | + if test "${lt_cv_aix_libpath+set}" = set; then |
6690 | + aix_libpath=$lt_cv_aix_libpath | 6696 | + aix_libpath=$lt_cv_aix_libpath |
6691 | +else | 6697 | +else |
6692 | + if ${lt_cv_aix_libpath_+:} false; then : | 6698 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
6693 | + $as_echo_n "(cached) " >&6 | 6699 | + $as_echo_n "(cached) " >&6 |
6694 | +else | 6700 | +else |
6695 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6701 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -6739,7 +6745,7 @@ Index: git/gprof/configure | |||
6739 | 6745 | ||
6740 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 6746 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
6741 | 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" | 6747 | 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" |
6742 | @@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libp | 6748 | @@ -9292,7 +9814,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6743 | else | 6749 | else |
6744 | # Determine the default libpath from the value encoded in an | 6750 | # Determine the default libpath from the value encoded in an |
6745 | # empty executable. | 6751 | # empty executable. |
@@ -6747,7 +6753,7 @@ Index: git/gprof/configure | |||
6747 | + if test "${lt_cv_aix_libpath+set}" = set; then | 6753 | + if test "${lt_cv_aix_libpath+set}" = set; then |
6748 | + aix_libpath=$lt_cv_aix_libpath | 6754 | + aix_libpath=$lt_cv_aix_libpath |
6749 | +else | 6755 | +else |
6750 | + if ${lt_cv_aix_libpath_+:} false; then : | 6756 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
6751 | + $as_echo_n "(cached) " >&6 | 6757 | + $as_echo_n "(cached) " >&6 |
6752 | +else | 6758 | +else |
6753 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 6759 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -6797,7 +6803,7 @@ Index: git/gprof/configure | |||
6797 | 6803 | ||
6798 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 6804 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
6799 | # Warning - without using the other run time loading flags, | 6805 | # Warning - without using the other run time loading flags, |
6800 | @@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libp | 6806 | @@ -9365,20 +9900,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6801 | # Microsoft Visual C++. | 6807 | # Microsoft Visual C++. |
6802 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 6808 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
6803 | # no search path for DLLs. | 6809 | # no search path for DLLs. |
@@ -6875,7 +6881,7 @@ Index: git/gprof/configure | |||
6875 | ;; | 6881 | ;; |
6876 | 6882 | ||
6877 | darwin* | rhapsody*) | 6883 | darwin* | rhapsody*) |
6878 | @@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libp | 6884 | @@ -9439,7 +10017,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6879 | 6885 | ||
6880 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 6886 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
6881 | freebsd* | dragonfly*) | 6887 | freebsd* | dragonfly*) |
@@ -6884,7 +6890,7 @@ Index: git/gprof/configure | |||
6884 | hardcode_libdir_flag_spec='-R$libdir' | 6890 | hardcode_libdir_flag_spec='-R$libdir' |
6885 | hardcode_direct=yes | 6891 | hardcode_direct=yes |
6886 | hardcode_shlibpath_var=no | 6892 | hardcode_shlibpath_var=no |
6887 | @@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libp | 6893 | @@ -9447,7 +10025,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6888 | 6894 | ||
6889 | hpux9*) | 6895 | hpux9*) |
6890 | if test "$GCC" = yes; then | 6896 | if test "$GCC" = yes; then |
@@ -6893,7 +6899,7 @@ Index: git/gprof/configure | |||
6893 | else | 6899 | else |
6894 | 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' | 6900 | 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' |
6895 | fi | 6901 | fi |
6896 | @@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libp | 6902 | @@ -9463,7 +10041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6897 | 6903 | ||
6898 | hpux10*) | 6904 | hpux10*) |
6899 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 6905 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -6902,7 +6908,7 @@ Index: git/gprof/configure | |||
6902 | else | 6908 | else |
6903 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 6909 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
6904 | fi | 6910 | fi |
6905 | @@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libp | 6911 | @@ -9487,10 +10065,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
6906 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 6912 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
6907 | ;; | 6913 | ;; |
6908 | ia64*) | 6914 | ia64*) |
@@ -6930,7 +6936,7 @@ Index: git/gprof/configure | |||
6930 | + # This should be the same for all languages, so no per-tag cache variable. | 6936 | + # This should be the same for all languages, so no per-tag cache variable. |
6931 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | 6937 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
6932 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | 6938 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
6933 | +if ${lt_cv_irix_exported_symbol+:} false; then : | 6939 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
6934 | + $as_echo_n "(cached) " >&6 | 6940 | + $as_echo_n "(cached) " >&6 |
6935 | +else | 6941 | +else |
6936 | + save_LDFLAGS="$LDFLAGS" | 6942 | + save_LDFLAGS="$LDFLAGS" |
@@ -6960,7 +6966,7 @@ Index: git/gprof/configure | |||
6960 | else | 6966 | else |
6961 | 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' | 6967 | 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' |
6962 | 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' | 6968 | 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' |
6963 | @@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_obj | 6969 | @@ -9670,7 +10261,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
6964 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 6970 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
6965 | if test "$GCC" = yes; then | 6971 | if test "$GCC" = yes; then |
6966 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 6972 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -6969,7 +6975,7 @@ Index: git/gprof/configure | |||
6969 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 6975 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
6970 | else | 6976 | else |
6971 | allow_undefined_flag=' -expect_unresolved \*' | 6977 | allow_undefined_flag=' -expect_unresolved \*' |
6972 | @@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_obj | 6978 | @@ -9689,9 +10280,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
6973 | no_undefined_flag=' -z defs' | 6979 | no_undefined_flag=' -z defs' |
6974 | if test "$GCC" = yes; then | 6980 | if test "$GCC" = yes; then |
6975 | wlarc='${wl}' | 6981 | wlarc='${wl}' |
@@ -7075,15 +7081,6 @@ Index: git/gprof/configure | |||
7075 | hardcode_into_libs=yes | 7081 | hardcode_into_libs=yes |
7076 | ;; | 7082 | ;; |
7077 | 7083 | ||
7078 | @@ -11195,7 +11845,7 @@ else | ||
7079 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
7080 | lt_status=$lt_dlunknown | ||
7081 | cat > conftest.$ac_ext <<_LT_EOF | ||
7082 | -#line 11193 "configure" | ||
7083 | +#line $LINENO "configure" | ||
7084 | #include "confdefs.h" | ||
7085 | |||
7086 | #if HAVE_DLFCN_H | ||
7087 | @@ -11239,10 +11889,10 @@ else | 7084 | @@ -11239,10 +11889,10 @@ else |
7088 | /* When -fvisbility=hidden is used, assume the code has been annotated | 7085 | /* When -fvisbility=hidden is used, assume the code has been annotated |
7089 | correspondingly for the symbols needed. */ | 7086 | correspondingly for the symbols needed. */ |
@@ -7097,15 +7094,6 @@ Index: git/gprof/configure | |||
7097 | int main () | 7094 | int main () |
7098 | { | 7095 | { |
7099 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 7096 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
7100 | @@ -11301,7 +11951,7 @@ else | ||
7101 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
7102 | lt_status=$lt_dlunknown | ||
7103 | cat > conftest.$ac_ext <<_LT_EOF | ||
7104 | -#line 11299 "configure" | ||
7105 | +#line $LINENO "configure" | ||
7106 | #include "confdefs.h" | ||
7107 | |||
7108 | #if HAVE_DLFCN_H | ||
7109 | @@ -11345,10 +11995,10 @@ else | 7097 | @@ -11345,10 +11995,10 @@ else |
7110 | /* When -fvisbility=hidden is used, assume the code has been annotated | 7098 | /* When -fvisbility=hidden is used, assume the code has been annotated |
7111 | correspondingly for the symbols needed. */ | 7099 | correspondingly for the symbols needed. */ |
@@ -7119,7 +7107,7 @@ Index: git/gprof/configure | |||
7119 | int main () | 7107 | int main () |
7120 | { | 7108 | { |
7121 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 7109 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
7122 | @@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 7110 | @@ -13314,13 +13964,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
7123 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 7111 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
7124 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 7112 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
7125 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 7113 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -7140,7 +7128,7 @@ Index: git/gprof/configure | |||
7140 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 7128 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
7141 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 7129 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
7142 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 7130 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
7143 | @@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 7131 | @@ -13335,14 +13992,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
7144 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 7132 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
7145 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 7133 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
7146 | 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"`' | 7134 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -7159,7 +7147,7 @@ Index: git/gprof/configure | |||
7159 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 7147 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
7160 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 7148 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
7161 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 7149 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
7162 | @@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 7150 | @@ -13375,12 +14035,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
7163 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 7151 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
7164 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 7152 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
7165 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 7153 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -7273,7 +7261,7 @@ Index: git/gprof/configure | |||
7273 | # A symbol stripping program. | 7261 | # A symbol stripping program. |
7274 | STRIP=$lt_STRIP | 7262 | STRIP=$lt_STRIP |
7275 | 7263 | ||
7276 | @@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 7264 | @@ -14413,6 +15104,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
7277 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 7265 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
7278 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 7266 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
7279 | 7267 | ||
@@ -7534,9 +7522,15 @@ Index: git/gprof/configure | |||
7534 | -_LT_EOF | 7522 | -_LT_EOF |
7535 | - ;; | 7523 | - ;; |
7536 | - esac | 7524 | - esac |
7525 | - | ||
7526 | - | ||
7527 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
7528 | - || (rm -f "$cfgfile"; exit 1) | ||
7529 | - | ||
7530 | - mv -f "$cfgfile" "$ofile" || | ||
7537 | + sed '$q' "$ltmain" >> "$cfgfile" \ | 7531 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
7538 | + || (rm -f "$cfgfile"; exit 1) | 7532 | + || (rm -f "$cfgfile"; exit 1) |
7539 | 7533 | + | |
7540 | + if test x"$xsi_shell" = xyes; then | 7534 | + if test x"$xsi_shell" = xyes; then |
7541 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | 7535 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
7542 | +func_dirname ()\ | 7536 | +func_dirname ()\ |
@@ -7694,19 +7688,16 @@ Index: git/gprof/configure | |||
7694 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | 7688 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
7695 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | 7689 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
7696 | +fi | 7690 | +fi |
7697 | 7691 | + | |
7698 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 7692 | + |
7699 | - || (rm -f "$cfgfile"; exit 1) | ||
7700 | |||
7701 | - mv -f "$cfgfile" "$ofile" || | ||
7702 | + mv -f "$cfgfile" "$ofile" || | 7693 | + mv -f "$cfgfile" "$ofile" || |
7703 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 7694 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
7704 | chmod +x "$ofile" | 7695 | chmod +x "$ofile" |
7705 | 7696 | ||
7706 | Index: git/ld/configure | 7697 | diff --git a/ld/configure b/ld/configure |
7707 | =================================================================== | 7698 | index bc09e7ef81..43c391c2b3 100755 |
7708 | --- git.orig/ld/configure | 7699 | --- a/ld/configure |
7709 | +++ git/ld/configure | 7700 | +++ b/ld/configure |
7710 | @@ -687,8 +687,11 @@ OTOOL | 7701 | @@ -687,8 +687,11 @@ OTOOL |
7711 | LIPO | 7702 | LIPO |
7712 | NMEDIT | 7703 | NMEDIT |
@@ -7756,7 +7747,7 @@ Index: git/ld/configure | |||
7756 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 7747 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
7757 | ECHO='print -r --' | 7748 | ECHO='print -r --' |
7758 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 7749 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
7759 | @@ -6686,8 +6692,8 @@ $as_echo_n "checking whether the shell u | 7750 | @@ -6686,8 +6692,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
7760 | # Try some XSI features | 7751 | # Try some XSI features |
7761 | xsi_shell=no | 7752 | xsi_shell=no |
7762 | ( _lt_dummy="a/b/c" | 7753 | ( _lt_dummy="a/b/c" |
@@ -7892,7 +7883,7 @@ Index: git/ld/configure | |||
7892 | file_magic_cmd=$lt_cv_file_magic_cmd | 7883 | file_magic_cmd=$lt_cv_file_magic_cmd |
7893 | deplibs_check_method=$lt_cv_deplibs_check_method | 7884 | deplibs_check_method=$lt_cv_deplibs_check_method |
7894 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 7885 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
7895 | @@ -7089,9 +7190,162 @@ test -z "$deplibs_check_method" && depli | 7886 | @@ -7089,9 +7190,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
7896 | 7887 | ||
7897 | 7888 | ||
7898 | 7889 | ||
@@ -8105,7 +8096,7 @@ Index: git/ld/configure | |||
8105 | if test "x$ac_ct_AR" = x; then | 8096 | if test "x$ac_ct_AR" = x; then |
8106 | AR="false" | 8097 | AR="false" |
8107 | else | 8098 | else |
8108 | @@ -7177,12 +7439,11 @@ ac_tool_warned=yes ;; | 8099 | @@ -7177,12 +7439,12 @@ ac_tool_warned=yes ;; |
8109 | esac | 8100 | esac |
8110 | AR=$ac_ct_AR | 8101 | AR=$ac_ct_AR |
8111 | fi | 8102 | fi |
@@ -8118,10 +8109,11 @@ Index: git/ld/configure | |||
8118 | +: ${AR=ar} | 8109 | +: ${AR=ar} |
8119 | +: ${AR_FLAGS=cru} | 8110 | +: ${AR_FLAGS=cru} |
8120 | + | 8111 | + |
8112 | + | ||
8121 | 8113 | ||
8122 | 8114 | ||
8123 | 8115 | ||
8124 | @@ -7193,6 +7454,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 8116 | @@ -7192,6 +7454,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
8125 | 8117 | ||
8126 | 8118 | ||
8127 | 8119 | ||
@@ -8181,10 +8173,9 @@ Index: git/ld/configure | |||
8181 | + | 8173 | + |
8182 | + | 8174 | + |
8183 | + | 8175 | + |
8184 | + | 8176 | |
8185 | 8177 | ||
8186 | if test -n "$ac_tool_prefix"; then | 8178 | if test -n "$ac_tool_prefix"; then |
8187 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
8188 | @@ -7528,8 +7846,8 @@ esac | 8179 | @@ -7528,8 +7846,8 @@ esac |
8189 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 8180 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
8190 | 8181 | ||
@@ -8232,7 +8223,7 @@ Index: git/ld/configure | |||
8232 | const char *name; | 8223 | const char *name; |
8233 | void *address; | 8224 | void *address; |
8234 | } | 8225 | } |
8235 | @@ -7643,8 +7974,8 @@ static const void *lt_preloaded_setup() | 8226 | @@ -7643,8 +7974,8 @@ static const void *lt_preloaded_setup() { |
8236 | _LT_EOF | 8227 | _LT_EOF |
8237 | # Now try linking the two files. | 8228 | # Now try linking the two files. |
8238 | mv conftest.$ac_objext conftstm.$ac_objext | 8229 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -8254,7 +8245,7 @@ Index: git/ld/configure | |||
8254 | else | 8245 | else |
8255 | echo "cannot find nm_test_func in $nlist" >&5 | 8246 | echo "cannot find nm_test_func in $nlist" >&5 |
8256 | fi | 8247 | fi |
8257 | @@ -7692,6 +8023,13 @@ else | 8248 | @@ -7692,6 +8023,19 @@ else |
8258 | $as_echo "ok" >&6; } | 8249 | $as_echo "ok" >&6; } |
8259 | fi | 8250 | fi |
8260 | 8251 | ||
@@ -8265,10 +8256,16 @@ Index: git/ld/configure | |||
8265 | + nm_file_list_spec='@' | 8256 | + nm_file_list_spec='@' |
8266 | +fi | 8257 | +fi |
8267 | + | 8258 | + |
8259 | + | ||
8260 | + | ||
8261 | + | ||
8262 | + | ||
8263 | + | ||
8264 | + | ||
8268 | 8265 | ||
8269 | 8266 | ||
8270 | 8267 | ||
8271 | @@ -7713,6 +8051,48 @@ fi | 8268 | @@ -7708,6 +8052,42 @@ fi |
8272 | 8269 | ||
8273 | 8270 | ||
8274 | 8271 | ||
@@ -8276,7 +8273,6 @@ Index: git/ld/configure | |||
8276 | + | 8273 | + |
8277 | + | 8274 | + |
8278 | + | 8275 | + |
8279 | + | ||
8280 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 8276 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
8281 | +$as_echo_n "checking for sysroot... " >&6; } | 8277 | +$as_echo_n "checking for sysroot... " >&6; } |
8282 | + | 8278 | + |
@@ -8309,14 +8305,9 @@ Index: git/ld/configure | |||
8309 | + | 8305 | + |
8310 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 8306 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
8311 | +$as_echo "${lt_sysroot:-no}" >&6; } | 8307 | +$as_echo "${lt_sysroot:-no}" >&6; } |
8312 | + | 8308 | |
8313 | + | 8309 | |
8314 | + | 8310 | |
8315 | + | ||
8316 | + | ||
8317 | # Check whether --enable-libtool-lock was given. | ||
8318 | if test "${enable_libtool_lock+set}" = set; then : | ||
8319 | enableval=$enable_libtool_lock; | ||
8320 | @@ -7919,6 +8299,123 @@ esac | 8311 | @@ -7919,6 +8299,123 @@ esac |
8321 | 8312 | ||
8322 | need_locks="$enable_libtool_lock" | 8313 | need_locks="$enable_libtool_lock" |
@@ -8495,7 +8486,7 @@ Index: git/ld/configure | |||
8495 | 8486 | ||
8496 | if test "$GCC" = yes; then | 8487 | if test "$GCC" = yes; then |
8497 | lt_prog_compiler_wl='-Wl,' | 8488 | lt_prog_compiler_wl='-Wl,' |
8498 | @@ -9232,6 +9740,12 @@ $as_echo_n "checking for $compiler optio | 8489 | @@ -9232,6 +9740,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
8499 | lt_prog_compiler_pic='--shared' | 8490 | lt_prog_compiler_pic='--shared' |
8500 | lt_prog_compiler_static='--static' | 8491 | lt_prog_compiler_static='--static' |
8501 | ;; | 8492 | ;; |
@@ -8508,7 +8499,7 @@ Index: git/ld/configure | |||
8508 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 8499 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
8509 | # Portland Group compilers (*not* the Pentium gcc compiler, | 8500 | # Portland Group compilers (*not* the Pentium gcc compiler, |
8510 | # which looks to be a dead project) | 8501 | # which looks to be a dead project) |
8511 | @@ -9294,7 +9808,7 @@ $as_echo_n "checking for $compiler optio | 8502 | @@ -9294,7 +9808,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
8512 | lt_prog_compiler_pic='-KPIC' | 8503 | lt_prog_compiler_pic='-KPIC' |
8513 | lt_prog_compiler_static='-Bstatic' | 8504 | lt_prog_compiler_static='-Bstatic' |
8514 | case $cc_basename in | 8505 | case $cc_basename in |
@@ -8669,7 +8660,7 @@ Index: git/ld/configure | |||
8669 | 8660 | ||
8670 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 8661 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
8671 | 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" | 8662 | 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" |
8672 | @@ -10123,7 +10660,13 @@ if test -z "$aix_libpath"; then aix_libp | 8663 | @@ -10123,7 +10660,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8673 | else | 8664 | else |
8674 | # Determine the default libpath from the value encoded in an | 8665 | # Determine the default libpath from the value encoded in an |
8675 | # empty executable. | 8666 | # empty executable. |
@@ -8727,10 +8718,11 @@ Index: git/ld/configure | |||
8727 | 8718 | ||
8728 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 8719 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
8729 | # Warning - without using the other run time loading flags, | 8720 | # Warning - without using the other run time loading flags, |
8730 | @@ -10196,20 +10746,63 @@ if test -z "$aix_libpath"; then aix_libp | 8721 | @@ -10195,21 +10745,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8722 | # When not using gcc, we currently assume that we are using | ||
8731 | # Microsoft Visual C++. | 8723 | # Microsoft Visual C++. |
8732 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 8724 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
8733 | # no search path for DLLs. | 8725 | - # no search path for DLLs. |
8734 | - hardcode_libdir_flag_spec=' ' | 8726 | - hardcode_libdir_flag_spec=' ' |
8735 | - allow_undefined_flag=unsupported | 8727 | - allow_undefined_flag=unsupported |
8736 | - # Tell ltmain to make .lib files, not .a files. | 8728 | - # Tell ltmain to make .lib files, not .a files. |
@@ -8745,6 +8737,7 @@ Index: git/ld/configure | |||
8745 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | 8737 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
8746 | - fix_srcfile_path='`cygpath -w "$srcfile"`' | 8738 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
8747 | - enable_shared_with_static_runtimes=yes | 8739 | - enable_shared_with_static_runtimes=yes |
8740 | + # no search path for DLLs. | ||
8748 | + case $cc_basename in | 8741 | + case $cc_basename in |
8749 | + cl*) | 8742 | + cl*) |
8750 | + # Native MSVC | 8743 | + # Native MSVC |
@@ -8805,7 +8798,7 @@ Index: git/ld/configure | |||
8805 | ;; | 8798 | ;; |
8806 | 8799 | ||
8807 | darwin* | rhapsody*) | 8800 | darwin* | rhapsody*) |
8808 | @@ -10270,7 +10863,7 @@ if test -z "$aix_libpath"; then aix_libp | 8801 | @@ -10270,7 +10863,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8809 | 8802 | ||
8810 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 8803 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
8811 | freebsd* | dragonfly*) | 8804 | freebsd* | dragonfly*) |
@@ -8814,7 +8807,7 @@ Index: git/ld/configure | |||
8814 | hardcode_libdir_flag_spec='-R$libdir' | 8807 | hardcode_libdir_flag_spec='-R$libdir' |
8815 | hardcode_direct=yes | 8808 | hardcode_direct=yes |
8816 | hardcode_shlibpath_var=no | 8809 | hardcode_shlibpath_var=no |
8817 | @@ -10278,7 +10871,7 @@ if test -z "$aix_libpath"; then aix_libp | 8810 | @@ -10278,7 +10871,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8818 | 8811 | ||
8819 | hpux9*) | 8812 | hpux9*) |
8820 | if test "$GCC" = yes; then | 8813 | if test "$GCC" = yes; then |
@@ -8823,7 +8816,7 @@ Index: git/ld/configure | |||
8823 | else | 8816 | else |
8824 | 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' | 8817 | 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' |
8825 | fi | 8818 | fi |
8826 | @@ -10294,7 +10887,7 @@ if test -z "$aix_libpath"; then aix_libp | 8819 | @@ -10294,7 +10887,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8827 | 8820 | ||
8828 | hpux10*) | 8821 | hpux10*) |
8829 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 8822 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -8832,7 +8825,7 @@ Index: git/ld/configure | |||
8832 | else | 8825 | else |
8833 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 8826 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
8834 | fi | 8827 | fi |
8835 | @@ -10318,10 +10911,10 @@ if test -z "$aix_libpath"; then aix_libp | 8828 | @@ -10318,10 +10911,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
8836 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 8829 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
8837 | ;; | 8830 | ;; |
8838 | ia64*) | 8831 | ia64*) |
@@ -8890,7 +8883,7 @@ Index: git/ld/configure | |||
8890 | else | 8883 | else |
8891 | 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' | 8884 | 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' |
8892 | 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' | 8885 | 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' |
8893 | @@ -10501,7 +11107,7 @@ rm -f core conftest.err conftest.$ac_obj | 8886 | @@ -10501,7 +11107,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
8894 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 8887 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
8895 | if test "$GCC" = yes; then | 8888 | if test "$GCC" = yes; then |
8896 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 8889 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -8899,7 +8892,7 @@ Index: git/ld/configure | |||
8899 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 8892 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
8900 | else | 8893 | else |
8901 | allow_undefined_flag=' -expect_unresolved \*' | 8894 | allow_undefined_flag=' -expect_unresolved \*' |
8902 | @@ -10520,9 +11126,9 @@ rm -f core conftest.err conftest.$ac_obj | 8895 | @@ -10520,9 +11126,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
8903 | no_undefined_flag=' -z defs' | 8896 | no_undefined_flag=' -z defs' |
8904 | if test "$GCC" = yes; then | 8897 | if test "$GCC" = yes; then |
8905 | wlarc='${wl}' | 8898 | wlarc='${wl}' |
@@ -9065,7 +9058,7 @@ Index: git/ld/configure | |||
9065 | compiler=$CC | 9058 | compiler=$CC |
9066 | compiler_CXX=$CC | 9059 | compiler_CXX=$CC |
9067 | for cc_temp in $compiler""; do | 9060 | for cc_temp in $compiler""; do |
9068 | @@ -12870,7 +13537,13 @@ $as_echo_n "checking whether the $compil | 9061 | @@ -12870,7 +13537,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
9069 | allow_undefined_flag_CXX='-berok' | 9062 | allow_undefined_flag_CXX='-berok' |
9070 | # Determine the default libpath from the value encoded in an empty | 9063 | # Determine the default libpath from the value encoded in an empty |
9071 | # executable. | 9064 | # executable. |
@@ -9123,7 +9116,7 @@ Index: git/ld/configure | |||
9123 | 9116 | ||
9124 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | 9117 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
9125 | 9118 | ||
9126 | @@ -12911,7 +13591,13 @@ if test -z "$aix_libpath"; then aix_libp | 9119 | @@ -12911,7 +13591,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9127 | else | 9120 | else |
9128 | # Determine the default libpath from the value encoded in an | 9121 | # Determine the default libpath from the value encoded in an |
9129 | # empty executable. | 9122 | # empty executable. |
@@ -9181,7 +9174,7 @@ Index: git/ld/configure | |||
9181 | 9174 | ||
9182 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" | 9175 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
9183 | # Warning - without using the other run time loading flags, | 9176 | # Warning - without using the other run time loading flags, |
9184 | @@ -12982,29 +13675,75 @@ if test -z "$aix_libpath"; then aix_libp | 9177 | @@ -12982,29 +13675,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9185 | ;; | 9178 | ;; |
9186 | 9179 | ||
9187 | cygwin* | mingw* | pw32* | cegcc*) | 9180 | cygwin* | mingw* | pw32* | cegcc*) |
@@ -9280,7 +9273,7 @@ Index: git/ld/configure | |||
9280 | darwin* | rhapsody*) | 9273 | darwin* | rhapsody*) |
9281 | 9274 | ||
9282 | 9275 | ||
9283 | @@ -13110,7 +13849,7 @@ if test -z "$aix_libpath"; then aix_libp | 9276 | @@ -13110,7 +13849,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9284 | ;; | 9277 | ;; |
9285 | *) | 9278 | *) |
9286 | if test "$GXX" = yes; then | 9279 | if test "$GXX" = yes; then |
@@ -9289,7 +9282,7 @@ Index: git/ld/configure | |||
9289 | else | 9282 | else |
9290 | # FIXME: insert proper C++ library support | 9283 | # FIXME: insert proper C++ library support |
9291 | ld_shlibs_CXX=no | 9284 | ld_shlibs_CXX=no |
9292 | @@ -13181,10 +13920,10 @@ if test -z "$aix_libpath"; then aix_libp | 9285 | @@ -13181,10 +13920,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9293 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 9286 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
9294 | ;; | 9287 | ;; |
9295 | ia64*) | 9288 | ia64*) |
@@ -9302,7 +9295,7 @@ Index: git/ld/configure | |||
9302 | ;; | 9295 | ;; |
9303 | esac | 9296 | esac |
9304 | fi | 9297 | fi |
9305 | @@ -13225,9 +13964,9 @@ if test -z "$aix_libpath"; then aix_libp | 9298 | @@ -13225,9 +13964,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9306 | *) | 9299 | *) |
9307 | if test "$GXX" = yes; then | 9300 | if test "$GXX" = yes; then |
9308 | if test "$with_gnu_ld" = no; then | 9301 | if test "$with_gnu_ld" = no; then |
@@ -9314,7 +9307,7 @@ Index: git/ld/configure | |||
9314 | fi | 9307 | fi |
9315 | fi | 9308 | fi |
9316 | link_all_deplibs_CXX=yes | 9309 | link_all_deplibs_CXX=yes |
9317 | @@ -13297,20 +14036,20 @@ if test -z "$aix_libpath"; then aix_libp | 9310 | @@ -13297,20 +14036,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9318 | prelink_cmds_CXX='tpldir=Template.dir~ | 9311 | prelink_cmds_CXX='tpldir=Template.dir~ |
9319 | rm -rf $tpldir~ | 9312 | rm -rf $tpldir~ |
9320 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 9313 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
@@ -9339,7 +9332,7 @@ Index: git/ld/configure | |||
9339 | ;; | 9332 | ;; |
9340 | *) # Version 6 and above use weak symbols | 9333 | *) # Version 6 and above use weak symbols |
9341 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 9334 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
9342 | @@ -13505,7 +14244,7 @@ if test -z "$aix_libpath"; then aix_libp | 9335 | @@ -13505,7 +14244,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9343 | 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' | 9336 | 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' |
9344 | ;; | 9337 | ;; |
9345 | *) | 9338 | *) |
@@ -9348,7 +9341,7 @@ Index: git/ld/configure | |||
9348 | ;; | 9341 | ;; |
9349 | esac | 9342 | esac |
9350 | 9343 | ||
9351 | @@ -13551,7 +14290,7 @@ if test -z "$aix_libpath"; then aix_libp | 9344 | @@ -13551,7 +14290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9352 | 9345 | ||
9353 | solaris*) | 9346 | solaris*) |
9354 | case $cc_basename in | 9347 | case $cc_basename in |
@@ -9357,7 +9350,7 @@ Index: git/ld/configure | |||
9357 | # Sun C++ 4.2, 5.x and Centerline C++ | 9350 | # Sun C++ 4.2, 5.x and Centerline C++ |
9358 | archive_cmds_need_lc_CXX=yes | 9351 | archive_cmds_need_lc_CXX=yes |
9359 | no_undefined_flag_CXX=' -zdefs' | 9352 | no_undefined_flag_CXX=' -zdefs' |
9360 | @@ -13592,9 +14331,9 @@ if test -z "$aix_libpath"; then aix_libp | 9353 | @@ -13592,9 +14331,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
9361 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 9354 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
9362 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' | 9355 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
9363 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 9356 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
@@ -9383,7 +9376,7 @@ Index: git/ld/configure | |||
9383 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 9376 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9384 | (eval $ac_compile) 2>&5 | 9377 | (eval $ac_compile) 2>&5 |
9385 | ac_status=$? | 9378 | ac_status=$? |
9386 | @@ -13742,7 +14488,7 @@ if { { eval echo "\"\$as_me\":${as_linen | 9379 | @@ -13742,7 +14488,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9387 | pre_test_object_deps_done=no | 9380 | pre_test_object_deps_done=no |
9388 | 9381 | ||
9389 | for p in `eval "$output_verbose_link_cmd"`; do | 9382 | for p in `eval "$output_verbose_link_cmd"`; do |
@@ -9392,7 +9385,7 @@ Index: git/ld/configure | |||
9392 | 9385 | ||
9393 | -L* | -R* | -l*) | 9386 | -L* | -R* | -l*) |
9394 | # Some compilers place space between "-{L,R}" and the path. | 9387 | # Some compilers place space between "-{L,R}" and the path. |
9395 | @@ -13751,13 +14497,22 @@ if { { eval echo "\"\$as_me\":${as_linen | 9388 | @@ -13751,13 +14497,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9396 | test $p = "-R"; then | 9389 | test $p = "-R"; then |
9397 | prev=$p | 9390 | prev=$p |
9398 | continue | 9391 | continue |
@@ -9419,7 +9412,7 @@ Index: git/ld/configure | |||
9419 | # Internal compiler library paths should come after those | 9412 | # Internal compiler library paths should come after those |
9420 | # provided the user. The postdeps already come after the | 9413 | # provided the user. The postdeps already come after the |
9421 | # user supplied libs so there is no need to process them. | 9414 | # user supplied libs so there is no need to process them. |
9422 | @@ -13777,8 +14532,10 @@ if { { eval echo "\"\$as_me\":${as_linen | 9415 | @@ -13777,8 +14532,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
9423 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" | 9416 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" |
9424 | fi | 9417 | fi |
9425 | fi | 9418 | fi |
@@ -9456,7 +9449,7 @@ Index: git/ld/configure | |||
9456 | 9449 | ||
9457 | # C++ specific cases for pic, static, wl, etc. | 9450 | # C++ specific cases for pic, static, wl, etc. |
9458 | if test "$GXX" = yes; then | 9451 | if test "$GXX" = yes; then |
9459 | @@ -14020,6 +14776,11 @@ $as_echo_n "checking for $compiler optio | 9452 | @@ -14020,6 +14776,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
9460 | ;; | 9453 | ;; |
9461 | esac | 9454 | esac |
9462 | ;; | 9455 | ;; |
@@ -9468,7 +9461,7 @@ Index: git/ld/configure | |||
9468 | dgux*) | 9461 | dgux*) |
9469 | case $cc_basename in | 9462 | case $cc_basename in |
9470 | ec++*) | 9463 | ec++*) |
9471 | @@ -14172,7 +14933,7 @@ $as_echo_n "checking for $compiler optio | 9464 | @@ -14172,7 +14933,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
9472 | ;; | 9465 | ;; |
9473 | solaris*) | 9466 | solaris*) |
9474 | case $cc_basename in | 9467 | case $cc_basename in |
@@ -9515,7 +9508,7 @@ Index: git/ld/configure | |||
9515 | case $host_os in | 9508 | case $host_os in |
9516 | aix[4-9]*) | 9509 | aix[4-9]*) |
9517 | # If we're using GNU nm, then we don't want the "-C" option. | 9510 | # If we're using GNU nm, then we don't want the "-C" option. |
9518 | @@ -14489,15 +15260,20 @@ $as_echo_n "checking whether the $compil | 9511 | @@ -14489,15 +15260,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
9519 | ;; | 9512 | ;; |
9520 | pw32*) | 9513 | pw32*) |
9521 | export_symbols_cmds_CXX="$ltdll_cmds" | 9514 | export_symbols_cmds_CXX="$ltdll_cmds" |
@@ -9643,7 +9636,7 @@ Index: git/ld/configure | |||
9643 | LDCXX=$LD | 9636 | LDCXX=$LD |
9644 | LD=$lt_save_LD | 9637 | LD=$lt_save_LD |
9645 | GCC=$lt_save_GCC | 9638 | GCC=$lt_save_GCC |
9646 | @@ -18444,13 +19280,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 9639 | @@ -18444,13 +19280,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
9647 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 9640 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
9648 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 9641 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
9649 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 9642 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -9664,7 +9657,7 @@ Index: git/ld/configure | |||
9664 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 9657 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
9665 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 9658 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
9666 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 9659 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
9667 | @@ -18465,14 +19308,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 9660 | @@ -18465,14 +19308,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
9668 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 9661 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
9669 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 9662 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
9670 | 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"`' | 9663 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -9683,7 +9676,7 @@ Index: git/ld/configure | |||
9683 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 9676 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
9684 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 9677 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
9685 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 9678 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
9686 | @@ -18505,12 +19351,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 9679 | @@ -18505,12 +19351,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
9687 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 9680 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
9688 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 9681 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
9689 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 9682 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -9697,7 +9690,7 @@ Index: git/ld/configure | |||
9697 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 9690 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
9698 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 9691 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
9699 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 9692 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
9700 | @@ -18549,8 +19395,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archi | 9693 | @@ -18549,8 +19395,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
9701 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' | 9694 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
9702 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' | 9695 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
9703 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' | 9696 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -9707,7 +9700,7 @@ Index: git/ld/configure | |||
9707 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' | 9700 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
9708 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' | 9701 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
9709 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' | 9702 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
9710 | @@ -18577,12 +19423,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$har | 9703 | @@ -18577,12 +19423,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
9711 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' | 9704 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
9712 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' | 9705 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
9713 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' | 9706 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
@@ -9849,7 +9842,7 @@ Index: git/ld/configure | |||
9849 | # A symbol stripping program. | 9842 | # A symbol stripping program. |
9850 | STRIP=$lt_STRIP | 9843 | STRIP=$lt_STRIP |
9851 | 9844 | ||
9852 | @@ -19684,6 +20561,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 9845 | @@ -19684,6 +20561,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
9853 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 9846 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
9854 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 9847 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
9855 | 9848 | ||
@@ -10110,9 +10103,15 @@ Index: git/ld/configure | |||
10110 | -_LT_EOF | 10103 | -_LT_EOF |
10111 | - ;; | 10104 | - ;; |
10112 | - esac | 10105 | - esac |
10106 | - | ||
10107 | - | ||
10108 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
10109 | - || (rm -f "$cfgfile"; exit 1) | ||
10110 | - | ||
10111 | - mv -f "$cfgfile" "$ofile" || | ||
10113 | + sed '$q' "$ltmain" >> "$cfgfile" \ | 10112 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
10114 | + || (rm -f "$cfgfile"; exit 1) | 10113 | + || (rm -f "$cfgfile"; exit 1) |
10115 | 10114 | + | |
10116 | + if test x"$xsi_shell" = xyes; then | 10115 | + if test x"$xsi_shell" = xyes; then |
10117 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | 10116 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
10118 | +func_dirname ()\ | 10117 | +func_dirname ()\ |
@@ -10270,11 +10269,8 @@ Index: git/ld/configure | |||
10270 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | 10269 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
10271 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | 10270 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
10272 | +fi | 10271 | +fi |
10273 | 10272 | + | |
10274 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 10273 | + |
10275 | - || (rm -f "$cfgfile"; exit 1) | ||
10276 | |||
10277 | - mv -f "$cfgfile" "$ofile" || | ||
10278 | + mv -f "$cfgfile" "$ofile" || | 10274 | + mv -f "$cfgfile" "$ofile" || |
10279 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 10275 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
10280 | chmod +x "$ofile" | 10276 | chmod +x "$ofile" |
@@ -10315,10 +10311,10 @@ Index: git/ld/configure | |||
10315 | # Specify filename containing input files. | 10311 | # Specify filename containing input files. |
10316 | file_list_spec=$lt_file_list_spec_CXX | 10312 | file_list_spec=$lt_file_list_spec_CXX |
10317 | 10313 | ||
10318 | Index: git/libtool.m4 | 10314 | diff --git a/libtool.m4 b/libtool.m4 |
10319 | =================================================================== | 10315 | index 434530059f..e45fdc6998 100644 |
10320 | --- git.orig/libtool.m4 | 10316 | --- a/libtool.m4 |
10321 | +++ git/libtool.m4 | 10317 | +++ b/libtool.m4 |
10322 | @@ -1,7 +1,8 @@ | 10318 | @@ -1,7 +1,8 @@ |
10323 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 10319 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
10324 | # | 10320 | # |
@@ -10358,7 +10354,7 @@ Index: git/libtool.m4 | |||
10358 | AC_SUBST(LIBTOOL)dnl | 10354 | AC_SUBST(LIBTOOL)dnl |
10359 | 10355 | ||
10360 | _LT_SETUP | 10356 | _LT_SETUP |
10361 | @@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable | 10357 | @@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl |
10362 | dnl | 10358 | dnl |
10363 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 10359 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
10364 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | 10360 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
@@ -10381,7 +10377,7 @@ Index: git/libtool.m4 | |||
10381 | can_build_shared=yes | 10377 | can_build_shared=yes |
10382 | 10378 | ||
10383 | # All known linkers require a `.a' archive for static linking (except MSVC, | 10379 | # All known linkers require a `.a' archive for static linking (except MSVC, |
10384 | @@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_ | 10380 | @@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl |
10385 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 10381 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
10386 | configured by $[0], generated by m4_PACKAGE_STRING. | 10382 | configured by $[0], generated by m4_PACKAGE_STRING. |
10387 | 10383 | ||
@@ -10486,7 +10482,7 @@ Index: git/libtool.m4 | |||
10486 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 10482 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
10487 | ECHO='print -r --' | 10483 | ECHO='print -r --' |
10488 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 10484 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
10489 | @@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr | 10485 | @@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
10490 | ])# _LT_PROG_ECHO_BACKSLASH | 10486 | ])# _LT_PROG_ECHO_BACKSLASH |
10491 | 10487 | ||
10492 | 10488 | ||
@@ -10739,7 +10735,7 @@ Index: git/libtool.m4 | |||
10739 | file_magic_cmd=$lt_cv_file_magic_cmd | 10735 | file_magic_cmd=$lt_cv_file_magic_cmd |
10740 | deplibs_check_method=$lt_cv_deplibs_check_method | 10736 | deplibs_check_method=$lt_cv_deplibs_check_method |
10741 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 10737 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
10742 | @@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && depli | 10738 | @@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
10743 | _LT_DECL([], [deplibs_check_method], [1], | 10739 | _LT_DECL([], [deplibs_check_method], [1], |
10744 | [Method to check whether dependent libraries are shared objects]) | 10740 | [Method to check whether dependent libraries are shared objects]) |
10745 | _LT_DECL([], [file_magic_cmd], [1], | 10741 | _LT_DECL([], [file_magic_cmd], [1], |
@@ -10867,7 +10863,7 @@ Index: git/libtool.m4 | |||
10867 | const char *name; | 10863 | const char *name; |
10868 | void *address; | 10864 | void *address; |
10869 | } | 10865 | } |
10870 | @@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() | 10866 | @@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { |
10871 | _LT_EOF | 10867 | _LT_EOF |
10872 | # Now try linking the two files. | 10868 | # Now try linking the two files. |
10873 | mv conftest.$ac_objext conftstm.$ac_objext | 10869 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -10901,7 +10897,7 @@ Index: git/libtool.m4 | |||
10901 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], | 10897 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
10902 | [Take the output of nm and produce a listing of raw symbols and C names]) | 10898 | [Take the output of nm and produce a listing of raw symbols and C names]) |
10903 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], | 10899 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
10904 | @@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_addres | 10900 | @@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], |
10905 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], | 10901 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
10906 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], | 10902 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
10907 | [Transform the output of nm in a C name address pair when lib prefix is needed]) | 10903 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
@@ -10986,7 +10982,7 @@ Index: git/libtool.m4 | |||
10986 | # | 10982 | # |
10987 | # Check to make sure the static flag actually works. | 10983 | # Check to make sure the static flag actually works. |
10988 | # | 10984 | # |
10989 | @@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog | 10985 | @@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], |
10990 | m4_defun([_LT_LINKER_SHLIBS], | 10986 | m4_defun([_LT_LINKER_SHLIBS], |
10991 | [AC_REQUIRE([LT_PATH_LD])dnl | 10987 | [AC_REQUIRE([LT_PATH_LD])dnl |
10992 | AC_REQUIRE([LT_PATH_NM])dnl | 10988 | AC_REQUIRE([LT_PATH_NM])dnl |
@@ -11308,7 +11304,7 @@ Index: git/libtool.m4 | |||
11308 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 11304 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
11309 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 11305 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
11310 | (test "X$CXX" != "Xg++"))) ; then | 11306 | (test "X$CXX" != "Xg++"))) ; then |
11311 | @@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; | 11307 | @@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
11312 | 11308 | ||
11313 | # Allow CC to be a program name with arguments. | 11309 | # Allow CC to be a program name with arguments. |
11314 | lt_save_CC=$CC | 11310 | lt_save_CC=$CC |
@@ -11316,7 +11312,7 @@ Index: git/libtool.m4 | |||
11316 | lt_save_LD=$LD | 11312 | lt_save_LD=$LD |
11317 | lt_save_GCC=$GCC | 11313 | lt_save_GCC=$GCC |
11318 | GCC=$GXX | 11314 | GCC=$GXX |
11319 | @@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; | 11315 | @@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
11320 | fi | 11316 | fi |
11321 | test -z "${LDCXX+set}" || LD=$LDCXX | 11317 | test -z "${LDCXX+set}" || LD=$LDCXX |
11322 | CC=${CXX-"c++"} | 11318 | CC=${CXX-"c++"} |
@@ -11324,7 +11320,7 @@ Index: git/libtool.m4 | |||
11324 | compiler=$CC | 11320 | compiler=$CC |
11325 | _LT_TAGVAR(compiler, $1)=$CC | 11321 | _LT_TAGVAR(compiler, $1)=$CC |
11326 | _LT_CC_BASENAME([$compiler]) | 11322 | _LT_CC_BASENAME([$compiler]) |
11327 | @@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; | 11323 | @@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
11328 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 11324 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
11329 | # Determine the default libpath from the value encoded in an empty | 11325 | # Determine the default libpath from the value encoded in an empty |
11330 | # executable. | 11326 | # executable. |
@@ -11333,7 +11329,7 @@ Index: git/libtool.m4 | |||
11333 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 11329 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
11334 | 11330 | ||
11335 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 11331 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
11336 | @@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; | 11332 | @@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
11337 | else | 11333 | else |
11338 | # Determine the default libpath from the value encoded in an | 11334 | # Determine the default libpath from the value encoded in an |
11339 | # empty executable. | 11335 | # empty executable. |
@@ -11342,7 +11338,7 @@ Index: git/libtool.m4 | |||
11342 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 11338 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
11343 | # Warning - without using the other run time loading flags, | 11339 | # Warning - without using the other run time loading flags, |
11344 | # -berok will link without error, but may produce a broken library. | 11340 | # -berok will link without error, but may produce a broken library. |
11345 | @@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; | 11341 | @@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then |
11346 | ;; | 11342 | ;; |
11347 | 11343 | ||
11348 | cygwin* | mingw* | pw32* | cegcc*) | 11344 | cygwin* | mingw* | pw32* | cegcc*) |
@@ -11441,7 +11437,7 @@ Index: git/libtool.m4 | |||
11441 | darwin* | rhapsody*) | 11437 | darwin* | rhapsody*) |
11442 | _LT_DARWIN_LINKER_FEATURES($1) | 11438 | _LT_DARWIN_LINKER_FEATURES($1) |
11443 | ;; | 11439 | ;; |
11444 | @@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; | 11440 | @@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
11445 | ;; | 11441 | ;; |
11446 | *) | 11442 | *) |
11447 | if test "$GXX" = yes; then | 11443 | if test "$GXX" = yes; then |
@@ -11450,7 +11446,7 @@ Index: git/libtool.m4 | |||
11450 | else | 11446 | else |
11451 | # FIXME: insert proper C++ library support | 11447 | # FIXME: insert proper C++ library support |
11452 | _LT_TAGVAR(ld_shlibs, $1)=no | 11448 | _LT_TAGVAR(ld_shlibs, $1)=no |
11453 | @@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; | 11449 | @@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then |
11454 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 11450 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
11455 | ;; | 11451 | ;; |
11456 | ia64*) | 11452 | ia64*) |
@@ -11463,7 +11459,7 @@ Index: git/libtool.m4 | |||
11463 | ;; | 11459 | ;; |
11464 | esac | 11460 | esac |
11465 | fi | 11461 | fi |
11466 | @@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; | 11462 | @@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
11467 | *) | 11463 | *) |
11468 | if test "$GXX" = yes; then | 11464 | if test "$GXX" = yes; then |
11469 | if test "$with_gnu_ld" = no; then | 11465 | if test "$with_gnu_ld" = no; then |
@@ -11475,7 +11471,7 @@ Index: git/libtool.m4 | |||
11475 | fi | 11471 | fi |
11476 | fi | 11472 | fi |
11477 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 11473 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
11478 | @@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; | 11474 | @@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then |
11479 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ | 11475 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
11480 | rm -rf $tpldir~ | 11476 | rm -rf $tpldir~ |
11481 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 11477 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
@@ -11500,7 +11496,7 @@ Index: git/libtool.m4 | |||
11500 | ;; | 11496 | ;; |
11501 | *) # Version 6 and above use weak symbols | 11497 | *) # Version 6 and above use weak symbols |
11502 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 11498 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
11503 | @@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; | 11499 | @@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
11504 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 11500 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
11505 | ;; | 11501 | ;; |
11506 | *) | 11502 | *) |
@@ -11509,7 +11505,7 @@ Index: git/libtool.m4 | |||
11509 | ;; | 11505 | ;; |
11510 | esac | 11506 | esac |
11511 | 11507 | ||
11512 | @@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; | 11508 | @@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
11513 | 11509 | ||
11514 | solaris*) | 11510 | solaris*) |
11515 | case $cc_basename in | 11511 | case $cc_basename in |
@@ -11518,7 +11514,7 @@ Index: git/libtool.m4 | |||
11518 | # Sun C++ 4.2, 5.x and Centerline C++ | 11514 | # Sun C++ 4.2, 5.x and Centerline C++ |
11519 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes | 11515 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
11520 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' | 11516 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
11521 | @@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; | 11517 | @@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
11522 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 11518 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
11523 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' | 11519 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
11524 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 11520 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
@@ -11530,7 +11526,7 @@ Index: git/libtool.m4 | |||
11530 | 11526 | ||
11531 | # Commands to make compiler produce verbose output that lists | 11527 | # Commands to make compiler produce verbose output that lists |
11532 | # what "hidden" libraries, object files and flags are used when | 11528 | # what "hidden" libraries, object files and flags are used when |
11533 | @@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; | 11529 | @@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
11534 | fi # test -n "$compiler" | 11530 | fi # test -n "$compiler" |
11535 | 11531 | ||
11536 | CC=$lt_save_CC | 11532 | CC=$lt_save_CC |
@@ -11738,7 +11734,7 @@ Index: git/libtool.m4 | |||
11738 | ])# _LT_LANG_RC_CONFIG | 11734 | ])# _LT_LANG_RC_CONFIG |
11739 | 11735 | ||
11740 | 11736 | ||
11741 | @@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object | 11737 | @@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) |
11742 | AC_SUBST([OBJDUMP]) | 11738 | AC_SUBST([OBJDUMP]) |
11743 | ]) | 11739 | ]) |
11744 | 11740 | ||
@@ -11765,7 +11761,7 @@ Index: git/libtool.m4 | |||
11765 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 11761 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
11766 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 11762 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
11767 | && xsi_shell=yes | 11763 | && xsi_shell=yes |
11768 | @@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn | 11764 | @@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl |
11769 | ])# _LT_CHECK_SHELL_FEATURES | 11765 | ])# _LT_CHECK_SHELL_FEATURES |
11770 | 11766 | ||
11771 | 11767 | ||
@@ -11863,31 +11859,6 @@ Index: git/libtool.m4 | |||
11863 | -{ | 11859 | -{ |
11864 | - func_len_result=${#1} | 11860 | - func_len_result=${#1} |
11865 | -} | 11861 | -} |
11866 | - | ||
11867 | -_LT_EOF | ||
11868 | - ;; | ||
11869 | - *) # Bourne compatible functions. | ||
11870 | - cat << \_LT_EOF >> "$cfgfile" | ||
11871 | - | ||
11872 | -# func_dirname file append nondir_replacement | ||
11873 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
11874 | -# otherwise set result to NONDIR_REPLACEMENT. | ||
11875 | -func_dirname () | ||
11876 | -{ | ||
11877 | - # Extract subdirectory from the argument. | ||
11878 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | ||
11879 | - if test "X$func_dirname_result" = "X${1}"; then | ||
11880 | - func_dirname_result="${3}" | ||
11881 | - else | ||
11882 | - func_dirname_result="$func_dirname_result${2}" | ||
11883 | - fi | ||
11884 | -} | ||
11885 | - | ||
11886 | -# func_basename file | ||
11887 | -func_basename () | ||
11888 | -{ | ||
11889 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
11890 | -} | ||
11891 | +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) | 11862 | +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
11892 | +# ------------------------------------------------------ | 11863 | +# ------------------------------------------------------ |
11893 | +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and | 11864 | +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
@@ -11904,22 +11875,23 @@ Index: git/libtool.m4 | |||
11904 | +test 0 -eq $? || _lt_function_replace_fail=: | 11875 | +test 0 -eq $? || _lt_function_replace_fail=: |
11905 | +]) | 11876 | +]) |
11906 | 11877 | ||
11907 | -dnl func_dirname_and_basename | 11878 | -_LT_EOF |
11908 | -dnl A portable version of this function is already defined in general.m4sh | 11879 | - ;; |
11909 | -dnl so there is no need for it here. | 11880 | - *) # Bourne compatible functions. |
11881 | - cat << \_LT_EOF >> "$cfgfile" | ||
11910 | 11882 | ||
11911 | -# func_stripname prefix suffix name | 11883 | -# func_dirname file append nondir_replacement |
11912 | -# strip PREFIX and SUFFIX off of NAME. | 11884 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
11913 | -# PREFIX and SUFFIX must not contain globbing or regex special | 11885 | -# otherwise set result to NONDIR_REPLACEMENT. |
11914 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | 11886 | -func_dirname () |
11915 | -# dot (in which case that matches only a dot). | ||
11916 | -# func_strip_suffix prefix name | ||
11917 | -func_stripname () | ||
11918 | -{ | 11887 | -{ |
11919 | - case ${2} in | 11888 | - # Extract subdirectory from the argument. |
11920 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | 11889 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
11921 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | 11890 | - if test "X$func_dirname_result" = "X${1}"; then |
11922 | - esac | 11891 | - func_dirname_result="${3}" |
11892 | - else | ||
11893 | - func_dirname_result="$func_dirname_result${2}" | ||
11894 | - fi | ||
11923 | -} | 11895 | -} |
11924 | +# _LT_PROG_REPLACE_SHELLFNS | 11896 | +# _LT_PROG_REPLACE_SHELLFNS |
11925 | +# ------------------------- | 11897 | +# ------------------------- |
@@ -11943,24 +11915,45 @@ Index: git/libtool.m4 | |||
11943 | + esac | 11915 | + esac |
11944 | + func_basename_result="${1##*/}"]) | 11916 | + func_basename_result="${1##*/}"]) |
11945 | 11917 | ||
11946 | -# sed scripts: | 11918 | -# func_basename file |
11947 | -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' | 11919 | -func_basename () |
11948 | -my_sed_long_arg='1s/^-[[^=]]*=//' | 11920 | -{ |
11921 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` | ||
11922 | -} | ||
11949 | + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl | 11923 | + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
11950 | + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | 11924 | + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
11951 | + # positional parameters, so assign one to ordinary parameter first. | 11925 | + # positional parameters, so assign one to ordinary parameter first. |
11952 | + func_stripname_result=${3} | 11926 | + func_stripname_result=${3} |
11953 | + func_stripname_result=${func_stripname_result#"${1}"} | 11927 | + func_stripname_result=${func_stripname_result#"${1}"} |
11954 | + func_stripname_result=${func_stripname_result%"${2}"}]) | 11928 | + func_stripname_result=${func_stripname_result%"${2}"}]) |
11955 | + | 11929 | |
11930 | -dnl func_dirname_and_basename | ||
11931 | -dnl A portable version of this function is already defined in general.m4sh | ||
11932 | -dnl so there is no need for it here. | ||
11956 | + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl | 11933 | + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
11957 | + func_split_long_opt_name=${1%%=*} | 11934 | + func_split_long_opt_name=${1%%=*} |
11958 | + func_split_long_opt_arg=${1#*=}]) | 11935 | + func_split_long_opt_arg=${1#*=}]) |
11959 | + | 11936 | |
11937 | -# func_stripname prefix suffix name | ||
11938 | -# strip PREFIX and SUFFIX off of NAME. | ||
11939 | -# PREFIX and SUFFIX must not contain globbing or regex special | ||
11940 | -# characters, hashes, percent signs, but SUFFIX may contain a leading | ||
11941 | -# dot (in which case that matches only a dot). | ||
11942 | -# func_strip_suffix prefix name | ||
11943 | -func_stripname () | ||
11944 | -{ | ||
11945 | - case ${2} in | ||
11946 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
11947 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
11948 | - esac | ||
11949 | -} | ||
11960 | + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl | 11950 | + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
11961 | + func_split_short_opt_arg=${1#??} | 11951 | + func_split_short_opt_arg=${1#??} |
11962 | + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) | 11952 | + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
11963 | + | 11953 | |
11954 | -# sed scripts: | ||
11955 | -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' | ||
11956 | -my_sed_long_arg='1s/^-[[^=]]*=//' | ||
11964 | + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl | 11957 | + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
11965 | + case ${1} in | 11958 | + case ${1} in |
11966 | + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | 11959 | + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
@@ -12008,7 +12001,9 @@ Index: git/libtool.m4 | |||
12008 | + func_quote_for_eval "${2}" | 12001 | + func_quote_for_eval "${2}" |
12009 | +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ | 12002 | +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ |
12010 | + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) | 12003 | + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) |
12011 | + | 12004 | |
12005 | -_LT_EOF | ||
12006 | -esac | ||
12012 | + # Save a `func_append' function call where possible by direct use of '+=' | 12007 | + # Save a `func_append' function call where possible by direct use of '+=' |
12013 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | 12008 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
12014 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ | 12009 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
@@ -12022,17 +12017,14 @@ Index: git/libtool.m4 | |||
12022 | + test 0 -eq $? || _lt_function_replace_fail=: | 12017 | + test 0 -eq $? || _lt_function_replace_fail=: |
12023 | +fi | 12018 | +fi |
12024 | 12019 | ||
12025 | -_LT_EOF | 12020 | -case $lt_shell_append in |
12026 | -esac | 12021 | - yes) |
12022 | - cat << \_LT_EOF >> "$cfgfile" | ||
12027 | +if test x"$_lt_function_replace_fail" = x":"; then | 12023 | +if test x"$_lt_function_replace_fail" = x":"; then |
12028 | + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) | 12024 | + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) |
12029 | +fi | 12025 | +fi |
12030 | +]) | 12026 | +]) |
12031 | 12027 | ||
12032 | -case $lt_shell_append in | ||
12033 | - yes) | ||
12034 | - cat << \_LT_EOF >> "$cfgfile" | ||
12035 | - | ||
12036 | -# func_append var value | 12028 | -# func_append var value |
12037 | -# Append VALUE to the end of shell variable VAR. | 12029 | -# Append VALUE to the end of shell variable VAR. |
12038 | -func_append () | 12030 | -func_append () |
@@ -12118,10 +12110,10 @@ Index: git/libtool.m4 | |||
12118 | +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], | 12110 | +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], |
12119 | + [0], [convert $build files to toolchain format])dnl | 12111 | + [0], [convert $build files to toolchain format])dnl |
12120 | +])# _LT_PATH_CONVERSION_FUNCTIONS | 12112 | +])# _LT_PATH_CONVERSION_FUNCTIONS |
12121 | Index: git/ltmain.sh | 12113 | diff --git a/ltmain.sh b/ltmain.sh |
12122 | =================================================================== | 12114 | index 9503ec85d7..70e856e065 100644 |
12123 | --- git.orig/ltmain.sh | 12115 | --- a/ltmain.sh |
12124 | +++ git/ltmain.sh | 12116 | +++ b/ltmain.sh |
12125 | @@ -1,10 +1,9 @@ | 12117 | @@ -1,10 +1,9 @@ |
12126 | -# Generated from ltmain.m4sh. | 12118 | -# Generated from ltmain.m4sh. |
12127 | 12119 | ||
@@ -12551,7 +12543,31 @@ Index: git/ltmain.sh | |||
12551 | +$progname: of $PACKAGE $VERSION and run autoconf again. | 12543 | +$progname: of $PACKAGE $VERSION and run autoconf again. |
12552 | +_LT_EOF | 12544 | +_LT_EOF |
12553 | + fi | 12545 | + fi |
12554 | + | 12546 | |
12547 | - # Shorthand for --mode=foo, only valid as the first argument | ||
12548 | - case $1 in | ||
12549 | - clean|clea|cle|cl) | ||
12550 | - shift; set dummy --mode clean ${1+"$@"}; shift | ||
12551 | - ;; | ||
12552 | - compile|compil|compi|comp|com|co|c) | ||
12553 | - shift; set dummy --mode compile ${1+"$@"}; shift | ||
12554 | - ;; | ||
12555 | - execute|execut|execu|exec|exe|ex|e) | ||
12556 | - shift; set dummy --mode execute ${1+"$@"}; shift | ||
12557 | - ;; | ||
12558 | - finish|finis|fini|fin|fi|f) | ||
12559 | - shift; set dummy --mode finish ${1+"$@"}; shift | ||
12560 | - ;; | ||
12561 | - install|instal|insta|inst|ins|in|i) | ||
12562 | - shift; set dummy --mode install ${1+"$@"}; shift | ||
12563 | - ;; | ||
12564 | - link|lin|li|l) | ||
12565 | - shift; set dummy --mode link ${1+"$@"}; shift | ||
12566 | - ;; | ||
12567 | - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) | ||
12568 | - shift; set dummy --mode uninstall ${1+"$@"}; shift | ||
12569 | - ;; | ||
12570 | - esac | ||
12555 | + exit $EXIT_MISMATCH | 12571 | + exit $EXIT_MISMATCH |
12556 | + fi | 12572 | + fi |
12557 | +} | 12573 | +} |
@@ -12581,7 +12597,9 @@ Index: git/ltmain.sh | |||
12581 | + shift; set dummy --mode uninstall ${1+"$@"}; shift | 12597 | + shift; set dummy --mode uninstall ${1+"$@"}; shift |
12582 | + ;; | 12598 | + ;; |
12583 | +esac | 12599 | +esac |
12584 | + | 12600 | |
12601 | - # Parse non-mode specific arguments: | ||
12602 | - while test "$#" -gt 0; do | ||
12585 | + | 12603 | + |
12586 | + | 12604 | + |
12587 | +# Option defaults: | 12605 | +# Option defaults: |
@@ -12597,34 +12615,8 @@ Index: git/ltmain.sh | |||
12597 | +opt_verbose=: | 12615 | +opt_verbose=: |
12598 | +opt_silent=false | 12616 | +opt_silent=false |
12599 | +opt_verbose=false | 12617 | +opt_verbose=false |
12600 | 12618 | + | |
12601 | - # Shorthand for --mode=foo, only valid as the first argument | 12619 | + |
12602 | - case $1 in | ||
12603 | - clean|clea|cle|cl) | ||
12604 | - shift; set dummy --mode clean ${1+"$@"}; shift | ||
12605 | - ;; | ||
12606 | - compile|compil|compi|comp|com|co|c) | ||
12607 | - shift; set dummy --mode compile ${1+"$@"}; shift | ||
12608 | - ;; | ||
12609 | - execute|execut|execu|exec|exe|ex|e) | ||
12610 | - shift; set dummy --mode execute ${1+"$@"}; shift | ||
12611 | - ;; | ||
12612 | - finish|finis|fini|fin|fi|f) | ||
12613 | - shift; set dummy --mode finish ${1+"$@"}; shift | ||
12614 | - ;; | ||
12615 | - install|instal|insta|inst|ins|in|i) | ||
12616 | - shift; set dummy --mode install ${1+"$@"}; shift | ||
12617 | - ;; | ||
12618 | - link|lin|li|l) | ||
12619 | - shift; set dummy --mode link ${1+"$@"}; shift | ||
12620 | - ;; | ||
12621 | - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) | ||
12622 | - shift; set dummy --mode uninstall ${1+"$@"}; shift | ||
12623 | - ;; | ||
12624 | - esac | ||
12625 | |||
12626 | - # Parse non-mode specific arguments: | ||
12627 | - while test "$#" -gt 0; do | ||
12628 | +# Parse options once, thoroughly. This comes as soon as possible in the | 12620 | +# Parse options once, thoroughly. This comes as soon as possible in the |
12629 | +# script to make things like `--version' happen as quickly as we can. | 12621 | +# script to make things like `--version' happen as quickly as we can. |
12630 | +{ | 12622 | +{ |
@@ -12868,13 +12860,13 @@ Index: git/ltmain.sh | |||
12868 | - fi | 12860 | - fi |
12869 | -} | 12861 | -} |
12870 | - | 12862 | - |
12871 | - | ||
12872 | -## ----------- ## | ||
12873 | -## Main. ## | ||
12874 | -## ----------- ## | ||
12875 | + # Darwin sucks | 12863 | + # Darwin sucks |
12876 | + eval std_shrext=\"$shrext_cmds\" | 12864 | + eval std_shrext=\"$shrext_cmds\" |
12877 | 12865 | ||
12866 | -## ----------- ## | ||
12867 | -## Main. ## | ||
12868 | -## ----------- ## | ||
12869 | - | ||
12878 | -$opt_help || { | 12870 | -$opt_help || { |
12879 | - # Sanity checks first: | 12871 | - # Sanity checks first: |
12880 | - func_check_version_match | 12872 | - func_check_version_match |
@@ -13595,7 +13587,7 @@ Index: git/ltmain.sh | |||
13595 | "") | 13587 | "") |
13596 | # Generic help is extracted from the usage comments | 13588 | # Generic help is extracted from the usage comments |
13597 | # at the start of this file. | 13589 | # at the start of this file. |
13598 | @@ -1659,8 +2327,8 @@ This mode accepts the following addition | 13590 | @@ -1659,8 +2327,8 @@ This mode accepts the following additional options: |
13599 | 13591 | ||
13600 | -o OUTPUT-FILE set the output file name to OUTPUT-FILE | 13592 | -o OUTPUT-FILE set the output file name to OUTPUT-FILE |
13601 | -no-suppress do not suppress compiler output for multiple passes | 13593 | -no-suppress do not suppress compiler output for multiple passes |
@@ -13606,7 +13598,7 @@ Index: git/ltmain.sh | |||
13606 | -shared do not build a \`.o' file suitable for static linking | 13598 | -shared do not build a \`.o' file suitable for static linking |
13607 | -static only build a \`.o' file suitable for static linking | 13599 | -static only build a \`.o' file suitable for static linking |
13608 | -Wc,FLAG pass FLAG directly to the compiler | 13600 | -Wc,FLAG pass FLAG directly to the compiler |
13609 | @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted u | 13601 | @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." |
13610 | ;; | 13602 | ;; |
13611 | 13603 | ||
13612 | *) | 13604 | *) |
@@ -13708,7 +13700,7 @@ Index: git/ltmain.sh | |||
13708 | + do | 13700 | + do |
13709 | + if test -d "$opt"; then | 13701 | + if test -d "$opt"; then |
13710 | + func_append libdirs " $opt" | 13702 | + func_append libdirs " $opt" |
13711 | + | 13703 | |
13712 | + elif test -f "$opt"; then | 13704 | + elif test -f "$opt"; then |
13713 | + if func_lalib_unsafe_p "$opt"; then | 13705 | + if func_lalib_unsafe_p "$opt"; then |
13714 | + func_append libs " $opt" | 13706 | + func_append libs " $opt" |
@@ -13728,7 +13720,7 @@ Index: git/ltmain.sh | |||
13728 | + else | 13720 | + else |
13729 | + sysroot_cmd= | 13721 | + sysroot_cmd= |
13730 | + fi | 13722 | + fi |
13731 | 13723 | + | |
13732 | + # Remove sysroot references | 13724 | + # Remove sysroot references |
13733 | + if $opt_dry_run; then | 13725 | + if $opt_dry_run; then |
13734 | + for lib in $libs; do | 13726 | + for lib in $libs; do |
@@ -14140,7 +14132,7 @@ Index: git/ltmain.sh | |||
14140 | lt_${my_prefix}_LTX_preloaded_symbols[] = | 14132 | lt_${my_prefix}_LTX_preloaded_symbols[] = |
14141 | {\ | 14133 | {\ |
14142 | { \"$my_originator\", (void *) 0 }," | 14134 | { \"$my_originator\", (void *) 0 }," |
14143 | @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() | 14135 | @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { |
14144 | for arg in $LTCFLAGS; do | 14136 | for arg in $LTCFLAGS; do |
14145 | case $arg in | 14137 | case $arg in |
14146 | -pie | -fpie | -fPIE) ;; | 14138 | -pie | -fpie | -fPIE) ;; |
@@ -14669,7 +14661,7 @@ Index: git/ltmain.sh | |||
14669 | */ | 14661 | */ |
14670 | EOF | 14662 | EOF |
14671 | cat <<"EOF" | 14663 | cat <<"EOF" |
14672 | @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, | 14664 | @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); |
14673 | if (stale) { free ((void *) stale); stale = 0; } \ | 14665 | if (stale) { free ((void *) stale); stale = 0; } \ |
14674 | } while (0) | 14666 | } while (0) |
14675 | 14667 | ||
@@ -14696,7 +14688,7 @@ Index: git/ltmain.sh | |||
14696 | 14688 | ||
14697 | void *xmalloc (size_t num); | 14689 | void *xmalloc (size_t num); |
14698 | char *xstrdup (const char *string); | 14690 | char *xstrdup (const char *string); |
14699 | @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathsp | 14691 | @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); |
14700 | int make_executable (const char *path); | 14692 | int make_executable (const char *path); |
14701 | int check_executable (const char *path); | 14693 | int check_executable (const char *path); |
14702 | char *strendzap (char *str, const char *pat); | 14694 | char *strendzap (char *str, const char *pat); |
@@ -15024,7 +15016,7 @@ Index: git/ltmain.sh | |||
15024 | vfprintf (stderr, message, ap); | 15016 | vfprintf (stderr, message, ap); |
15025 | fprintf (stderr, ".\n"); | 15017 | fprintf (stderr, ".\n"); |
15026 | 15018 | ||
15027 | @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const ch | 15019 | @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, |
15028 | } | 15020 | } |
15029 | 15021 | ||
15030 | void | 15022 | void |
@@ -15062,7 +15054,7 @@ Index: git/ltmain.sh | |||
15062 | { | 15054 | { |
15063 | #ifdef HAVE_SETENV | 15055 | #ifdef HAVE_SETENV |
15064 | /* always make a copy, for consistency with !HAVE_SETENV */ | 15056 | /* always make a copy, for consistency with !HAVE_SETENV */ |
15065 | @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, c | 15057 | @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) |
15066 | void | 15058 | void |
15067 | lt_update_exe_path (const char *name, const char *value) | 15059 | lt_update_exe_path (const char *name, const char *value) |
15068 | { | 15060 | { |
@@ -15075,7 +15067,7 @@ Index: git/ltmain.sh | |||
15075 | 15067 | ||
15076 | if (name && *name && value && *value) | 15068 | if (name && *name && value && *value) |
15077 | { | 15069 | { |
15078 | @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, co | 15070 | @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) |
15079 | void | 15071 | void |
15080 | lt_update_lib_path (const char *name, const char *value) | 15072 | lt_update_lib_path (const char *name, const char *value) |
15081 | { | 15073 | { |
@@ -17348,10 +17340,10 @@ Index: git/ltmain.sh | |||
17348 | 17340 | ||
17349 | if test -n "$exec_cmd"; then | 17341 | if test -n "$exec_cmd"; then |
17350 | eval exec "$exec_cmd" | 17342 | eval exec "$exec_cmd" |
17351 | Index: git/ltoptions.m4 | 17343 | diff --git a/ltoptions.m4 b/ltoptions.m4 |
17352 | =================================================================== | 17344 | index 5ef12ced2a..17cfd51c0b 100644 |
17353 | --- git.orig/ltoptions.m4 | 17345 | --- a/ltoptions.m4 |
17354 | +++ git/ltoptions.m4 | 17346 | +++ b/ltoptions.m4 |
17355 | @@ -8,7 +8,7 @@ | 17347 | @@ -8,7 +8,7 @@ |
17356 | # unlimited permission to copy and/or distribute it, with or without | 17348 | # unlimited permission to copy and/or distribute it, with or without |
17357 | # modifications, as long as this notice is preserved. | 17349 | # modifications, as long as this notice is preserved. |
@@ -17361,10 +17353,10 @@ Index: git/ltoptions.m4 | |||
17361 | 17353 | ||
17362 | # This is to help aclocal find these macros, as it can't see m4_define. | 17354 | # This is to help aclocal find these macros, as it can't see m4_define. |
17363 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) | 17355 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
17364 | Index: git/ltversion.m4 | 17356 | diff --git a/ltversion.m4 b/ltversion.m4 |
17365 | =================================================================== | 17357 | index bf87f77132..9c7b5d4118 100644 |
17366 | --- git.orig/ltversion.m4 | 17358 | --- a/ltversion.m4 |
17367 | +++ git/ltversion.m4 | 17359 | +++ b/ltversion.m4 |
17368 | @@ -7,17 +7,17 @@ | 17360 | @@ -7,17 +7,17 @@ |
17369 | # unlimited permission to copy and/or distribute it, with or without | 17361 | # unlimited permission to copy and/or distribute it, with or without |
17370 | # modifications, as long as this notice is preserved. | 17362 | # modifications, as long as this notice is preserved. |
@@ -17389,10 +17381,10 @@ Index: git/ltversion.m4 | |||
17389 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | 17381 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
17390 | _LT_DECL(, macro_revision, 0) | 17382 | _LT_DECL(, macro_revision, 0) |
17391 | ]) | 17383 | ]) |
17392 | Index: git/lt~obsolete.m4 | 17384 | diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 |
17393 | =================================================================== | 17385 | index bf92b5e079..c573da90c5 100644 |
17394 | --- git.orig/lt~obsolete.m4 | 17386 | --- a/lt~obsolete.m4 |
17395 | +++ git/lt~obsolete.m4 | 17387 | +++ b/lt~obsolete.m4 |
17396 | @@ -7,7 +7,7 @@ | 17388 | @@ -7,7 +7,7 @@ |
17397 | # unlimited permission to copy and/or distribute it, with or without | 17389 | # unlimited permission to copy and/or distribute it, with or without |
17398 | # modifications, as long as this notice is preserved. | 17390 | # modifications, as long as this notice is preserved. |
@@ -17402,11 +17394,11 @@ Index: git/lt~obsolete.m4 | |||
17402 | 17394 | ||
17403 | # These exist entirely to fool aclocal when bootstrapping libtool. | 17395 | # These exist entirely to fool aclocal when bootstrapping libtool. |
17404 | # | 17396 | # |
17405 | Index: git/opcodes/configure | 17397 | diff --git a/opcodes/configure b/opcodes/configure |
17406 | =================================================================== | 17398 | index 853849ee58..5f74ecf7da 100755 |
17407 | --- git.orig/opcodes/configure | 17399 | --- a/opcodes/configure |
17408 | +++ git/opcodes/configure | 17400 | +++ b/opcodes/configure |
17409 | @@ -681,6 +681,9 @@ OTOOL | 17401 | @@ -680,6 +680,9 @@ OTOOL |
17410 | LIPO | 17402 | LIPO |
17411 | NMEDIT | 17403 | NMEDIT |
17412 | DSYMUTIL | 17404 | DSYMUTIL |
@@ -17416,7 +17408,7 @@ Index: git/opcodes/configure | |||
17416 | OBJDUMP | 17408 | OBJDUMP |
17417 | LN_S | 17409 | LN_S |
17418 | NM | 17410 | NM |
17419 | @@ -799,6 +802,7 @@ enable_static | 17411 | @@ -798,6 +801,7 @@ enable_static |
17420 | with_pic | 17412 | with_pic |
17421 | enable_fast_install | 17413 | enable_fast_install |
17422 | with_gnu_ld | 17414 | with_gnu_ld |
@@ -17424,7 +17416,7 @@ Index: git/opcodes/configure | |||
17424 | enable_libtool_lock | 17416 | enable_libtool_lock |
17425 | enable_targets | 17417 | enable_targets |
17426 | enable_werror | 17418 | enable_werror |
17427 | @@ -1463,6 +1467,8 @@ Optional Packages: | 17419 | @@ -1462,6 +1466,8 @@ Optional Packages: |
17428 | --with-pic try to use only PIC/non-PIC objects [default=use | 17420 | --with-pic try to use only PIC/non-PIC objects [default=use |
17429 | both] | 17421 | both] |
17430 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 17422 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
@@ -17433,7 +17425,7 @@ Index: git/opcodes/configure | |||
17433 | 17425 | ||
17434 | Some influential environment variables: | 17426 | Some influential environment variables: |
17435 | CC C compiler command | 17427 | CC C compiler command |
17436 | @@ -5404,8 +5410,8 @@ esac | 17428 | @@ -5403,8 +5409,8 @@ esac |
17437 | 17429 | ||
17438 | 17430 | ||
17439 | 17431 | ||
@@ -17444,7 +17436,7 @@ Index: git/opcodes/configure | |||
17444 | 17436 | ||
17445 | 17437 | ||
17446 | 17438 | ||
17447 | @@ -5445,7 +5451,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 17439 | @@ -5444,7 +5450,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
17448 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | 17440 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
17449 | $as_echo_n "checking how to print strings... " >&6; } | 17441 | $as_echo_n "checking how to print strings... " >&6; } |
17450 | # Test print first, because it will be a builtin if present. | 17442 | # Test print first, because it will be a builtin if present. |
@@ -17453,7 +17445,7 @@ Index: git/opcodes/configure | |||
17453 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 17445 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
17454 | ECHO='print -r --' | 17446 | ECHO='print -r --' |
17455 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 17447 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
17456 | @@ -6131,8 +6137,8 @@ $as_echo_n "checking whether the shell u | 17448 | @@ -6130,8 +6136,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
17457 | # Try some XSI features | 17449 | # Try some XSI features |
17458 | xsi_shell=no | 17450 | xsi_shell=no |
17459 | ( _lt_dummy="a/b/c" | 17451 | ( _lt_dummy="a/b/c" |
@@ -17464,7 +17456,7 @@ Index: git/opcodes/configure | |||
17464 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 17456 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
17465 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 17457 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
17466 | && xsi_shell=yes | 17458 | && xsi_shell=yes |
17467 | @@ -6181,6 +6187,80 @@ esac | 17459 | @@ -6180,6 +6186,80 @@ esac |
17468 | 17460 | ||
17469 | 17461 | ||
17470 | 17462 | ||
@@ -17545,7 +17537,7 @@ Index: git/opcodes/configure | |||
17545 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 17537 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
17546 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 17538 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
17547 | if ${lt_cv_ld_reload_flag+:} false; then : | 17539 | if ${lt_cv_ld_reload_flag+:} false; then : |
17548 | @@ -6197,6 +6277,11 @@ case $reload_flag in | 17540 | @@ -6196,6 +6276,11 @@ case $reload_flag in |
17549 | esac | 17541 | esac |
17550 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 17542 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
17551 | case $host_os in | 17543 | case $host_os in |
@@ -17557,7 +17549,7 @@ Index: git/opcodes/configure | |||
17557 | darwin*) | 17549 | darwin*) |
17558 | if test "$GCC" = yes; then | 17550 | if test "$GCC" = yes; then |
17559 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 17551 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
17560 | @@ -6365,7 +6450,8 @@ mingw* | pw32*) | 17552 | @@ -6364,7 +6449,8 @@ mingw* | pw32*) |
17561 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 17553 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
17562 | lt_cv_file_magic_cmd='func_win32_libid' | 17554 | lt_cv_file_magic_cmd='func_win32_libid' |
17563 | else | 17555 | else |
@@ -17567,7 +17559,7 @@ Index: git/opcodes/configure | |||
17567 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 17559 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
17568 | fi | 17560 | fi |
17569 | ;; | 17561 | ;; |
17570 | @@ -6519,6 +6605,21 @@ esac | 17562 | @@ -6518,6 +6604,21 @@ esac |
17571 | fi | 17563 | fi |
17572 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 17564 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
17573 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 17565 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
@@ -17589,7 +17581,7 @@ Index: git/opcodes/configure | |||
17589 | file_magic_cmd=$lt_cv_file_magic_cmd | 17581 | file_magic_cmd=$lt_cv_file_magic_cmd |
17590 | deplibs_check_method=$lt_cv_deplibs_check_method | 17582 | deplibs_check_method=$lt_cv_deplibs_check_method |
17591 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 17583 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
17592 | @@ -6534,9 +6635,162 @@ test -z "$deplibs_check_method" && depli | 17584 | @@ -6531,11 +6632,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
17593 | 17585 | ||
17594 | 17586 | ||
17595 | 17587 | ||
@@ -17603,6 +17595,8 @@ Index: git/opcodes/configure | |||
17603 | + | 17595 | + |
17604 | + | 17596 | + |
17605 | + | 17597 | + |
17598 | |||
17599 | |||
17606 | if test -n "$ac_tool_prefix"; then | 17600 | if test -n "$ac_tool_prefix"; then |
17607 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 17601 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
17608 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | 17602 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
@@ -17754,7 +17748,7 @@ Index: git/opcodes/configure | |||
17754 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 17748 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
17755 | $as_echo_n "checking for $ac_word... " >&6; } | 17749 | $as_echo_n "checking for $ac_word... " >&6; } |
17756 | if ${ac_cv_prog_AR+:} false; then : | 17750 | if ${ac_cv_prog_AR+:} false; then : |
17757 | @@ -6552,7 +6806,7 @@ do | 17751 | @@ -6551,7 +6805,7 @@ do |
17758 | test -z "$as_dir" && as_dir=. | 17752 | test -z "$as_dir" && as_dir=. |
17759 | for ac_exec_ext in '' $ac_executable_extensions; do | 17753 | for ac_exec_ext in '' $ac_executable_extensions; do |
17760 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 17754 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -17763,7 +17757,7 @@ Index: git/opcodes/configure | |||
17763 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 17757 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
17764 | break 2 | 17758 | break 2 |
17765 | fi | 17759 | fi |
17766 | @@ -6572,11 +6826,15 @@ $as_echo "no" >&6; } | 17760 | @@ -6571,11 +6825,15 @@ $as_echo "no" >&6; } |
17767 | fi | 17761 | fi |
17768 | 17762 | ||
17769 | 17763 | ||
@@ -17782,7 +17776,7 @@ Index: git/opcodes/configure | |||
17782 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 17776 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
17783 | $as_echo_n "checking for $ac_word... " >&6; } | 17777 | $as_echo_n "checking for $ac_word... " >&6; } |
17784 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 17778 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
17785 | @@ -6592,7 +6850,7 @@ do | 17779 | @@ -6591,7 +6849,7 @@ do |
17786 | test -z "$as_dir" && as_dir=. | 17780 | test -z "$as_dir" && as_dir=. |
17787 | for ac_exec_ext in '' $ac_executable_extensions; do | 17781 | for ac_exec_ext in '' $ac_executable_extensions; do |
17788 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | 17782 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
@@ -17791,7 +17785,7 @@ Index: git/opcodes/configure | |||
17791 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 17785 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
17792 | break 2 | 17786 | break 2 |
17793 | fi | 17787 | fi |
17794 | @@ -6611,6 +6869,10 @@ else | 17788 | @@ -6610,6 +6868,10 @@ else |
17795 | $as_echo "no" >&6; } | 17789 | $as_echo "no" >&6; } |
17796 | fi | 17790 | fi |
17797 | 17791 | ||
@@ -17802,7 +17796,7 @@ Index: git/opcodes/configure | |||
17802 | if test "x$ac_ct_AR" = x; then | 17796 | if test "x$ac_ct_AR" = x; then |
17803 | AR="false" | 17797 | AR="false" |
17804 | else | 17798 | else |
17805 | @@ -6622,12 +6884,11 @@ ac_tool_warned=yes ;; | 17799 | @@ -6621,16 +6883,72 @@ ac_tool_warned=yes ;; |
17806 | esac | 17800 | esac |
17807 | AR=$ac_ct_AR | 17801 | AR=$ac_ct_AR |
17808 | fi | 17802 | fi |
@@ -17815,13 +17809,16 @@ Index: git/opcodes/configure | |||
17815 | +: ${AR=ar} | 17809 | +: ${AR=ar} |
17816 | +: ${AR_FLAGS=cru} | 17810 | +: ${AR_FLAGS=cru} |
17817 | + | 17811 | + |
17818 | 17812 | + | |
17819 | 17813 | + | |
17820 | 17814 | + | |
17821 | @@ -6638,6 +6899,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 17815 | + |
17822 | 17816 | + | |
17823 | 17817 | + | |
17824 | 17818 | + | |
17819 | + | ||
17820 | + | ||
17821 | + | ||
17825 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 17822 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
17826 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 17823 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
17827 | +if ${lt_cv_ar_at_file+:} false; then : | 17824 | +if ${lt_cv_ar_at_file+:} false; then : |
@@ -17834,7 +17831,7 @@ Index: git/opcodes/configure | |||
17834 | +int | 17831 | +int |
17835 | +main () | 17832 | +main () |
17836 | +{ | 17833 | +{ |
17837 | + | 17834 | |
17838 | + ; | 17835 | + ; |
17839 | + return 0; | 17836 | + return 0; |
17840 | +} | 17837 | +} |
@@ -17860,29 +17857,23 @@ Index: git/opcodes/configure | |||
17860 | + fi | 17857 | + fi |
17861 | + fi | 17858 | + fi |
17862 | + rm -f conftest.* libconftest.a | 17859 | + rm -f conftest.* libconftest.a |
17863 | + | 17860 | |
17864 | +fi | 17861 | +fi |
17865 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 17862 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
17866 | + | 17863 | |
17867 | +fi | 17864 | +fi |
17868 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 17865 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
17869 | +$as_echo "$lt_cv_ar_at_file" >&6; } | 17866 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
17870 | + | 17867 | |
17871 | +if test "x$lt_cv_ar_at_file" = xno; then | 17868 | +if test "x$lt_cv_ar_at_file" = xno; then |
17872 | + archiver_list_spec= | 17869 | + archiver_list_spec= |
17873 | +else | 17870 | +else |
17874 | + archiver_list_spec=$lt_cv_ar_at_file | 17871 | + archiver_list_spec=$lt_cv_ar_at_file |
17875 | +fi | 17872 | +fi |
17876 | + | ||
17877 | + | ||
17878 | + | ||
17879 | + | ||
17880 | + | ||
17881 | + | ||
17882 | 17873 | ||
17883 | if test -n "$ac_tool_prefix"; then | 17874 | |
17884 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | 17875 | |
17885 | @@ -6973,8 +7291,8 @@ esac | 17876 | @@ -6972,8 +7290,8 @@ esac |
17886 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 17877 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
17887 | 17878 | ||
17888 | # Transform an extracted symbol line into symbol name and symbol address | 17879 | # Transform an extracted symbol line into symbol name and symbol address |
@@ -17893,7 +17884,7 @@ Index: git/opcodes/configure | |||
17893 | 17884 | ||
17894 | # Handle CRLF in mingw tool chain | 17885 | # Handle CRLF in mingw tool chain |
17895 | opt_cr= | 17886 | opt_cr= |
17896 | @@ -7010,6 +7328,7 @@ for ac_symprfx in "" "_"; do | 17887 | @@ -7009,6 +7327,7 @@ for ac_symprfx in "" "_"; do |
17897 | else | 17888 | else |
17898 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 17889 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
17899 | fi | 17890 | fi |
@@ -17901,7 +17892,7 @@ Index: git/opcodes/configure | |||
17901 | 17892 | ||
17902 | # Check to see that the pipe works correctly. | 17893 | # Check to see that the pipe works correctly. |
17903 | pipe_works=no | 17894 | pipe_works=no |
17904 | @@ -7051,6 +7370,18 @@ _LT_EOF | 17895 | @@ -7050,6 +7369,18 @@ _LT_EOF |
17905 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 17896 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
17906 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 17897 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
17907 | cat <<_LT_EOF > conftest.$ac_ext | 17898 | cat <<_LT_EOF > conftest.$ac_ext |
@@ -17920,7 +17911,7 @@ Index: git/opcodes/configure | |||
17920 | #ifdef __cplusplus | 17911 | #ifdef __cplusplus |
17921 | extern "C" { | 17912 | extern "C" { |
17922 | #endif | 17913 | #endif |
17923 | @@ -7062,7 +7393,7 @@ _LT_EOF | 17914 | @@ -7061,7 +7392,7 @@ _LT_EOF |
17924 | cat <<_LT_EOF >> conftest.$ac_ext | 17915 | cat <<_LT_EOF >> conftest.$ac_ext |
17925 | 17916 | ||
17926 | /* The mapping between symbol names and symbols. */ | 17917 | /* The mapping between symbol names and symbols. */ |
@@ -17929,7 +17920,7 @@ Index: git/opcodes/configure | |||
17929 | const char *name; | 17920 | const char *name; |
17930 | void *address; | 17921 | void *address; |
17931 | } | 17922 | } |
17932 | @@ -7088,8 +7419,8 @@ static const void *lt_preloaded_setup() | 17923 | @@ -7087,8 +7418,8 @@ static const void *lt_preloaded_setup() { |
17933 | _LT_EOF | 17924 | _LT_EOF |
17934 | # Now try linking the two files. | 17925 | # Now try linking the two files. |
17935 | mv conftest.$ac_objext conftstm.$ac_objext | 17926 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -17940,7 +17931,7 @@ Index: git/opcodes/configure | |||
17940 | LIBS="conftstm.$ac_objext" | 17931 | LIBS="conftstm.$ac_objext" |
17941 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 17932 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
17942 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 17933 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
17943 | @@ -7099,8 +7430,8 @@ _LT_EOF | 17934 | @@ -7098,8 +7429,8 @@ _LT_EOF |
17944 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 17935 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
17945 | pipe_works=yes | 17936 | pipe_works=yes |
17946 | fi | 17937 | fi |
@@ -17951,7 +17942,7 @@ Index: git/opcodes/configure | |||
17951 | else | 17942 | else |
17952 | echo "cannot find nm_test_func in $nlist" >&5 | 17943 | echo "cannot find nm_test_func in $nlist" >&5 |
17953 | fi | 17944 | fi |
17954 | @@ -7137,6 +7468,14 @@ else | 17945 | @@ -7136,6 +7467,16 @@ else |
17955 | $as_echo "ok" >&6; } | 17946 | $as_echo "ok" >&6; } |
17956 | fi | 17947 | fi |
17957 | 17948 | ||
@@ -17963,10 +17954,12 @@ Index: git/opcodes/configure | |||
17963 | +fi | 17954 | +fi |
17964 | + | 17955 | + |
17965 | + | 17956 | + |
17957 | + | ||
17958 | + | ||
17966 | 17959 | ||
17967 | 17960 | ||
17968 | 17961 | ||
17969 | @@ -7158,6 +7497,47 @@ fi | 17962 | @@ -7152,6 +7493,45 @@ fi |
17970 | 17963 | ||
17971 | 17964 | ||
17972 | 17965 | ||
@@ -17974,6 +17967,9 @@ Index: git/opcodes/configure | |||
17974 | + | 17967 | + |
17975 | + | 17968 | + |
17976 | + | 17969 | + |
17970 | + | ||
17971 | + | ||
17972 | + | ||
17977 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 17973 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
17978 | +$as_echo_n "checking for sysroot... " >&6; } | 17974 | +$as_echo_n "checking for sysroot... " >&6; } |
17979 | + | 17975 | + |
@@ -18006,15 +18002,10 @@ Index: git/opcodes/configure | |||
18006 | + | 18002 | + |
18007 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 18003 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
18008 | +$as_echo "${lt_sysroot:-no}" >&6; } | 18004 | +$as_echo "${lt_sysroot:-no}" >&6; } |
18009 | + | 18005 | |
18010 | + | 18006 | |
18011 | + | 18007 | |
18012 | + | 18008 | @@ -7363,6 +7743,123 @@ esac |
18013 | + | ||
18014 | # Check whether --enable-libtool-lock was given. | ||
18015 | if test "${enable_libtool_lock+set}" = set; then : | ||
18016 | enableval=$enable_libtool_lock; | ||
18017 | @@ -7364,6 +7744,123 @@ esac | ||
18018 | 18009 | ||
18019 | need_locks="$enable_libtool_lock" | 18010 | need_locks="$enable_libtool_lock" |
18020 | 18011 | ||
@@ -18138,7 +18129,7 @@ Index: git/opcodes/configure | |||
18138 | 18129 | ||
18139 | case $host_os in | 18130 | case $host_os in |
18140 | rhapsody* | darwin*) | 18131 | rhapsody* | darwin*) |
18141 | @@ -7927,6 +8424,8 @@ _LT_EOF | 18132 | @@ -7926,6 +8423,8 @@ _LT_EOF |
18142 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | 18133 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
18143 | echo "$AR cru libconftest.a conftest.o" >&5 | 18134 | echo "$AR cru libconftest.a conftest.o" >&5 |
18144 | $AR cru libconftest.a conftest.o 2>&5 | 18135 | $AR cru libconftest.a conftest.o 2>&5 |
@@ -18147,7 +18138,7 @@ Index: git/opcodes/configure | |||
18147 | cat > conftest.c << _LT_EOF | 18138 | cat > conftest.c << _LT_EOF |
18148 | int main() { return 0;} | 18139 | int main() { return 0;} |
18149 | _LT_EOF | 18140 | _LT_EOF |
18150 | @@ -8092,7 +8591,8 @@ fi | 18141 | @@ -8091,7 +8590,8 @@ fi |
18151 | LIBTOOL_DEPS="$ltmain" | 18142 | LIBTOOL_DEPS="$ltmain" |
18152 | 18143 | ||
18153 | # Always use our own libtool. | 18144 | # Always use our own libtool. |
@@ -18157,7 +18148,7 @@ Index: git/opcodes/configure | |||
18157 | 18148 | ||
18158 | 18149 | ||
18159 | 18150 | ||
18160 | @@ -8181,7 +8681,7 @@ aix3*) | 18151 | @@ -8180,7 +8680,7 @@ aix3*) |
18161 | esac | 18152 | esac |
18162 | 18153 | ||
18163 | # Global variables: | 18154 | # Global variables: |
@@ -18166,7 +18157,7 @@ Index: git/opcodes/configure | |||
18166 | can_build_shared=yes | 18157 | can_build_shared=yes |
18167 | 18158 | ||
18168 | # All known linkers require a `.a' archive for static linking (except MSVC, | 18159 | # All known linkers require a `.a' archive for static linking (except MSVC, |
18169 | @@ -8479,8 +8979,6 @@ fi | 18160 | @@ -8478,8 +8978,6 @@ fi |
18170 | lt_prog_compiler_pic= | 18161 | lt_prog_compiler_pic= |
18171 | lt_prog_compiler_static= | 18162 | lt_prog_compiler_static= |
18172 | 18163 | ||
@@ -18175,7 +18166,7 @@ Index: git/opcodes/configure | |||
18175 | 18166 | ||
18176 | if test "$GCC" = yes; then | 18167 | if test "$GCC" = yes; then |
18177 | lt_prog_compiler_wl='-Wl,' | 18168 | lt_prog_compiler_wl='-Wl,' |
18178 | @@ -8646,6 +9144,12 @@ $as_echo_n "checking for $compiler optio | 18169 | @@ -8645,6 +9143,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
18179 | lt_prog_compiler_pic='--shared' | 18170 | lt_prog_compiler_pic='--shared' |
18180 | lt_prog_compiler_static='--static' | 18171 | lt_prog_compiler_static='--static' |
18181 | ;; | 18172 | ;; |
@@ -18188,7 +18179,7 @@ Index: git/opcodes/configure | |||
18188 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 18179 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
18189 | # Portland Group compilers (*not* the Pentium gcc compiler, | 18180 | # Portland Group compilers (*not* the Pentium gcc compiler, |
18190 | # which looks to be a dead project) | 18181 | # which looks to be a dead project) |
18191 | @@ -8708,7 +9212,7 @@ $as_echo_n "checking for $compiler optio | 18182 | @@ -8707,7 +9211,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
18192 | lt_prog_compiler_pic='-KPIC' | 18183 | lt_prog_compiler_pic='-KPIC' |
18193 | lt_prog_compiler_static='-Bstatic' | 18184 | lt_prog_compiler_static='-Bstatic' |
18194 | case $cc_basename in | 18185 | case $cc_basename in |
@@ -18197,7 +18188,7 @@ Index: git/opcodes/configure | |||
18197 | lt_prog_compiler_wl='-Qoption ld ';; | 18188 | lt_prog_compiler_wl='-Qoption ld ';; |
18198 | *) | 18189 | *) |
18199 | lt_prog_compiler_wl='-Wl,';; | 18190 | lt_prog_compiler_wl='-Wl,';; |
18200 | @@ -8765,13 +9269,17 @@ case $host_os in | 18191 | @@ -8764,13 +9268,17 @@ case $host_os in |
18201 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 18192 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
18202 | ;; | 18193 | ;; |
18203 | esac | 18194 | esac |
@@ -18221,7 +18212,7 @@ Index: git/opcodes/configure | |||
18221 | 18212 | ||
18222 | # | 18213 | # |
18223 | # Check to make sure the PIC flag actually works. | 18214 | # Check to make sure the PIC flag actually works. |
18224 | @@ -8832,6 +9340,11 @@ fi | 18215 | @@ -8831,6 +9339,11 @@ fi |
18225 | 18216 | ||
18226 | 18217 | ||
18227 | 18218 | ||
@@ -18233,7 +18224,7 @@ Index: git/opcodes/configure | |||
18233 | # | 18224 | # |
18234 | # Check to make sure the static flag actually works. | 18225 | # Check to make sure the static flag actually works. |
18235 | # | 18226 | # |
18236 | @@ -9182,7 +9695,8 @@ _LT_EOF | 18227 | @@ -9181,7 +9694,8 @@ _LT_EOF |
18237 | allow_undefined_flag=unsupported | 18228 | allow_undefined_flag=unsupported |
18238 | always_export_symbols=no | 18229 | always_export_symbols=no |
18239 | enable_shared_with_static_runtimes=yes | 18230 | enable_shared_with_static_runtimes=yes |
@@ -18243,7 +18234,7 @@ Index: git/opcodes/configure | |||
18243 | 18234 | ||
18244 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 18235 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
18245 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 18236 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
18246 | @@ -9281,12 +9795,12 @@ _LT_EOF | 18237 | @@ -9280,12 +9794,12 @@ _LT_EOF |
18247 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 18238 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
18248 | hardcode_libdir_flag_spec= | 18239 | hardcode_libdir_flag_spec= |
18249 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 18240 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
@@ -18258,7 +18249,7 @@ Index: git/opcodes/configure | |||
18258 | fi | 18249 | fi |
18259 | ;; | 18250 | ;; |
18260 | esac | 18251 | esac |
18261 | @@ -9300,8 +9814,8 @@ _LT_EOF | 18252 | @@ -9299,8 +9813,8 @@ _LT_EOF |
18262 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 18253 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
18263 | wlarc= | 18254 | wlarc= |
18264 | else | 18255 | else |
@@ -18269,7 +18260,7 @@ Index: git/opcodes/configure | |||
18269 | fi | 18260 | fi |
18270 | ;; | 18261 | ;; |
18271 | 18262 | ||
18272 | @@ -9319,8 +9833,8 @@ _LT_EOF | 18263 | @@ -9318,8 +9832,8 @@ _LT_EOF |
18273 | 18264 | ||
18274 | _LT_EOF | 18265 | _LT_EOF |
18275 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 18266 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -18280,7 +18271,7 @@ Index: git/opcodes/configure | |||
18280 | else | 18271 | else |
18281 | ld_shlibs=no | 18272 | ld_shlibs=no |
18282 | fi | 18273 | fi |
18283 | @@ -9366,8 +9880,8 @@ _LT_EOF | 18274 | @@ -9365,8 +9879,8 @@ _LT_EOF |
18284 | 18275 | ||
18285 | *) | 18276 | *) |
18286 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 18277 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
@@ -18291,7 +18282,7 @@ Index: git/opcodes/configure | |||
18291 | else | 18282 | else |
18292 | ld_shlibs=no | 18283 | ld_shlibs=no |
18293 | fi | 18284 | fi |
18294 | @@ -9497,7 +10011,13 @@ _LT_EOF | 18285 | @@ -9496,7 +10010,13 @@ _LT_EOF |
18295 | allow_undefined_flag='-berok' | 18286 | allow_undefined_flag='-berok' |
18296 | # Determine the default libpath from the value encoded in an | 18287 | # Determine the default libpath from the value encoded in an |
18297 | # empty executable. | 18288 | # empty executable. |
@@ -18306,7 +18297,7 @@ Index: git/opcodes/configure | |||
18306 | /* end confdefs.h. */ | 18297 | /* end confdefs.h. */ |
18307 | 18298 | ||
18308 | int | 18299 | int |
18309 | @@ -9510,22 +10030,29 @@ main () | 18300 | @@ -9509,22 +10029,29 @@ main () |
18310 | _ACEOF | 18301 | _ACEOF |
18311 | if ac_fn_c_try_link "$LINENO"; then : | 18302 | if ac_fn_c_try_link "$LINENO"; then : |
18312 | 18303 | ||
@@ -18349,7 +18340,7 @@ Index: git/opcodes/configure | |||
18349 | 18340 | ||
18350 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 18341 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
18351 | 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" | 18342 | 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" |
18352 | @@ -9537,7 +10064,13 @@ if test -z "$aix_libpath"; then aix_libp | 18343 | @@ -9536,7 +10063,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18353 | else | 18344 | else |
18354 | # Determine the default libpath from the value encoded in an | 18345 | # Determine the default libpath from the value encoded in an |
18355 | # empty executable. | 18346 | # empty executable. |
@@ -18364,7 +18355,7 @@ Index: git/opcodes/configure | |||
18364 | /* end confdefs.h. */ | 18355 | /* end confdefs.h. */ |
18365 | 18356 | ||
18366 | int | 18357 | int |
18367 | @@ -9550,22 +10083,29 @@ main () | 18358 | @@ -9549,22 +10082,29 @@ main () |
18368 | _ACEOF | 18359 | _ACEOF |
18369 | if ac_fn_c_try_link "$LINENO"; then : | 18360 | if ac_fn_c_try_link "$LINENO"; then : |
18370 | 18361 | ||
@@ -18407,7 +18398,7 @@ Index: git/opcodes/configure | |||
18407 | 18398 | ||
18408 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 18399 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
18409 | # Warning - without using the other run time loading flags, | 18400 | # Warning - without using the other run time loading flags, |
18410 | @@ -9610,20 +10150,63 @@ if test -z "$aix_libpath"; then aix_libp | 18401 | @@ -9609,20 +10149,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18411 | # Microsoft Visual C++. | 18402 | # Microsoft Visual C++. |
18412 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 18403 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
18413 | # no search path for DLLs. | 18404 | # no search path for DLLs. |
@@ -18485,7 +18476,7 @@ Index: git/opcodes/configure | |||
18485 | ;; | 18476 | ;; |
18486 | 18477 | ||
18487 | darwin* | rhapsody*) | 18478 | darwin* | rhapsody*) |
18488 | @@ -9684,7 +10267,7 @@ if test -z "$aix_libpath"; then aix_libp | 18479 | @@ -9683,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18489 | 18480 | ||
18490 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 18481 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
18491 | freebsd* | dragonfly*) | 18482 | freebsd* | dragonfly*) |
@@ -18494,7 +18485,7 @@ Index: git/opcodes/configure | |||
18494 | hardcode_libdir_flag_spec='-R$libdir' | 18485 | hardcode_libdir_flag_spec='-R$libdir' |
18495 | hardcode_direct=yes | 18486 | hardcode_direct=yes |
18496 | hardcode_shlibpath_var=no | 18487 | hardcode_shlibpath_var=no |
18497 | @@ -9692,7 +10275,7 @@ if test -z "$aix_libpath"; then aix_libp | 18488 | @@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18498 | 18489 | ||
18499 | hpux9*) | 18490 | hpux9*) |
18500 | if test "$GCC" = yes; then | 18491 | if test "$GCC" = yes; then |
@@ -18503,7 +18494,7 @@ Index: git/opcodes/configure | |||
18503 | else | 18494 | else |
18504 | 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' | 18495 | 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' |
18505 | fi | 18496 | fi |
18506 | @@ -9708,7 +10291,7 @@ if test -z "$aix_libpath"; then aix_libp | 18497 | @@ -9707,7 +10290,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18507 | 18498 | ||
18508 | hpux10*) | 18499 | hpux10*) |
18509 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 18500 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -18512,7 +18503,7 @@ Index: git/opcodes/configure | |||
18512 | else | 18503 | else |
18513 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 18504 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
18514 | fi | 18505 | fi |
18515 | @@ -9732,10 +10315,10 @@ if test -z "$aix_libpath"; then aix_libp | 18506 | @@ -9731,10 +10314,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
18516 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 18507 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
18517 | ;; | 18508 | ;; |
18518 | ia64*) | 18509 | ia64*) |
@@ -18525,7 +18516,7 @@ Index: git/opcodes/configure | |||
18525 | ;; | 18516 | ;; |
18526 | esac | 18517 | esac |
18527 | else | 18518 | else |
18528 | @@ -9814,23 +10397,36 @@ fi | 18519 | @@ -9813,23 +10396,36 @@ fi |
18529 | 18520 | ||
18530 | irix5* | irix6* | nonstopux*) | 18521 | irix5* | irix6* | nonstopux*) |
18531 | if test "$GCC" = yes; then | 18522 | if test "$GCC" = yes; then |
@@ -18570,7 +18561,7 @@ Index: git/opcodes/configure | |||
18570 | else | 18561 | else |
18571 | 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' | 18562 | 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' |
18572 | 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' | 18563 | 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' |
18573 | @@ -9915,7 +10511,7 @@ rm -f core conftest.err conftest.$ac_obj | 18564 | @@ -9914,7 +10510,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
18574 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 18565 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
18575 | if test "$GCC" = yes; then | 18566 | if test "$GCC" = yes; then |
18576 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 18567 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -18579,7 +18570,7 @@ Index: git/opcodes/configure | |||
18579 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 18570 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
18580 | else | 18571 | else |
18581 | allow_undefined_flag=' -expect_unresolved \*' | 18572 | allow_undefined_flag=' -expect_unresolved \*' |
18582 | @@ -9934,9 +10530,9 @@ rm -f core conftest.err conftest.$ac_obj | 18573 | @@ -9933,9 +10529,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
18583 | no_undefined_flag=' -z defs' | 18574 | no_undefined_flag=' -z defs' |
18584 | if test "$GCC" = yes; then | 18575 | if test "$GCC" = yes; then |
18585 | wlarc='${wl}' | 18576 | wlarc='${wl}' |
@@ -18591,7 +18582,7 @@ Index: git/opcodes/configure | |||
18591 | else | 18582 | else |
18592 | case `$CC -V 2>&1` in | 18583 | case `$CC -V 2>&1` in |
18593 | *"Compilers 5.0"*) | 18584 | *"Compilers 5.0"*) |
18594 | @@ -10512,8 +11108,9 @@ cygwin* | mingw* | pw32* | cegcc*) | 18585 | @@ -10511,8 +11107,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
18595 | need_version=no | 18586 | need_version=no |
18596 | need_lib_prefix=no | 18587 | need_lib_prefix=no |
18597 | 18588 | ||
@@ -18603,7 +18594,7 @@ Index: git/opcodes/configure | |||
18603 | library_names_spec='$libname.dll.a' | 18594 | library_names_spec='$libname.dll.a' |
18604 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 18595 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
18605 | postinstall_cmds='base_file=`basename \${file}`~ | 18596 | postinstall_cmds='base_file=`basename \${file}`~ |
18606 | @@ -10546,13 +11143,71 @@ cygwin* | mingw* | pw32* | cegcc*) | 18597 | @@ -10545,13 +11142,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
18607 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 18598 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
18608 | ;; | 18599 | ;; |
18609 | esac | 18600 | esac |
@@ -18676,7 +18667,7 @@ Index: git/opcodes/configure | |||
18676 | # FIXME: first we should search . and the directory the executable is in | 18667 | # FIXME: first we should search . and the directory the executable is in |
18677 | shlibpath_var=PATH | 18668 | shlibpath_var=PATH |
18678 | ;; | 18669 | ;; |
18679 | @@ -10644,7 +11299,7 @@ haiku*) | 18670 | @@ -10643,7 +11298,7 @@ haiku*) |
18680 | soname_spec='${libname}${release}${shared_ext}$major' | 18671 | soname_spec='${libname}${release}${shared_ext}$major' |
18681 | shlibpath_var=LIBRARY_PATH | 18672 | shlibpath_var=LIBRARY_PATH |
18682 | shlibpath_overrides_runpath=yes | 18673 | shlibpath_overrides_runpath=yes |
@@ -18685,16 +18676,16 @@ Index: git/opcodes/configure | |||
18685 | hardcode_into_libs=yes | 18676 | hardcode_into_libs=yes |
18686 | ;; | 18677 | ;; |
18687 | 18678 | ||
18688 | @@ -11440,7 +12095,7 @@ else | 18679 | @@ -11439,7 +12094,7 @@ else |
18689 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 18680 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
18690 | lt_status=$lt_dlunknown | 18681 | lt_status=$lt_dlunknown |
18691 | cat > conftest.$ac_ext <<_LT_EOF | 18682 | cat > conftest.$ac_ext <<_LT_EOF |
18692 | -#line 11443 "configure" | 18683 | -#line 11442 "configure" |
18693 | +#line $LINENO "configure" | 18684 | +#line $LINENO "configure" |
18694 | #include "confdefs.h" | 18685 | #include "confdefs.h" |
18695 | 18686 | ||
18696 | #if HAVE_DLFCN_H | 18687 | #if HAVE_DLFCN_H |
18697 | @@ -11484,10 +12139,10 @@ else | 18688 | @@ -11483,10 +12138,10 @@ else |
18698 | /* When -fvisbility=hidden is used, assume the code has been annotated | 18689 | /* When -fvisbility=hidden is used, assume the code has been annotated |
18699 | correspondingly for the symbols needed. */ | 18690 | correspondingly for the symbols needed. */ |
18700 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 18691 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -18707,16 +18698,16 @@ Index: git/opcodes/configure | |||
18707 | int main () | 18698 | int main () |
18708 | { | 18699 | { |
18709 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 18700 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
18710 | @@ -11546,7 +12201,7 @@ else | 18701 | @@ -11545,7 +12200,7 @@ else |
18711 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 18702 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
18712 | lt_status=$lt_dlunknown | 18703 | lt_status=$lt_dlunknown |
18713 | cat > conftest.$ac_ext <<_LT_EOF | 18704 | cat > conftest.$ac_ext <<_LT_EOF |
18714 | -#line 11549 "configure" | 18705 | -#line 11548 "configure" |
18715 | +#line $LINENO "configure" | 18706 | +#line $LINENO "configure" |
18716 | #include "confdefs.h" | 18707 | #include "confdefs.h" |
18717 | 18708 | ||
18718 | #if HAVE_DLFCN_H | 18709 | #if HAVE_DLFCN_H |
18719 | @@ -11590,10 +12245,10 @@ else | 18710 | @@ -11589,10 +12244,10 @@ else |
18720 | /* When -fvisbility=hidden is used, assume the code has been annotated | 18711 | /* When -fvisbility=hidden is used, assume the code has been annotated |
18721 | correspondingly for the symbols needed. */ | 18712 | correspondingly for the symbols needed. */ |
18722 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | 18713 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
@@ -18729,7 +18720,7 @@ Index: git/opcodes/configure | |||
18729 | int main () | 18720 | int main () |
18730 | { | 18721 | { |
18731 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 18722 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
18732 | @@ -12831,7 +13486,7 @@ if test "$enable_shared" = "yes"; then | 18723 | @@ -12779,7 +13434,7 @@ if test "$enable_shared" = "yes"; then |
18733 | # since libbfd may not pull in the entirety of libiberty. | 18724 | # since libbfd may not pull in the entirety of libiberty. |
18734 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | 18725 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
18735 | if test -n "$x"; then | 18726 | if test -n "$x"; then |
@@ -18738,7 +18729,7 @@ Index: git/opcodes/configure | |||
18738 | fi | 18729 | fi |
18739 | 18730 | ||
18740 | case "${host}" in | 18731 | case "${host}" in |
18741 | @@ -13807,13 +14462,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 18732 | @@ -13756,13 +14411,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
18742 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 18733 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
18743 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 18734 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
18744 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 18735 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -18759,7 +18750,7 @@ Index: git/opcodes/configure | |||
18759 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 18750 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
18760 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 18751 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
18761 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 18752 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
18762 | @@ -13828,14 +14490,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 18753 | @@ -13777,14 +14439,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
18763 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 18754 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
18764 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 18755 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
18765 | 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"`' | 18756 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -18778,7 +18769,7 @@ Index: git/opcodes/configure | |||
18778 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 18769 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
18779 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 18770 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
18780 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 18771 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
18781 | @@ -13868,12 +14533,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 18772 | @@ -13817,12 +14482,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
18782 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 18773 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
18783 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 18774 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
18784 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 18775 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -18792,7 +18783,7 @@ Index: git/opcodes/configure | |||
18792 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 18783 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
18793 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 18784 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
18794 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 18785 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
18795 | @@ -13928,8 +14593,13 @@ reload_flag \ | 18786 | @@ -13877,8 +14542,13 @@ reload_flag \ |
18796 | OBJDUMP \ | 18787 | OBJDUMP \ |
18797 | deplibs_check_method \ | 18788 | deplibs_check_method \ |
18798 | file_magic_cmd \ | 18789 | file_magic_cmd \ |
@@ -18806,7 +18797,7 @@ Index: git/opcodes/configure | |||
18806 | STRIP \ | 18797 | STRIP \ |
18807 | RANLIB \ | 18798 | RANLIB \ |
18808 | CC \ | 18799 | CC \ |
18809 | @@ -13939,12 +14609,14 @@ lt_cv_sys_global_symbol_pipe \ | 18800 | @@ -13888,12 +14558,14 @@ lt_cv_sys_global_symbol_pipe \ |
18810 | lt_cv_sys_global_symbol_to_cdecl \ | 18801 | lt_cv_sys_global_symbol_to_cdecl \ |
18811 | lt_cv_sys_global_symbol_to_c_name_address \ | 18802 | lt_cv_sys_global_symbol_to_c_name_address \ |
18812 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 18803 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -18822,7 +18813,7 @@ Index: git/opcodes/configure | |||
18822 | DSYMUTIL \ | 18813 | DSYMUTIL \ |
18823 | NMEDIT \ | 18814 | NMEDIT \ |
18824 | LIPO \ | 18815 | LIPO \ |
18825 | @@ -13960,7 +14632,6 @@ no_undefined_flag \ | 18816 | @@ -13909,7 +14581,6 @@ no_undefined_flag \ |
18826 | hardcode_libdir_flag_spec \ | 18817 | hardcode_libdir_flag_spec \ |
18827 | hardcode_libdir_flag_spec_ld \ | 18818 | hardcode_libdir_flag_spec_ld \ |
18828 | hardcode_libdir_separator \ | 18819 | hardcode_libdir_separator \ |
@@ -18830,7 +18821,7 @@ Index: git/opcodes/configure | |||
18830 | exclude_expsyms \ | 18821 | exclude_expsyms \ |
18831 | include_expsyms \ | 18822 | include_expsyms \ |
18832 | file_list_spec \ | 18823 | file_list_spec \ |
18833 | @@ -13996,6 +14667,7 @@ module_cmds \ | 18824 | @@ -13945,6 +14616,7 @@ module_cmds \ |
18834 | module_expsym_cmds \ | 18825 | module_expsym_cmds \ |
18835 | export_symbols_cmds \ | 18826 | export_symbols_cmds \ |
18836 | prelink_cmds \ | 18827 | prelink_cmds \ |
@@ -18838,7 +18829,7 @@ Index: git/opcodes/configure | |||
18838 | postinstall_cmds \ | 18829 | postinstall_cmds \ |
18839 | postuninstall_cmds \ | 18830 | postuninstall_cmds \ |
18840 | finish_cmds \ | 18831 | finish_cmds \ |
18841 | @@ -14761,7 +15433,8 @@ $as_echo X"$file" | | 18832 | @@ -14710,7 +15382,8 @@ $as_echo X"$file" | |
18842 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 18833 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
18843 | # | 18834 | # |
18844 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 18835 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -18848,7 +18839,7 @@ Index: git/opcodes/configure | |||
18848 | # Written by Gordon Matzigkeit, 1996 | 18839 | # Written by Gordon Matzigkeit, 1996 |
18849 | # | 18840 | # |
18850 | # This file is part of GNU Libtool. | 18841 | # This file is part of GNU Libtool. |
18851 | @@ -14864,19 +15537,42 @@ SP2NL=$lt_lt_SP2NL | 18842 | @@ -14813,19 +15486,42 @@ SP2NL=$lt_lt_SP2NL |
18852 | # turn newlines into spaces. | 18843 | # turn newlines into spaces. |
18853 | NL2SP=$lt_lt_NL2SP | 18844 | NL2SP=$lt_lt_NL2SP |
18854 | 18845 | ||
@@ -18892,7 +18883,7 @@ Index: git/opcodes/configure | |||
18892 | # A symbol stripping program. | 18883 | # A symbol stripping program. |
18893 | STRIP=$lt_STRIP | 18884 | STRIP=$lt_STRIP |
18894 | 18885 | ||
18895 | @@ -14906,6 +15602,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 18886 | @@ -14855,6 +15551,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
18896 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 18887 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
18897 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 18888 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
18898 | 18889 | ||
@@ -18905,7 +18896,7 @@ Index: git/opcodes/configure | |||
18905 | # The name of the directory that contains temporary libtool files. | 18896 | # The name of the directory that contains temporary libtool files. |
18906 | objdir=$objdir | 18897 | objdir=$objdir |
18907 | 18898 | ||
18908 | @@ -14915,6 +15617,9 @@ MAGIC_CMD=$MAGIC_CMD | 18899 | @@ -14864,6 +15566,9 @@ MAGIC_CMD=$MAGIC_CMD |
18909 | # Must we lock files when doing compilation? | 18900 | # Must we lock files when doing compilation? |
18910 | need_locks=$lt_need_locks | 18901 | need_locks=$lt_need_locks |
18911 | 18902 | ||
@@ -18915,7 +18906,7 @@ Index: git/opcodes/configure | |||
18915 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 18906 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
18916 | DSYMUTIL=$lt_DSYMUTIL | 18907 | DSYMUTIL=$lt_DSYMUTIL |
18917 | 18908 | ||
18918 | @@ -15029,12 +15734,12 @@ with_gcc=$GCC | 18909 | @@ -14978,12 +15683,12 @@ with_gcc=$GCC |
18919 | # Compiler flag to turn off builtin functions. | 18910 | # Compiler flag to turn off builtin functions. |
18920 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 18911 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
18921 | 18912 | ||
@@ -18931,7 +18922,7 @@ Index: git/opcodes/configure | |||
18931 | # Compiler flag to prevent dynamic linking. | 18922 | # Compiler flag to prevent dynamic linking. |
18932 | link_static_flag=$lt_lt_prog_compiler_static | 18923 | link_static_flag=$lt_lt_prog_compiler_static |
18933 | 18924 | ||
18934 | @@ -15121,9 +15826,6 @@ inherit_rpath=$inherit_rpath | 18925 | @@ -15070,9 +15775,6 @@ inherit_rpath=$inherit_rpath |
18935 | # Whether libtool must link a program against all its dependency libraries. | 18926 | # Whether libtool must link a program against all its dependency libraries. |
18936 | link_all_deplibs=$link_all_deplibs | 18927 | link_all_deplibs=$link_all_deplibs |
18937 | 18928 | ||
@@ -18941,7 +18932,7 @@ Index: git/opcodes/configure | |||
18941 | # Set to "yes" if exported symbols are required. | 18932 | # Set to "yes" if exported symbols are required. |
18942 | always_export_symbols=$always_export_symbols | 18933 | always_export_symbols=$always_export_symbols |
18943 | 18934 | ||
18944 | @@ -15139,6 +15841,9 @@ include_expsyms=$lt_include_expsyms | 18935 | @@ -15088,6 +15790,9 @@ include_expsyms=$lt_include_expsyms |
18945 | # Commands necessary for linking programs (against libraries) with templates. | 18936 | # Commands necessary for linking programs (against libraries) with templates. |
18946 | prelink_cmds=$lt_prelink_cmds | 18937 | prelink_cmds=$lt_prelink_cmds |
18947 | 18938 | ||
@@ -18951,7 +18942,7 @@ Index: git/opcodes/configure | |||
18951 | # Specify filename containing input files. | 18942 | # Specify filename containing input files. |
18952 | file_list_spec=$lt_file_list_spec | 18943 | file_list_spec=$lt_file_list_spec |
18953 | 18944 | ||
18954 | @@ -15171,210 +15876,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 18945 | @@ -15120,210 +15825,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
18955 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 18946 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
18956 | # text mode, it properly converts lines to CR/LF. This bash problem | 18947 | # text mode, it properly converts lines to CR/LF. This bash problem |
18957 | # is reportedly fixed, but why not run on old versions too? | 18948 | # is reportedly fixed, but why not run on old versions too? |
@@ -19153,9 +19144,15 @@ Index: git/opcodes/configure | |||
19153 | -_LT_EOF | 19144 | -_LT_EOF |
19154 | - ;; | 19145 | - ;; |
19155 | - esac | 19146 | - esac |
19147 | - | ||
19148 | - | ||
19149 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
19150 | - || (rm -f "$cfgfile"; exit 1) | ||
19151 | - | ||
19152 | - mv -f "$cfgfile" "$ofile" || | ||
19156 | + sed '$q' "$ltmain" >> "$cfgfile" \ | 19153 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
19157 | + || (rm -f "$cfgfile"; exit 1) | 19154 | + || (rm -f "$cfgfile"; exit 1) |
19158 | 19155 | + | |
19159 | + if test x"$xsi_shell" = xyes; then | 19156 | + if test x"$xsi_shell" = xyes; then |
19160 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | 19157 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
19161 | +func_dirname ()\ | 19158 | +func_dirname ()\ |
@@ -19313,20 +19310,17 @@ Index: git/opcodes/configure | |||
19313 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | 19310 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
19314 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | 19311 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
19315 | +fi | 19312 | +fi |
19316 | 19313 | + | |
19317 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 19314 | + |
19318 | - || (rm -f "$cfgfile"; exit 1) | ||
19319 | |||
19320 | - mv -f "$cfgfile" "$ofile" || | ||
19321 | + mv -f "$cfgfile" "$ofile" || | 19315 | + mv -f "$cfgfile" "$ofile" || |
19322 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 19316 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
19323 | chmod +x "$ofile" | 19317 | chmod +x "$ofile" |
19324 | 19318 | ||
19325 | Index: git/opcodes/configure.ac | 19319 | diff --git a/opcodes/configure.ac b/opcodes/configure.ac |
19326 | =================================================================== | 19320 | index 4eb19005e8..19a57608b9 100644 |
19327 | --- git.orig/opcodes/configure.ac | 19321 | --- a/opcodes/configure.ac |
19328 | +++ git/opcodes/configure.ac | 19322 | +++ b/opcodes/configure.ac |
19329 | @@ -166,7 +166,7 @@ changequote(,)dnl | 19323 | @@ -170,7 +170,7 @@ changequote(,)dnl |
19330 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` | 19324 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
19331 | changequote([,])dnl | 19325 | changequote([,])dnl |
19332 | if test -n "$x"; then | 19326 | if test -n "$x"; then |
@@ -19335,10 +19329,10 @@ Index: git/opcodes/configure.ac | |||
19335 | fi | 19329 | fi |
19336 | 19330 | ||
19337 | case "${host}" in | 19331 | case "${host}" in |
19338 | Index: git/zlib/configure | 19332 | diff --git a/zlib/configure b/zlib/configure |
19339 | =================================================================== | 19333 | index 041cbdbf71..19d605fc85 100755 |
19340 | --- git.orig/zlib/configure | 19334 | --- a/zlib/configure |
19341 | +++ git/zlib/configure | 19335 | +++ b/zlib/configure |
19342 | @@ -646,8 +646,11 @@ OTOOL | 19336 | @@ -646,8 +646,11 @@ OTOOL |
19343 | LIPO | 19337 | LIPO |
19344 | NMEDIT | 19338 | NMEDIT |
@@ -19388,7 +19382,7 @@ Index: git/zlib/configure | |||
19388 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 19382 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
19389 | ECHO='print -r --' | 19383 | ECHO='print -r --' |
19390 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 19384 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
19391 | @@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell u | 19385 | @@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
19392 | # Try some XSI features | 19386 | # Try some XSI features |
19393 | xsi_shell=no | 19387 | xsi_shell=no |
19394 | ( _lt_dummy="a/b/c" | 19388 | ( _lt_dummy="a/b/c" |
@@ -19524,7 +19518,7 @@ Index: git/zlib/configure | |||
19524 | file_magic_cmd=$lt_cv_file_magic_cmd | 19518 | file_magic_cmd=$lt_cv_file_magic_cmd |
19525 | deplibs_check_method=$lt_cv_deplibs_check_method | 19519 | deplibs_check_method=$lt_cv_deplibs_check_method |
19526 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 19520 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
19527 | @@ -5407,9 +5508,163 @@ test -z "$deplibs_check_method" && depli | 19521 | @@ -5405,11 +5506,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
19528 | 19522 | ||
19529 | 19523 | ||
19530 | 19524 | ||
@@ -19538,6 +19532,8 @@ Index: git/zlib/configure | |||
19538 | + | 19532 | + |
19539 | + | 19533 | + |
19540 | + | 19534 | + |
19535 | |||
19536 | |||
19541 | if test -n "$ac_tool_prefix"; then | 19537 | if test -n "$ac_tool_prefix"; then |
19542 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 19538 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
19543 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 | 19539 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
@@ -19738,7 +19734,7 @@ Index: git/zlib/configure | |||
19738 | if test "x$ac_ct_AR" = x; then | 19734 | if test "x$ac_ct_AR" = x; then |
19739 | AR="false" | 19735 | AR="false" |
19740 | else | 19736 | else |
19741 | @@ -5495,12 +5758,10 @@ ac_tool_warned=yes ;; | 19737 | @@ -5495,16 +5758,72 @@ ac_tool_warned=yes ;; |
19742 | esac | 19738 | esac |
19743 | AR=$ac_ct_AR | 19739 | AR=$ac_ct_AR |
19744 | fi | 19740 | fi |
@@ -19750,13 +19746,17 @@ Index: git/zlib/configure | |||
19750 | -test -z "$AR_FLAGS" && AR_FLAGS=cru | 19746 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
19751 | +: ${AR=ar} | 19747 | +: ${AR=ar} |
19752 | +: ${AR_FLAGS=cru} | 19748 | +: ${AR_FLAGS=cru} |
19753 | 19749 | + | |
19754 | 19750 | + | |
19755 | 19751 | + | |
19756 | @@ -5512,6 +5773,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru | 19752 | + |
19757 | 19753 | + | |
19758 | 19754 | + | |
19759 | 19755 | + | |
19756 | + | ||
19757 | + | ||
19758 | + | ||
19759 | + | ||
19760 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | 19760 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
19761 | +$as_echo_n "checking for archiver @FILE support... " >&6; } | 19761 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
19762 | +if ${lt_cv_ar_at_file+:} false; then : | 19762 | +if ${lt_cv_ar_at_file+:} false; then : |
@@ -19769,7 +19769,7 @@ Index: git/zlib/configure | |||
19769 | +int | 19769 | +int |
19770 | +main () | 19770 | +main () |
19771 | +{ | 19771 | +{ |
19772 | + | 19772 | |
19773 | + ; | 19773 | + ; |
19774 | + return 0; | 19774 | + return 0; |
19775 | +} | 19775 | +} |
@@ -19795,29 +19795,22 @@ Index: git/zlib/configure | |||
19795 | + fi | 19795 | + fi |
19796 | + fi | 19796 | + fi |
19797 | + rm -f conftest.* libconftest.a | 19797 | + rm -f conftest.* libconftest.a |
19798 | + | 19798 | |
19799 | +fi | 19799 | +fi |
19800 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | 19800 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
19801 | + | 19801 | |
19802 | +fi | 19802 | +fi |
19803 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | 19803 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
19804 | +$as_echo "$lt_cv_ar_at_file" >&6; } | 19804 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
19805 | + | 19805 | |
19806 | +if test "x$lt_cv_ar_at_file" = xno; then | 19806 | +if test "x$lt_cv_ar_at_file" = xno; then |
19807 | + archiver_list_spec= | 19807 | + archiver_list_spec= |
19808 | +else | 19808 | +else |
19809 | + archiver_list_spec=$lt_cv_ar_at_file | 19809 | + archiver_list_spec=$lt_cv_ar_at_file |
19810 | +fi | 19810 | +fi |
19811 | + | 19811 | |
19812 | + | 19812 | |
19813 | + | 19813 | |
19814 | + | ||
19815 | + | ||
19816 | + | ||
19817 | + | ||
19818 | if test -n "$ac_tool_prefix"; then | ||
19819 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | ||
19820 | set dummy ${ac_tool_prefix}strip; ac_word=$2 | ||
19821 | @@ -5846,8 +6165,8 @@ esac | 19814 | @@ -5846,8 +6165,8 @@ esac |
19822 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 19815 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
19823 | 19816 | ||
@@ -19865,7 +19858,7 @@ Index: git/zlib/configure | |||
19865 | const char *name; | 19858 | const char *name; |
19866 | void *address; | 19859 | void *address; |
19867 | } | 19860 | } |
19868 | @@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() | 19861 | @@ -5961,8 +6293,8 @@ static const void *lt_preloaded_setup() { |
19869 | _LT_EOF | 19862 | _LT_EOF |
19870 | # Now try linking the two files. | 19863 | # Now try linking the two files. |
19871 | mv conftest.$ac_objext conftstm.$ac_objext | 19864 | mv conftest.$ac_objext conftstm.$ac_objext |
@@ -19887,7 +19880,7 @@ Index: git/zlib/configure | |||
19887 | else | 19880 | else |
19888 | echo "cannot find nm_test_func in $nlist" >&5 | 19881 | echo "cannot find nm_test_func in $nlist" >&5 |
19889 | fi | 19882 | fi |
19890 | @@ -6010,6 +6342,18 @@ else | 19883 | @@ -6010,6 +6342,19 @@ else |
19891 | $as_echo "ok" >&6; } | 19884 | $as_echo "ok" >&6; } |
19892 | fi | 19885 | fi |
19893 | 19886 | ||
@@ -19903,13 +19896,17 @@ Index: git/zlib/configure | |||
19903 | + | 19896 | + |
19904 | + | 19897 | + |
19905 | + | 19898 | + |
19899 | + | ||
19906 | 19900 | ||
19907 | 19901 | ||
19908 | 19902 | ||
19909 | @@ -6031,6 +6375,42 @@ fi | 19903 | @@ -6027,6 +6372,41 @@ fi |
19910 | 19904 | ||
19911 | 19905 | ||
19912 | 19906 | ||
19907 | + | ||
19908 | + | ||
19909 | + | ||
19913 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | 19910 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
19914 | +$as_echo_n "checking for sysroot... " >&6; } | 19911 | +$as_echo_n "checking for sysroot... " >&6; } |
19915 | + | 19912 | + |
@@ -19942,13 +19939,9 @@ Index: git/zlib/configure | |||
19942 | + | 19939 | + |
19943 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | 19940 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
19944 | +$as_echo "${lt_sysroot:-no}" >&6; } | 19941 | +$as_echo "${lt_sysroot:-no}" >&6; } |
19945 | + | ||
19946 | + | ||
19947 | + | ||
19948 | + | ||
19949 | 19942 | ||
19950 | # Check whether --enable-libtool-lock was given. | 19943 | |
19951 | if test "${enable_libtool_lock+set}" = set; then : | 19944 | |
19952 | @@ -6241,6 +6621,123 @@ esac | 19945 | @@ -6241,6 +6621,123 @@ esac |
19953 | 19946 | ||
19954 | need_locks="$enable_libtool_lock" | 19947 | need_locks="$enable_libtool_lock" |
@@ -20110,7 +20103,7 @@ Index: git/zlib/configure | |||
20110 | 20103 | ||
20111 | if test "$GCC" = yes; then | 20104 | if test "$GCC" = yes; then |
20112 | lt_prog_compiler_wl='-Wl,' | 20105 | lt_prog_compiler_wl='-Wl,' |
20113 | @@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler optio | 20106 | @@ -7823,6 +8321,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
20114 | lt_prog_compiler_pic='--shared' | 20107 | lt_prog_compiler_pic='--shared' |
20115 | lt_prog_compiler_static='--static' | 20108 | lt_prog_compiler_static='--static' |
20116 | ;; | 20109 | ;; |
@@ -20123,7 +20116,7 @@ Index: git/zlib/configure | |||
20123 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | 20116 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
20124 | # Portland Group compilers (*not* the Pentium gcc compiler, | 20117 | # Portland Group compilers (*not* the Pentium gcc compiler, |
20125 | # which looks to be a dead project) | 20118 | # which looks to be a dead project) |
20126 | @@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler optio | 20119 | @@ -7885,7 +8389,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
20127 | lt_prog_compiler_pic='-KPIC' | 20120 | lt_prog_compiler_pic='-KPIC' |
20128 | lt_prog_compiler_static='-Bstatic' | 20121 | lt_prog_compiler_static='-Bstatic' |
20129 | case $cc_basename in | 20122 | case $cc_basename in |
@@ -20284,7 +20277,7 @@ Index: git/zlib/configure | |||
20284 | 20277 | ||
20285 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 20278 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
20286 | 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" | 20279 | 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" |
20287 | @@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libp | 20280 | @@ -8717,7 +9244,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20288 | else | 20281 | else |
20289 | # Determine the default libpath from the value encoded in an | 20282 | # Determine the default libpath from the value encoded in an |
20290 | # empty executable. | 20283 | # empty executable. |
@@ -20342,7 +20335,7 @@ Index: git/zlib/configure | |||
20342 | 20335 | ||
20343 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 20336 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
20344 | # Warning - without using the other run time loading flags, | 20337 | # Warning - without using the other run time loading flags, |
20345 | @@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libp | 20338 | @@ -8793,20 +9333,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20346 | # Microsoft Visual C++. | 20339 | # Microsoft Visual C++. |
20347 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 20340 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
20348 | # no search path for DLLs. | 20341 | # no search path for DLLs. |
@@ -20420,7 +20413,7 @@ Index: git/zlib/configure | |||
20420 | ;; | 20413 | ;; |
20421 | 20414 | ||
20422 | darwin* | rhapsody*) | 20415 | darwin* | rhapsody*) |
20423 | @@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libp | 20416 | @@ -8867,7 +9450,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20424 | 20417 | ||
20425 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 20418 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
20426 | freebsd* | dragonfly*) | 20419 | freebsd* | dragonfly*) |
@@ -20429,7 +20422,7 @@ Index: git/zlib/configure | |||
20429 | hardcode_libdir_flag_spec='-R$libdir' | 20422 | hardcode_libdir_flag_spec='-R$libdir' |
20430 | hardcode_direct=yes | 20423 | hardcode_direct=yes |
20431 | hardcode_shlibpath_var=no | 20424 | hardcode_shlibpath_var=no |
20432 | @@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libp | 20425 | @@ -8875,7 +9458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20433 | 20426 | ||
20434 | hpux9*) | 20427 | hpux9*) |
20435 | if test "$GCC" = yes; then | 20428 | if test "$GCC" = yes; then |
@@ -20438,7 +20431,7 @@ Index: git/zlib/configure | |||
20438 | else | 20431 | else |
20439 | 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' | 20432 | 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' |
20440 | fi | 20433 | fi |
20441 | @@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libp | 20434 | @@ -8891,7 +9474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20442 | 20435 | ||
20443 | hpux10*) | 20436 | hpux10*) |
20444 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 20437 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
@@ -20447,7 +20440,7 @@ Index: git/zlib/configure | |||
20447 | else | 20440 | else |
20448 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 20441 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
20449 | fi | 20442 | fi |
20450 | @@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libp | 20443 | @@ -8915,10 +9498,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
20451 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 20444 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
20452 | ;; | 20445 | ;; |
20453 | ia64*) | 20446 | ia64*) |
@@ -20508,7 +20501,7 @@ Index: git/zlib/configure | |||
20508 | else | 20501 | else |
20509 | 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' | 20502 | 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' |
20510 | 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' | 20503 | 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' |
20511 | @@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_obj | 20504 | @@ -9101,7 +9697,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
20512 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 20505 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
20513 | if test "$GCC" = yes; then | 20506 | if test "$GCC" = yes; then |
20514 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 20507 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
@@ -20517,7 +20510,7 @@ Index: git/zlib/configure | |||
20517 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 20510 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
20518 | else | 20511 | else |
20519 | allow_undefined_flag=' -expect_unresolved \*' | 20512 | allow_undefined_flag=' -expect_unresolved \*' |
20520 | @@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_obj | 20513 | @@ -9120,9 +9716,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
20521 | no_undefined_flag=' -z defs' | 20514 | no_undefined_flag=' -z defs' |
20522 | if test "$GCC" = yes; then | 20515 | if test "$GCC" = yes; then |
20523 | wlarc='${wl}' | 20516 | wlarc='${wl}' |
@@ -20667,7 +20660,7 @@ Index: git/zlib/configure | |||
20667 | int main () | 20660 | int main () |
20668 | { | 20661 | { |
20669 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 20662 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
20670 | @@ -12266,13 +12921,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ | 20663 | @@ -12267,13 +12922,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
20671 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | 20664 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
20672 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | 20665 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
20673 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | 20666 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
@@ -20688,7 +20681,7 @@ Index: git/zlib/configure | |||
20688 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | 20681 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
20689 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | 20682 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
20690 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | 20683 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
20691 | @@ -12287,14 +12949,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l | 20684 | @@ -12288,14 +12950,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
20692 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' | 20685 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
20693 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' | 20686 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
20694 | 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"`' | 20687 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
@@ -20707,7 +20700,7 @@ Index: git/zlib/configure | |||
20707 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | 20700 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
20708 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | 20701 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
20709 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | 20702 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
20710 | @@ -12327,12 +12992,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod | 20703 | @@ -12328,12 +12993,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
20711 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | 20704 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
20712 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | 20705 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
20713 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | 20706 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
@@ -20721,7 +20714,7 @@ Index: git/zlib/configure | |||
20721 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | 20714 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
20722 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | 20715 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
20723 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | 20716 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
20724 | @@ -12387,8 +13052,13 @@ reload_flag \ | 20717 | @@ -12388,8 +13053,13 @@ reload_flag \ |
20725 | OBJDUMP \ | 20718 | OBJDUMP \ |
20726 | deplibs_check_method \ | 20719 | deplibs_check_method \ |
20727 | file_magic_cmd \ | 20720 | file_magic_cmd \ |
@@ -20735,7 +20728,7 @@ Index: git/zlib/configure | |||
20735 | STRIP \ | 20728 | STRIP \ |
20736 | RANLIB \ | 20729 | RANLIB \ |
20737 | CC \ | 20730 | CC \ |
20738 | @@ -12398,12 +13068,14 @@ lt_cv_sys_global_symbol_pipe \ | 20731 | @@ -12399,12 +13069,14 @@ lt_cv_sys_global_symbol_pipe \ |
20739 | lt_cv_sys_global_symbol_to_cdecl \ | 20732 | lt_cv_sys_global_symbol_to_cdecl \ |
20740 | lt_cv_sys_global_symbol_to_c_name_address \ | 20733 | lt_cv_sys_global_symbol_to_c_name_address \ |
20741 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 20734 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
@@ -20751,7 +20744,7 @@ Index: git/zlib/configure | |||
20751 | DSYMUTIL \ | 20744 | DSYMUTIL \ |
20752 | NMEDIT \ | 20745 | NMEDIT \ |
20753 | LIPO \ | 20746 | LIPO \ |
20754 | @@ -12419,7 +13091,6 @@ no_undefined_flag \ | 20747 | @@ -12420,7 +13092,6 @@ no_undefined_flag \ |
20755 | hardcode_libdir_flag_spec \ | 20748 | hardcode_libdir_flag_spec \ |
20756 | hardcode_libdir_flag_spec_ld \ | 20749 | hardcode_libdir_flag_spec_ld \ |
20757 | hardcode_libdir_separator \ | 20750 | hardcode_libdir_separator \ |
@@ -20759,7 +20752,7 @@ Index: git/zlib/configure | |||
20759 | exclude_expsyms \ | 20752 | exclude_expsyms \ |
20760 | include_expsyms \ | 20753 | include_expsyms \ |
20761 | file_list_spec \ | 20754 | file_list_spec \ |
20762 | @@ -12455,6 +13126,7 @@ module_cmds \ | 20755 | @@ -12456,6 +13127,7 @@ module_cmds \ |
20763 | module_expsym_cmds \ | 20756 | module_expsym_cmds \ |
20764 | export_symbols_cmds \ | 20757 | export_symbols_cmds \ |
20765 | prelink_cmds \ | 20758 | prelink_cmds \ |
@@ -20767,7 +20760,7 @@ Index: git/zlib/configure | |||
20767 | postinstall_cmds \ | 20760 | postinstall_cmds \ |
20768 | postuninstall_cmds \ | 20761 | postuninstall_cmds \ |
20769 | finish_cmds \ | 20762 | finish_cmds \ |
20770 | @@ -13053,7 +13725,8 @@ $as_echo X"$file" | | 20763 | @@ -13054,7 +13726,8 @@ $as_echo X"$file" | |
20771 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 20764 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
20772 | # | 20765 | # |
20773 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 20766 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
@@ -20777,7 +20770,7 @@ Index: git/zlib/configure | |||
20777 | # Written by Gordon Matzigkeit, 1996 | 20770 | # Written by Gordon Matzigkeit, 1996 |
20778 | # | 20771 | # |
20779 | # This file is part of GNU Libtool. | 20772 | # This file is part of GNU Libtool. |
20780 | @@ -13156,19 +13829,42 @@ SP2NL=$lt_lt_SP2NL | 20773 | @@ -13157,19 +13830,42 @@ SP2NL=$lt_lt_SP2NL |
20781 | # turn newlines into spaces. | 20774 | # turn newlines into spaces. |
20782 | NL2SP=$lt_lt_NL2SP | 20775 | NL2SP=$lt_lt_NL2SP |
20783 | 20776 | ||
@@ -20821,7 +20814,7 @@ Index: git/zlib/configure | |||
20821 | # A symbol stripping program. | 20814 | # A symbol stripping program. |
20822 | STRIP=$lt_STRIP | 20815 | STRIP=$lt_STRIP |
20823 | 20816 | ||
20824 | @@ -13198,6 +13894,12 @@ global_symbol_to_c_name_address=$lt_lt_c | 20817 | @@ -13199,6 +13895,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
20825 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 20818 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
20826 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 20819 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
20827 | 20820 | ||
@@ -20834,7 +20827,7 @@ Index: git/zlib/configure | |||
20834 | # The name of the directory that contains temporary libtool files. | 20827 | # The name of the directory that contains temporary libtool files. |
20835 | objdir=$objdir | 20828 | objdir=$objdir |
20836 | 20829 | ||
20837 | @@ -13207,6 +13909,9 @@ MAGIC_CMD=$MAGIC_CMD | 20830 | @@ -13208,6 +13910,9 @@ MAGIC_CMD=$MAGIC_CMD |
20838 | # Must we lock files when doing compilation? | 20831 | # Must we lock files when doing compilation? |
20839 | need_locks=$lt_need_locks | 20832 | need_locks=$lt_need_locks |
20840 | 20833 | ||
@@ -20844,7 +20837,7 @@ Index: git/zlib/configure | |||
20844 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 20837 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
20845 | DSYMUTIL=$lt_DSYMUTIL | 20838 | DSYMUTIL=$lt_DSYMUTIL |
20846 | 20839 | ||
20847 | @@ -13321,12 +14026,12 @@ with_gcc=$GCC | 20840 | @@ -13322,12 +14027,12 @@ with_gcc=$GCC |
20848 | # Compiler flag to turn off builtin functions. | 20841 | # Compiler flag to turn off builtin functions. |
20849 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 20842 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
20850 | 20843 | ||
@@ -20860,7 +20853,7 @@ Index: git/zlib/configure | |||
20860 | # Compiler flag to prevent dynamic linking. | 20853 | # Compiler flag to prevent dynamic linking. |
20861 | link_static_flag=$lt_lt_prog_compiler_static | 20854 | link_static_flag=$lt_lt_prog_compiler_static |
20862 | 20855 | ||
20863 | @@ -13413,9 +14118,6 @@ inherit_rpath=$inherit_rpath | 20856 | @@ -13414,9 +14119,6 @@ inherit_rpath=$inherit_rpath |
20864 | # Whether libtool must link a program against all its dependency libraries. | 20857 | # Whether libtool must link a program against all its dependency libraries. |
20865 | link_all_deplibs=$link_all_deplibs | 20858 | link_all_deplibs=$link_all_deplibs |
20866 | 20859 | ||
@@ -20870,7 +20863,7 @@ Index: git/zlib/configure | |||
20870 | # Set to "yes" if exported symbols are required. | 20863 | # Set to "yes" if exported symbols are required. |
20871 | always_export_symbols=$always_export_symbols | 20864 | always_export_symbols=$always_export_symbols |
20872 | 20865 | ||
20873 | @@ -13431,6 +14133,9 @@ include_expsyms=$lt_include_expsyms | 20866 | @@ -13432,6 +14134,9 @@ include_expsyms=$lt_include_expsyms |
20874 | # Commands necessary for linking programs (against libraries) with templates. | 20867 | # Commands necessary for linking programs (against libraries) with templates. |
20875 | prelink_cmds=$lt_prelink_cmds | 20868 | prelink_cmds=$lt_prelink_cmds |
20876 | 20869 | ||
@@ -20880,7 +20873,7 @@ Index: git/zlib/configure | |||
20880 | # Specify filename containing input files. | 20873 | # Specify filename containing input files. |
20881 | file_list_spec=$lt_file_list_spec | 20874 | file_list_spec=$lt_file_list_spec |
20882 | 20875 | ||
20883 | @@ -13463,210 +14168,169 @@ ltmain="$ac_aux_dir/ltmain.sh" | 20876 | @@ -13464,210 +14169,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
20884 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 20877 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
20885 | # text mode, it properly converts lines to CR/LF. This bash problem | 20878 | # text mode, it properly converts lines to CR/LF. This bash problem |
20886 | # is reportedly fixed, but why not run on old versions too? | 20879 | # is reportedly fixed, but why not run on old versions too? |
@@ -21082,9 +21075,15 @@ Index: git/zlib/configure | |||
21082 | -_LT_EOF | 21075 | -_LT_EOF |
21083 | - ;; | 21076 | - ;; |
21084 | - esac | 21077 | - esac |
21078 | - | ||
21079 | - | ||
21080 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
21081 | - || (rm -f "$cfgfile"; exit 1) | ||
21082 | - | ||
21083 | - mv -f "$cfgfile" "$ofile" || | ||
21085 | + sed '$q' "$ltmain" >> "$cfgfile" \ | 21084 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
21086 | + || (rm -f "$cfgfile"; exit 1) | 21085 | + || (rm -f "$cfgfile"; exit 1) |
21087 | 21086 | + | |
21088 | + if test x"$xsi_shell" = xyes; then | 21087 | + if test x"$xsi_shell" = xyes; then |
21089 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ | 21088 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
21090 | +func_dirname ()\ | 21089 | +func_dirname ()\ |
@@ -21242,12 +21241,12 @@ Index: git/zlib/configure | |||
21242 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 | 21241 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
21243 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} | 21242 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
21244 | +fi | 21243 | +fi |
21245 | 21244 | + | |
21246 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | 21245 | + |
21247 | - || (rm -f "$cfgfile"; exit 1) | ||
21248 | |||
21249 | - mv -f "$cfgfile" "$ofile" || | ||
21250 | + mv -f "$cfgfile" "$ofile" || | 21246 | + mv -f "$cfgfile" "$ofile" || |
21251 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 21247 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
21252 | chmod +x "$ofile" | 21248 | chmod +x "$ofile" |
21253 | 21249 | ||
21250 | -- | ||
21251 | 2.20.1 | ||
21252 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch deleted file mode 100644 index 18ef6bb7ff..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From ef50d848d983f81e4a86dd3eef4933e3579336f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 2 Mar 2015 01:37:10 +0000 | ||
4 | Subject: [PATCH 07/15] Add the armv5e architecture to binutils | ||
5 | |||
6 | Binutils has a comment that indicates it is supposed to match gcc for | ||
7 | all of the support "-march=" settings, but it was lacking the armv5e setting. | ||
8 | This was a simple way to add it, as thumb instructions shouldn't be generated | ||
9 | by the compiler anyway. | ||
10 | |||
11 | Upstream-Status: Denied | ||
12 | Upstream maintainer indicated that we should not be using armv5e, even | ||
13 | though it is a legal archicture defined by our gcc. | ||
14 | |||
15 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | gas/config/tc-arm.c | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c | ||
22 | index 3f5384e1c7..8d5bc145af 100644 | ||
23 | --- a/gas/config/tc-arm.c | ||
24 | +++ b/gas/config/tc-arm.c | ||
25 | @@ -26294,6 +26294,7 @@ static const struct arm_arch_option_table arm_archs[] = | ||
26 | ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA), | ||
27 | ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA), | ||
28 | ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP), | ||
29 | + ARM_ARCH_OPT ("armv5e", ARM_ARCH_V5TE, FPU_ARCH_VFP), | ||
30 | ARM_ARCH_OPT ("armv5t", ARM_ARCH_V5T, FPU_ARCH_VFP), | ||
31 | ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP), | ||
32 | ARM_ARCH_OPT ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP), | ||
33 | -- | ||
34 | 2.18.0 | ||
35 | |||
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 6999ed9c94..a2c6312d0a 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,7 +1,7 @@ | |||
1 | From ca25d55cef8398bad508c2b2be29aea5aa3c4d26 Mon Sep 17 00:00:00 2001 | 1 | From 8cb013106c379e81fe40cfdf486d9805c9e276ad 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 08/15] don't let the distro compiler point to the wrong | 4 | Subject: [PATCH 07/15] don't let the distro compiler point to the wrong |
5 | installation 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. |
@@ -17,7 +17,7 @@ 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 ed1b334c36..d4ffd8b57b 100644 | 20 | index 0be45b4ae8..4817616bb2 100644 |
21 | --- a/libiberty/Makefile.in | 21 | --- a/libiberty/Makefile.in |
22 | +++ b/libiberty/Makefile.in | 22 | +++ b/libiberty/Makefile.in |
23 | @@ -364,7 +364,8 @@ install-strip: install | 23 | @@ -364,7 +364,8 @@ install-strip: install |
@@ -31,5 +31,5 @@ index ed1b334c36..d4ffd8b57b 100644 | |||
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 | -- | 33 | -- |
34 | 2.18.0 | 34 | 2.20.1 |
35 | 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 9a9e319621..9727821b1f 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 a3667059fc0d52d890b505bed0e5050ea3d7002e Mon Sep 17 00:00:00 2001 | 1 | From 98f68c0892ba4bbd53b0a0a4cbbdf0b7197e0320 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 09/15] warn for uses of system directories when cross linking | 4 | Subject: [PATCH 08/15] 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 | ||
@@ -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 2b291f0da8..facc386563 100755 | 80 | index 43c391c2b3..ff9f6b3c02 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 |
@@ -118,7 +118,7 @@ index 2b291f0da8..facc386563 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 d10c553650..9f1b57b120 100644 | 121 | index d335f21091..7f692d9387 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 d10c553650..9f1b57b120 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 ba914b921e..9df17dab6c 100644 | 142 | index b97d977f37..f3bbd2d55d 100644 |
143 | --- a/ld/ld.h | 143 | --- a/ld/ld.h |
144 | +++ b/ld/ld.h | 144 | +++ b/ld/ld.h |
145 | @@ -180,6 +180,14 @@ typedef struct | 145 | @@ -180,6 +180,14 @@ typedef struct |
@@ -158,10 +158,10 @@ index ba914b921e..9df17dab6c 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 b9fe2324da..43486605e0 100644 | 161 | index 5179af3e0e..f78bf74682 100644 |
162 | --- a/ld/ld.texi | 162 | --- a/ld/ld.texi |
163 | +++ b/ld/ld.texi | 163 | +++ b/ld/ld.texi |
164 | @@ -2479,6 +2479,18 @@ string identifying the original linked file does not change. | 164 | @@ -2524,6 +2524,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 b9fe2324da..43486605e0 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 a72ff13526..dc5148f748 100644 | 184 | index fcadc08c73..63e295ce8a 100644 |
185 | --- a/ld/ldfile.c | 185 | --- a/ld/ldfile.c |
186 | +++ b/ld/ldfile.c | 186 | +++ b/ld/ldfile.c |
187 | @@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) | 187 | @@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) |
@@ -209,7 +209,7 @@ index a72ff13526..dc5148f748 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 04d6fd5f96..d7df005bb2 100644 | 212 | index 32853debe4..8135361c49 100644 |
213 | --- a/ld/ldlex.h | 213 | --- a/ld/ldlex.h |
214 | +++ b/ld/ldlex.h | 214 | +++ b/ld/ldlex.h |
215 | @@ -148,6 +148,8 @@ enum option_values | 215 | @@ -148,6 +148,8 @@ enum option_values |
@@ -222,10 +222,10 @@ index 04d6fd5f96..d7df005bb2 100644 | |||
222 | 222 | ||
223 | /* The initial parser states. */ | 223 | /* The initial parser states. */ |
224 | diff --git a/ld/ldmain.c b/ld/ldmain.c | 224 | diff --git a/ld/ldmain.c b/ld/ldmain.c |
225 | index f31eeb29c3..25f8497888 100644 | 225 | index 77cdbd0dd2..725512f126 100644 |
226 | --- a/ld/ldmain.c | 226 | --- a/ld/ldmain.c |
227 | +++ b/ld/ldmain.c | 227 | +++ b/ld/ldmain.c |
228 | @@ -268,6 +268,8 @@ main (int argc, char **argv) | 228 | @@ -269,6 +269,8 @@ main (int argc, char **argv) |
229 | command_line.warn_mismatch = TRUE; | 229 | command_line.warn_mismatch = TRUE; |
230 | command_line.warn_search_mismatch = TRUE; | 230 | command_line.warn_search_mismatch = TRUE; |
231 | command_line.check_section_addresses = -1; | 231 | command_line.check_section_addresses = -1; |
@@ -235,7 +235,7 @@ index f31eeb29c3..25f8497888 100644 | |||
235 | /* We initialize DEMANGLING based on the environment variable | 235 | /* We initialize DEMANGLING based on the environment variable |
236 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the | 236 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the |
237 | diff --git a/ld/lexsup.c b/ld/lexsup.c | 237 | diff --git a/ld/lexsup.c b/ld/lexsup.c |
238 | index 86a033a383..4a40d48020 100644 | 238 | index 88e85c73f4..eed1b71456 100644 |
239 | --- a/ld/lexsup.c | 239 | --- a/ld/lexsup.c |
240 | +++ b/ld/lexsup.c | 240 | +++ b/ld/lexsup.c |
241 | @@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = | 241 | @@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = |
@@ -269,5 +269,5 @@ index 86a033a383..4a40d48020 100644 | |||
269 | } | 269 | } |
270 | 270 | ||
271 | -- | 271 | -- |
272 | 2.18.0 | 272 | 2.20.1 |
273 | 273 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch index 8fc00ff456..b6b1e7a672 100644 --- a/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch +++ b/meta/recipes-devtools/binutils/binutils/0009-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9e1d8f9a657a8bd48048c2ea6407cf60b723bd68 Mon Sep 17 00:00:00 2001 | 1 | From 2cd5613a86f8772f9d7f188532718363668ed99d 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 10/15] Fix rpath in libtool when sysroot is enabled | 4 | Subject: [PATCH 09/15] 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 |
@@ -48,5 +48,5 @@ index 70e856e065..11ee684ccc 100644 | |||
48 | if test -z "$hardcode_libdirs"; then | 48 | if test -z "$hardcode_libdirs"; then |
49 | hardcode_libdirs="$libdir" | 49 | hardcode_libdirs="$libdir" |
50 | -- | 50 | -- |
51 | 2.18.0 | 51 | 2.20.1 |
52 | 52 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch index 2e93b129dd..ba5e4c2ce5 100644 --- a/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch +++ b/meta/recipes-devtools/binutils/binutils/0010-Change-default-emulation-for-mips64-linux.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2d2e2fcdd9646849716ee99d8d3e5d72ae8889bc Mon Sep 17 00:00:00 2001 | 1 | From d540e95d05cd7c4b8924ac7b257c14ae0105d0ab 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 11/15] Change default emulation for mips64*-*-linux | 4 | Subject: [PATCH 10/15] 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 6391f35684..8a11c0680a 100644 | 17 | index 0e1ddb659c..cc65547588 100644 |
18 | --- a/bfd/config.bfd | 18 | --- a/bfd/config.bfd |
19 | +++ b/bfd/config.bfd | 19 | +++ b/bfd/config.bfd |
20 | @@ -913,12 +913,12 @@ case "${targ}" in | 20 | @@ -919,12 +919,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 6391f35684..8a11c0680a 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 fad8b2e5c8..7fb2168503 100644 | 38 | index beba17ef51..917be6f8eb 100644 |
39 | --- a/ld/configure.tgt | 39 | --- a/ld/configure.tgt |
40 | +++ b/ld/configure.tgt | 40 | +++ b/ld/configure.tgt |
41 | @@ -464,11 +464,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks | 41 | @@ -468,11 +468,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmipvxworks |
42 | mips*-*-vxworks*) targ_emul=elf32ebmipvxworks | 42 | mips*-*-vxworks*) targ_emul=elf32ebmipvxworks |
43 | targ_extra_emuls="elf32elmipvxworks" ;; | 43 | targ_extra_emuls="elf32elmipvxworks" ;; |
44 | mips*-*-windiss) targ_emul=elf32mipswindiss ;; | 44 | mips*-*-windiss) targ_emul=elf32mipswindiss ;; |
@@ -55,5 +55,5 @@ index fad8b2e5c8..7fb2168503 100644 | |||
55 | mips*el-*-linux-*) targ_emul=elf32ltsmip | 55 | mips*el-*-linux-*) targ_emul=elf32ltsmip |
56 | targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" | 56 | targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" |
57 | -- | 57 | -- |
58 | 2.18.0 | 58 | 2.20.1 |
59 | 59 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch b/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch index 4d64bd53f8..20c5ed6308 100644 --- a/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch +++ b/meta/recipes-devtools/binutils/binutils/0011-Add-support-for-Netlogic-XLP.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 96ff7570c29f792c466a933529fefda9b8e97994 Mon Sep 17 00:00:00 2001 | 1 | From e4a0cd30c7e9334ed507c93014a8b2d1315ff937 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 12/15] Add support for Netlogic XLP | 4 | Subject: [PATCH 11/15] 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 | ||
@@ -34,10 +34,10 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | |||
34 | 14 files changed, 61 insertions(+), 21 deletions(-) | 34 | 14 files changed, 61 insertions(+), 21 deletions(-) |
35 | 35 | ||
36 | diff --git a/bfd/aoutx.h b/bfd/aoutx.h | 36 | diff --git a/bfd/aoutx.h b/bfd/aoutx.h |
37 | index 023843b0be..46246fec2d 100644 | 37 | index e5d8dcf390..2cc74a2d61 100644 |
38 | --- a/bfd/aoutx.h | 38 | --- a/bfd/aoutx.h |
39 | +++ b/bfd/aoutx.h | 39 | +++ b/bfd/aoutx.h |
40 | @@ -798,6 +798,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, | 40 | @@ -799,6 +799,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch, |
41 | case bfd_mach_mipsisa64r6: | 41 | case bfd_mach_mipsisa64r6: |
42 | case bfd_mach_mips_sb1: | 42 | case bfd_mach_mips_sb1: |
43 | case bfd_mach_mips_xlr: | 43 | case bfd_mach_mips_xlr: |
@@ -46,10 +46,10 @@ index 023843b0be..46246fec2d 100644 | |||
46 | arch_flags = M_MIPS2; | 46 | arch_flags = M_MIPS2; |
47 | break; | 47 | break; |
48 | diff --git a/bfd/archures.c b/bfd/archures.c | 48 | diff --git a/bfd/archures.c b/bfd/archures.c |
49 | index 282e983086..b38b05d132 100644 | 49 | index 647cf0d8d4..7e1d0c810f 100644 |
50 | --- a/bfd/archures.c | 50 | --- a/bfd/archures.c |
51 | +++ b/bfd/archures.c | 51 | +++ b/bfd/archures.c |
52 | @@ -183,6 +183,7 @@ DESCRIPTION | 52 | @@ -185,6 +185,7 @@ DESCRIPTION |
53 | .#define bfd_mach_mips_octeon3 6503 | 53 | .#define bfd_mach_mips_octeon3 6503 |
54 | .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR'. *} | 54 | .#define bfd_mach_mips_xlr 887682 {* decimal 'XLR'. *} |
55 | .#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2'. *} | 55 | .#define bfd_mach_mips_interaptiv_mr2 736550 {* decimal 'IA2'. *} |
@@ -58,10 +58,10 @@ index 282e983086..b38b05d132 100644 | |||
58 | .#define bfd_mach_mipsisa32r2 33 | 58 | .#define bfd_mach_mipsisa32r2 33 |
59 | .#define bfd_mach_mipsisa32r3 34 | 59 | .#define bfd_mach_mipsisa32r3 34 |
60 | diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h | 60 | diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h |
61 | index 93745bd3fd..326e9e49ed 100644 | 61 | index e25da50aaf..e251d7e7aa 100644 |
62 | --- a/bfd/bfd-in2.h | 62 | --- a/bfd/bfd-in2.h |
63 | +++ b/bfd/bfd-in2.h | 63 | +++ b/bfd/bfd-in2.h |
64 | @@ -2054,6 +2054,7 @@ enum bfd_architecture | 64 | @@ -2084,6 +2084,7 @@ enum bfd_architecture |
65 | #define bfd_mach_mips_octeon3 6503 | 65 | #define bfd_mach_mips_octeon3 6503 |
66 | #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ | 66 | #define bfd_mach_mips_xlr 887682 /* decimal 'XLR'. */ |
67 | #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ | 67 | #define bfd_mach_mips_interaptiv_mr2 736550 /* decimal 'IA2'. */ |
@@ -70,10 +70,10 @@ index 93745bd3fd..326e9e49ed 100644 | |||
70 | #define bfd_mach_mipsisa32r2 33 | 70 | #define bfd_mach_mipsisa32r2 33 |
71 | #define bfd_mach_mipsisa32r3 34 | 71 | #define bfd_mach_mipsisa32r3 34 |
72 | diff --git a/bfd/config.bfd b/bfd/config.bfd | 72 | diff --git a/bfd/config.bfd b/bfd/config.bfd |
73 | index 8a11c0680a..c882421343 100644 | 73 | index cc65547588..3614ff79d4 100644 |
74 | --- a/bfd/config.bfd | 74 | --- a/bfd/config.bfd |
75 | +++ b/bfd/config.bfd | 75 | +++ b/bfd/config.bfd |
76 | @@ -896,6 +896,11 @@ case "${targ}" in | 76 | @@ -902,6 +902,11 @@ case "${targ}" in |
77 | targ_defvec=mips_elf32_le_vec | 77 | targ_defvec=mips_elf32_le_vec |
78 | targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" | 78 | targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec" |
79 | ;; | 79 | ;; |
@@ -86,10 +86,10 @@ index 8a11c0680a..c882421343 100644 | |||
86 | targ_defvec=mips_elf32_be_vec | 86 | targ_defvec=mips_elf32_be_vec |
87 | targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" | 87 | targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec" |
88 | diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c | 88 | diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c |
89 | index cb50c64371..2b9d1d6ecf 100644 | 89 | index b359491305..61a3e7aaca 100644 |
90 | --- a/bfd/cpu-mips.c | 90 | --- a/bfd/cpu-mips.c |
91 | +++ b/bfd/cpu-mips.c | 91 | +++ b/bfd/cpu-mips.c |
92 | @@ -105,7 +105,8 @@ enum | 92 | @@ -107,7 +107,8 @@ enum |
93 | I_mipsocteon3, | 93 | I_mipsocteon3, |
94 | I_xlr, | 94 | I_xlr, |
95 | I_interaptiv_mr2, | 95 | I_interaptiv_mr2, |
@@ -99,7 +99,7 @@ index cb50c64371..2b9d1d6ecf 100644 | |||
99 | }; | 99 | }; |
100 | 100 | ||
101 | #define NN(index) (&arch_info_struct[(index) + 1]) | 101 | #define NN(index) (&arch_info_struct[(index) + 1]) |
102 | @@ -158,7 +159,8 @@ static const bfd_arch_info_type arch_info_struct[] = | 102 | @@ -162,7 +163,8 @@ static const bfd_arch_info_type arch_info_struct[] = |
103 | N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), | 103 | N (64, 64, bfd_mach_mips_xlr, "mips:xlr", FALSE, NN(I_xlr)), |
104 | N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, | 104 | N (32, 32, bfd_mach_mips_interaptiv_mr2, "mips:interaptiv-mr2", FALSE, |
105 | NN(I_interaptiv_mr2)), | 105 | NN(I_interaptiv_mr2)), |
@@ -110,10 +110,10 @@ index cb50c64371..2b9d1d6ecf 100644 | |||
110 | 110 | ||
111 | /* The default architecture is mips:3000, but with a machine number of | 111 | /* The default architecture is mips:3000, but with a machine number of |
112 | diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c | 112 | diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c |
113 | index d91942301c..5d1bd3f0b1 100644 | 113 | index 5998bc43a8..0d5795222b 100644 |
114 | --- a/bfd/elfxx-mips.c | 114 | --- a/bfd/elfxx-mips.c |
115 | +++ b/bfd/elfxx-mips.c | 115 | +++ b/bfd/elfxx-mips.c |
116 | @@ -6805,6 +6805,9 @@ _bfd_elf_mips_mach (flagword flags) | 116 | @@ -6919,6 +6919,9 @@ _bfd_elf_mips_mach (flagword flags) |
117 | case E_MIPS_MACH_IAMR2: | 117 | case E_MIPS_MACH_IAMR2: |
118 | return bfd_mach_mips_interaptiv_mr2; | 118 | return bfd_mach_mips_interaptiv_mr2; |
119 | 119 | ||
@@ -123,7 +123,7 @@ index d91942301c..5d1bd3f0b1 100644 | |||
123 | default: | 123 | default: |
124 | switch (flags & EF_MIPS_ARCH) | 124 | switch (flags & EF_MIPS_ARCH) |
125 | { | 125 | { |
126 | @@ -12003,6 +12006,10 @@ mips_set_isa_flags (bfd *abfd) | 126 | @@ -12199,6 +12202,10 @@ mips_set_isa_flags (bfd *abfd) |
127 | val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; | 127 | val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON2; |
128 | break; | 128 | break; |
129 | 129 | ||
@@ -134,19 +134,19 @@ index d91942301c..5d1bd3f0b1 100644 | |||
134 | case bfd_mach_mipsisa32: | 134 | case bfd_mach_mipsisa32: |
135 | val = E_MIPS_ARCH_32; | 135 | val = E_MIPS_ARCH_32; |
136 | break; | 136 | break; |
137 | @@ -13992,6 +13999,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = | 137 | @@ -14214,6 +14221,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = |
138 | { bfd_mach_mips_octeonp, bfd_mach_mips_octeon }, | 138 | { bfd_mach_mips_gs264e, bfd_mach_mips_gs464e }, |
139 | { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 }, | 139 | { bfd_mach_mips_gs464e, bfd_mach_mips_gs464 }, |
140 | { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64r2 }, | 140 | { bfd_mach_mips_gs464, bfd_mach_mipsisa64r2 }, |
141 | + { bfd_mach_mips_xlp, bfd_mach_mipsisa64r2 }, | 141 | + { bfd_mach_mips_xlp, bfd_mach_mipsisa64r2 }, |
142 | 142 | ||
143 | /* MIPS64 extensions. */ | 143 | /* MIPS64 extensions. */ |
144 | { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, | 144 | { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, |
145 | diff --git a/binutils/readelf.c b/binutils/readelf.c | 145 | diff --git a/binutils/readelf.c b/binutils/readelf.c |
146 | index 2b78db219b..7a7178925f 100644 | 146 | index b13eb6a43b..9df3742682 100644 |
147 | --- a/binutils/readelf.c | 147 | --- a/binutils/readelf.c |
148 | +++ b/binutils/readelf.c | 148 | +++ b/binutils/readelf.c |
149 | @@ -3403,6 +3403,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) | 149 | @@ -3412,6 +3412,7 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) |
150 | case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; | 150 | case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; |
151 | case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; | 151 | case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; |
152 | case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; | 152 | case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; |
@@ -155,10 +155,10 @@ index 2b78db219b..7a7178925f 100644 | |||
155 | /* We simply ignore the field in this case to avoid confusion: | 155 | /* We simply ignore the field in this case to avoid confusion: |
156 | MIPS ELF does not specify EF_MIPS_MACH, it is a GNU | 156 | MIPS ELF does not specify EF_MIPS_MACH, it is a GNU |
157 | diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c | 157 | diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c |
158 | index 59df787155..48537226c0 100644 | 158 | index ae55904229..d6882712f5 100644 |
159 | --- a/gas/config/tc-mips.c | 159 | --- a/gas/config/tc-mips.c |
160 | +++ b/gas/config/tc-mips.c | 160 | +++ b/gas/config/tc-mips.c |
161 | @@ -552,6 +552,7 @@ static int mips_32bitmode = 0; | 161 | @@ -554,6 +554,7 @@ static int mips_32bitmode = 0; |
162 | || mips_opts.arch == CPU_RM7000 \ | 162 | || mips_opts.arch == CPU_RM7000 \ |
163 | || mips_opts.arch == CPU_VR5500 \ | 163 | || mips_opts.arch == CPU_VR5500 \ |
164 | || mips_opts.micromips \ | 164 | || mips_opts.micromips \ |
@@ -166,7 +166,7 @@ index 59df787155..48537226c0 100644 | |||
166 | ) | 166 | ) |
167 | 167 | ||
168 | /* Whether the processor uses hardware interlocks to protect reads | 168 | /* Whether the processor uses hardware interlocks to protect reads |
169 | @@ -581,6 +582,7 @@ static int mips_32bitmode = 0; | 169 | @@ -583,6 +584,7 @@ static int mips_32bitmode = 0; |
170 | && mips_opts.isa != ISA_MIPS3) \ | 170 | && mips_opts.isa != ISA_MIPS3) \ |
171 | || mips_opts.arch == CPU_R4300 \ | 171 | || mips_opts.arch == CPU_R4300 \ |
172 | || mips_opts.micromips \ | 172 | || mips_opts.micromips \ |
@@ -174,7 +174,7 @@ index 59df787155..48537226c0 100644 | |||
174 | ) | 174 | ) |
175 | 175 | ||
176 | /* Whether the processor uses hardware interlocks to protect reads | 176 | /* Whether the processor uses hardware interlocks to protect reads |
177 | @@ -19778,7 +19780,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = | 177 | @@ -19867,7 +19869,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] = |
178 | /* Broadcom XLP. | 178 | /* Broadcom XLP. |
179 | XLP is mostly like XLR, with the prominent exception that it is | 179 | XLP is mostly like XLR, with the prominent exception that it is |
180 | MIPS64R2 rather than MIPS64. */ | 180 | MIPS64R2 rather than MIPS64. */ |
@@ -184,10 +184,10 @@ index 59df787155..48537226c0 100644 | |||
184 | /* MIPS 64 Release 6 */ | 184 | /* MIPS 64 Release 6 */ |
185 | { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, | 185 | { "i6400", 0, ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, |
186 | diff --git a/gas/configure b/gas/configure | 186 | diff --git a/gas/configure b/gas/configure |
187 | index 134278fa25..2fdca147a1 100755 | 187 | index a82fde7fa8..afc77c347a 100755 |
188 | --- a/gas/configure | 188 | --- a/gas/configure |
189 | +++ b/gas/configure | 189 | +++ b/gas/configure |
190 | @@ -13336,6 +13336,9 @@ _ACEOF | 190 | @@ -13364,6 +13364,9 @@ _ACEOF |
191 | mipsisa64r6 | mipsisa64r6el) | 191 | mipsisa64r6 | mipsisa64r6el) |
192 | mips_cpu=mips64r6 | 192 | mips_cpu=mips64r6 |
193 | ;; | 193 | ;; |
@@ -198,7 +198,7 @@ index 134278fa25..2fdca147a1 100755 | |||
198 | mips_cpu=r3900 | 198 | mips_cpu=r3900 |
199 | ;; | 199 | ;; |
200 | diff --git a/include/elf/mips.h b/include/elf/mips.h | 200 | diff --git a/include/elf/mips.h b/include/elf/mips.h |
201 | index 4e2cde3279..c329f38929 100644 | 201 | index b76d450ae2..7cddb365ad 100644 |
202 | --- a/include/elf/mips.h | 202 | --- a/include/elf/mips.h |
203 | +++ b/include/elf/mips.h | 203 | +++ b/include/elf/mips.h |
204 | @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) | 204 | @@ -290,6 +290,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) |
@@ -210,10 +210,10 @@ index 4e2cde3279..c329f38929 100644 | |||
210 | #define E_MIPS_MACH_OCTEON3 0x008e0000 | 210 | #define E_MIPS_MACH_OCTEON3 0x008e0000 |
211 | #define E_MIPS_MACH_5400 0x00910000 | 211 | #define E_MIPS_MACH_5400 0x00910000 |
212 | diff --git a/include/opcode/mips.h b/include/opcode/mips.h | 212 | diff --git a/include/opcode/mips.h b/include/opcode/mips.h |
213 | index 1ab1780567..74f457b579 100644 | 213 | index abd52c8980..53b6752a1c 100644 |
214 | --- a/include/opcode/mips.h | 214 | --- a/include/opcode/mips.h |
215 | +++ b/include/opcode/mips.h | 215 | +++ b/include/opcode/mips.h |
216 | @@ -1262,6 +1262,8 @@ static const unsigned int mips_isa_table[] = { | 216 | @@ -1260,6 +1260,8 @@ static const unsigned int mips_isa_table[] = { |
217 | #define INSN_XLR 0x00000020 | 217 | #define INSN_XLR 0x00000020 |
218 | /* Imagination interAptiv MR2. */ | 218 | /* Imagination interAptiv MR2. */ |
219 | #define INSN_INTERAPTIV_MR2 0x04000000 | 219 | #define INSN_INTERAPTIV_MR2 0x04000000 |
@@ -222,7 +222,7 @@ index 1ab1780567..74f457b579 100644 | |||
222 | 222 | ||
223 | /* DSP ASE */ | 223 | /* DSP ASE */ |
224 | #define ASE_DSP 0x00000001 | 224 | #define ASE_DSP 0x00000001 |
225 | @@ -1373,6 +1375,7 @@ static const unsigned int mips_isa_table[] = { | 225 | @@ -1381,6 +1383,7 @@ static const unsigned int mips_isa_table[] = { |
226 | #define CPU_OCTEON3 6503 | 226 | #define CPU_OCTEON3 6503 |
227 | #define CPU_XLR 887682 /* decimal 'XLR' */ | 227 | #define CPU_XLR 887682 /* decimal 'XLR' */ |
228 | #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ | 228 | #define CPU_INTERAPTIV_MR2 736550 /* decimal 'IA2' */ |
@@ -230,7 +230,7 @@ index 1ab1780567..74f457b579 100644 | |||
230 | 230 | ||
231 | /* Return true if the given CPU is included in INSN_* mask MASK. */ | 231 | /* Return true if the given CPU is included in INSN_* mask MASK. */ |
232 | 232 | ||
233 | @@ -1453,6 +1456,9 @@ cpu_is_member (int cpu, unsigned int mask) | 233 | @@ -1458,6 +1461,9 @@ cpu_is_member (int cpu, unsigned int mask) |
234 | return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) | 234 | return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) |
235 | || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); | 235 | || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); |
236 | 236 | ||
@@ -241,10 +241,10 @@ index 1ab1780567..74f457b579 100644 | |||
241 | return FALSE; | 241 | return FALSE; |
242 | } | 242 | } |
243 | diff --git a/ld/configure.tgt b/ld/configure.tgt | 243 | diff --git a/ld/configure.tgt b/ld/configure.tgt |
244 | index 7fb2168503..a1db7adfe2 100644 | 244 | index 917be6f8eb..347df6c3f6 100644 |
245 | --- a/ld/configure.tgt | 245 | --- a/ld/configure.tgt |
246 | +++ b/ld/configure.tgt | 246 | +++ b/ld/configure.tgt |
247 | @@ -450,6 +450,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*) | 247 | @@ -454,6 +454,8 @@ mips*el-sde-elf* | mips*el-mti-elf* | mips*el-img-elf*) |
248 | mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) | 248 | mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) |
249 | targ_emul=elf32btsmip | 249 | targ_emul=elf32btsmip |
250 | targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; | 250 | targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; |
@@ -254,10 +254,10 @@ index 7fb2168503..a1db7adfe2 100644 | |||
254 | targ_extra_emuls="elf32lr5900" | 254 | targ_extra_emuls="elf32lr5900" |
255 | targ_extra_libpath=$targ_extra_emuls ;; | 255 | targ_extra_libpath=$targ_extra_emuls ;; |
256 | diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c | 256 | diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c |
257 | index bbf21328e8..38e487c16f 100644 | 257 | index 0dd85e3779..1ea708dde7 100644 |
258 | --- a/opcodes/mips-dis.c | 258 | --- a/opcodes/mips-dis.c |
259 | +++ b/opcodes/mips-dis.c | 259 | +++ b/opcodes/mips-dis.c |
260 | @@ -656,13 +656,11 @@ const struct mips_arch_choice mips_arch_choices[] = | 260 | @@ -673,13 +673,11 @@ const struct mips_arch_choice mips_arch_choices[] = |
261 | mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), | 261 | mips_cp0sel_names_xlr, ARRAY_SIZE (mips_cp0sel_names_xlr), |
262 | mips_cp1_names_mips3264, mips_hwr_names_numeric }, | 262 | mips_cp1_names_mips3264, mips_hwr_names_numeric }, |
263 | 263 | ||
@@ -277,10 +277,10 @@ index bbf21328e8..38e487c16f 100644 | |||
277 | /* This entry, mips16, is here only for ISA/processor selection; do | 277 | /* This entry, mips16, is here only for ISA/processor selection; do |
278 | not print its name. */ | 278 | not print its name. */ |
279 | diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c | 279 | diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c |
280 | index 1cbcbc6abc..e1fbdc89de 100644 | 280 | index 837da6bd99..d3ea5b8877 100644 |
281 | --- a/opcodes/mips-opc.c | 281 | --- a/opcodes/mips-opc.c |
282 | +++ b/opcodes/mips-opc.c | 282 | +++ b/opcodes/mips-opc.c |
283 | @@ -329,6 +329,7 @@ decode_mips_operand (const char *p) | 283 | @@ -328,6 +328,7 @@ decode_mips_operand (const char *p) |
284 | #define IOCT3 INSN_OCTEON3 | 284 | #define IOCT3 INSN_OCTEON3 |
285 | #define XLR INSN_XLR | 285 | #define XLR INSN_XLR |
286 | #define IAMR2 INSN_INTERAPTIV_MR2 | 286 | #define IAMR2 INSN_INTERAPTIV_MR2 |
@@ -288,7 +288,7 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
288 | #define IVIRT ASE_VIRT | 288 | #define IVIRT ASE_VIRT |
289 | #define IVIRT64 ASE_VIRT64 | 289 | #define IVIRT64 ASE_VIRT64 |
290 | 290 | ||
291 | @@ -974,6 +975,7 @@ const struct mips_opcode mips_builtin_opcodes[] = | 291 | @@ -989,6 +990,7 @@ const struct mips_opcode mips_builtin_opcodes[] = |
292 | {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, | 292 | {"clo", "U,s", 0x70000021, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, |
293 | {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, | 293 | {"clz", "d,s", 0x00000050, 0xfc1f07ff, WR_1|RD_2, 0, I37, 0, 0 }, |
294 | {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, | 294 | {"clz", "U,s", 0x70000020, 0xfc0007ff, WR_1|RD_2, 0, I32|N55, 0, I37 }, |
@@ -296,7 +296,7 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
296 | /* ctc0 is at the bottom of the table. */ | 296 | /* ctc0 is at the bottom of the table. */ |
297 | {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, | 297 | {"ctc1", "t,G", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, |
298 | {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, | 298 | {"ctc1", "t,S", 0x44c00000, 0xffe007ff, RD_1|WR_CC|CM, 0, I1, 0, 0 }, |
299 | @@ -1006,12 +1008,13 @@ const struct mips_opcode mips_builtin_opcodes[] = | 299 | @@ -1021,12 +1023,13 @@ const struct mips_opcode mips_builtin_opcodes[] = |
300 | {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, | 300 | {"daddiu", "t,r,j", 0x64000000, 0xfc000000, WR_1|RD_2, 0, I3, 0, 0 }, |
301 | {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, | 301 | {"daddu", "d,v,t", 0x0000002d, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I3, 0, 0 }, |
302 | {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, | 302 | {"daddu", "t,r,I", 0, (int) M_DADDU_I, INSN_MACRO, 0, I3, 0, 0 }, |
@@ -311,7 +311,7 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
311 | /* dctr and dctw are used on the r5000. */ | 311 | /* dctr and dctw are used on the r5000. */ |
312 | {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, | 312 | {"dctr", "o(b)", 0xbc050000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, |
313 | {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, | 313 | {"dctw", "o(b)", 0xbc090000, 0xfc1f0000, RD_2, 0, I3, 0, 0 }, |
314 | @@ -1083,6 +1086,7 @@ const struct mips_opcode mips_builtin_opcodes[] = | 314 | @@ -1098,6 +1101,7 @@ const struct mips_opcode mips_builtin_opcodes[] = |
315 | {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, | 315 | {"dmfc0", "t,G,H", 0x40200000, 0xffe007f8, WR_1|RD_C0|LC, 0, I64, 0, 0 }, |
316 | {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, | 316 | {"dmfgc0", "t,G", 0x40600100, 0xffe007ff, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, |
317 | {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, | 317 | {"dmfgc0", "t,G,H", 0x40600100, 0xffe007f8, WR_1|RD_C0|LC, 0, 0, IVIRT64, 0 }, |
@@ -319,7 +319,7 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
319 | {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, | 319 | {"dmt", "", 0x41600bc1, 0xffffffff, TRAP, 0, 0, MT32, 0 }, |
320 | {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, | 320 | {"dmt", "t", 0x41600bc1, 0xffe0ffff, WR_1|TRAP, 0, 0, MT32, 0 }, |
321 | {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, | 321 | {"dmtc0", "t,G", 0x40a00000, 0xffe007ff, RD_1|WR_C0|WR_CC|CM, 0, I3, 0, EE }, |
322 | @@ -1098,6 +1102,8 @@ const struct mips_opcode mips_builtin_opcodes[] = | 322 | @@ -1113,6 +1117,8 @@ const struct mips_opcode mips_builtin_opcodes[] = |
323 | /* dmfc3 is at the bottom of the table. */ | 323 | /* dmfc3 is at the bottom of the table. */ |
324 | /* dmtc3 is at the bottom of the table. */ | 324 | /* dmtc3 is at the bottom of the table. */ |
325 | {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, | 325 | {"dmuh", "d,s,t", 0x000000dc, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, |
@@ -328,7 +328,7 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
328 | {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, | 328 | {"dmul", "d,s,t", 0x0000009c, 0xfc0007ff, WR_1|RD_2|RD_3, 0, I69, 0, 0 }, |
329 | {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, | 329 | {"dmul", "d,v,t", 0x70000003, 0xfc0007ff, WR_1|RD_2|RD_3|WR_HILO, 0, IOCT, 0, 0 }, |
330 | {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, | 330 | {"dmul", "d,v,t", 0, (int) M_DMUL, INSN_MACRO, 0, I3, 0, M32|I69 }, |
331 | @@ -1251,9 +1257,9 @@ const struct mips_opcode mips_builtin_opcodes[] = | 331 | @@ -1266,9 +1272,9 @@ const struct mips_opcode mips_builtin_opcodes[] = |
332 | {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, | 332 | {"ld", "s,-b(+R)", 0xec180000, 0xfc1c0000, WR_1, RD_pc, I69, 0, 0 }, |
333 | {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, | 333 | {"ld", "t,A(b)", 0, (int) M_LD_AB, INSN_MACRO, 0, I1, 0, 0 }, |
334 | {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, | 334 | {"ld", "t,o(b)", 0xdc000000, 0xfc000000, WR_1|RD_3|LM, 0, I3, 0, 0 }, |
@@ -341,7 +341,7 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
341 | {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, | 341 | {"ldc1", "T,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, |
342 | {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, | 342 | {"ldc1", "E,o(b)", 0xd4000000, 0xfc000000, WR_1|RD_3|CLD|FP_D, 0, I2, 0, SF }, |
343 | {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, | 343 | {"ldc1", "T,A(b)", 0, (int) M_LDC1_AB, INSN_MACRO, INSN2_M_FP_D, I2, 0, SF }, |
344 | @@ -1418,7 +1424,7 @@ const struct mips_opcode mips_builtin_opcodes[] = | 344 | @@ -1433,7 +1439,7 @@ const struct mips_opcode mips_builtin_opcodes[] = |
345 | {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, | 345 | {"mflo", "d,9", 0x00000012, 0xff9f07ff, WR_1|RD_LO, 0, 0, D32, 0 }, |
346 | {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, | 346 | {"mflo1", "d", 0x70000012, 0xffff07ff, WR_1|RD_LO, 0, EE, 0, 0 }, |
347 | {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, | 347 | {"mflhxu", "d", 0x00000052, 0xffff07ff, WR_1|MOD_HILO, 0, 0, SMT, 0 }, |
@@ -350,7 +350,7 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
350 | {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, | 350 | {"mfsa", "d", 0x00000028, 0xffff07ff, WR_1, 0, EE, 0, 0 }, |
351 | {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, | 351 | {"min.ob", "X,Y,Q", 0x78000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, SB1, MX, 0 }, |
352 | {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, | 352 | {"min.ob", "D,S,Q", 0x48000006, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, N54, 0, 0 }, |
353 | @@ -1463,10 +1469,13 @@ const struct mips_opcode mips_builtin_opcodes[] = | 353 | @@ -1478,10 +1484,13 @@ const struct mips_opcode mips_builtin_opcodes[] = |
354 | /* move is at the top of the table. */ | 354 | /* move is at the top of the table. */ |
355 | {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, | 355 | {"msgn.qh", "X,Y,Q", 0x78200000, 0xfc20003f, WR_1|RD_2|RD_3|FP_D, 0, 0, MX, 0 }, |
356 | {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, | 356 | {"msgsnd", "t", 0, (int) M_MSGSND, INSN_MACRO, 0, XLR, 0, 0 }, |
@@ -366,7 +366,7 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
366 | {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, | 366 | {"msub.d", "D,R,S,T", 0x4c000029, 0xfc00003f, WR_1|RD_2|RD_3|RD_4|FP_D, 0, I4_33, 0, I37 }, |
367 | {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, | 367 | {"msub.d", "D,S,T", 0x46200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2E, 0, 0 }, |
368 | {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, | 368 | {"msub.d", "D,S,T", 0x72200019, 0xffe0003f, WR_1|RD_2|RD_3|FP_D, 0, IL2F, 0, 0 }, |
369 | @@ -1516,7 +1525,7 @@ const struct mips_opcode mips_builtin_opcodes[] = | 369 | @@ -1531,7 +1540,7 @@ const struct mips_opcode mips_builtin_opcodes[] = |
370 | {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, | 370 | {"mtlo", "s,7", 0x00000013, 0xfc1fe7ff, RD_1|WR_LO, 0, 0, D32, 0 }, |
371 | {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, | 371 | {"mtlo1", "s", 0x70000013, 0xfc1fffff, RD_1|WR_LO, 0, EE, 0, 0 }, |
372 | {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, | 372 | {"mtlhx", "s", 0x00000053, 0xfc1fffff, RD_1|MOD_HILO, 0, 0, SMT, 0 }, |
@@ -375,7 +375,7 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
375 | {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, | 375 | {"mtm0", "s", 0x70000008, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, |
376 | {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, | 376 | {"mtm0", "s,t", 0x70000008, 0xfc00ffff, RD_1|RD_2, 0, IOCT3, 0, 0 }, |
377 | {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, | 377 | {"mtm1", "s", 0x7000000c, 0xfc1fffff, RD_1, 0, IOCT, 0, 0 }, |
378 | @@ -1953,9 +1962,9 @@ const struct mips_opcode mips_builtin_opcodes[] = | 378 | @@ -1968,9 +1977,9 @@ const struct mips_opcode mips_builtin_opcodes[] = |
379 | {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, | 379 | {"suxc1", "S,t(b)", 0x4c00000d, 0xfc0007ff, RD_1|RD_2|RD_3|SM|FP_D, 0, I5_33|N55, 0, I37}, |
380 | {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, | 380 | {"sw", "t,o(b)", 0xac000000, 0xfc000000, RD_1|RD_3|SM, 0, I1, 0, 0 }, |
381 | {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, | 381 | {"sw", "t,A(b)", 0, (int) M_SW_AB, INSN_MACRO, 0, I1, 0, 0 }, |
@@ -389,5 +389,5 @@ index 1cbcbc6abc..e1fbdc89de 100644 | |||
389 | {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, | 389 | {"swc0", "E,A(b)", 0, (int) M_SWC0_AB, INSN_MACRO, 0, I1, 0, IOCT|IOCTP|IOCT2|I37 }, |
390 | {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, | 390 | {"swc1", "T,o(b)", 0xe4000000, 0xfc000000, RD_1|RD_3|SM|FP_S, 0, I1, 0, 0 }, |
391 | -- | 391 | -- |
392 | 2.18.0 | 392 | 2.20.1 |
393 | 393 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch index c9ffdada91..6a3b78f227 100644 --- a/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch +++ b/meta/recipes-devtools/binutils/binutils/0012-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d45455db35db5693c5efe0e1b384295e4c0db998 Mon Sep 17 00:00:00 2001 | 1 | From e48767a0298e6ccf53d83fecc93bb6d26b595897 Mon Sep 17 00:00:00 2001 |
2 | From: Zhenhua Luo <zhenhua.luo@nxp.com> | 2 | From: Zhenhua Luo <zhenhua.luo@nxp.com> |
3 | Date: Sat, 11 Jun 2016 22:08:29 -0500 | 3 | Date: Sat, 11 Jun 2016 22:08:29 -0500 |
4 | Subject: [PATCH 13/15] fix the incorrect assembling for ppc wait mnemonic | 4 | Subject: [PATCH 12/15] fix the incorrect assembling for ppc wait mnemonic |
5 | 5 | ||
6 | Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> | 6 | Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> |
7 | 7 | ||
@@ -11,10 +11,10 @@ Upstream-Status: Pending | |||
11 | 1 file changed, 1 insertion(+), 2 deletions(-) | 11 | 1 file changed, 1 insertion(+), 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c | 13 | diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c |
14 | index 4a0fca5f0a..49f72fc35c 100644 | 14 | index 3032631d4e..142f096ef4 100644 |
15 | --- a/opcodes/ppc-opc.c | 15 | --- a/opcodes/ppc-opc.c |
16 | +++ b/opcodes/ppc-opc.c | 16 | +++ b/opcodes/ppc-opc.c |
17 | @@ -5351,7 +5351,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { | 17 | @@ -5325,7 +5325,6 @@ const struct powerpc_opcode powerpc_opcodes[] = { |
18 | {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, | 18 | {"ldepx", X(31,29), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, |
19 | 19 | ||
20 | {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, | 20 | {"waitasec", X(31,30), XRTRARB_MASK, POWER8, POWER9, {0}}, |
@@ -22,7 +22,7 @@ index 4a0fca5f0a..49f72fc35c 100644 | |||
22 | 22 | ||
23 | {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, | 23 | {"lwepx", X(31,31), X_MASK, E500MC|PPCA2, 0, {RT, RA0, RB}}, |
24 | 24 | ||
25 | @@ -5405,7 +5404,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { | 25 | @@ -5379,7 +5378,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { |
26 | 26 | ||
27 | {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | 27 | {"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, |
28 | {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, | 28 | {"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, 0, {0}}, |
@@ -32,5 +32,5 @@ index 4a0fca5f0a..49f72fc35c 100644 | |||
32 | {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, | 32 | {"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2, 0, {RA0, RB}}, |
33 | 33 | ||
34 | -- | 34 | -- |
35 | 2.18.0 | 35 | 2.20.1 |
36 | 36 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch b/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch index 6197df6d5a..d929179de2 100644 --- a/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch +++ b/meta/recipes-devtools/binutils/binutils/0013-Detect-64-bit-MIPS-targets.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9af90cfc35ff1fe78755578861473039836c467a Mon Sep 17 00:00:00 2001 | 1 | From 6587e7b8e7730dda20d8c47cabe9f7f8397efa3c 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 14/15] Detect 64-bit MIPS targets | 4 | Subject: [PATCH 13/15] 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 8aef22a318..7030026ffa 100644 | 17 | index 3e066edaa8..caf130ceda 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*-*) |
@@ -46,5 +46,5 @@ index 8aef22a318..7030026ffa 100644 | |||
46 | targ_obj=mips | 46 | targ_obj=mips |
47 | targ_machine=EM_MIPS | 47 | targ_machine=EM_MIPS |
48 | -- | 48 | -- |
49 | 2.18.0 | 49 | 2.20.1 |
50 | 50 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch index 7dc8ba8c37..65ba10a553 100644 --- a/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch +++ b/meta/recipes-devtools/binutils/binutils/0014-sync-with-OE-libtool-changes.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f9e26bd29b5f017ea1307b51b5036063bff78600 Mon Sep 17 00:00:00 2001 | 1 | From b7729343206fa196b9a11747a92b3cf563277056 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 15/15] sync with OE libtool changes | 4 | Subject: [PATCH 14/15] 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 |
@@ -85,5 +85,5 @@ index 11ee684ccc..3b19ac1532 100644 | |||
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 | -- | 87 | -- |
88 | 2.18.0 | 88 | 2.20.1 |
89 | 89 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/0016-add-i386pep-emulation-for-x86_64.patch b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch index 9f20784eba..bfde561dee 100644 --- a/meta/recipes-devtools/binutils/binutils/0016-add-i386pep-emulation-for-x86_64.patch +++ b/meta/recipes-devtools/binutils/binutils/0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch | |||
@@ -1,4 +1,8 @@ | |||
1 | binutils : enable x86_64-pep for producing EFI binaries on x86-64 | 1 | From d5d783903e335302e562bac8da1a083338d75b25 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 29 Nov 2018 17:46:40 -0800 | ||
4 | Subject: [PATCH 15/15] binutils : enable x86_64-pep for producing EFI binaries | ||
5 | on x86-64 | ||
2 | 6 | ||
3 | Add x86_64-pep emulation support to the set enabled for x86_64 targets | 7 | Add x86_64-pep emulation support to the set enabled for x86_64 targets |
4 | to enable the linker to produce Portable Executables for EFI binaries. | 8 | to enable the linker to produce Portable Executables for EFI binaries. |
@@ -6,15 +10,20 @@ to enable the linker to produce Portable Executables for EFI binaries. | |||
6 | Enables building the x86-64 EFI variant of the Xen hypervisor for | 10 | Enables building the x86-64 EFI variant of the Xen hypervisor for |
7 | the OpenXT Project. | 11 | the OpenXT Project. |
8 | 12 | ||
9 | Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE configuration specific] | 13 | Upstream-Status: Inappropriate [OE configuration specific] |
14 | |||
15 | Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | 17 | --- |
18 | bfd/config.bfd | 2 +- | ||
19 | ld/configure.tgt | 5 +++-- | ||
20 | 2 files changed, 4 insertions(+), 3 deletions(-) | ||
21 | |||
13 | diff --git a/bfd/config.bfd b/bfd/config.bfd | 22 | diff --git a/bfd/config.bfd b/bfd/config.bfd |
14 | index c882421..dc705b6 100644 | 23 | index 3614ff79d4..aef144803a 100644 |
15 | --- a/bfd/config.bfd | 24 | --- a/bfd/config.bfd |
16 | +++ b/bfd/config.bfd | 25 | +++ b/bfd/config.bfd |
17 | @@ -688,7 +688,7 @@ case "${targ}" in | 26 | @@ -694,7 +694,7 @@ case "${targ}" in |
18 | ;; | 27 | ;; |
19 | x86_64-*-linux-*) | 28 | x86_64-*-linux-*) |
20 | targ_defvec=x86_64_elf64_vec | 29 | targ_defvec=x86_64_elf64_vec |
@@ -24,10 +33,10 @@ index c882421..dc705b6 100644 | |||
24 | ;; | 33 | ;; |
25 | x86_64-*-nacl*) | 34 | x86_64-*-nacl*) |
26 | diff --git a/ld/configure.tgt b/ld/configure.tgt | 35 | diff --git a/ld/configure.tgt b/ld/configure.tgt |
27 | index a1db7ad..65a984a 100644 | 36 | index 347df6c3f6..1e37d747a9 100644 |
28 | --- a/ld/configure.tgt | 37 | --- a/ld/configure.tgt |
29 | +++ b/ld/configure.tgt | 38 | +++ b/ld/configure.tgt |
30 | @@ -253,8 +253,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x86_64 | 39 | @@ -257,8 +257,9 @@ x86_64-*-linux-gnux32) targ_emul=elf32_x86_64 |
31 | tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` | 40 | tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` |
32 | tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; | 41 | tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;; |
33 | x86_64-*-linux-*) targ_emul=elf_x86_64 | 42 | x86_64-*-linux-*) targ_emul=elf_x86_64 |
@@ -39,3 +48,6 @@ index a1db7ad..65a984a 100644 | |||
39 | tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; | 48 | tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; |
40 | i[3-7]86-*-redox*) targ_emul=elf_i386 | 49 | i[3-7]86-*-redox*) targ_emul=elf_i386 |
41 | targ_extra_emuls=elf_x86_64 ;; | 50 | targ_extra_emuls=elf_x86_64 ;; |
51 | -- | ||
52 | 2.20.1 | ||
53 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0022-Handle-ELF-compressed-header-alignment-correctly-by-.patch b/meta/recipes-devtools/binutils/binutils/0022-Handle-ELF-compressed-header-alignment-correctly-by-.patch deleted file mode 100644 index 650de9b9a3..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0022-Handle-ELF-compressed-header-alignment-correctly-by-.patch +++ /dev/null | |||
@@ -1,332 +0,0 @@ | |||
1 | From bb9c8cc3c5f4ffd6019a8c53adead429954162e1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Wielaard <mark@klomp.org> | ||
3 | Date: Tue, 27 Nov 2018 11:59:10 +0000 | ||
4 | Subject: [PATCH 1/2] Handle ELF compressed header alignment correctly by | ||
5 | setting up the section alignment correctly for the Elf32_Chdr or Elf64_Chdr | ||
6 | type and respect the ch_addralign field when decompressing the section data. | ||
7 | |||
8 | PR binutils/23919 | ||
9 | binutils* readelf.c (dump_sections_as_strings): Remove bogus addralign check. | ||
10 | (dump_sections_as_bytes): Likewise. | ||
11 | (load_specific_debug_sections): Likewise. | ||
12 | * testsuite/binutils-all/dw2-3.rS: Adjust alignment. | ||
13 | * testsuite/binutils-all/dw2-3.rt: Likewise. | ||
14 | |||
15 | bfd * bfd.c (bfd_update_compression_header): Explicitly set alignment. | ||
16 | (bfd_check_compression_header): Add uncompressed_alignment_power | ||
17 | argument. Check ch_addralign is a power of 2. | ||
18 | * bfd-in2.h: Regenerated. | ||
19 | * compress.c (bfd_compress_section_contents): Get and set | ||
20 | orig_uncompressed_alignment_pow if section is decompressed. | ||
21 | (bfd_is_section_compressed_with_header): Add and get | ||
22 | uncompressed_align_pow_p argument. | ||
23 | (bfd_is_section_compressed): Add uncompressed_align_power argument | ||
24 | to bfd_is_section_compressed_with_header call. | ||
25 | (bfd_init_section_decompress_status): Get and set | ||
26 | uncompressed_alignment_power. | ||
27 | * elf.c (_bfd_elf_make_section_from_shdr): Add | ||
28 | uncompressed_align_power argument to | ||
29 | bfd_is_section_compressed_with_header call. | ||
30 | --- | ||
31 | bfd/bfd-in2.h | 6 ++-- | ||
32 | bfd/bfd.c | 20 ++++++++++---- | ||
33 | bfd/compress.c | 35 +++++++++++++++++------- | ||
34 | bfd/elf.c | 5 ++-- | ||
35 | binutils/readelf.c | 18 ------------ | ||
36 | binutils/testsuite/binutils-all/dw2-3.rS | 2 +- | ||
37 | binutils/testsuite/binutils-all/dw2-3.rt | 2 +- | ||
38 | 7 files changed, 49 insertions(+), 39 deletions(-) | ||
39 | |||
40 | Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4207142d6a5d2359170c5f9a140fc1a2351fbda9] | ||
41 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
42 | |||
43 | diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h | ||
44 | index f53dbb5e8c..d0c2190d0b 100644 | ||
45 | --- a/bfd/bfd-in2.h | ||
46 | +++ b/bfd/bfd-in2.h | ||
47 | @@ -7279,7 +7279,8 @@ void bfd_update_compression_header | ||
48 | |||
49 | bfd_boolean bfd_check_compression_header | ||
50 | (bfd *abfd, bfd_byte *contents, asection *sec, | ||
51 | - bfd_size_type *uncompressed_size); | ||
52 | + bfd_size_type *uncompressed_size, | ||
53 | + unsigned int *uncompressed_alignment_power); | ||
54 | |||
55 | int bfd_get_compression_header_size (bfd *abfd, asection *sec); | ||
56 | |||
57 | @@ -7855,7 +7856,8 @@ void bfd_cache_section_contents | ||
58 | bfd_boolean bfd_is_section_compressed_with_header | ||
59 | (bfd *abfd, asection *section, | ||
60 | int *compression_header_size_p, | ||
61 | - bfd_size_type *uncompressed_size_p); | ||
62 | + bfd_size_type *uncompressed_size_p, | ||
63 | + unsigned int *uncompressed_alignment_power_p); | ||
64 | |||
65 | bfd_boolean bfd_is_section_compressed | ||
66 | (bfd *abfd, asection *section); | ||
67 | diff --git a/bfd/bfd.c b/bfd/bfd.c | ||
68 | index 851710401e..ea10d7b185 100644 | ||
69 | --- a/bfd/bfd.c | ||
70 | +++ b/bfd/bfd.c | ||
71 | @@ -2332,6 +2332,8 @@ bfd_update_compression_header (bfd *abfd, bfd_byte *contents, | ||
72 | bfd_put_32 (abfd, sec->size, &echdr->ch_size); | ||
73 | bfd_put_32 (abfd, 1 << sec->alignment_power, | ||
74 | &echdr->ch_addralign); | ||
75 | + /* bfd_log2 (alignof (Elf32_Chdr)) */ | ||
76 | + bfd_set_section_alignment (abfd, sec, 2); | ||
77 | } | ||
78 | else | ||
79 | { | ||
80 | @@ -2342,6 +2344,8 @@ bfd_update_compression_header (bfd *abfd, bfd_byte *contents, | ||
81 | bfd_put_64 (abfd, sec->size, &echdr->ch_size); | ||
82 | bfd_put_64 (abfd, 1 << sec->alignment_power, | ||
83 | &echdr->ch_addralign); | ||
84 | + /* bfd_log2 (alignof (Elf64_Chdr)) */ | ||
85 | + bfd_set_section_alignment (abfd, sec, 3); | ||
86 | } | ||
87 | } | ||
88 | else | ||
89 | @@ -2354,6 +2358,8 @@ bfd_update_compression_header (bfd *abfd, bfd_byte *contents, | ||
90 | order. */ | ||
91 | memcpy (contents, "ZLIB", 4); | ||
92 | bfd_putb64 (sec->size, contents + 4); | ||
93 | + /* No way to keep the original alignment, just use 1 always. */ | ||
94 | + bfd_set_section_alignment (abfd, sec, 0); | ||
95 | } | ||
96 | } | ||
97 | } | ||
98 | @@ -2368,12 +2374,14 @@ bfd_update_compression_header (bfd *abfd, bfd_byte *contents, | ||
99 | SYNOPSIS | ||
100 | bfd_boolean bfd_check_compression_header | ||
101 | (bfd *abfd, bfd_byte *contents, asection *sec, | ||
102 | - bfd_size_type *uncompressed_size); | ||
103 | + bfd_size_type *uncompressed_size, | ||
104 | + unsigned int *uncompressed_alignment_power); | ||
105 | |||
106 | DESCRIPTION | ||
107 | Check the compression header at CONTENTS of SEC in ABFD and | ||
108 | - store the uncompressed size in UNCOMPRESSED_SIZE if the | ||
109 | - compression header is valid. | ||
110 | + store the uncompressed size in UNCOMPRESSED_SIZE and the | ||
111 | + uncompressed data alignment in UNCOMPRESSED_ALIGNMENT_POWER | ||
112 | + if the compression header is valid. | ||
113 | |||
114 | RETURNS | ||
115 | Return TRUE if the compression header is valid. | ||
116 | @@ -2382,7 +2390,8 @@ RETURNS | ||
117 | bfd_boolean | ||
118 | bfd_check_compression_header (bfd *abfd, bfd_byte *contents, | ||
119 | asection *sec, | ||
120 | - bfd_size_type *uncompressed_size) | ||
121 | + bfd_size_type *uncompressed_size, | ||
122 | + unsigned int *uncompressed_alignment_power) | ||
123 | { | ||
124 | if (bfd_get_flavour (abfd) == bfd_target_elf_flavour | ||
125 | && (elf_section_flags (sec) & SHF_COMPRESSED) != 0) | ||
126 | @@ -2404,9 +2413,10 @@ bfd_check_compression_header (bfd *abfd, bfd_byte *contents, | ||
127 | chdr.ch_addralign = bfd_get_64 (abfd, &echdr->ch_addralign); | ||
128 | } | ||
129 | if (chdr.ch_type == ELFCOMPRESS_ZLIB | ||
130 | - && chdr.ch_addralign == 1U << sec->alignment_power) | ||
131 | + && chdr.ch_addralign == (1U << bfd_log2 (chdr.ch_addralign))) | ||
132 | { | ||
133 | *uncompressed_size = chdr.ch_size; | ||
134 | + *uncompressed_alignment_power = bfd_log2 (chdr.ch_addralign); | ||
135 | return TRUE; | ||
136 | } | ||
137 | } | ||
138 | diff --git a/bfd/compress.c b/bfd/compress.c | ||
139 | index 53e566e498..97ea624eb8 100644 | ||
140 | --- a/bfd/compress.c | ||
141 | +++ b/bfd/compress.c | ||
142 | @@ -84,11 +84,13 @@ bfd_compress_section_contents (bfd *abfd, sec_ptr sec, | ||
143 | int zlib_size = 0; | ||
144 | int orig_compression_header_size; | ||
145 | bfd_size_type orig_uncompressed_size; | ||
146 | + unsigned int orig_uncompressed_alignment_pow; | ||
147 | int header_size = bfd_get_compression_header_size (abfd, NULL); | ||
148 | bfd_boolean compressed | ||
149 | = bfd_is_section_compressed_with_header (abfd, sec, | ||
150 | &orig_compression_header_size, | ||
151 | - &orig_uncompressed_size); | ||
152 | + &orig_uncompressed_size, | ||
153 | + &orig_uncompressed_alignment_pow); | ||
154 | |||
155 | /* Either ELF compression header or the 12-byte, "ZLIB" + 8-byte size, | ||
156 | overhead in .zdebug* section. */ | ||
157 | @@ -153,6 +155,9 @@ bfd_compress_section_contents (bfd *abfd, sec_ptr sec, | ||
158 | return 0; | ||
159 | } | ||
160 | free (uncompressed_buffer); | ||
161 | + bfd_set_section_alignment (abfd, sec, | ||
162 | + orig_uncompressed_alignment_pow); | ||
163 | + | ||
164 | sec->contents = buffer; | ||
165 | sec->compress_status = COMPRESS_SECTION_DONE; | ||
166 | return orig_uncompressed_size; | ||
167 | @@ -364,20 +369,24 @@ SYNOPSIS | ||
168 | bfd_boolean bfd_is_section_compressed_with_header | ||
169 | (bfd *abfd, asection *section, | ||
170 | int *compression_header_size_p, | ||
171 | - bfd_size_type *uncompressed_size_p); | ||
172 | + bfd_size_type *uncompressed_size_p, | ||
173 | + unsigned int *uncompressed_alignment_power_p); | ||
174 | |||
175 | DESCRIPTION | ||
176 | Return @code{TRUE} if @var{section} is compressed. Compression | ||
177 | - header size is returned in @var{compression_header_size_p} and | ||
178 | - uncompressed size is returned in @var{uncompressed_size_p}. If | ||
179 | - compression is unsupported, compression header size is returned | ||
180 | - with -1 and uncompressed size is returned with 0. | ||
181 | + header size is returned in @var{compression_header_size_p}, | ||
182 | + uncompressed size is returned in @var{uncompressed_size_p} | ||
183 | + and the uncompressed data alignement power is returned in | ||
184 | + @var{uncompressed_align_pow_p}. If compression is | ||
185 | + unsupported, compression header size is returned with -1 | ||
186 | + and uncompressed size is returned with 0. | ||
187 | */ | ||
188 | |||
189 | bfd_boolean | ||
190 | bfd_is_section_compressed_with_header (bfd *abfd, sec_ptr sec, | ||
191 | int *compression_header_size_p, | ||
192 | - bfd_size_type *uncompressed_size_p) | ||
193 | + bfd_size_type *uncompressed_size_p, | ||
194 | + unsigned int *uncompressed_align_pow_p) | ||
195 | { | ||
196 | bfd_byte header[MAX_COMPRESSION_HEADER_SIZE]; | ||
197 | int compression_header_size; | ||
198 | @@ -412,7 +421,8 @@ bfd_is_section_compressed_with_header (bfd *abfd, sec_ptr sec, | ||
199 | if (compression_header_size != 0) | ||
200 | { | ||
201 | if (!bfd_check_compression_header (abfd, header, sec, | ||
202 | - uncompressed_size_p)) | ||
203 | + uncompressed_size_p, | ||
204 | + uncompressed_align_pow_p)) | ||
205 | compression_header_size = -1; | ||
206 | } | ||
207 | /* Check for the pathalogical case of a debug string section that | ||
208 | @@ -449,9 +459,11 @@ bfd_is_section_compressed (bfd *abfd, sec_ptr sec) | ||
209 | { | ||
210 | int compression_header_size; | ||
211 | bfd_size_type uncompressed_size; | ||
212 | + unsigned int uncompressed_align_power; | ||
213 | return (bfd_is_section_compressed_with_header (abfd, sec, | ||
214 | &compression_header_size, | ||
215 | - &uncompressed_size) | ||
216 | + &uncompressed_size, | ||
217 | + &uncompressed_align_power) | ||
218 | && compression_header_size >= 0 | ||
219 | && uncompressed_size > 0); | ||
220 | } | ||
221 | @@ -480,6 +492,7 @@ bfd_init_section_decompress_status (bfd *abfd, sec_ptr sec) | ||
222 | int compression_header_size; | ||
223 | int header_size; | ||
224 | bfd_size_type uncompressed_size; | ||
225 | + unsigned int uncompressed_alignment_power = 0; | ||
226 | |||
227 | compression_header_size = bfd_get_compression_header_size (abfd, sec); | ||
228 | if (compression_header_size > MAX_COMPRESSION_HEADER_SIZE) | ||
229 | @@ -508,7 +521,8 @@ bfd_init_section_decompress_status (bfd *abfd, sec_ptr sec) | ||
230 | uncompressed_size = bfd_getb64 (header + 4); | ||
231 | } | ||
232 | else if (!bfd_check_compression_header (abfd, header, sec, | ||
233 | - &uncompressed_size)) | ||
234 | + &uncompressed_size, | ||
235 | + &uncompressed_alignment_power)) | ||
236 | { | ||
237 | bfd_set_error (bfd_error_wrong_format); | ||
238 | return FALSE; | ||
239 | @@ -516,6 +530,7 @@ bfd_init_section_decompress_status (bfd *abfd, sec_ptr sec) | ||
240 | |||
241 | sec->compressed_size = sec->size; | ||
242 | sec->size = uncompressed_size; | ||
243 | + bfd_set_section_alignment (abfd, sec, uncompressed_alignment_power); | ||
244 | sec->compress_status = DECOMPRESS_SECTION_SIZED; | ||
245 | |||
246 | return TRUE; | ||
247 | diff --git a/bfd/elf.c b/bfd/elf.c | ||
248 | index 828241d48a..c4f131ddcf 100644 | ||
249 | --- a/bfd/elf.c | ||
250 | +++ b/bfd/elf.c | ||
251 | @@ -1177,11 +1177,12 @@ _bfd_elf_make_section_from_shdr (bfd *abfd, | ||
252 | enum { nothing, compress, decompress } action = nothing; | ||
253 | int compression_header_size; | ||
254 | bfd_size_type uncompressed_size; | ||
255 | + unsigned int uncompressed_align_power; | ||
256 | bfd_boolean compressed | ||
257 | = bfd_is_section_compressed_with_header (abfd, newsect, | ||
258 | &compression_header_size, | ||
259 | - &uncompressed_size); | ||
260 | - | ||
261 | + &uncompressed_size, | ||
262 | + &uncompressed_align_power); | ||
263 | if (compressed) | ||
264 | { | ||
265 | /* Compressed section. Check if we should decompress. */ | ||
266 | diff --git a/binutils/readelf.c b/binutils/readelf.c | ||
267 | index f4df697a7d..4b0efa884f 100644 | ||
268 | --- a/binutils/readelf.c | ||
269 | +++ b/binutils/readelf.c | ||
270 | @@ -13345,12 +13345,6 @@ dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata) | ||
271 | printable_section_name (filedata, section), chdr.ch_type); | ||
272 | return FALSE; | ||
273 | } | ||
274 | - else if (chdr.ch_addralign != section->sh_addralign) | ||
275 | - { | ||
276 | - warn (_("compressed section '%s' is corrupted\n"), | ||
277 | - printable_section_name (filedata, section)); | ||
278 | - return FALSE; | ||
279 | - } | ||
280 | uncompressed_size = chdr.ch_size; | ||
281 | start += compression_header_size; | ||
282 | new_size -= compression_header_size; | ||
283 | @@ -13492,12 +13486,6 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, | ||
284 | printable_section_name (filedata, section), chdr.ch_type); | ||
285 | return FALSE; | ||
286 | } | ||
287 | - else if (chdr.ch_addralign != section->sh_addralign) | ||
288 | - { | ||
289 | - warn (_("compressed section '%s' is corrupted\n"), | ||
290 | - printable_section_name (filedata, section)); | ||
291 | - return FALSE; | ||
292 | - } | ||
293 | uncompressed_size = chdr.ch_size; | ||
294 | start += compression_header_size; | ||
295 | new_size -= compression_header_size; | ||
296 | @@ -13667,12 +13655,6 @@ load_specific_debug_section (enum dwarf_section_display_enum debug, | ||
297 | section->name, chdr.ch_type); | ||
298 | return FALSE; | ||
299 | } | ||
300 | - else if (chdr.ch_addralign != sec->sh_addralign) | ||
301 | - { | ||
302 | - warn (_("compressed section '%s' is corrupted\n"), | ||
303 | - section->name); | ||
304 | - return FALSE; | ||
305 | - } | ||
306 | uncompressed_size = chdr.ch_size; | ||
307 | start += compression_header_size; | ||
308 | size -= compression_header_size; | ||
309 | diff --git a/binutils/testsuite/binutils-all/dw2-3.rS b/binutils/testsuite/binutils-all/dw2-3.rS | ||
310 | index f1637e9149..86bc73d9a2 100644 | ||
311 | --- a/binutils/testsuite/binutils-all/dw2-3.rS | ||
312 | +++ b/binutils/testsuite/binutils-all/dw2-3.rS | ||
313 | @@ -1,3 +1,3 @@ | ||
314 | #... | ||
315 | - +\[[ 0-9]+\] .debug_info +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ [0-9a-f]+ +C +0 +0 +1 | ||
316 | + +\[[ 0-9]+\] .debug_info +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ [0-9a-f]+ +C +0 +0 +(4|8) | ||
317 | #pass | ||
318 | diff --git a/binutils/testsuite/binutils-all/dw2-3.rt b/binutils/testsuite/binutils-all/dw2-3.rt | ||
319 | index f59cbaa22b..74e7f8deca 100644 | ||
320 | --- a/binutils/testsuite/binutils-all/dw2-3.rt | ||
321 | +++ b/binutils/testsuite/binutils-all/dw2-3.rt | ||
322 | @@ -1,6 +1,6 @@ | ||
323 | #... | ||
324 | +\[[ 0-9]+\] .debug_info | ||
325 | - +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0 +0 +1 | ||
326 | + +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0 +0 +(4|8) | ||
327 | +\[0+800\]: COMPRESSED | ||
328 | +ZLIB, 0+9d, 1 | ||
329 | #pass | ||
330 | -- | ||
331 | 2.20.1 | ||
332 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/0023-gold-Get-alignment-of-uncompressed-section-from-ch_a.patch b/meta/recipes-devtools/binutils/binutils/0023-gold-Get-alignment-of-uncompressed-section-from-ch_a.patch deleted file mode 100644 index 1f072a6057..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0023-gold-Get-alignment-of-uncompressed-section-from-ch_a.patch +++ /dev/null | |||
@@ -1,200 +0,0 @@ | |||
1 | From 0261ec511ac07177fa488133e0bb3c03860977b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: "H.J. Lu" <hjl.tools@gmail.com> | ||
3 | Date: Sun, 2 Dec 2018 05:42:36 -0800 | ||
4 | Subject: [PATCH 2/2] gold: Get alignment of uncompressed section from | ||
5 | ch_addralign | ||
6 | |||
7 | The ELF compression header has a field (ch_addralign) that is set to | ||
8 | the alignment of the uncompressed section. This way the section itself | ||
9 | can have a different alignment than the decompressed section. Update | ||
10 | decompress_input_section to get alignment of the decompressed section | ||
11 | and use it when merging decompressed strings. | ||
12 | |||
13 | PR binutils/23919 | ||
14 | * merge.cc (Output_merge_string<Char_type>::do_add_input_section): | ||
15 | Get addralign from decompressed_section_contents. | ||
16 | * object.cc (build_compressed_section_map): Set info.addralign. | ||
17 | (Object::decompressed_section_contents): Add a palign | ||
18 | argument and store p->second.addralign in *palign if it isn't | ||
19 | NULL. | ||
20 | * object.h (Compressed_section_info): Add addralign. | ||
21 | (section_is_compressed): Add a palign argument, default it | ||
22 | to NULL, store p->second.addralign in *palign if it isn't NULL. | ||
23 | (Object::decompressed_section_contents): Likewise. | ||
24 | * output.cc (Output_section::add_input_section): Get addralign | ||
25 | from section_is_compressed. | ||
26 | --- | ||
27 | gold/merge.cc | 8 +++++--- | ||
28 | gold/object.cc | 11 +++++++++-- | ||
29 | gold/object.h | 8 ++++++-- | ||
30 | gold/output.cc | 11 ++++++----- | ||
31 | 4 files changed, 26 insertions(+), 12 deletions(-) | ||
32 | |||
33 | Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5f6c22aee74f17393b82934a5682d985672e011a] | ||
34 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
35 | |||
36 | |||
37 | diff --git a/gold/merge.cc b/gold/merge.cc | ||
38 | index de00ee9ae9..d7de11789f 100644 | ||
39 | --- a/gold/merge.cc | ||
40 | +++ b/gold/merge.cc | ||
41 | @@ -440,9 +440,11 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object, | ||
42 | { | ||
43 | section_size_type sec_len; | ||
44 | bool is_new; | ||
45 | + uint64_t addralign = this->addralign(); | ||
46 | const unsigned char* pdata = object->decompressed_section_contents(shndx, | ||
47 | &sec_len, | ||
48 | - &is_new); | ||
49 | + &is_new, | ||
50 | + &addralign); | ||
51 | |||
52 | const Char_type* p = reinterpret_cast<const Char_type*>(pdata); | ||
53 | const Char_type* pend = p + sec_len / sizeof(Char_type); | ||
54 | @@ -494,7 +496,7 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object, | ||
55 | // aligned, so each string within the section must retain the same | ||
56 | // modulo. | ||
57 | uintptr_t init_align_modulo = (reinterpret_cast<uintptr_t>(pdata) | ||
58 | - & (this->addralign() - 1)); | ||
59 | + & (addralign - 1)); | ||
60 | bool has_misaligned_strings = false; | ||
61 | |||
62 | while (p < pend) | ||
63 | @@ -503,7 +505,7 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object, | ||
64 | |||
65 | // Within merge input section each string must be aligned. | ||
66 | if (len != 0 | ||
67 | - && ((reinterpret_cast<uintptr_t>(p) & (this->addralign() - 1)) | ||
68 | + && ((reinterpret_cast<uintptr_t>(p) & (addralign - 1)) | ||
69 | != init_align_modulo)) | ||
70 | has_misaligned_strings = true; | ||
71 | |||
72 | diff --git a/gold/object.cc b/gold/object.cc | ||
73 | index 374340fa16..711793e5e4 100644 | ||
74 | --- a/gold/object.cc | ||
75 | +++ b/gold/object.cc | ||
76 | @@ -751,11 +751,13 @@ build_compressed_section_map( | ||
77 | const unsigned char* contents = | ||
78 | obj->section_contents(i, &len, false); | ||
79 | uint64_t uncompressed_size; | ||
80 | + Compressed_section_info info; | ||
81 | if (is_zcompressed) | ||
82 | { | ||
83 | // Skip over the ".zdebug" prefix. | ||
84 | name += 7; | ||
85 | uncompressed_size = get_uncompressed_size(contents, len); | ||
86 | + info.addralign = shdr.get_sh_addralign(); | ||
87 | } | ||
88 | else | ||
89 | { | ||
90 | @@ -763,8 +765,8 @@ build_compressed_section_map( | ||
91 | name += 6; | ||
92 | elfcpp::Chdr<size, big_endian> chdr(contents); | ||
93 | uncompressed_size = chdr.get_ch_size(); | ||
94 | + info.addralign = chdr.get_ch_addralign(); | ||
95 | } | ||
96 | - Compressed_section_info info; | ||
97 | info.size = convert_to_section_size_type(uncompressed_size); | ||
98 | info.flag = shdr.get_sh_flags(); | ||
99 | info.contents = NULL; | ||
100 | @@ -3060,7 +3062,8 @@ const unsigned char* | ||
101 | Object::decompressed_section_contents( | ||
102 | unsigned int shndx, | ||
103 | section_size_type* plen, | ||
104 | - bool* is_new) | ||
105 | + bool* is_new, | ||
106 | + uint64_t* palign) | ||
107 | { | ||
108 | section_size_type buffer_size; | ||
109 | const unsigned char* buffer = this->do_section_contents(shndx, &buffer_size, | ||
110 | @@ -3087,6 +3090,8 @@ Object::decompressed_section_contents( | ||
111 | { | ||
112 | *plen = uncompressed_size; | ||
113 | *is_new = false; | ||
114 | + if (palign != NULL) | ||
115 | + *palign = p->second.addralign; | ||
116 | return p->second.contents; | ||
117 | } | ||
118 | |||
119 | @@ -3108,6 +3113,8 @@ Object::decompressed_section_contents( | ||
120 | // once in this pass. | ||
121 | *plen = uncompressed_size; | ||
122 | *is_new = true; | ||
123 | + if (palign != NULL) | ||
124 | + *palign = p->second.addralign; | ||
125 | return uncompressed_data; | ||
126 | } | ||
127 | |||
128 | diff --git a/gold/object.h b/gold/object.h | ||
129 | index 0b786a5471..b99548463d 100644 | ||
130 | --- a/gold/object.h | ||
131 | +++ b/gold/object.h | ||
132 | @@ -373,6 +373,7 @@ struct Compressed_section_info | ||
133 | { | ||
134 | section_size_type size; | ||
135 | elfcpp::Elf_Xword flag; | ||
136 | + uint64_t addralign; | ||
137 | const unsigned char* contents; | ||
138 | }; | ||
139 | typedef std::map<unsigned int, Compressed_section_info> Compressed_section_map; | ||
140 | @@ -808,7 +809,8 @@ class Object | ||
141 | |||
142 | bool | ||
143 | section_is_compressed(unsigned int shndx, | ||
144 | - section_size_type* uncompressed_size) const | ||
145 | + section_size_type* uncompressed_size, | ||
146 | + elfcpp::Elf_Xword* palign = NULL) const | ||
147 | { | ||
148 | if (this->compressed_sections_ == NULL) | ||
149 | return false; | ||
150 | @@ -818,6 +820,8 @@ class Object | ||
151 | { | ||
152 | if (uncompressed_size != NULL) | ||
153 | *uncompressed_size = p->second.size; | ||
154 | + if (palign != NULL) | ||
155 | + *palign = p->second.addralign; | ||
156 | return true; | ||
157 | } | ||
158 | return false; | ||
159 | @@ -828,7 +832,7 @@ class Object | ||
160 | // by the caller. | ||
161 | const unsigned char* | ||
162 | decompressed_section_contents(unsigned int shndx, section_size_type* plen, | ||
163 | - bool* is_cached); | ||
164 | + bool* is_cached, uint64_t* palign = NULL); | ||
165 | |||
166 | // Discard any buffers of decompressed sections. This is done | ||
167 | // at the end of the Add_symbols task. | ||
168 | diff --git a/gold/output.cc b/gold/output.cc | ||
169 | index 1701db1c99..75ac3bcf97 100644 | ||
170 | --- a/gold/output.cc | ||
171 | +++ b/gold/output.cc | ||
172 | @@ -2448,7 +2448,13 @@ Output_section::add_input_section(Layout* layout, | ||
173 | unsigned int reloc_shndx, | ||
174 | bool have_sections_script) | ||
175 | { | ||
176 | + section_size_type input_section_size = shdr.get_sh_size(); | ||
177 | + section_size_type uncompressed_size; | ||
178 | elfcpp::Elf_Xword addralign = shdr.get_sh_addralign(); | ||
179 | + if (object->section_is_compressed(shndx, &uncompressed_size, | ||
180 | + &addralign)) | ||
181 | + input_section_size = uncompressed_size; | ||
182 | + | ||
183 | if ((addralign & (addralign - 1)) != 0) | ||
184 | { | ||
185 | object->error(_("invalid alignment %lu for section \"%s\""), | ||
186 | @@ -2498,11 +2504,6 @@ Output_section::add_input_section(Layout* layout, | ||
187 | } | ||
188 | } | ||
189 | |||
190 | - section_size_type input_section_size = shdr.get_sh_size(); | ||
191 | - section_size_type uncompressed_size; | ||
192 | - if (object->section_is_compressed(shndx, &uncompressed_size)) | ||
193 | - input_section_size = uncompressed_size; | ||
194 | - | ||
195 | off_t offset_in_section; | ||
196 | |||
197 | if (this->has_fixed_layout()) | ||
198 | -- | ||
199 | 2.20.1 | ||
200 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch deleted file mode 100644 index d5a1ea1dc4..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch +++ /dev/null | |||
@@ -1,121 +0,0 @@ | |||
1 | From 30838132997e6a3cfe3ec11c58b32b22f6f6b102 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Thu, 20 Sep 2018 15:29:17 +0930 | ||
4 | Subject: [PATCH] Bug 23686, two segment faults in nm | ||
5 | |||
6 | Fixes the bugs exposed by the testcases in the PR, plus two more bugs | ||
7 | I noticed when looking at _bfd_stab_section_find_nearest_line. | ||
8 | |||
9 | PR 23686 | ||
10 | * dwarf2.c (read_section): Error when attempting to malloc | ||
11 | "(bfd_size_type) -1". | ||
12 | * syms.c (_bfd_stab_section_find_nearest_line): Bounds check | ||
13 | function_name. Bounds check reloc address. Formatting. Ensure | ||
14 | .stabstr zero terminated. | ||
15 | CVE: CVE-2018-17358 and CVE-2018-17359 | ||
16 | Upstream-Status: Backport | ||
17 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
18 | --- | ||
19 | bfd/ChangeLog | 9 +++++++++ | ||
20 | bfd/dwarf2.c | 9 ++++++++- | ||
21 | bfd/syms.c | 22 ++++++++++++++++------ | ||
22 | 3 files changed, 33 insertions(+), 7 deletions(-) | ||
23 | |||
24 | --- a/bfd/dwarf2.c | ||
25 | +++ b/bfd/dwarf2.c | ||
26 | @@ -527,6 +527,7 @@ read_section (bfd * abfd, | ||
27 | asection *msec; | ||
28 | const char *section_name = sec->uncompressed_name; | ||
29 | bfd_byte *contents = *section_buffer; | ||
30 | + bfd_size_type amt; | ||
31 | |||
32 | /* The section may have already been read. */ | ||
33 | if (contents == NULL) | ||
34 | @@ -549,7 +550,13 @@ read_section (bfd * abfd, | ||
35 | *section_size = msec->rawsize ? msec->rawsize : msec->size; | ||
36 | /* Paranoia - alloc one extra so that we can make sure a string | ||
37 | section is NUL terminated. */ | ||
38 | - contents = (bfd_byte *) bfd_malloc (*section_size + 1); | ||
39 | + amt = *section_size + 1; | ||
40 | + if (amt == 0) | ||
41 | + { | ||
42 | + bfd_set_error (bfd_error_no_memory); | ||
43 | + return FALSE; | ||
44 | + } | ||
45 | + contents = (bfd_byte *) bfd_malloc (amt); | ||
46 | if (contents == NULL) | ||
47 | return FALSE; | ||
48 | if (syms | ||
49 | --- a/bfd/syms.c | ||
50 | +++ b/bfd/syms.c | ||
51 | @@ -1035,6 +1035,10 @@ _bfd_stab_section_find_nearest_line (bfd | ||
52 | 0, strsize)) | ||
53 | return FALSE; | ||
54 | |||
55 | + /* Stab strings ought to be nul terminated. Ensure the last one | ||
56 | + is, to prevent running off the end of the buffer. */ | ||
57 | + info->strs[strsize - 1] = 0; | ||
58 | + | ||
59 | /* If this is a relocatable object file, we have to relocate | ||
60 | the entries in .stab. This should always be simple 32 bit | ||
61 | relocations against symbols defined in this object file, so | ||
62 | @@ -1073,7 +1077,8 @@ _bfd_stab_section_find_nearest_line (bfd | ||
63 | || r->howto->bitsize != 32 | ||
64 | || r->howto->pc_relative | ||
65 | || r->howto->bitpos != 0 | ||
66 | - || r->howto->dst_mask != 0xffffffff) | ||
67 | + || r->howto->dst_mask != 0xffffffff | ||
68 | + || r->address * bfd_octets_per_byte (abfd) + 4 > stabsize) | ||
69 | { | ||
70 | _bfd_error_handler | ||
71 | (_("unsupported .stab relocation")); | ||
72 | @@ -1195,7 +1200,8 @@ _bfd_stab_section_find_nearest_line (bfd | ||
73 | { | ||
74 | nul_fun = stab; | ||
75 | nul_str = str; | ||
76 | - if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) | ||
77 | + if (file_name >= (char *) info->strs + strsize | ||
78 | + || file_name < (char *) str) | ||
79 | file_name = NULL; | ||
80 | if (stab + STABSIZE + TYPEOFF < info->stabs + stabsize | ||
81 | && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO) | ||
82 | @@ -1206,7 +1212,8 @@ _bfd_stab_section_find_nearest_line (bfd | ||
83 | directory_name = file_name; | ||
84 | file_name = ((char *) str | ||
85 | + bfd_get_32 (abfd, stab + STRDXOFF)); | ||
86 | - if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) | ||
87 | + if (file_name >= (char *) info->strs + strsize | ||
88 | + || file_name < (char *) str) | ||
89 | file_name = NULL; | ||
90 | } | ||
91 | } | ||
92 | @@ -1217,7 +1224,8 @@ _bfd_stab_section_find_nearest_line (bfd | ||
93 | file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); | ||
94 | /* PR 17512: file: 0c680a1f. */ | ||
95 | /* PR 17512: file: 5da8aec4. */ | ||
96 | - if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) | ||
97 | + if (file_name >= (char *) info->strs + strsize | ||
98 | + || file_name < (char *) str) | ||
99 | file_name = NULL; | ||
100 | break; | ||
101 | |||
102 | @@ -1226,7 +1234,8 @@ _bfd_stab_section_find_nearest_line (bfd | ||
103 | function_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); | ||
104 | if (function_name == (char *) str) | ||
105 | continue; | ||
106 | - if (function_name >= (char *) info->strs + strsize) | ||
107 | + if (function_name >= (char *) info->strs + strsize | ||
108 | + || function_name < (char *) str) | ||
109 | function_name = NULL; | ||
110 | |||
111 | nul_fun = NULL; | ||
112 | @@ -1335,7 +1344,8 @@ _bfd_stab_section_find_nearest_line (bfd | ||
113 | if (val <= offset) | ||
114 | { | ||
115 | file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); | ||
116 | - if (file_name >= (char *) info->strs + strsize || file_name < (char *) str) | ||
117 | + if (file_name >= (char *) info->strs + strsize | ||
118 | + || file_name < (char *) str) | ||
119 | file_name = NULL; | ||
120 | *pline = 0; | ||
121 | } | ||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch deleted file mode 100644 index 45c637967b..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From cf93e9c2cf8f8b2566f8fc86e961592b51b5980d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Thu, 20 Sep 2018 18:23:17 +0930 | ||
4 | Subject: [PATCH] PR23685, buffer overflow | ||
5 | |||
6 | PR 23685 | ||
7 | * peXXigen.c (pe_print_edata): Correct export address table | ||
8 | overflow checks. Check dataoff against section size too. | ||
9 | |||
10 | CVE: CVE-2018-17360 | ||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
13 | --- | ||
14 | bfd/ChangeLog | 6 ++++++ | ||
15 | bfd/peXXigen.c | 11 ++++++----- | ||
16 | 2 files changed, 12 insertions(+), 5 deletions(-) | ||
17 | |||
18 | --- a/bfd/peXXigen.c | ||
19 | +++ b/bfd/peXXigen.c | ||
20 | @@ -1661,7 +1661,8 @@ pe_print_edata (bfd * abfd, void * vfile | ||
21 | |||
22 | dataoff = addr - section->vma; | ||
23 | datasize = extra->DataDirectory[PE_EXPORT_TABLE].Size; | ||
24 | - if (datasize > section->size - dataoff) | ||
25 | + if (dataoff > section->size | ||
26 | + || datasize > section->size - dataoff) | ||
27 | { | ||
28 | fprintf (file, | ||
29 | _("\nThere is an export table in %s, but it does not fit into that section\n"), | ||
30 | @@ -1778,11 +1779,11 @@ pe_print_edata (bfd * abfd, void * vfile | ||
31 | edt.base); | ||
32 | |||
33 | /* PR 17512: Handle corrupt PE binaries. */ | ||
34 | - if (edt.eat_addr + (edt.num_functions * 4) - adj >= datasize | ||
35 | + /* PR 17512 file: 140-165018-0.004. */ | ||
36 | + if (edt.eat_addr - adj >= datasize | ||
37 | /* PR 17512: file: 092b1829 */ | ||
38 | - || (edt.num_functions * 4) < edt.num_functions | ||
39 | - /* PR 17512 file: 140-165018-0.004. */ | ||
40 | - || data + edt.eat_addr - adj < data) | ||
41 | + || (edt.num_functions + 1) * 4 < edt.num_functions | ||
42 | + || edt.eat_addr - adj + (edt.num_functions + 1) * 4 > datasize) | ||
43 | fprintf (file, _("\tInvalid Export Address Table rva (0x%lx) or entry count (0x%lx)\n"), | ||
44 | (long) edt.eat_addr, | ||
45 | (long) edt.num_functions); | ||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch deleted file mode 100644 index 010e6b5d53..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch +++ /dev/null | |||
@@ -1,251 +0,0 @@ | |||
1 | From 0930cb3021b8078b34cf216e79eb8608d017864f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Sat, 13 Oct 2018 22:03:02 +1030 | ||
4 | Subject: [PATCH] _bfd_clear_contents bounds checking | ||
5 | |||
6 | This PR shows a fuzzed binary triggering a segfault via a bad | ||
7 | relocation in .debug_line. It turns out that unlike normal | ||
8 | relocations applied to a section, the linker applies those with | ||
9 | symbols from discarded sections via _bfd_clear_contents without | ||
10 | checking that the relocation is within the section bounds. The same | ||
11 | thing now happens when reading debug sections since commit | ||
12 | a4cd947aca23, the PR23425 fix. | ||
13 | |||
14 | PR 23770 | ||
15 | PR 23425 | ||
16 | * reloc.c (_bfd_clear_contents): Replace "location" param with | ||
17 | "buf" and "off". Bounds check "off". Return status. | ||
18 | * cofflink.c (_bfd_coff_generic_relocate_section): Update | ||
19 | _bfd_clear_contents call. | ||
20 | * elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Likewise. | ||
21 | * elf32-arc.c (elf_arc_relocate_section): Likewise. | ||
22 | * elf32-i386.c (elf_i386_relocate_section): Likewise. | ||
23 | * elf32-metag.c (metag_final_link_relocate): Likewise. | ||
24 | * elf32-nds32.c (nds32_elf_get_relocated_section_contents): Likewise. | ||
25 | * elf32-ppc.c (ppc_elf_relocate_section): Likewise. | ||
26 | * elf32-visium.c (visium_elf_relocate_section): Likewise. | ||
27 | * elf64-ppc.c (ppc64_elf_relocate_section): Likewise. | ||
28 | * elf64-x86-64.c *(elf_x86_64_relocate_section): Likewise. | ||
29 | * libbfd-in.h (_bfd_clear_contents): Update prototype. | ||
30 | * libbfd.h: Regenerate. | ||
31 | |||
32 | Upstream-Status: Backport | ||
33 | CVE: CVE-2018-18605 | ||
34 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
35 | --- | ||
36 | bfd/ChangeLog | 20 ++++++++++++++++++++ | ||
37 | bfd/cofflink.c | 2 +- | ||
38 | bfd/elf-bfd.h | 2 +- | ||
39 | bfd/elf32-arc.c | 2 +- | ||
40 | bfd/elf32-i386.c | 2 +- | ||
41 | bfd/elf32-metag.c | 2 +- | ||
42 | bfd/elf32-nds32.c | 8 ++++---- | ||
43 | bfd/elf32-ppc.c | 2 +- | ||
44 | bfd/elf32-visium.c | 2 +- | ||
45 | bfd/elf64-ppc.c | 2 +- | ||
46 | bfd/elf64-x86-64.c | 2 +- | ||
47 | bfd/libbfd-in.h | 4 ++-- | ||
48 | bfd/libbfd.h | 4 ++-- | ||
49 | bfd/reloc.c | 19 +++++++++++++------ | ||
50 | 14 files changed, 50 insertions(+), 23 deletions(-) | ||
51 | |||
52 | --- a/bfd/cofflink.c | ||
53 | +++ b/bfd/cofflink.c | ||
54 | @@ -3080,7 +3080,7 @@ _bfd_coff_generic_relocate_section (bfd | ||
55 | if (sec != NULL && discarded_section (sec)) | ||
56 | { | ||
57 | _bfd_clear_contents (howto, input_bfd, input_section, | ||
58 | - contents + (rel->r_vaddr - input_section->vma)); | ||
59 | + contents, rel->r_vaddr - input_section->vma); | ||
60 | continue; | ||
61 | } | ||
62 | |||
63 | --- a/bfd/elf-bfd.h | ||
64 | +++ b/bfd/elf-bfd.h | ||
65 | @@ -2811,7 +2811,7 @@ extern asection _bfd_elf_large_com_secti | ||
66 | { \ | ||
67 | int i_; \ | ||
68 | _bfd_clear_contents (howto, input_bfd, input_section, \ | ||
69 | - contents + rel[index].r_offset); \ | ||
70 | + contents, rel[index].r_offset); \ | ||
71 | \ | ||
72 | if (bfd_link_relocatable (info) \ | ||
73 | && (input_section->flags & SEC_DEBUGGING)) \ | ||
74 | --- a/bfd/elf32-arc.c | ||
75 | +++ b/bfd/elf32-arc.c | ||
76 | @@ -1552,7 +1552,7 @@ elf_arc_relocate_section (bfd * outp | ||
77 | if (sec != NULL && discarded_section (sec)) | ||
78 | { | ||
79 | _bfd_clear_contents (howto, input_bfd, input_section, | ||
80 | - contents + rel->r_offset); | ||
81 | + contents, rel->r_offset); | ||
82 | rel->r_info = 0; | ||
83 | rel->r_addend = 0; | ||
84 | |||
85 | --- a/bfd/elf32-i386.c | ||
86 | +++ b/bfd/elf32-i386.c | ||
87 | @@ -2197,7 +2197,7 @@ elf_i386_relocate_section (bfd *output_b | ||
88 | if (sec != NULL && discarded_section (sec)) | ||
89 | { | ||
90 | _bfd_clear_contents (howto, input_bfd, input_section, | ||
91 | - contents + rel->r_offset); | ||
92 | + contents, rel->r_offset); | ||
93 | wrel->r_offset = rel->r_offset; | ||
94 | wrel->r_info = 0; | ||
95 | wrel->r_addend = 0; | ||
96 | --- a/bfd/elf32-metag.c | ||
97 | +++ b/bfd/elf32-metag.c | ||
98 | @@ -1396,7 +1396,7 @@ metag_final_link_relocate (reloc_howto_t | ||
99 | rel, relend, howto, contents) \ | ||
100 | { \ | ||
101 | _bfd_clear_contents (howto, input_bfd, input_section, \ | ||
102 | - contents + rel->r_offset); \ | ||
103 | + contents, rel->r_offset); \ | ||
104 | \ | ||
105 | if (bfd_link_relocatable (info) \ | ||
106 | && (input_section->flags & SEC_DEBUGGING)) \ | ||
107 | --- a/bfd/elf32-nds32.c | ||
108 | +++ b/bfd/elf32-nds32.c | ||
109 | @@ -12582,14 +12582,14 @@ nds32_elf_get_relocated_section_contents | ||
110 | symbol = *(*parent)->sym_ptr_ptr; | ||
111 | if (symbol->section && discarded_section (symbol->section)) | ||
112 | { | ||
113 | - bfd_byte *p; | ||
114 | + bfd_vma off; | ||
115 | static reloc_howto_type none_howto | ||
116 | = HOWTO (0, 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, | ||
117 | "unused", FALSE, 0, 0, FALSE); | ||
118 | |||
119 | - p = data + (*parent)->address * bfd_octets_per_byte (input_bfd); | ||
120 | - _bfd_clear_contents ((*parent)->howto, input_bfd, input_section, | ||
121 | - p); | ||
122 | + off = (*parent)->address * bfd_octets_per_byte (input_bfd); | ||
123 | + _bfd_clear_contents ((*parent)->howto, input_bfd, | ||
124 | + input_section, data, off); | ||
125 | (*parent)->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; | ||
126 | (*parent)->addend = 0; | ||
127 | (*parent)->howto = &none_howto; | ||
128 | --- a/bfd/elf32-ppc.c | ||
129 | +++ b/bfd/elf32-ppc.c | ||
130 | @@ -8232,7 +8232,7 @@ ppc_elf_relocate_section (bfd *output_bf | ||
131 | howto = ppc_elf_howto_table[r_type]; | ||
132 | |||
133 | _bfd_clear_contents (howto, input_bfd, input_section, | ||
134 | - contents + rel->r_offset); | ||
135 | + contents, rel->r_offset); | ||
136 | wrel->r_offset = rel->r_offset; | ||
137 | wrel->r_info = 0; | ||
138 | wrel->r_addend = 0; | ||
139 | --- a/bfd/elf32-visium.c | ||
140 | +++ b/bfd/elf32-visium.c | ||
141 | @@ -621,7 +621,7 @@ visium_elf_relocate_section (bfd *output | ||
142 | or sections discarded by a linker script, we just want the | ||
143 | section contents zeroed. Avoid any special processing. */ | ||
144 | _bfd_clear_contents (howto, input_bfd, input_section, | ||
145 | - contents + rel->r_offset); | ||
146 | + contents, rel->r_offset); | ||
147 | |||
148 | rel->r_info = 0; | ||
149 | rel->r_addend = 0; | ||
150 | --- a/bfd/elf64-ppc.c | ||
151 | +++ b/bfd/elf64-ppc.c | ||
152 | @@ -14074,7 +14074,7 @@ ppc64_elf_relocate_section (bfd *output_ | ||
153 | { | ||
154 | _bfd_clear_contents (ppc64_elf_howto_table[r_type], | ||
155 | input_bfd, input_section, | ||
156 | - contents + rel->r_offset); | ||
157 | + contents, rel->r_offset); | ||
158 | wrel->r_offset = rel->r_offset; | ||
159 | wrel->r_info = 0; | ||
160 | wrel->r_addend = 0; | ||
161 | --- a/bfd/elf64-x86-64.c | ||
162 | +++ b/bfd/elf64-x86-64.c | ||
163 | @@ -2490,7 +2490,7 @@ elf_x86_64_relocate_section (bfd *output | ||
164 | if (sec != NULL && discarded_section (sec)) | ||
165 | { | ||
166 | _bfd_clear_contents (howto, input_bfd, input_section, | ||
167 | - contents + rel->r_offset); | ||
168 | + contents, rel->r_offset); | ||
169 | wrel->r_offset = rel->r_offset; | ||
170 | wrel->r_info = 0; | ||
171 | wrel->r_addend = 0; | ||
172 | --- a/bfd/libbfd-in.h | ||
173 | +++ b/bfd/libbfd-in.h | ||
174 | @@ -696,8 +696,8 @@ extern bfd_reloc_status_type _bfd_reloca | ||
175 | (reloc_howto_type *, bfd *, bfd_vma, bfd_byte *) ATTRIBUTE_HIDDEN; | ||
176 | |||
177 | /* Clear a given location using a given howto. */ | ||
178 | -extern void _bfd_clear_contents | ||
179 | - (reloc_howto_type *, bfd *, asection *, bfd_byte *) ATTRIBUTE_HIDDEN; | ||
180 | +extern bfd_reloc_status_type _bfd_clear_contents | ||
181 | + (reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma) ATTRIBUTE_HIDDEN; | ||
182 | |||
183 | /* Link stabs in sections in the first pass. */ | ||
184 | |||
185 | --- a/bfd/libbfd.h | ||
186 | +++ b/bfd/libbfd.h | ||
187 | @@ -701,8 +701,8 @@ extern bfd_reloc_status_type _bfd_reloca | ||
188 | (reloc_howto_type *, bfd *, bfd_vma, bfd_byte *) ATTRIBUTE_HIDDEN; | ||
189 | |||
190 | /* Clear a given location using a given howto. */ | ||
191 | -extern void _bfd_clear_contents | ||
192 | - (reloc_howto_type *, bfd *, asection *, bfd_byte *) ATTRIBUTE_HIDDEN; | ||
193 | +extern bfd_reloc_status_type _bfd_clear_contents | ||
194 | + (reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma) ATTRIBUTE_HIDDEN; | ||
195 | |||
196 | /* Link stabs in sections in the first pass. */ | ||
197 | |||
198 | --- a/bfd/reloc.c | ||
199 | +++ b/bfd/reloc.c | ||
200 | @@ -1613,16 +1613,22 @@ _bfd_relocate_contents (reloc_howto_type | ||
201 | relocations against discarded symbols, to make ignorable debug or unwind | ||
202 | information more obvious. */ | ||
203 | |||
204 | -void | ||
205 | +bfd_reloc_status_type | ||
206 | _bfd_clear_contents (reloc_howto_type *howto, | ||
207 | bfd *input_bfd, | ||
208 | asection *input_section, | ||
209 | - bfd_byte *location) | ||
210 | + bfd_byte *buf, | ||
211 | + bfd_vma off) | ||
212 | { | ||
213 | int size; | ||
214 | bfd_vma x = 0; | ||
215 | + bfd_byte *location; | ||
216 | + | ||
217 | + if (!bfd_reloc_offset_in_range (howto, input_bfd, input_section, off)) | ||
218 | + return bfd_reloc_outofrange; | ||
219 | |||
220 | /* Get the value we are going to relocate. */ | ||
221 | + location = buf + off; | ||
222 | size = bfd_get_reloc_size (howto); | ||
223 | switch (size) | ||
224 | { | ||
225 | @@ -1681,6 +1687,7 @@ _bfd_clear_contents (reloc_howto_type *h | ||
226 | #endif | ||
227 | break; | ||
228 | } | ||
229 | + return bfd_reloc_ok; | ||
230 | } | ||
231 | |||
232 | /* | ||
233 | @@ -8268,14 +8275,14 @@ bfd_generic_get_relocated_section_conten | ||
234 | |||
235 | if (symbol->section && discarded_section (symbol->section)) | ||
236 | { | ||
237 | - bfd_byte *p; | ||
238 | + bfd_vma off; | ||
239 | static reloc_howto_type none_howto | ||
240 | = HOWTO (0, 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, | ||
241 | "unused", FALSE, 0, 0, FALSE); | ||
242 | |||
243 | - p = data + (*parent)->address * bfd_octets_per_byte (input_bfd); | ||
244 | - _bfd_clear_contents ((*parent)->howto, input_bfd, input_section, | ||
245 | - p); | ||
246 | + off = (*parent)->address * bfd_octets_per_byte (input_bfd); | ||
247 | + _bfd_clear_contents ((*parent)->howto, input_bfd, | ||
248 | + input_section, data, off); | ||
249 | (*parent)->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; | ||
250 | (*parent)->addend = 0; | ||
251 | (*parent)->howto = &none_howto; | ||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch deleted file mode 100644 index a117f95df1..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From ab419ddbb2cdd17ca83618990f2cacf904ce1d61 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Tue, 23 Oct 2018 18:29:24 +1030 | ||
4 | Subject: [PATCH] PR23804, buffer overflow in sec_merge_hash_lookup | ||
5 | |||
6 | PR 23804 | ||
7 | * merge.c (_bfd_add_merge_section): Don't attempt to merge | ||
8 | sections where size is not a multiple of entsize. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | CVE: CVE-2018-18605 | ||
12 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
13 | --- | ||
14 | bfd/ChangeLog | 6 ++++++ | ||
15 | bfd/merge.c | 3 +++ | ||
16 | 2 files changed, 9 insertions(+) | ||
17 | |||
18 | --- a/bfd/merge.c | ||
19 | +++ b/bfd/merge.c | ||
20 | @@ -376,6 +376,9 @@ _bfd_add_merge_section (bfd *abfd, void | ||
21 | || sec->entsize == 0) | ||
22 | return TRUE; | ||
23 | |||
24 | + if (sec->size % sec->entsize != 0) | ||
25 | + return TRUE; | ||
26 | + | ||
27 | if ((sec->flags & SEC_RELOC) != 0) | ||
28 | { | ||
29 | /* We aren't prepared to handle relocations in merged sections. */ | ||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch deleted file mode 100644 index 325c339b88..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 45a0eaf77022963d639d6d19871dbab7b79703fc Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Tue, 23 Oct 2018 19:02:06 +1030 | ||
4 | Subject: [PATCH] PR23806, NULL pointer dereference in merge_strings | ||
5 | |||
6 | PR 23806 | ||
7 | * merge.c (_bfd_add_merge_section): Don't attempt to merge | ||
8 | sections with ridiculously large alignments. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | CVE: CVE-2018-18606 | ||
12 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
13 | --- | ||
14 | bfd/ChangeLog | 6 ++++++ | ||
15 | bfd/merge.c | 15 +++++++++++---- | ||
16 | 2 files changed, 17 insertions(+), 4 deletions(-) | ||
17 | |||
18 | --- a/bfd/merge.c | ||
19 | +++ b/bfd/merge.c | ||
20 | @@ -24,6 +24,7 @@ | ||
21 | as used in ELF SHF_MERGE. */ | ||
22 | |||
23 | #include "sysdep.h" | ||
24 | +#include <limits.h> | ||
25 | #include "bfd.h" | ||
26 | #include "elf-bfd.h" | ||
27 | #include "libbfd.h" | ||
28 | @@ -385,12 +386,18 @@ _bfd_add_merge_section (bfd *abfd, void | ||
29 | return TRUE; | ||
30 | } | ||
31 | |||
32 | - align = sec->alignment_power; | ||
33 | - if ((sec->entsize < (unsigned) 1 << align | ||
34 | +#ifndef CHAR_BIT | ||
35 | +#define CHAR_BIT 8 | ||
36 | +#endif | ||
37 | + if (sec->alignment_power >= sizeof (align) * CHAR_BIT) | ||
38 | + return TRUE; | ||
39 | + | ||
40 | + align = 1u << sec->alignment_power; | ||
41 | + if ((sec->entsize < align | ||
42 | && ((sec->entsize & (sec->entsize - 1)) | ||
43 | || !(sec->flags & SEC_STRINGS))) | ||
44 | - || (sec->entsize > (unsigned) 1 << align | ||
45 | - && (sec->entsize & (((unsigned) 1 << align) - 1)))) | ||
46 | + || (sec->entsize > align | ||
47 | + && (sec->entsize & (align - 1)))) | ||
48 | { | ||
49 | /* Sanity check. If string character size is smaller than | ||
50 | alignment, then we require character size to be a power | ||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch deleted file mode 100644 index 902a90dbc3..0000000000 --- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 102def4da826b3d9e169741421e5e67e8731909a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Tue, 23 Oct 2018 18:30:22 +1030 | ||
4 | Subject: [PATCH] PR23805, NULL pointer dereference in elf_link_input_bfd | ||
5 | |||
6 | PR 23805 | ||
7 | * elflink.c (elf_link_input_bfd): Don't segfault on finding | ||
8 | STT_TLS symbols without any TLS sections. Instead, change the | ||
9 | symbol type to STT_NOTYPE. | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | CVE: CVE-2018-18606 | ||
13 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
14 | --- | ||
15 | bfd/ChangeLog | 7 +++++++ | ||
16 | bfd/elflink.c | 20 ++++++++++++++------ | ||
17 | 2 files changed, 21 insertions(+), 6 deletions(-) | ||
18 | |||
19 | --- a/bfd/elflink.c | ||
20 | +++ b/bfd/elflink.c | ||
21 | @@ -10496,8 +10496,11 @@ elf_link_input_bfd (struct elf_final_lin | ||
22 | if (ELF_ST_TYPE (osym.st_info) == STT_TLS) | ||
23 | { | ||
24 | /* STT_TLS symbols are relative to PT_TLS segment base. */ | ||
25 | - BFD_ASSERT (elf_hash_table (flinfo->info)->tls_sec != NULL); | ||
26 | - osym.st_value -= elf_hash_table (flinfo->info)->tls_sec->vma; | ||
27 | + if (elf_hash_table (flinfo->info)->tls_sec != NULL) | ||
28 | + osym.st_value -= elf_hash_table (flinfo->info)->tls_sec->vma; | ||
29 | + else | ||
30 | + osym.st_info = ELF_ST_INFO (ELF_ST_BIND (osym.st_info), | ||
31 | + STT_NOTYPE); | ||
32 | } | ||
33 | } | ||
34 | |||
35 | @@ -11053,12 +11056,17 @@ elf_link_input_bfd (struct elf_final_lin | ||
36 | sym.st_value += osec->vma; | ||
37 | if (ELF_ST_TYPE (sym.st_info) == STT_TLS) | ||
38 | { | ||
39 | + struct elf_link_hash_table *htab | ||
40 | + = elf_hash_table (flinfo->info); | ||
41 | + | ||
42 | /* STT_TLS symbols are relative to PT_TLS | ||
43 | segment base. */ | ||
44 | - BFD_ASSERT (elf_hash_table (flinfo->info) | ||
45 | - ->tls_sec != NULL); | ||
46 | - sym.st_value -= (elf_hash_table (flinfo->info) | ||
47 | - ->tls_sec->vma); | ||
48 | + if (htab->tls_sec != NULL) | ||
49 | + sym.st_value -= htab->tls_sec->vma; | ||
50 | + else | ||
51 | + sym.st_info | ||
52 | + = ELF_ST_INFO (ELF_ST_BIND (sym.st_info), | ||
53 | + STT_NOTYPE); | ||
54 | } | ||
55 | } | ||
56 | |||
diff --git a/meta/recipes-devtools/binutils/binutils/clang-bfd-fix.patch b/meta/recipes-devtools/binutils/binutils/clang-bfd-fix.patch deleted file mode 100644 index 29c0d48fed..0000000000 --- a/meta/recipes-devtools/binutils/binutils/clang-bfd-fix.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | Fix compiler error seen with clang, The return value of this | ||
2 | function is not checked anywhere so in a way its useless but | ||
3 | still technically correct to return a value here | ||
4 | |||
5 | Fixes | ||
6 | |||
7 | ../../bfd/reloc.c:1638:7: error: non-void function '_bfd_clear_contents' should return a value [-Wreturn-type] | ||
8 | return; | ||
9 | ^ | ||
10 | 1 error generated. | ||
11 | |||
12 | It has been fixed in master along with a larger cleanup and fix for relocations | ||
13 | |||
14 | https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=1dc9e2d63e37839ff1768346b2e3f52e338baba5 | ||
15 | |||
16 | Upstream-Status: Backport [Fixes differently] | ||
17 | |||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | |||
20 | --- a/bfd/reloc.c | ||
21 | +++ b/bfd/reloc.c | ||
22 | @@ -1629,7 +1629,7 @@ _bfd_clear_contents (reloc_howto_type *h | ||
23 | default: | ||
24 | abort (); | ||
25 | case 0: | ||
26 | - return; | ||
27 | + return 0; | ||
28 | case 1: | ||
29 | x = bfd_get_8 (input_bfd, location); | ||
30 | break; | ||
diff --git a/meta/recipes-devtools/binutils/binutils_2.31.bb b/meta/recipes-devtools/binutils/binutils_2.32.bb index 51a9748906..51a9748906 100644 --- a/meta/recipes-devtools/binutils/binutils_2.31.bb +++ b/meta/recipes-devtools/binutils/binutils_2.32.bb | |||