++ // 91000000 add x0, x0, #0x0 ++ // 94000000 bl 0 <__tls_get_addr> ++ // optimized to sequence - ++ // d53bd040 mrs x0, tpidr_el0 ++ // 91400000 add x0, x0, #0x0, lsl #12 ++ // 91000000 add x0, x0, #0x0 ++ ++ // Unlike tls_ie_to_le, we change the 3 insns in one function call when we ++ // encounter the first relocation "R_AARCH64_TLSLD_ADR_PAGE21". Because we ++ // have to change "bl tls_get_addr", which does not have a corresponding tls ++ // relocation type. So before proceeding, we need to make sure compiler ++ // does not change the sequence. ++ if(!(insn1 == 0x90000000 // adrp x0,0 ++ && insn2 == 0x91000000 // add x0, x0, #0x0 ++ && insn3 == 0x94000000)) // bl 0 ++ { ++ // Ideally we should give up gd_to_le relaxation and do gd access. ++ // However the gd_to_le relaxation decision has been made early ++ // in the scan stage, where we did not allocate any GOT entry for ++ // this symbol. Therefore we have to exit and report error now. ++ gold_error(_("unexpected reloc insn sequence while relaxing " ++ "tls gd to le for reloc %u."), r_type); ++ return aarch64_reloc_funcs::STATUS_BAD_RELOC; ++ } ++ ++ // Write new insns. ++ insn1 = 0xd53bd040; // mrs x0, tpidr_el0 ++ insn2 = 0x91400000; // add x0, x0, #0x0, lsl #12 ++ insn3 = 0x91000000; // add x0, x0, #0x0 ++ elfcpp::Swap<32, big_endian>::writeval(ip, insn1); ++ elfcpp::Swap<32, big_endian>::writeval(ip + 1, insn2); ++ elfcpp::Swap<32, big_endian>::writeval(ip + 2, insn3); ++ ++ // Calculate tprel value. ++ Output_segment* tls_segment = relinfo->layout->tls_segment(); ++ gold_assert(tls_segment != NULL); ++ AArch64_address value = psymval->value(relinfo->object, 0); ++ const elfcpp::Elf_Xword addend = rela.get_r_addend(); ++ AArch64_address aligned_tcb_size = ++ align_address(target->tcb_size(), tls_segment->maximum_alignment()); ++ AArch64_address x = value + aligned_tcb_size; ++ ++ // After new insns are written, apply TLSLE relocs. ++ const AArch64_reloc_property* rp1 = ++ aarch64_reloc_property_table->get_reloc_property( ++ elfcpp::R_AARCH64_TLSLE_ADD_TPREL_HI12); ++ const AArch64_reloc_property* rp2 = ++ aarch64_reloc_property_table->get_reloc_property( ++ elfcpp::R_AARCH64_TLSLE_ADD_TPREL_LO12); ++ gold_assert(rp1 != NULL && rp2 != NULL); ++ ++ typename aarch64_reloc_funcs::Status s1 = ++ aarch64_reloc_funcs::template rela_general<32>(view + 4, ++ x, ++ addend, ++ rp1); ++ if (s1 != aarch64_reloc_funcs::STATUS_OKAY) ++ return s1; ++ ++ typename aarch64_reloc_funcs::Status s2 = ++ aarch64_reloc_funcs::template rela_general<32>(view + 8, ++ x, ++ addend, ++ rp2); ++ ++ this->skip_call_tls_get_addr_ = true; ++ return s2; ++ ++} // End of tls_ld_to_le ++ ++template ++inline ++typename AArch64_relocate_functions::Status + Target_aarch64::Relocate::tls_ie_to_le( + const Relocate_info* relinfo, + Target_aarch64* target, +@@ -5963,7 +6407,7 @@ Target_aarch64::Reloca + newinsn = (0xf2800000 | regno) | ((x & 0xffff) << 5); + } + else +- gold_assert(false); ++ gold_unreachable(); + + elfcpp::Swap<32, big_endian>::writeval(ip, newinsn); + return aarch64_reloc_funcs::STATUS_OKAY; +Index: b/gold/testsuite/icf_safe_so_test.cc +=================================================================== +--- a/gold/testsuite/icf_safe_so_test.cc ++++ b/gold/testsuite/icf_safe_so_test.cc +@@ -22,10 +22,10 @@ + + // The goal of this program is to verify if identical code folding + // in safe mode correctly folds functions in a shared object. The +-// foo_* functions below should not be folded. For x86-64, +-// foo_glob and bar_glob should be folded as their function pointers +-// are addresses of PLT entries in shared objects. For 32-bit X86, +-// the hidden protected and internal symbols can be folded. ++// foo_* functions below should not be folded on X86_64. ++// For 32-bit X86, the hidden protected and internal symbols can be folded. ++// foo_glob and bar_glob should not be folded, because function pointer ++// of foo_glob is taken. + + int __attribute__ ((visibility ("protected"))) + foo_prot() +Index: b/gold/testsuite/icf_safe_test.sh +=================================================================== +--- a/gold/testsuite/icf_safe_test.sh ++++ b/gold/testsuite/icf_safe_test.sh +@@ -57,7 +57,7 @@ END { + + arch_specific_safe_fold() + { +- grep_x86=`grep -q -e "Advanced Micro Devices X86-64" -e "Intel 80386" -e "ARM" -e "TILE" -e "PowerPC" $2` ++ grep_x86=`grep -q -e "Advanced Micro Devices X86-64" -e "Intel 80386" -e "ARM" -e "TILE" -e "PowerPC" -e "AArch64" $2` + if [ $? -eq 0 ]; + then + check_fold $3 $4 $5 --- binutils-2.25.1.orig/debian/patches/aarch64-libpath.diff +++ binutils-2.25.1/debian/patches/aarch64-libpath.diff @@ -0,0 +1,27 @@ +Index: b/ld/emulparams/aarch64linux.sh +=================================================================== +--- a/ld/emulparams/aarch64linux.sh ++++ b/ld/emulparams/aarch64linux.sh +@@ -38,12 +38,15 @@ + + # Linux modifies the default library search path to first include + # a 64-bit specific directory. +-case "$target" in +- aarch64*-linux*) +- case "$EMULATION_NAME" in +- aarch64linux*) LIBPATH_SUFFIX=64 ;; +- esac +- ;; +-esac ++ ++# not for multiarch systems ... ++ ++#case "$target" in ++# aarch64*-linux*) ++# case "$EMULATION_NAME" in ++# aarch64linux*) LIBPATH_SUFFIX=64 ;; ++# esac ++# ;; ++#esac + + ELF_INTERPRETER_NAME=\"/lib/ld-linux-aarch64.so.1\" --- binutils-2.25.1.orig/debian/patches/aarch64-thunderx.diff +++ binutils-2.25.1/debian/patches/aarch64-thunderx.diff @@ -0,0 +1,28 @@ +# DP: gas: Recognize: AAarch64 ThunderX processor. + +Index: b/gas/config/tc-aarch64.c +=================================================================== +--- a/gas/config/tc-aarch64.c ++++ b/gas/config/tc-aarch64.c +@@ -7191,6 +7191,9 @@ static const struct aarch64_cpu_option_t + {"exynos-m1", AARCH64_FEATURE (AARCH64_ARCH_V8, + AARCH64_FEATURE_CRC | AARCH64_FEATURE_CRYPTO), + "Samsung Exynos M1"}, ++ {"thunderx", AARCH64_FEATURE (AARCH64_ARCH_V8, ++ AARCH64_FEATURE_CRC | AARCH64_FEATURE_CRYPTO), ++ "Cavium ThunderX"}, + /* The 'xgene-1' name is an older name for 'xgene1', which was used + in earlier releases and is superseded by 'xgene1' in all + tools. */ +Index: b/gas/doc/c-aarch64.texi +=================================================================== +--- a/gas/doc/c-aarch64.texi ++++ b/gas/doc/c-aarch64.texi +@@ -59,6 +59,7 @@ on the target processor. The following + @code{cortex-a57}, + @code{cortex-a72}, + @code{exynos-m1}, ++@code{thunderx}, + @code{xgene1}, + and + @code{xgene2}. --- binutils-2.25.1.orig/debian/patches/arm-ld-unique-tests.diff +++ binutils-2.25.1/debian/patches/arm-ld-unique-tests.diff @@ -0,0 +1,55 @@ +# DP: ld/testsuite/ld-unique: Fix running unique tests on ARM + +The @ character is a comment character on ARM, so use % instead. Also +use a wider glob for matching ARM targets to make sure the test gets +run. + +ld/testsuite/ChangeLog: + +2014-10-23 Will Newton + + * ld-unique/unique.exp: Use a wider glob for matching ARM + targets. + * ld-unique/unique.s: Use % instead of @ in .type directive. + * ld-unique/unique_shared.s: Likewise. +--- + ld/testsuite/ld-unique/unique.exp | 2 +- + ld/testsuite/ld-unique/unique.s | 2 +- + ld/testsuite/ld-unique/unique_shared.s | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ld/testsuite/ld-unique/unique.exp b/ld/testsuite/ld-unique/unique.exp +index a93f9b2..994ed87 100644 +--- a/ld/testsuite/ld-unique/unique.exp ++++ b/ld/testsuite/ld-unique/unique.exp +@@ -28,7 +28,7 @@ + # arm, powerpc, and sparc so far. + if {!(([istarget "i?86-*-*"] + || [istarget "x86_64-*-*"] +- || [istarget "arm-*-*"] ++ || [istarget "arm*-*-*"] + || [istarget "powerpc*-*-*"] + || [istarget "sparc*-*-*"]) + && ([istarget "*-*-elf*"] +diff --git a/ld/testsuite/ld-unique/unique.s b/ld/testsuite/ld-unique/unique.s +index 9b0593c..7477a69 100644 +--- a/ld/testsuite/ld-unique/unique.s ++++ b/ld/testsuite/ld-unique/unique.s +@@ -1,4 +1,4 @@ +- .type a, @gnu_unique_object ++ .type a, %gnu_unique_object + a: .long 0 + .size a, .-a + +diff --git a/ld/testsuite/ld-unique/unique_shared.s b/ld/testsuite/ld-unique/unique_shared.s +index b18a5b1..8022291 100644 +--- a/ld/testsuite/ld-unique/unique_shared.s ++++ b/ld/testsuite/ld-unique/unique_shared.s +@@ -1,3 +1,3 @@ +- .type b, @gnu_unique_object ++ .type b, %gnu_unique_object + b: .long 0 + .size b, .-b +-- +1.9.3 + --- binutils-2.25.1.orig/debian/patches/branch-updates.diff +++ binutils-2.25.1/debian/patches/branch-updates.diff @@ -0,0 +1,5 @@ +# DP: updates from the binutils-2.25 branch + +# git diff 15a2e5b3fab5543c499a58783d9562c0c973fc1f 7dcadfe848fc3bc443795eeac919b69f4ab34cbe +# exclude bfd/{configure{,.ac},Makefile.{am,in}} + --- binutils-2.25.1.orig/debian/patches/branch-version.diff +++ binutils-2.25.1/debian/patches/branch-version.diff @@ -0,0 +1,52 @@ +diff --git a/bfd/Makefile.am b/bfd/Makefile.am +index ea4fd28..8610d5e 100644 +--- a/bfd/Makefile.am ++++ b/bfd/Makefile.am +@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.11 no-dist foreign + ACLOCAL_AMFLAGS = -I . -I .. -I ../config + + # Uncomment the following line when doing a release. +-RELEASE=y ++# RELEASE=y + + INCDIR = $(srcdir)/../include + CSEARCH = -I. -I$(srcdir) -I$(INCDIR) +diff --git a/bfd/Makefile.in b/bfd/Makefile.in +index 741809c..34196aa 100644 +--- a/bfd/Makefile.in ++++ b/bfd/Makefile.in +@@ -320,7 +320,7 @@ AUTOMAKE_OPTIONS = 1.11 no-dist foreign + ACLOCAL_AMFLAGS = -I . -I .. -I ../config + + # Uncomment the following line when doing a release. +-RELEASE = y ++# RELEASE=y + INCDIR = $(srcdir)/../include + CSEARCH = -I. -I$(srcdir) -I$(INCDIR) + SUBDIRS = doc po +diff --git a/bfd/configure b/bfd/configure +index bc242b9..d31f0d9 100755 +--- a/bfd/configure ++++ b/bfd/configure +@@ -3988,7 +3988,7 @@ fi + + # Define the identity of the package. + PACKAGE=bfd +- VERSION=2.22 ++ VERSION=2.22.0 + + + cat >>confdefs.h <<_ACEOF +diff --git a/bfd/configure.ac b/bfd/configure.ac +index 435aaaa..9ba3000 100644 +--- a/bfd/configure.ac ++++ b/bfd/configure.ac +@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([libbfd.c]) + AC_CANONICAL_TARGET + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(bfd, 2.22) ++AM_INIT_AUTOMAKE(bfd, 2.22.0) + + dnl These must be called before LT_INIT, because it may want + dnl to call AC_CHECK_PROG. --- binutils-2.25.1.orig/debian/patches/fix-Bsymbolic-functions.diff +++ binutils-2.25.1/debian/patches/fix-Bsymbolic-functions.diff @@ -0,0 +1,241 @@ +From a496fbc8802f0a5719db6347a43cc869e03d83c9 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Sat, 25 Jul 2015 16:38:42 +0930 +Subject: [PATCH] Fix broken -Bsymbolic-functions + +For selected targets. The testcase reveals a number of targets that +still need fixing. + +bfd/ + * elf32-arm.c (elf32_arm_final_link_relocate): Use SYMBOLIC_BIND to + check if a symbol should be bound symbolically. + * elf32-hppa.c (elf32_hppa_check_relocs, + elf32_hppa_adjust_dynamic_symbol, elf32_hppa_relocate_section, + elf32_hppa_finish_dynamic_symbol): Likewise. + * elf32-m68k.c (elf_m68k_check_relocs, + elf_m68k_relocate_section): Likewise. + * elf32-nios2.c (nios2_elf32_relocate_section, + nios2_elf32_check_relocs, allocate_dynrelocs): Likewise. + * elf32-tic6x.c (elf32_tic6x_finish_dynamic_symbol, + elf32_tic6x_relocate_section): Likewise. +ld/testsuite/ + * ld-elf/symbolic-func.s, + * ld-elf/symbolic-func.r: New test. + * ld-elf/elf.exp: Run it. +--- + bfd/ChangeLog | 14 ++++++++++++++ + bfd/elf32-arm.c | 2 +- + bfd/elf32-hppa.c | 8 ++++---- + bfd/elf32-m68k.c | 4 ++-- + bfd/elf32-nios2.c | 6 +++--- + bfd/elf32-tic6x.c | 4 ++-- + ld/testsuite/ChangeLog | 6 ++++++ + ld/testsuite/ld-elf/elf.exp | 10 +++++++++- + ld/testsuite/ld-elf/symbolic-func.r | 18 ++++++++++++++++++ + ld/testsuite/ld-elf/symbolic-func.s | 13 +++++++++++++ + 10 files changed, 72 insertions(+), 13 deletions(-) + create mode 100644 ld/testsuite/ld-elf/symbolic-func.r + create mode 100644 ld/testsuite/ld-elf/symbolic-func.s + +diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c +index 919df17..367dff3 100644 +--- a/bfd/elf32-arm.c ++++ b/bfd/elf32-arm.c +@@ -8449,7 +8449,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, + else if (h != NULL + && h->dynindx != -1 + && (!info->shared +- || !info->symbolic ++ || !SYMBOLIC_BIND (info, h) + || !h->def_regular)) + outrel.r_info = ELF32_R_INFO (h->dynindx, r_type); + else +diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c +index af512a7..f611e0d 100644 +--- a/bfd/elf32-hppa.c ++++ b/bfd/elf32-hppa.c +@@ -1467,7 +1467,7 @@ elf32_hppa_check_relocs (bfd *abfd, + && (sec->flags & SEC_ALLOC) != 0 + && (IS_ABSOLUTE_RELOC (r_type) + || (hh != NULL +- && (!info->symbolic ++ && (!SYMBOLIC_BIND (info, &hh->eh) + || hh->eh.root.type == bfd_link_hash_defweak + || !hh->eh.def_regular)))) + || (ELIMINATE_COPY_RELOCS +@@ -1819,7 +1819,7 @@ elf32_hppa_adjust_dynamic_symbol (struct bfd_link_info *info, + || (eh->def_regular + && eh->root.type != bfd_link_hash_defweak + && ! hppa_elf_hash_entry (eh)->plabel +- && (!info->shared || info->symbolic))) ++ && (!info->shared || SYMBOLIC_BIND (info, eh)))) + { + /* The .plt entry is not needed when: + a) Garbage collection has removed all references to the +@@ -4005,7 +4005,7 @@ elf32_hppa_relocate_section (bfd *output_bfd, + && (plabel + || !IS_ABSOLUTE_RELOC (r_type) + || !info->shared +- || !info->symbolic ++ || !SYMBOLIC_BIND (info, &hh->eh) + || !hh->eh.def_regular)) + { + outrel.r_info = ELF32_R_INFO (hh->eh.dynindx, r_type); +@@ -4389,7 +4389,7 @@ elf32_hppa_finish_dynamic_symbol (bfd *output_bfd, + global offset table will already have been initialized in the + relocate_section function. */ + if (info->shared +- && (info->symbolic || eh->dynindx == -1) ++ && (SYMBOLIC_BIND (info, eh) || eh->dynindx == -1) + && eh->def_regular) + { + rela.r_info = ELF32_R_INFO (0, R_PARISC_DIR32); +diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c +index fad3ec6..db0d0da 100644 +--- a/bfd/elf32-m68k.c ++++ b/bfd/elf32-m68k.c +@@ -2758,7 +2758,7 @@ elf_m68k_check_relocs (bfd *abfd, + if (!(info->shared + && (sec->flags & SEC_ALLOC) != 0 + && h != NULL +- && (!info->symbolic ++ && (!SYMBOLIC_BIND (info, h) + || h->root.type == bfd_link_hash_defweak + || !h->def_regular))) + { +@@ -4027,7 +4027,7 @@ elf_m68k_relocate_section (bfd *output_bfd, + || r_type == R_68K_PC16 + || r_type == R_68K_PC32 + || !info->shared +- || !info->symbolic ++ || !SYMBOLIC_BIND (info, h) + || !h->def_regular)) + { + outrel.r_info = ELF32_R_INFO (h->dynindx, r_type); +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index e5b7763..a5ab54f 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -4398,7 +4398,7 @@ nios2_elf32_relocate_section (bfd *output_bfd, + else if (h != NULL + && h->dynindx != -1 + && (!info->shared +- || !info->symbolic ++ || !SYMBOLIC_BIND (info, h) + || !h->def_regular)) + { + outrel.r_info = ELF32_R_INFO (h->dynindx, r_type); +@@ -4909,7 +4909,7 @@ nios2_elf32_check_relocs (bfd *abfd, struct bfd_link_info *info, + && (sec->flags & SEC_ALLOC) != 0 + && (r_type == R_NIOS2_BFD_RELOC_32 + || (h != NULL && ! h->needs_plt +- && (! info->symbolic || ! h->def_regular)))) ++ && (! SYMBOLIC_BIND (info, h) || ! h->def_regular)))) + { + struct elf32_nios2_dyn_relocs *p; + struct elf32_nios2_dyn_relocs **head; +@@ -5752,7 +5752,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, PTR inf) + if (info->shared) + { + if (h->def_regular +- && (h->forced_local || info->symbolic)) ++ && (h->forced_local || SYMBOLIC_BIND (info, h))) + { + struct elf32_nios2_dyn_relocs **pp; + +diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c +index 8bfad84..7fc385b 100644 +--- a/bfd/elf32-tic6x.c ++++ b/bfd/elf32-tic6x.c +@@ -1849,7 +1849,7 @@ elf32_tic6x_finish_dynamic_symbol (bfd * output_bfd, + The entry in the global offset table will already have been + initialized in the relocate_section function. */ + if (info->shared +- && (info->symbolic ++ && (SYMBOLIC_BIND (info, h) + || h->dynindx == -1 || h->forced_local) && h->def_regular) + { + asection *s = h->root.u.def.section; +@@ -2449,7 +2449,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, + else if (h != NULL + && h->dynindx != -1 + && (!info->shared +- || !info->symbolic ++ || !SYMBOLIC_BIND (info, h) + || !h->def_regular)) + { + outrel.r_info = ELF32_R_INFO (h->dynindx, r_type); +diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp +index d1a70ea..55bcb72 100644 +--- a/ld/testsuite/ld-elf/elf.exp ++++ b/ld/testsuite/ld-elf/elf.exp +@@ -77,7 +77,7 @@ if { ![istarget hppa64*-hpux*] } { + } + } + +-# Only run these tests on targets thats support creating shared libraries. ++# Only run these tests on targets that support creating shared libraries. + if { [check_shared_lib_support] } then { + # Run a test to check linking a shared library with a broken linker + # script that accidentally marks dynamic sections as notes. The +@@ -107,6 +107,14 @@ if { [check_shared_lib_support] } then { + "--as-needed" "--start-group tmpdir/pr17068a.a tmpdir/pr17068.so tmpdir/pr17068b.a --end-group" "" + {start.s pr17068.s} {} "pr17068"} + } ++ # xfail on tic6x due to non-PIC/non-PID warnings ++ setup_xfail "tic6x-*-*" ++ run_ld_link_tests { ++ {"-Bsymbolic-functions" ++ "-shared -Bsymbolic-functions" "" "" ++ {symbolic-func.s} {{readelf {-r --wide} symbolic-func.r}} ++ "symbolic-func.so"} ++ } + } + + set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]] +diff --git a/ld/testsuite/ld-elf/symbolic-func.r b/ld/testsuite/ld-elf/symbolic-func.r +new file mode 100644 +index 0000000..174e76f +--- /dev/null ++++ b/ld/testsuite/ld-elf/symbolic-func.r +@@ -0,0 +1,18 @@ ++# Most targets will emit an R_*_RELATIVE reloc here, but RELATIVE ++# relocs are superfluous. A target can do without them by simply ++# defining an ADDR32 or ADDR64 style reloc without a symbol to behave ++# like a RELATIVE reloc. GLOB_DAT relocs are similarly superfluous. ++# In fact, a RELATIVE reloc can be wrong even if a target does have ++# them, if the 32-bit or 64-bit field being relocated is unaligned. ++# In that case the target ought to emit a UADDR32/64 or similar rather ++# than a RELATIVE reloc. ++# ++# We also allow a dynamic reloc with a reference to .text as that ++# should also resolve correctly. No reloc, or one referencing "fun" ++# is incorrect. Also fail the test on finding a reloc at offset 0, ++# typically a NONE reloc. ++ ++Relocation section.* ++ *Offset.* ++0*[1-9a-f][0-9a-f]* +[^ ]+ +[^ ]+ +([0-9a-f]+( +\.text( \+ 0)?)?)? ++#pass +diff --git a/ld/testsuite/ld-elf/symbolic-func.s b/ld/testsuite/ld-elf/symbolic-func.s +new file mode 100644 +index 0000000..29f4138 +--- /dev/null ++++ b/ld/testsuite/ld-elf/symbolic-func.s +@@ -0,0 +1,13 @@ ++ .text ++ .global fun ++ .type fun, %function ++fun: ++ .space 4 ++ .size fun, .-fun ++ ++ .section .data.rel.ro,"aw",%progbits ++ .p2align 3 ++ .type fun_ptr, %object ++fun_ptr: ++ .dc.a fun ++ .size fun_ptr, .-fun_ptr +-- +1.9.4 + --- binutils-2.25.1.orig/debian/patches/gprof-build.diff +++ binutils-2.25.1/debian/patches/gprof-build.diff @@ -0,0 +1,16 @@ +# DP: Fix gprof build error. + +Index: b/gprof/gconfig.in +=================================================================== +--- a/gprof/gconfig.in ++++ b/gprof/gconfig.in +@@ -96,9 +96,6 @@ + #endif + + +-/* Version number of package */ +-#undef VERSION +- + /* Number of bits in a file offset, on hosts where this is settable. */ + #undef _FILE_OFFSET_BITS + --- binutils-2.25.1.orig/debian/patches/mips64-default-n64.diff +++ binutils-2.25.1/debian/patches/mips64-default-n64.diff @@ -0,0 +1,66 @@ +Index: b/bfd/config.bfd +=================================================================== +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -1061,6 +1061,16 @@ case "${targ}" in + targ_defvec=mips_elf32_be_vec + targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" + ;; ++ mips64*el-*-linux*-gnuabi64) ++ targ_defvec=mips_elf64_trad_le_vec ++ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec" ++ want64=true ++ ;; ++ mips64*-*-linux*-gnuabi64) ++ targ_defvec=mips_elf64_trad_be_vec ++ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec" ++ want64=true ++ ;; + mips64*el-*-linux*) + targ_defvec=mips_elf32_ntrad_le_vec + targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec" +Index: b/gas/configure.ac +=================================================================== +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -287,6 +287,9 @@ changequote([,])dnl + esac + # Decide which ABI to target by default. + case ${target} in ++ mips64*-linux-gnuabi64) ++ mips_default_abi=N64_ABI ++ ;; + mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* | mips64*-kfreebsd*-gnu) + mips_default_abi=N32_ABI + ;; +Index: b/ld/configure.tgt +=================================================================== +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -476,6 +476,12 @@ mips*el-*-vxworks*) targ_emul=elf32elmip + mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + targ_extra_emuls="elf32elmipvxworks" ;; + mips*-*-windiss) targ_emul=elf32mipswindiss ;; ++mips64*el-*-linux-gnuabi64) targ_emul=elf64ltsmip ++ targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf32ltsmipn32 elf64btsmip" ++ targ_extra_libpath=$targ_extra_emuls ;; ++mips64*-*-linux-gnuabi64) targ_emul=elf64btsmip ++ targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf32btsmipn32 elf64ltsmip" ++ targ_extra_libpath=$targ_extra_emuls ;; + mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 + targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" + targ_extra_libpath=$targ_extra_emuls ;; +Index: b/gas/configure +=================================================================== +--- a/gas/configure ++++ b/gas/configure +@@ -12197,6 +12197,9 @@ _ACEOF + esac + # Decide which ABI to target by default. + case ${target} in ++ mips64*-linux-gnuabi64) ++ mips_default_abi=N64_ABI ++ ;; + mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* | mips64*-kfreebsd*-gnu) + mips_default_abi=N32_ABI + ;; --- binutils-2.25.1.orig/debian/patches/pr-ld-16428.diff +++ binutils-2.25.1/debian/patches/pr-ld-16428.diff @@ -0,0 +1,158 @@ +# DP: Proposed patch for PR ld/16428, disallow -shared/-pie, -shared/-static, -pie/-static. + +2014-01-10 H.J. Lu + + PR ld/16428 + * ld.texinfo: Updated for -static/-non_shared change. + * ldlex.h (option_values): Add OPTION_STATIC. + * lexsup.c (ld_options): Use OPTION_STATIC for -static/-non_shared. + (parse_args): Handle OPTION_STATIC. Disallow -shared and -pie, + -shared and -static, -pie and -static. + +2014-01-10 H.J. Lu + + PR ld/16428 + * ld-elf/pr16428a.d: New file. + * ld-elf/pr16428b.d: Likewise. + * ld-elf/pr16428c.d: Likewise. + * ld-elf/pr16428d.d: Likewise. + +diff --git a/ld/ld.texinfo b/ld/ld.texinfo +index ae3d568..bddfdfe 100644 +--- a/ld/ld.texinfo ++++ b/ld/ld.texinfo +@@ -1204,11 +1204,11 @@ platforms for which shared libraries are supported. The different + variants of this option are for compatibility with various systems. You + may use this option multiple times on the command line: it affects + library searching for @option{-l} options which follow it. This +-option also implies @option{--unresolved-symbols=report-all}. This +-option can be used with @option{-shared}. Doing so means that a +-shared library is being created but that all of the library's external +-references must be resolved by pulling in entries from static +-libraries. ++option also implies @option{--unresolved-symbols=report-all}. ++@option{-Bstatic} and @option{-dn} can be used with @option{-shared}. ++Doing so means that a shared library is being created but that all of ++the library's external references must be resolved by pulling in entries ++from static libraries. + + @kindex -Bsymbolic + @item -Bsymbolic +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 99f4282..6f237dc 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -49,6 +49,7 @@ enum option_values + OPTION_NO_WARN_SEARCH_MISMATCH, + OPTION_NOINHIBIT_EXEC, + OPTION_NON_SHARED, ++ OPTION_STATIC, + OPTION_NO_WHOLE_ARCHIVE, + OPTION_OFORMAT, + OPTION_RELAX, +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 2f71750..a366613 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -269,9 +269,9 @@ static const struct ld_option ld_options[] = + '\0', NULL, N_("Do not link against shared libraries"), ONE_DASH }, + { {"dn", no_argument, NULL, OPTION_NON_SHARED}, + '\0', NULL, NULL, ONE_DASH }, +- { {"non_shared", no_argument, NULL, OPTION_NON_SHARED}, ++ { {"non_shared", no_argument, NULL, OPTION_STATIC}, + '\0', NULL, NULL, ONE_DASH }, +- { {"static", no_argument, NULL, OPTION_NON_SHARED}, ++ { {"static", no_argument, NULL, OPTION_STATIC}, + '\0', NULL, NULL, ONE_DASH }, + { {"Bsymbolic", no_argument, NULL, OPTION_SYMBOLIC}, + '\0', NULL, N_("Bind global references locally"), ONE_DASH }, +@@ -523,6 +523,7 @@ parse_args (unsigned argc, char **argv) + struct option *really_longopts; + int last_optind; + enum report_method how_to_report_unresolved_symbols = RM_GENERATE_ERROR; ++ bfd_boolean seen_pie = FALSE, seen_shared = FALSE, seen_static = FALSE; + + shortopts = (char *) xmalloc (OPTION_COUNT * 3 + 2); + longopts = (struct option *) +@@ -707,6 +708,8 @@ parse_args (unsigned argc, char **argv) + case OPTION_CALL_SHARED: + input_flags.dynamic = TRUE; + break; ++ case OPTION_STATIC: ++ seen_static = TRUE; + case OPTION_NON_SHARED: + input_flags.dynamic = FALSE; + break; +@@ -1087,6 +1090,7 @@ parse_args (unsigned argc, char **argv) + case OPTION_SHARED: + if (config.has_shared) + { ++ seen_shared = TRUE; + link_info.shared = TRUE; + /* When creating a shared library, the default + behaviour is to ignore any unresolved references. */ +@@ -1101,6 +1105,7 @@ parse_args (unsigned argc, char **argv) + case OPTION_PIE: + if (config.has_shared) + { ++ seen_pie = TRUE; + link_info.shared = TRUE; + link_info.pie = TRUE; + } +@@ -1445,6 +1450,16 @@ parse_args (unsigned argc, char **argv) + } + } + ++ if (seen_shared) ++ { ++ if (seen_pie) ++ einfo (_("%P%F: -shared and -pie are incompatible\n")); ++ if (seen_static) ++ einfo (_("%P%F: -shared and -static are incompatible\n")); ++ } ++ if (seen_pie && seen_static) ++ einfo (_("%P%F: -pie and -static are incompatible\n")); ++ + while (ingroup) + { + lang_leave_group (); +diff --git a/ld/testsuite/ld-elf/pr16428a.d b/ld/testsuite/ld-elf/pr16428a.d +new file mode 100644 +index 0000000..8f5e833 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr16428a.d +@@ -0,0 +1,4 @@ ++#source: start.s ++#ld: -shared -static ++#target: *-*-linux* *-*-gnu* *-*-nacl* ++#error: -shared and -static are incompatible +diff --git a/ld/testsuite/ld-elf/pr16428b.d b/ld/testsuite/ld-elf/pr16428b.d +new file mode 100644 +index 0000000..f4ccba0 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr16428b.d +@@ -0,0 +1,4 @@ ++#source: start.s ++#ld: -shared -non_shared ++#target: *-*-linux* *-*-gnu* *-*-nacl* ++#error: -shared and -static are incompatible +diff --git a/ld/testsuite/ld-elf/pr16428c.d b/ld/testsuite/ld-elf/pr16428c.d +new file mode 100644 +index 0000000..747e8da +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr16428c.d +@@ -0,0 +1,4 @@ ++#source: start.s ++#ld: -shared -pie ++#target: *-*-linux* *-*-gnu* *-*-nacl* ++#error: -shared and -pie are incompatible +diff --git a/ld/testsuite/ld-elf/pr16428d.d b/ld/testsuite/ld-elf/pr16428d.d +new file mode 100644 +index 0000000..6e7a915 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr16428d.d +@@ -0,0 +1,4 @@ ++#source: start.s ++#ld: -pie -static ++#target: *-*-linux* *-*-gnu* *-*-nacl* ++#error: -pie and -static are incompatible --- binutils-2.25.1.orig/debian/patches/pr17481.diff +++ binutils-2.25.1/debian/patches/pr17481.diff @@ -0,0 +1,1583 @@ +# DP: Fix PR bfd/17481 + +bfd/ + +2014-10-15 Alan Modra + + PR 17481 + * aoutx.h (NAME (aout, find_nearest_line)): Add "discriminator_ptr" + param, group "section" and "offset" params. Zero discriminator. + * bfd.c (bfd_find_nearest_line): Implement with new + _bfd_find_nearest_line. + (bfd_find_nearest_line_discriminator): Likewise. + * coff-i386.c (_bfd_generic_find_nearest_line_discriminator): Don't + define. + * coff-rs6000.c (xcoff_find_nearest_line, + xcoff_find_nearest_line_discriminator): Delete. + (_bfd_xcoff_find_nearest_line): Don't define. + (_bfd_xcoff_find_nearest_line): Define as coff_find_nearest_line. + * coff-x86_64.c (_bfd_generic_find_nearest_line_discriminator): Don't + define. + * coff64-rs6000.c (rs6000_xcoff64_vec, rs6000_xcoff64_aix_vec): Adjust. + * coffgen.c (coff_find_nearest_line_with_names): Reorder params, + adjust _bfd_dwarf2_find_nearest_line call. + (coff_find_nearest_line): Add "discriminator_ptr" param, reorder + others. Set discriminator. Adjust call. + (coff_find_nearest_line_discriminator): Delete. + * dwarf1.c (_bfd_dwarf1_find_nearest_line): Reorder params. + * dwarf2.c (find_line): Rename to.. + (_bfd_dwarf2_find_nearest_line): ..this, reordering params. + Simplify setting of do_line. Delete old function. + (_bfd_dwarf2_find_line): Delete. + * ecoff.c (_bfd_ecoff_find_nearest_line): Reorder params, add + discriminator_ptr and set it. + * elf-bfd.h (_bfd_elf_find_nearest_line): Update prototype. + (_bfd_elf_find_nearest_line_discriminator): Delete. + (_bfd_elf_find_line_discriminator): Delete. + (_bfd_generic_find_nearest_line_discriminator): Don't define. + * elf.c (elf_find_function): Reorder params. + (_bfd_elf_find_nearest_line): Reorder params, add discriminator_ptr. + Adjust calls. + (_bfd_elf_find_nearest_line_discriminator): Delete. + (_bfd_elf_find_line): Adjust call. + * elf32-arm.c (arm_elf_find_function): Reorder params. + (elf32_arm_find_nearest_line): Reorder params, add discriminator_ptr. + Adjust calls. + * elf64-alpha.c (elf64_alpha_find_nearest_line): Similarly. + * elfnn-aarch64.c (aarch64_elf_find_function): Reorder params. + (elfNN_aarch64_find_nearest_line): Reorder params, add + discriminator_ptr. Adjust calls. + * elfxx-mips.c (_bfd_mips_elf_find_nearest_line): Similarly. + * elfxx-mips.h (_bfd_mips_elf_find_nearest_line): Update prototype. + * libaout.h (NAME (aout, find_nearest_line)): Update prototype. + * libbfd-in.h (_bfd_nosymbols_find_nearest_line): Update. + (_bfd_dwarf1_find_nearest_line): Likewise. + (_bfd_dwarf2_find_nearest_line): Likewise. + (_bfd_dwarf2_find_line): Delete. + (_bfd_generic_find_nearest_line_discriminator): Delete. + * libbfd.c (_bfd_generic_find_nearest_line_discriminator): Delete. + * libcoff-in.h (coff_find_nearest_line): Update prototype. + (coff_find_nearest_line_discriminator): Delete. + (coff_find_nearest_line_with_names): Update prototype. + * libecoff.h (_bfd_ecoff_find_nearest_line): Update prototype. + * mach-o.c (bfd_mach_o_find_nearest_line): Reorder params, add + discriminator_ptr. Adjust calls. + * mach-o.h (bfd_mach_o_find_nearest_line): Update prototype. + * pdp11.c (NAME (aout, find_nearest_line)): Reorder params, add + discriminator_ptr and set. + * som.c (som_find_nearest_line): Similarly. + * targets.c (BFD_JUMP_TABLE_SYMBOLS): Delete entry for + _bfd_find_nearest_line_discriminator. + (struct bfd_target <_bfd_find_nearest_line>): Adjust prototype. + (struct bfd_target <_bfd_find_nearest_line_discriminator>): Delete. + * vms-alpha.c (_bfd_vms_find_nearest_dst_line): Rename to.. + (_bfd_vms_find_nearest_line): ..this. Reorder params, add + "discriminator" and set. + (_bfd_vms_find_nearest_line_discriminator): Delete. + (_bfd_generic_find_nearest_line_discriminator): Don't define. + (alpha_vms_find_nearest_line): Update define. + * bfd-in2.h: Regenerate. + * libbfd.h: Regenerate. + * libcoff.h: Regenerate. + +2014-10-15 Alan Modra + + * targets.c (BFD_JUMP_TABLE_SYMBOLS): Use NAME##_find_line. + * aout-adobe.c (aout_32_find_line): Define. + (aout_32_bfd_make_debug_symbol, aout_32_bfd_reloc_type_lookup, + aout_32_bfd_reloc_name_lookup): Define using _bfd_nosymbols define. + * aout-target.h (MY_find_line): Define. + * aout-tic30.c (MY_find_line): Define. + * binary.c (binary_find_line): Define. + * bout.c (aout_32_find_line): Define. + * coff-rs6000.c (_bfd_xcoff_find_line): Define. + * coff64-rs6000.c (rs6000_xcoff64_vec): Use coff_find_line. + (rs6000_xcoff64_aix_vec): Likewise. + * elf-bfd.h (_bfd_generic_find_line): Don't define. + * elfxx-target.h (bfd_elfNN_find_line): Define. + * i386msdos.c (msdos_find_line): Define. + * i386os9k.c (aout_32_find_line): Define. + * ieee.c (ieee_find_nearest_line, ieee_find_inliner_info): Delete func. + (ieee_find_nearest_line, ieee_find_line, + ieee_find_inliner_info): Define. + * ihex.c (ihex_find_line): Define. + * libbfd-in.h (_bfd_nosymbols_find_line): Define. + (_bfd_generic_find_line): Don't define. + * libbfd.c (_bfd_generic_find_line): Delete. + * libcoff-in.h (coff_find_line): Define. + * libecoff.h (_bfd_ecoff_find_line): Define. + * mach-o.h (bfd_mach_o_find_line): Define. + * mmo.c (mmo_find_line): Define. + * nlm-target.h (nlm_find_line): Define. + * oasys.c (oasys_find_nearest_line, oasys_find_inliner_info): Delete. + (oasys_find_nearest_line, oasys_find_line, + oasys_find_inliner_info): Define. + * pef.c (bfd_pef_find_line): Define. + * plugin.c (bfd_plugin_find_line): Define. + * ppcboot.c (ppcboot_find_line): Define. + * som.c (som_find_line): Define. + * srec.c (srec_find_line): Define. + * tekhex.c (tekhex_find_line): Define. + * versados.c (versados_find_line): Define. + * vms-alpha.c (alpha_vms_find_line): Define. + * xsym.c (bfd_sym_find_line): Define. + * bfd-in2.h: Regenerate. + * libbfd.h: Regenerate. + * libcoff.h: Regenerate. + +--- a/bfd/aout-adobe.c ++++ b/bfd/aout-adobe.c +@@ -446,9 +446,10 @@ aout_adobe_sizeof_headers (bfd *ignore_abfd ATTRIBUTE_UNUSED, + + /* Build the transfer vector for Adobe A.Out files. */ + +-#define aout_32_bfd_make_debug_symbol ((asymbol *(*) (bfd *, void *, unsigned long)) bfd_nullvoidptr) +-#define aout_32_bfd_reloc_type_lookup ((reloc_howto_type *(*) (bfd *, bfd_reloc_code_real_type)) bfd_nullvoidptr) +-#define aout_32_bfd_reloc_name_lookup ((reloc_howto_type *(*) (bfd *, const char *)) bfd_nullvoidptr) ++#define aout_32_find_line _bfd_nosymbols_find_line ++#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol ++#define aout_32_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup ++#define aout_32_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup + #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info + #define aout_32_set_arch_mach aout_adobe_set_arch_mach + #define aout_32_set_section_contents aout_adobe_set_section_contents +--- a/bfd/aout-target.h ++++ b/bfd/aout-target.h +@@ -468,6 +468,9 @@ MY_bfd_final_link (bfd *abfd, struct bfd_link_info *info) + #ifndef MY_find_nearest_line + #define MY_find_nearest_line NAME (aout, find_nearest_line) + #endif ++#ifndef MY_find_line ++#define MY_find_line _bfd_nosymbols_find_line ++#endif + #ifndef MY_find_inliner_info + #define MY_find_inliner_info _bfd_nosymbols_find_inliner_info + #endif +--- a/bfd/aout-tic30.c ++++ b/bfd/aout-tic30.c +@@ -926,6 +926,9 @@ tic30_aout_set_arch_mach (bfd *abfd, + #ifndef MY_find_nearest_line + #define MY_find_nearest_line NAME (aout, find_nearest_line) + #endif ++#ifndef MY_find_line ++#define MY_find_line _bfd_nosymbols_find_line ++#endif + #ifndef MY_find_inliner_info + #define MY_find_inliner_info _bfd_nosymbols_find_inliner_info + #endif +--- a/bfd/aoutx.h ++++ b/bfd/aoutx.h +@@ -2640,12 +2640,13 @@ NAME (aout, minisymbol_to_symbol) (bfd *abfd, + + bfd_boolean + NAME (aout, find_nearest_line) (bfd *abfd, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) ++ unsigned int *line_ptr, ++ unsigned int *disriminator_ptr) + { + /* Run down the file looking for the filename, function and linenumber. */ + asymbol **p; +@@ -2663,6 +2664,8 @@ NAME (aout, find_nearest_line) (bfd *abfd, + *filename_ptr = abfd->filename; + *functionname_ptr = 0; + *line_ptr = 0; ++ if (disriminator_ptr) ++ *disriminator_ptr = 0; + + if (symbols != NULL) + { +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -6651,12 +6651,12 @@ bfd_boolean bfd_set_private_flags (bfd *abfd, flagword flags); + + #define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \ + BFD_SEND (abfd, _bfd_find_nearest_line, \ +- (abfd, sec, syms, off, file, func, line)) ++ (abfd, syms, sec, off, file, func, line, NULL)) + + #define bfd_find_nearest_line_discriminator(abfd, sec, syms, off, file, func, \ + line, disc) \ +- BFD_SEND (abfd, _bfd_find_nearest_line_discriminator, \ +- (abfd, sec, syms, off, file, func, line, disc)) ++ BFD_SEND (abfd, _bfd_find_nearest_line, \ ++ (abfd, syms, sec, off, file, func, line, disc)) + + #define bfd_find_line(abfd, syms, sym, file, line) \ + BFD_SEND (abfd, _bfd_find_line, \ +@@ -7018,8 +7018,7 @@ typedef struct bfd_target + NAME##_bfd_is_target_special_symbol, \ + NAME##_get_lineno, \ + NAME##_find_nearest_line, \ +- _bfd_generic_find_nearest_line_discriminator, \ +- _bfd_generic_find_line, \ ++ NAME##_find_line, \ + NAME##_find_inliner_info, \ + NAME##_bfd_make_debug_symbol, \ + NAME##_read_minisymbols, \ +@@ -7040,10 +7039,7 @@ typedef struct bfd_target + bfd_boolean (*_bfd_is_target_special_symbol) (bfd *, asymbol *); + alent * (*_get_lineno) (bfd *, struct bfd_symbol *); + bfd_boolean (*_bfd_find_nearest_line) +- (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma, +- const char **, const char **, unsigned int *); +- bfd_boolean (*_bfd_find_nearest_line_discriminator) +- (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma, ++ (bfd *, struct bfd_symbol **, struct bfd_section *, bfd_vma, + const char **, const char **, unsigned int *, unsigned int *); + bfd_boolean (*_bfd_find_line) + (bfd *, struct bfd_symbol **, struct bfd_symbol *, +--- a/bfd/bfd.c ++++ b/bfd/bfd.c +@@ -1444,12 +1444,12 @@ DESCRIPTION + . + .#define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \ + . BFD_SEND (abfd, _bfd_find_nearest_line, \ +-. (abfd, sec, syms, off, file, func, line)) ++. (abfd, syms, sec, off, file, func, line, NULL)) + . + .#define bfd_find_nearest_line_discriminator(abfd, sec, syms, off, file, func, \ + . line, disc) \ +-. BFD_SEND (abfd, _bfd_find_nearest_line_discriminator, \ +-. (abfd, sec, syms, off, file, func, line, disc)) ++. BFD_SEND (abfd, _bfd_find_nearest_line, \ ++. (abfd, syms, sec, off, file, func, line, disc)) + . + .#define bfd_find_line(abfd, syms, sym, file, line) \ + . BFD_SEND (abfd, _bfd_find_line, \ +--- a/bfd/binary.c ++++ b/bfd/binary.c +@@ -204,6 +204,7 @@ binary_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, + #define binary_bfd_is_local_label_name bfd_generic_is_local_label_name + #define binary_get_lineno _bfd_nosymbols_get_lineno + #define binary_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define binary_find_line _bfd_nosymbols_find_line + #define binary_find_inliner_info _bfd_nosymbols_find_inliner_info + #define binary_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define binary_read_minisymbols _bfd_generic_read_minisymbols +--- a/bfd/bout.c ++++ b/bfd/bout.c +@@ -1374,6 +1374,7 @@ b_out_bfd_get_relocated_section_contents (bfd *output_bfd, + + /* Build the transfer vectors for Big and Little-Endian B.OUT files. */ + ++#define aout_32_find_line _bfd_nosymbols_find_line + #define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info + #define b_out_bfd_link_hash_table_create _bfd_generic_link_hash_table_create +--- a/bfd/coff-i386.c ++++ b/bfd/coff-i386.c +@@ -605,9 +605,6 @@ coff_i386_is_local_label_name (bfd *abfd, const char *name) + + #include "coffcode.h" + +-#define _bfd_generic_find_nearest_line_discriminator \ +- coff_find_nearest_line_discriminator +- + const bfd_target + #ifdef TARGET_SYM + TARGET_SYM = +--- a/bfd/coff-rs6000.c ++++ b/bfd/coff-rs6000.c +@@ -430,39 +430,6 @@ static const struct dwarf_debug_section xcoff_debug_sections[] = + { NULL, NULL }, /* .debug_weaknames */ + { NULL, NULL }, + }; +- +-static bfd_boolean +-xcoff_find_nearest_line (bfd *abfd, +- asection *section, +- asymbol **symbols, +- bfd_vma offset, +- const char **filename_ptr, +- const char **functionname_ptr, +- unsigned int *line_ptr) +-{ +- return coff_find_nearest_line_with_names (abfd, xcoff_debug_sections, +- section, symbols, offset, +- filename_ptr, functionname_ptr, +- line_ptr); +-} +- +-static bfd_boolean +-xcoff_find_nearest_line_discriminator (bfd *abfd, +- asection *section, +- asymbol **symbols, +- bfd_vma offset, +- const char **filename_ptr, +- const char **functionname_ptr, +- unsigned int *line_ptr, +- unsigned int *discriminator) +-{ +- *discriminator = 0; +- return coff_find_nearest_line_with_names (abfd, xcoff_debug_sections, +- section, symbols, offset, +- filename_ptr, functionname_ptr, +- line_ptr); +-} +- + + void + _bfd_xcoff_swap_sym_in (bfd *abfd, void * ext1, void * in1) +@@ -4045,9 +4012,8 @@ const struct xcoff_dwsect_name xcoff_dwsect_names[] = { + #define _bfd_xcoff_bfd_is_target_special_symbol \ + coff_bfd_is_target_special_symbol + #define _bfd_xcoff_get_lineno coff_get_lineno +-#define _bfd_xcoff_find_nearest_line xcoff_find_nearest_line +-#define _bfd_generic_find_nearest_line_discriminator \ +- xcoff_find_nearest_line_discriminator ++#define _bfd_xcoff_find_nearest_line coff_find_nearest_line ++#define _bfd_xcoff_find_line coff_find_line + #define _bfd_xcoff_find_inliner_info coff_find_inliner_info + #define _bfd_xcoff_bfd_make_debug_symbol coff_bfd_make_debug_symbol + #define _bfd_xcoff_read_minisymbols _bfd_generic_read_minisymbols +--- a/bfd/coff-x86_64.c ++++ b/bfd/coff-x86_64.c +@@ -730,9 +730,6 @@ coff_amd64_is_local_label_name (bfd *abfd, const char *name) + #define amd64coff_object_p coff_object_p + #endif + +-#define _bfd_generic_find_nearest_line_discriminator \ +- coff_find_nearest_line_discriminator +- + const bfd_target + #ifdef TARGET_SYM + TARGET_SYM = +--- a/bfd/coff64-rs6000.c ++++ b/bfd/coff64-rs6000.c +@@ -2716,8 +2716,7 @@ const bfd_target rs6000_xcoff64_vec = + coff_bfd_is_target_special_symbol, + coff_get_lineno, + coff_find_nearest_line, +- _bfd_generic_find_nearest_line_discriminator, +- _bfd_generic_find_line, ++ coff_find_line, + coff_find_inliner_info, + coff_bfd_make_debug_symbol, + _bfd_generic_read_minisymbols, +@@ -2974,8 +2973,7 @@ const bfd_target rs6000_xcoff64_aix_vec = + coff_bfd_is_target_special_symbol, + coff_get_lineno, + coff_find_nearest_line, +- _bfd_generic_find_nearest_line_discriminator, +- _bfd_generic_find_line, ++ coff_find_line, + coff_find_inliner_info, + coff_bfd_make_debug_symbol, + _bfd_generic_read_minisymbols, +--- a/bfd/coffgen.c ++++ b/bfd/coffgen.c +@@ -2191,13 +2191,13 @@ _bfd_coff_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, + + bfd_boolean + coff_find_nearest_line_with_names (bfd *abfd, +- const struct dwarf_debug_section *debug_sections, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) ++ unsigned int *line_ptr, ++ const struct dwarf_debug_section *debug_sections) + { + bfd_boolean found; + unsigned int i; +@@ -2222,10 +2222,9 @@ coff_find_nearest_line_with_names (bfd *abfd, + return TRUE; + + /* Also try examining DWARF2 debugging information. */ +- if (_bfd_dwarf2_find_nearest_line (abfd, debug_sections, +- section, symbols, offset, ++ if (_bfd_dwarf2_find_nearest_line (abfd, symbols, NULL, section, offset, + filename_ptr, functionname_ptr, +- line_ptr, NULL, 0, ++ line_ptr, NULL, debug_sections, 0, + &coff_data(abfd)->dwarf2_find_line_info)) + return TRUE; + +@@ -2407,38 +2406,22 @@ coff_find_nearest_line_with_names (bfd *abfd, + + bfd_boolean + coff_find_nearest_line (bfd *abfd, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) ++ unsigned int *line_ptr, ++ unsigned int *discriminator_ptr) + { +- return coff_find_nearest_line_with_names (abfd, dwarf_debug_sections, +- section, symbols, offset, ++ if (discriminator_ptr) ++ *discriminator_ptr = 0; ++ return coff_find_nearest_line_with_names (abfd, symbols, section, offset, + filename_ptr, functionname_ptr, +- line_ptr); ++ line_ptr, dwarf_debug_sections); + } + + bfd_boolean +-coff_find_nearest_line_discriminator (bfd *abfd, +- asection *section, +- asymbol **symbols, +- bfd_vma offset, +- const char **filename_ptr, +- const char **functionname_ptr, +- unsigned int *line_ptr, +- unsigned int *discriminator) +-{ +- *discriminator = 0; +- return coff_find_nearest_line_with_names (abfd, dwarf_debug_sections, +- section, symbols, offset, +- filename_ptr, functionname_ptr, +- line_ptr); +-} +- +- +-bfd_boolean + coff_find_inliner_info (bfd *abfd, + const char **filename_ptr, + const char **functionname_ptr, +--- a/bfd/dwarf1.c ++++ b/bfd/dwarf1.c +@@ -449,8 +449,8 @@ dwarf1_unit_find_nearest_line (struct dwarf1_debug* stash, + + bfd_boolean + _bfd_dwarf1_find_nearest_line (bfd *abfd, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +--- a/bfd/dwarf2.c ++++ b/bfd/dwarf2.c +@@ -3602,19 +3602,19 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd, + field and in the abbreviation offset, or zero to indicate that the + default value should be used. */ + +-static bfd_boolean +-find_line (bfd *abfd, +- const struct dwarf_debug_section *debug_sections, +- asection *section, +- bfd_vma offset, +- asymbol *symbol, +- asymbol **symbols, +- const char **filename_ptr, +- const char **functionname_ptr, +- unsigned int *linenumber_ptr, +- unsigned int *discriminator_ptr, +- unsigned int addr_size, +- void **pinfo) ++bfd_boolean ++_bfd_dwarf2_find_nearest_line (bfd *abfd, ++ asymbol **symbols, ++ asymbol *symbol, ++ asection *section, ++ bfd_vma offset, ++ const char **filename_ptr, ++ const char **functionname_ptr, ++ unsigned int *linenumber_ptr, ++ unsigned int *discriminator_ptr, ++ const struct dwarf_debug_section *debug_sections, ++ unsigned int addr_size, ++ void **pinfo) + { + /* Read each compilation unit from the section .debug_info, and check + to see if it contains the address we are searching for. If yes, +@@ -3645,21 +3645,18 @@ find_line (bfd *abfd, + + stash = (struct dwarf2_debug *) *pinfo; + +- do_line = (section == NULL +- && offset == 0 +- && functionname_ptr == NULL +- && symbol != NULL); ++ do_line = symbol != NULL; + if (do_line) + { +- addr = symbol->value; ++ BFD_ASSERT (section == NULL && offset == 0 && functionname_ptr == NULL); + section = bfd_get_section (symbol); ++ addr = symbol->value; + } +- else if (section != NULL +- && functionname_ptr != NULL +- && symbol == NULL) +- addr = offset; + else +- abort (); ++ { ++ BFD_ASSERT (section != NULL && functionname_ptr != NULL); ++ addr = offset; ++ } + + if (section->output_section) + addr += section->output_section->vma + section->output_offset; +@@ -3874,45 +3871,6 @@ find_line (bfd *abfd, + return found; + } + +-/* The DWARF2 version of find_nearest_line. +- Return TRUE if the line is found without error. */ +- +-bfd_boolean +-_bfd_dwarf2_find_nearest_line (bfd *abfd, +- const struct dwarf_debug_section *debug_sections, +- asection *section, +- asymbol **symbols, +- bfd_vma offset, +- const char **filename_ptr, +- const char **functionname_ptr, +- unsigned int *linenumber_ptr, +- unsigned int *discriminator_ptr, +- unsigned int addr_size, +- void **pinfo) +-{ +- return find_line (abfd, debug_sections, section, offset, NULL, symbols, +- filename_ptr, functionname_ptr, linenumber_ptr, +- discriminator_ptr, addr_size, pinfo); +-} +- +-/* The DWARF2 version of find_line. +- Return TRUE if the line is found without error. */ +- +-bfd_boolean +-_bfd_dwarf2_find_line (bfd *abfd, +- asymbol **symbols, +- asymbol *symbol, +- const char **filename_ptr, +- unsigned int *linenumber_ptr, +- unsigned int *discriminator_ptr, +- unsigned int addr_size, +- void **pinfo) +-{ +- return find_line (abfd, dwarf_debug_sections, NULL, 0, symbol, symbols, +- filename_ptr, NULL, linenumber_ptr, discriminator_ptr, +- addr_size, pinfo); +-} +- + bfd_boolean + _bfd_dwarf2_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED, + const char **filename_ptr, +--- a/bfd/ecoff.c ++++ b/bfd/ecoff.c +@@ -1704,12 +1704,13 @@ _bfd_ecoff_canonicalize_reloc (bfd *abfd, + + bfd_boolean + _bfd_ecoff_find_nearest_line (bfd *abfd, ++ asymbol **symbols ATTRIBUTE_UNUSED, + asection *section, +- asymbol **ignore_symbols ATTRIBUTE_UNUSED, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *retline_ptr) ++ unsigned int *retline_ptr, ++ unsigned int *discriminator_ptr) + { + const struct ecoff_debug_swap * const debug_swap + = &ecoff_backend (abfd)->debug_swap; +@@ -1730,8 +1731,10 @@ _bfd_ecoff_find_nearest_line (bfd *abfd, + if (ecoff_data (abfd)->find_line_info == NULL) + return FALSE; + } +- line_info = ecoff_data (abfd)->find_line_info; + ++ if (discriminator_ptr) ++ *discriminator_ptr = 0; ++ line_info = ecoff_data (abfd)->find_line_info; + return _bfd_ecoff_locate_line (abfd, section, offset, debug_info, + debug_swap, line_info, filename_ptr, + functionname_ptr, retline_ptr); +--- a/bfd/elf-bfd.h ++++ b/bfd/elf-bfd.h +@@ -1898,18 +1898,10 @@ extern alent *_bfd_elf_get_lineno + extern bfd_boolean _bfd_elf_set_arch_mach + (bfd *, enum bfd_architecture, unsigned long); + extern bfd_boolean _bfd_elf_find_nearest_line +- (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, +- unsigned int *); +-extern bfd_boolean _bfd_elf_find_nearest_line_discriminator +- (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, +- unsigned int *, unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, ++ const char **, const char **, unsigned int *, unsigned int *); + extern bfd_boolean _bfd_elf_find_line + (bfd *, asymbol **, asymbol *, const char **, unsigned int *); +-extern bfd_boolean _bfd_elf_find_line_discriminator +- (bfd *, asymbol **, asymbol *, const char **, unsigned int *, unsigned int *); +-#define _bfd_generic_find_line _bfd_elf_find_line +-#define _bfd_generic_find_nearest_line_discriminator \ +- _bfd_elf_find_nearest_line_discriminator + extern bfd_boolean _bfd_elf_find_inliner_info + (bfd *, const char **, const char **, unsigned int *); + #define _bfd_elf_read_minisymbols _bfd_generic_read_minisymbols +--- a/bfd/elf.c ++++ b/bfd/elf.c +@@ -7549,8 +7549,8 @@ _bfd_elf_set_arch_mach (bfd *abfd, + + static bfd_boolean + elf_find_function (bfd *abfd, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr) +@@ -7652,52 +7652,35 @@ elf_find_function (bfd *abfd, + + bfd_boolean + _bfd_elf_find_nearest_line (bfd *abfd, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) +-{ +- return _bfd_elf_find_nearest_line_discriminator (abfd, section, symbols, +- offset, filename_ptr, +- functionname_ptr, +- line_ptr, +- NULL); +-} +- +-bfd_boolean +-_bfd_elf_find_nearest_line_discriminator (bfd *abfd, +- asection *section, +- asymbol **symbols, +- bfd_vma offset, +- const char **filename_ptr, +- const char **functionname_ptr, +- unsigned int *line_ptr, +- unsigned int *discriminator_ptr) ++ unsigned int *line_ptr, ++ unsigned int *discriminator_ptr) + { + bfd_boolean found; + +- if (_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset, ++ if (_bfd_dwarf2_find_nearest_line (abfd, symbols, NULL, section, offset, + filename_ptr, functionname_ptr, +- line_ptr)) ++ line_ptr, discriminator_ptr, ++ dwarf_debug_sections, 0, ++ &elf_tdata (abfd)->dwarf2_find_line_info)) + { + if (!*functionname_ptr) +- elf_find_function (abfd, section, symbols, offset, ++ elf_find_function (abfd, symbols, section, offset, + *filename_ptr ? NULL : filename_ptr, + functionname_ptr); + + return TRUE; + } + +- if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections, +- section, symbols, offset, +- filename_ptr, functionname_ptr, +- line_ptr, discriminator_ptr, 0, +- &elf_tdata (abfd)->dwarf2_find_line_info)) ++ if (_bfd_dwarf1_find_nearest_line (abfd, symbols, section, offset, ++ filename_ptr, functionname_ptr, line_ptr)) + { + if (!*functionname_ptr) +- elf_find_function (abfd, section, symbols, offset, ++ elf_find_function (abfd, symbols, section, offset, + *filename_ptr ? NULL : filename_ptr, + functionname_ptr); + +@@ -7715,7 +7698,7 @@ _bfd_elf_find_nearest_line_discriminator (bfd *abfd, + if (symbols == NULL) + return FALSE; + +- if (! elf_find_function (abfd, section, symbols, offset, ++ if (! elf_find_function (abfd, symbols, section, offset, + filename_ptr, functionname_ptr)) + return FALSE; + +@@ -7729,20 +7712,10 @@ bfd_boolean + _bfd_elf_find_line (bfd *abfd, asymbol **symbols, asymbol *symbol, + const char **filename_ptr, unsigned int *line_ptr) + { +- return _bfd_elf_find_line_discriminator (abfd, symbols, symbol, +- filename_ptr, line_ptr, +- NULL); +-} +- +-bfd_boolean +-_bfd_elf_find_line_discriminator (bfd *abfd, asymbol **symbols, asymbol *symbol, +- const char **filename_ptr, +- unsigned int *line_ptr, +- unsigned int *discriminator_ptr) +-{ +- return _bfd_dwarf2_find_line (abfd, symbols, symbol, +- filename_ptr, line_ptr, discriminator_ptr, 0, +- &elf_tdata (abfd)->dwarf2_find_line_info); ++ return _bfd_dwarf2_find_nearest_line (abfd, symbols, symbol, NULL, 0, ++ filename_ptr, NULL, line_ptr, NULL, ++ dwarf_debug_sections, 0, ++ &elf_tdata (abfd)->dwarf2_find_line_info); + } + + /* After a call to bfd_find_nearest_line, successive calls to +--- a/bfd/elf32-arm.c ++++ b/bfd/elf32-arm.c +@@ -13083,8 +13083,8 @@ elf32_arm_is_target_special_symbol (bfd * abfd ATTRIBUTE_UNUSED, asymbol * sym) + + static bfd_boolean + arm_elf_find_function (bfd * abfd ATTRIBUTE_UNUSED, +- asection * section, + asymbol ** symbols, ++ asection * section, + bfd_vma offset, + const char ** filename_ptr, + const char ** functionname_ptr) +@@ -13145,31 +13145,33 @@ arm_elf_find_function (bfd * abfd ATTRIBUTE_UNUSED, + + static bfd_boolean + elf32_arm_find_nearest_line (bfd * abfd, +- asection * section, + asymbol ** symbols, ++ asection * section, + bfd_vma offset, + const char ** filename_ptr, + const char ** functionname_ptr, +- unsigned int * line_ptr) ++ unsigned int * line_ptr, ++ unsigned int * discriminator_ptr) + { + bfd_boolean found = FALSE; + +- /* We skip _bfd_dwarf1_find_nearest_line since no known ARM toolchain uses it. */ +- +- if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections, +- section, symbols, offset, ++ if (_bfd_dwarf2_find_nearest_line (abfd, symbols, NULL, section, offset, + filename_ptr, functionname_ptr, +- line_ptr, NULL, 0, ++ line_ptr, discriminator_ptr, ++ dwarf_debug_sections, 0, + & elf_tdata (abfd)->dwarf2_find_line_info)) + { + if (!*functionname_ptr) +- arm_elf_find_function (abfd, section, symbols, offset, ++ arm_elf_find_function (abfd, symbols, section, offset, + *filename_ptr ? NULL : filename_ptr, + functionname_ptr); + + return TRUE; + } + ++ /* Skip _bfd_dwarf1_find_nearest_line since no known ARM toolchain ++ uses DWARF1. */ ++ + if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, + & found, filename_ptr, + functionname_ptr, line_ptr, +@@ -13182,7 +13184,7 @@ elf32_arm_find_nearest_line (bfd * abfd, + if (symbols == NULL) + return FALSE; + +- if (! arm_elf_find_function (abfd, section, symbols, offset, ++ if (! arm_elf_find_function (abfd, symbols, section, offset, + filename_ptr, functionname_ptr)) + return FALSE; + +--- a/bfd/elf64-alpha.c ++++ b/bfd/elf64-alpha.c +@@ -1442,17 +1442,19 @@ elf64_alpha_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name) + } + + static bfd_boolean +-elf64_alpha_find_nearest_line (bfd *abfd, asection *section, asymbol **symbols, +- bfd_vma offset, const char **filename_ptr, ++elf64_alpha_find_nearest_line (bfd *abfd, asymbol **symbols, ++ asection *section, bfd_vma offset, ++ const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) ++ unsigned int *line_ptr, ++ unsigned int *discriminator_ptr) + { + asection *msec; + +- if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections, +- section, symbols, offset, ++ if (_bfd_dwarf2_find_nearest_line (abfd, symbols, NULL, section, offset, + filename_ptr, functionname_ptr, +- line_ptr, NULL, 0, ++ line_ptr, discriminator_ptr, ++ dwarf_debug_sections, 0, + &elf_tdata (abfd)->dwarf2_find_line_info)) + return TRUE; + +@@ -1532,9 +1534,9 @@ elf64_alpha_find_nearest_line (bfd *abfd, asection *section, asymbol **symbols, + + /* Fall back on the generic ELF find_nearest_line routine. */ + +- return _bfd_elf_find_nearest_line (abfd, section, symbols, offset, ++ return _bfd_elf_find_nearest_line (abfd, symbols, section, offset, + filename_ptr, functionname_ptr, +- line_ptr); ++ line_ptr, discriminator_ptr); + } + + /* Structure used to pass information to alpha_elf_output_extsym. */ +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -5353,8 +5353,8 @@ elfNN_aarch64_is_target_special_symbol (bfd *abfd ATTRIBUTE_UNUSED, + + static bfd_boolean + aarch64_elf_find_function (bfd *abfd ATTRIBUTE_UNUSED, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr) +@@ -5413,32 +5413,33 @@ aarch64_elf_find_function (bfd *abfd ATTRIBUTE_UNUSED, + + static bfd_boolean + elfNN_aarch64_find_nearest_line (bfd *abfd, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) ++ unsigned int *line_ptr, ++ unsigned int *discriminator_ptr) + { + bfd_boolean found = FALSE; + +- /* We skip _bfd_dwarf1_find_nearest_line since no known AArch64 +- toolchain uses it. */ +- +- if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections, +- section, symbols, offset, ++ if (_bfd_dwarf2_find_nearest_line (abfd, symbols, NULL, section, offset, + filename_ptr, functionname_ptr, +- line_ptr, NULL, 0, ++ line_ptr, discriminator_ptr, ++ dwarf_debug_sections, 0, + &elf_tdata (abfd)->dwarf2_find_line_info)) + { + if (!*functionname_ptr) +- aarch64_elf_find_function (abfd, section, symbols, offset, ++ aarch64_elf_find_function (abfd, symbols, section, offset, + *filename_ptr ? NULL : filename_ptr, + functionname_ptr); + + return TRUE; + } + ++ /* Skip _bfd_dwarf1_find_nearest_line since no known AArch64 ++ toolchain uses DWARF1. */ ++ + if (!_bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, + &found, filename_ptr, + functionname_ptr, line_ptr, +@@ -5451,7 +5452,7 @@ elfNN_aarch64_find_nearest_line (bfd *abfd, + if (symbols == NULL) + return FALSE; + +- if (!aarch64_elf_find_function (abfd, section, symbols, offset, ++ if (!aarch64_elf_find_function (abfd, symbols, section, offset, + filename_ptr, functionname_ptr)) + return FALSE; + +--- a/bfd/elfxx-mips.c ++++ b/bfd/elfxx-mips.c +@@ -12591,24 +12591,26 @@ struct mips_elf_find_line + }; + + bfd_boolean +-_bfd_mips_elf_find_nearest_line (bfd *abfd, asection *section, +- asymbol **symbols, bfd_vma offset, ++_bfd_mips_elf_find_nearest_line (bfd *abfd, asymbol **symbols, ++ asection *section, bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) ++ unsigned int *line_ptr, ++ unsigned int *discriminator_ptr) + { + asection *msec; + +- if (_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset, ++ if (_bfd_dwarf2_find_nearest_line (abfd, symbols, NULL, section, offset, + filename_ptr, functionname_ptr, +- line_ptr)) ++ line_ptr, discriminator_ptr, ++ dwarf_debug_sections, ++ ABI_64_P (abfd) ? 8 : 0, ++ &elf_tdata (abfd)->dwarf2_find_line_info)) + return TRUE; + +- if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections, +- section, symbols, offset, ++ if (_bfd_dwarf1_find_nearest_line (abfd, symbols, section, offset, + filename_ptr, functionname_ptr, +- line_ptr, NULL, ABI_64_P (abfd) ? 8 : 0, +- &elf_tdata (abfd)->dwarf2_find_line_info)) ++ line_ptr)) + return TRUE; + + msec = bfd_get_section_by_name (abfd, ".mdebug"); +@@ -12687,9 +12689,9 @@ _bfd_mips_elf_find_nearest_line (bfd *abfd, asection *section, + + /* Fall back on the generic ELF find_nearest_line routine. */ + +- return _bfd_elf_find_nearest_line (abfd, section, symbols, offset, ++ return _bfd_elf_find_nearest_line (abfd, symbols, section, offset, + filename_ptr, functionname_ptr, +- line_ptr); ++ line_ptr, discriminator_ptr); + } + + bfd_boolean +--- a/bfd/elfxx-mips.h ++++ b/bfd/elfxx-mips.h +@@ -86,8 +86,8 @@ extern bfd_boolean _bfd_mips_elf_ignore_discarded_relocs + extern bfd_boolean _bfd_mips_elf_is_target_special_symbol + (bfd *abfd, asymbol *sym); + extern bfd_boolean _bfd_mips_elf_find_nearest_line +- (bfd *, asection *, asymbol **, bfd_vma, const char **, +- const char **, unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, ++ const char **, const char **, unsigned int *, unsigned int *); + extern bfd_boolean _bfd_mips_elf_find_inliner_info + (bfd *, const char **, const char **, unsigned int *); + extern bfd_boolean _bfd_mips_elf_set_section_contents +--- a/bfd/elfxx-target.h ++++ b/bfd/elfxx-target.h +@@ -49,6 +49,9 @@ + #ifndef bfd_elfNN_find_nearest_line + #define bfd_elfNN_find_nearest_line _bfd_elf_find_nearest_line + #endif ++#ifndef bfd_elfNN_find_line ++#define bfd_elfNN_find_line _bfd_elf_find_line ++#endif + #ifndef bfd_elfNN_find_inliner_info + #define bfd_elfNN_find_inliner_info _bfd_elf_find_inliner_info + #endif +--- a/bfd/i386msdos.c ++++ b/bfd/i386msdos.c +@@ -163,6 +163,7 @@ msdos_set_section_contents (bfd *abfd, + #define msdos_print_symbol _bfd_nosymbols_print_symbol + #define msdos_get_symbol_info _bfd_nosymbols_get_symbol_info + #define msdos_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define msdos_find_line _bfd_nosymbols_find_line + #define msdos_find_inliner_info _bfd_nosymbols_find_inliner_info + #define msdos_get_lineno _bfd_nosymbols_get_lineno + #define msdos_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) +--- a/bfd/i386os9k.c ++++ b/bfd/i386os9k.c +@@ -154,6 +154,7 @@ os9k_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, + + #define aout_32_close_and_cleanup aout_32_bfd_free_cached_info + ++#define aout_32_find_line _bfd_nosymbols_find_line + #define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + + #define aout_32_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup +--- a/bfd/ieee.c ++++ b/bfd/ieee.c +@@ -3675,26 +3675,9 @@ ieee_openr_next_archived_file (bfd *arch, bfd *prev) + } + } + +-static bfd_boolean +-ieee_find_nearest_line (bfd *abfd ATTRIBUTE_UNUSED, +- asection *section ATTRIBUTE_UNUSED, +- asymbol **symbols ATTRIBUTE_UNUSED, +- bfd_vma offset ATTRIBUTE_UNUSED, +- const char **filename_ptr ATTRIBUTE_UNUSED, +- const char **functionname_ptr ATTRIBUTE_UNUSED, +- unsigned int *line_ptr ATTRIBUTE_UNUSED) +-{ +- return FALSE; +-} +- +-static bfd_boolean +-ieee_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED, +- const char **filename_ptr ATTRIBUTE_UNUSED, +- const char **functionname_ptr ATTRIBUTE_UNUSED, +- unsigned int *line_ptr ATTRIBUTE_UNUSED) +-{ +- return FALSE; +-} ++#define ieee_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define ieee_find_line _bfd_nosymbols_find_line ++#define ieee_find_inliner_info _bfd_nosymbols_find_inliner_info + + static int + ieee_generic_stat_arch_elt (bfd *abfd, struct stat *buf) +--- a/bfd/ihex.c ++++ b/bfd/ihex.c +@@ -922,6 +922,7 @@ ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, + #define ihex_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name + #define ihex_get_lineno _bfd_nosymbols_get_lineno + #define ihex_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define ihex_find_line _bfd_nosymbols_find_line + #define ihex_find_inliner_info _bfd_nosymbols_find_inliner_info + #define ihex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define ihex_read_minisymbols _bfd_nosymbols_read_minisymbols +--- a/bfd/libaout.h ++++ b/bfd/libaout.h +@@ -551,8 +551,8 @@ extern void NAME (aout, get_symbol_info) + (bfd *, asymbol *, symbol_info *); + + extern bfd_boolean NAME (aout, find_nearest_line) +- (bfd *, asection *, asymbol **, bfd_vma, const char **, +- const char **, unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, ++ const char **, const char **, unsigned int *, unsigned int *); + + extern long NAME (aout, read_minisymbols) + (bfd *, bfd_boolean, void * *, unsigned int *); +--- a/bfd/libbfd-in.h ++++ b/bfd/libbfd-in.h +@@ -399,8 +399,13 @@ extern bfd_boolean _bfd_vms_lib_ia64_mkarchive (bfd *abfd); + #define _bfd_nosymbols_get_lineno \ + ((alent *(*) (bfd *, asymbol *)) bfd_nullvoidptr) + #define _bfd_nosymbols_find_nearest_line \ +- ((bfd_boolean (*) (bfd *, asection *, asymbol **, bfd_vma, const char **, \ +- const char **, unsigned int *)) \ ++ ((bfd_boolean (*) (bfd *, asymbol **, asection *, bfd_vma, \ ++ const char **, const char **, unsigned int *, \ ++ unsigned int *)) \ ++ bfd_false) ++#define _bfd_nosymbols_find_line \ ++ ((bfd_boolean (*) (bfd *, asymbol **, asymbol *, \ ++ const char **, unsigned int *)) \ + bfd_false) + #define _bfd_nosymbols_find_inliner_info \ + ((bfd_boolean (*) (bfd *, const char **, const char **, unsigned int *)) \ +@@ -520,8 +525,8 @@ extern bfd_boolean _bfd_stab_section_find_nearest_line + + /* Find the nearest line using DWARF 1 debugging information. */ + extern bfd_boolean _bfd_dwarf1_find_nearest_line +- (bfd *, asection *, asymbol **, bfd_vma, const char **, +- const char **, unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, ++ const char **, const char **, unsigned int *); + + struct dwarf_debug_section + { +@@ -536,21 +541,9 @@ extern const struct dwarf_debug_section dwarf_debug_sections[]; + + /* Find the nearest line using DWARF 2 debugging information. */ + extern bfd_boolean _bfd_dwarf2_find_nearest_line +- (bfd *, const struct dwarf_debug_section *, asection *, asymbol **, bfd_vma, +- const char **, const char **, unsigned int *, unsigned int *, unsigned int, +- void **); +- +-/* Find the line using DWARF 2 debugging information. */ +-extern bfd_boolean _bfd_dwarf2_find_line +- (bfd *, asymbol **, asymbol *, const char **, +- unsigned int *, unsigned int *, unsigned int, void **); +- +-bfd_boolean _bfd_generic_find_line +- (bfd *, asymbol **, asymbol *, const char **, unsigned int *); +- +-bfd_boolean _bfd_generic_find_nearest_line_discriminator +- (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, +- unsigned int *, unsigned int *); ++ (bfd *, asymbol **, asymbol *, asection *, bfd_vma, ++ const char **, const char **, unsigned int *, unsigned int *, ++ const struct dwarf_debug_section *, unsigned int, void **); + + /* Find inliner info after calling bfd_find_nearest_line. */ + extern bfd_boolean _bfd_dwarf2_find_inliner_info +--- a/bfd/libbfd.c ++++ b/bfd/libbfd.c +@@ -1105,29 +1105,6 @@ read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED, + } + + bfd_boolean +-_bfd_generic_find_line (bfd *abfd ATTRIBUTE_UNUSED, +- asymbol **symbols ATTRIBUTE_UNUSED, +- asymbol *symbol ATTRIBUTE_UNUSED, +- const char **filename_ptr ATTRIBUTE_UNUSED, +- unsigned int *linenumber_ptr ATTRIBUTE_UNUSED) +-{ +- return FALSE; +-} +- +-bfd_boolean +-_bfd_generic_find_nearest_line_discriminator (bfd *abfd ATTRIBUTE_UNUSED, +- asection *section ATTRIBUTE_UNUSED, +- asymbol **symbols ATTRIBUTE_UNUSED, +- bfd_vma offset ATTRIBUTE_UNUSED, +- const char **filename_ptr ATTRIBUTE_UNUSED, +- const char **functionname_ptr ATTRIBUTE_UNUSED, +- unsigned int *line_ptr ATTRIBUTE_UNUSED, +- unsigned int *discriminator_ptr ATTRIBUTE_UNUSED) +-{ +- return FALSE; +-} +- +-bfd_boolean + _bfd_generic_init_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED, + asection *isec ATTRIBUTE_UNUSED, + bfd *obfd ATTRIBUTE_UNUSED, +--- a/bfd/libbfd.h ++++ b/bfd/libbfd.h +@@ -404,8 +404,13 @@ extern bfd_boolean _bfd_vms_lib_ia64_mkarchive (bfd *abfd); + #define _bfd_nosymbols_get_lineno \ + ((alent *(*) (bfd *, asymbol *)) bfd_nullvoidptr) + #define _bfd_nosymbols_find_nearest_line \ +- ((bfd_boolean (*) (bfd *, asection *, asymbol **, bfd_vma, const char **, \ +- const char **, unsigned int *)) \ ++ ((bfd_boolean (*) (bfd *, asymbol **, asection *, bfd_vma, \ ++ const char **, const char **, unsigned int *, \ ++ unsigned int *)) \ ++ bfd_false) ++#define _bfd_nosymbols_find_line \ ++ ((bfd_boolean (*) (bfd *, asymbol **, asymbol *, \ ++ const char **, unsigned int *)) \ + bfd_false) + #define _bfd_nosymbols_find_inliner_info \ + ((bfd_boolean (*) (bfd *, const char **, const char **, unsigned int *)) \ +@@ -525,8 +530,8 @@ extern bfd_boolean _bfd_stab_section_find_nearest_line + + /* Find the nearest line using DWARF 1 debugging information. */ + extern bfd_boolean _bfd_dwarf1_find_nearest_line +- (bfd *, asection *, asymbol **, bfd_vma, const char **, +- const char **, unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, ++ const char **, const char **, unsigned int *); + + struct dwarf_debug_section + { +@@ -541,21 +546,9 @@ extern const struct dwarf_debug_section dwarf_debug_sections[]; + + /* Find the nearest line using DWARF 2 debugging information. */ + extern bfd_boolean _bfd_dwarf2_find_nearest_line +- (bfd *, const struct dwarf_debug_section *, asection *, asymbol **, bfd_vma, +- const char **, const char **, unsigned int *, unsigned int *, unsigned int, +- void **); +- +-/* Find the line using DWARF 2 debugging information. */ +-extern bfd_boolean _bfd_dwarf2_find_line +- (bfd *, asymbol **, asymbol *, const char **, +- unsigned int *, unsigned int *, unsigned int, void **); +- +-bfd_boolean _bfd_generic_find_line +- (bfd *, asymbol **, asymbol *, const char **, unsigned int *); +- +-bfd_boolean _bfd_generic_find_nearest_line_discriminator +- (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, +- unsigned int *, unsigned int *); ++ (bfd *, asymbol **, asymbol *, asection *, bfd_vma, ++ const char **, const char **, unsigned int *, unsigned int *, ++ const struct dwarf_debug_section *, unsigned int, void **); + + /* Find inliner info after calling bfd_find_nearest_line. */ + extern bfd_boolean _bfd_dwarf2_find_inliner_info +--- a/bfd/libcoff-in.h ++++ b/bfd/libcoff-in.h +@@ -355,15 +355,13 @@ extern bfd_boolean _bfd_coff_is_local_label_name + extern asymbol *coff_bfd_make_debug_symbol + (bfd *, void *, unsigned long); + extern bfd_boolean coff_find_nearest_line +- (bfd *, asection *, asymbol **, bfd_vma, const char **, +- const char **, unsigned int *); +-extern bfd_boolean coff_find_nearest_line_discriminator +- (bfd *, asection *, asymbol **, bfd_vma, const char **, +- const char **, unsigned int *, unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, ++ const char **, const char **, unsigned int *, unsigned int *); ++#define coff_find_line _bfd_nosymbols_find_line + struct dwarf_debug_section; + extern bfd_boolean coff_find_nearest_line_with_names +- (bfd *, const struct dwarf_debug_section *, asection *, asymbol **, +- bfd_vma, const char **, const char **, unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, const char **, const char **, ++ unsigned int *, const struct dwarf_debug_section *); + extern bfd_boolean coff_find_inliner_info + (bfd *, const char **, const char **, unsigned int *); + extern int coff_sizeof_headers +--- a/bfd/libcoff.h ++++ b/bfd/libcoff.h +@@ -359,15 +359,13 @@ extern bfd_boolean _bfd_coff_is_local_label_name + extern asymbol *coff_bfd_make_debug_symbol + (bfd *, void *, unsigned long); + extern bfd_boolean coff_find_nearest_line +- (bfd *, asection *, asymbol **, bfd_vma, const char **, +- const char **, unsigned int *); +-extern bfd_boolean coff_find_nearest_line_discriminator +- (bfd *, asection *, asymbol **, bfd_vma, const char **, +- const char **, unsigned int *, unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, ++ const char **, const char **, unsigned int *, unsigned int *); ++#define coff_find_line _bfd_nosymbols_find_line + struct dwarf_debug_section; + extern bfd_boolean coff_find_nearest_line_with_names +- (bfd *, const struct dwarf_debug_section *, asection *, asymbol **, +- bfd_vma, const char **, const char **, unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, const char **, const char **, ++ unsigned int *, const struct dwarf_debug_section *); + extern bfd_boolean coff_find_inliner_info + (bfd *, const char **, const char **, unsigned int *); + extern int coff_sizeof_headers +--- a/bfd/libecoff.h ++++ b/bfd/libecoff.h +@@ -289,8 +289,9 @@ extern bfd_boolean _bfd_ecoff_bfd_is_local_label_name + (bfd *, const char *); + #define _bfd_ecoff_get_lineno _bfd_nosymbols_get_lineno + extern bfd_boolean _bfd_ecoff_find_nearest_line +- (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **, +- unsigned int *); ++ (bfd *, asymbol **, asection *, bfd_vma, ++ const char **, const char **, unsigned int *, unsigned int *); ++#define _bfd_ecoff_find_line _bfd_nosymbols_find_line + #define _bfd_ecoff_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define _bfd_ecoff_read_minisymbols _bfd_generic_read_minisymbols + #define _bfd_ecoff_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol +--- a/bfd/mach-o.c ++++ b/bfd/mach-o.c +@@ -5631,12 +5631,13 @@ bfd_mach_o_follow_dsym (bfd *abfd) + + bfd_boolean + bfd_mach_o_find_nearest_line (bfd *abfd, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) ++ unsigned int *line_ptr, ++ unsigned int *discriminator_ptr) + { + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + if (mdata == NULL) +@@ -5668,13 +5669,11 @@ bfd_mach_o_find_nearest_line (bfd *abfd, + default: + return FALSE; + } +- if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections, +- section, symbols, offset, +- filename_ptr, functionname_ptr, +- line_ptr, NULL, 0, +- &mdata->dwarf2_find_line_info)) +- return TRUE; +- return FALSE; ++ return _bfd_dwarf2_find_nearest_line (abfd, symbols, NULL, section, offset, ++ filename_ptr, functionname_ptr, ++ line_ptr, discriminator_ptr, ++ dwarf_debug_sections, 0, ++ &mdata->dwarf2_find_line_info); + } + + bfd_boolean +--- a/bfd/mach-o.h ++++ b/bfd/mach-o.h +@@ -680,9 +680,11 @@ unsigned int bfd_mach_o_get_section_attribute_from_name (const char *); + + void bfd_mach_o_convert_section_name_to_bfd (bfd *, const char *, const char *, + const char **, flagword *); +-bfd_boolean bfd_mach_o_find_nearest_line (bfd *, asection *, asymbol **, +- bfd_vma, const char **, +- const char **, unsigned int *); ++bfd_boolean bfd_mach_o_find_nearest_line (bfd *, asymbol **, ++ asection *, bfd_vma, ++ const char **, const char **, ++ unsigned int *, unsigned int *); ++#define bfd_mach_o_find_line _bfd_nosymbols_find_line + bfd_boolean bfd_mach_o_close_and_cleanup (bfd *); + bfd_boolean bfd_mach_o_free_cached_info (bfd *); + +--- a/bfd/mmo.c ++++ b/bfd/mmo.c +@@ -3210,6 +3210,7 @@ mmo_write_object_contents (bfd *abfd) + /* FIXME: We can do better on this one, if we have a dwarf2 .debug_line + section or if MMO line numbers are implemented. */ + #define mmo_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define mmo_find_line _bfd_nosymbols_find_line + #define mmo_find_inliner_info _bfd_nosymbols_find_inliner_info + #define mmo_make_empty_symbol _bfd_generic_make_empty_symbol + #define mmo_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +--- a/bfd/nlm-target.h ++++ b/bfd/nlm-target.h +@@ -29,6 +29,7 @@ + #define nlm_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) + #define nlm_get_lineno _bfd_nosymbols_get_lineno + #define nlm_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define nlm_find_line _bfd_nosymbols_find_line + #define nlm_find_inliner_info _bfd_nosymbols_find_inliner_info + #define nlm_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define nlm_read_minisymbols _bfd_generic_read_minisymbols +--- a/bfd/oasys.c ++++ b/bfd/oasys.c +@@ -1129,26 +1129,9 @@ oasys_openr_next_archived_file (bfd *arch, bfd *prev) + return NULL; + } + +-static bfd_boolean +-oasys_find_nearest_line (bfd *abfd ATTRIBUTE_UNUSED, +- asection *section ATTRIBUTE_UNUSED, +- asymbol **symbols ATTRIBUTE_UNUSED, +- bfd_vma offset ATTRIBUTE_UNUSED, +- const char **filename_ptr ATTRIBUTE_UNUSED, +- const char **functionname_ptr ATTRIBUTE_UNUSED, +- unsigned int *line_ptr ATTRIBUTE_UNUSED) +-{ +- return FALSE; +-} +- +-static bfd_boolean +-oasys_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED, +- const char **filename_ptr ATTRIBUTE_UNUSED, +- const char **functionname_ptr ATTRIBUTE_UNUSED, +- unsigned int *line_ptr ATTRIBUTE_UNUSED) +-{ +- return FALSE; +-} ++#define oasys_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define oasys_find_line _bfd_nosymbols_find_line ++#define oasys_find_inliner_info _bfd_nosymbols_find_inliner_info + + static int + oasys_generic_stat_arch_elt (bfd *abfd, struct stat *buf) +--- a/bfd/pdp11.c ++++ b/bfd/pdp11.c +@@ -2182,12 +2182,13 @@ NAME (aout, minisymbol_to_symbol) (bfd *abfd, + + bfd_boolean + NAME (aout, find_nearest_line) (bfd *abfd, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) ++ unsigned int *line_ptr, ++ unsigned int *discriminator_ptr) + { + /* Run down the file looking for the filename, function and linenumber. */ + asymbol **p; +@@ -2204,6 +2205,8 @@ NAME (aout, find_nearest_line) (bfd *abfd, + *filename_ptr = abfd->filename; + *functionname_ptr = 0; + *line_ptr = 0; ++ if (discriminator_ptr) ++ *discriminator_ptr = 0; + + if (symbols != NULL) + { +--- a/bfd/pef.c ++++ b/bfd/pef.c +@@ -41,6 +41,7 @@ + #define bfd_pef_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) + #define bfd_pef_get_lineno _bfd_nosymbols_get_lineno + #define bfd_pef_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define bfd_pef_find_line _bfd_nosymbols_find_line + #define bfd_pef_find_inliner_info _bfd_nosymbols_find_inliner_info + #define bfd_pef_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define bfd_pef_read_minisymbols _bfd_generic_read_minisymbols +--- a/bfd/plugin.c ++++ b/bfd/plugin.c +@@ -83,6 +83,7 @@ dlerror (void) + #define bfd_plugin_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) + #define bfd_plugin_get_lineno _bfd_nosymbols_get_lineno + #define bfd_plugin_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define bfd_plugin_find_line _bfd_nosymbols_find_line + #define bfd_plugin_find_inliner_info _bfd_nosymbols_find_inliner_info + #define bfd_plugin_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define bfd_plugin_read_minisymbols _bfd_generic_read_minisymbols +--- a/bfd/ppcboot.c ++++ b/bfd/ppcboot.c +@@ -331,6 +331,7 @@ ppcboot_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, + #define ppcboot_bfd_is_local_label_name bfd_generic_is_local_label_name + #define ppcboot_get_lineno _bfd_nosymbols_get_lineno + #define ppcboot_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define ppcboot_find_line _bfd_nosymbols_find_line + #define ppcboot_find_inliner_info _bfd_nosymbols_find_inliner_info + #define ppcboot_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define ppcboot_read_minisymbols _bfd_generic_read_minisymbols +--- a/bfd/som.c ++++ b/bfd/som.c +@@ -5715,18 +5715,22 @@ som_set_arch_mach (bfd *abfd, + + static bfd_boolean + som_find_nearest_line (bfd *abfd, +- asection *section, + asymbol **symbols, ++ asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, +- unsigned int *line_ptr) ++ unsigned int *line_ptr, ++ unsigned int *discriminator_ptr) + { + bfd_boolean found; + asymbol *func; + bfd_vma low_func; + asymbol **p; + ++ if (discriminator_ptr) ++ *discriminator_ptr = 0; ++ + if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, + & found, filename_ptr, + functionname_ptr, line_ptr, +@@ -6713,6 +6717,7 @@ som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec) + return som_is_subspace (sec) && sec->size > 240000; + } + ++#define som_find_line _bfd_nosymbols_find_line + #define som_close_and_cleanup som_bfd_free_cached_info + #define som_read_ar_hdr _bfd_generic_read_ar_hdr + #define som_write_ar_hdr _bfd_generic_write_ar_hdr +--- a/bfd/srec.c ++++ b/bfd/srec.c +@@ -1255,6 +1255,7 @@ srec_print_symbol (bfd *abfd, + #define srec_bfd_is_local_label_name bfd_generic_is_local_label_name + #define srec_get_lineno _bfd_nosymbols_get_lineno + #define srec_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define srec_find_line _bfd_nosymbols_find_line + #define srec_find_inliner_info _bfd_nosymbols_find_inliner_info + #define srec_make_empty_symbol _bfd_generic_make_empty_symbol + #define srec_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +--- a/bfd/targets.c ++++ b/bfd/targets.c +@@ -367,8 +367,7 @@ BFD_JUMP_TABLE macros. + . NAME##_bfd_is_target_special_symbol, \ + . NAME##_get_lineno, \ + . NAME##_find_nearest_line, \ +-. _bfd_generic_find_nearest_line_discriminator, \ +-. _bfd_generic_find_line, \ ++. NAME##_find_line, \ + . NAME##_find_inliner_info, \ + . NAME##_bfd_make_debug_symbol, \ + . NAME##_read_minisymbols, \ +@@ -389,10 +388,7 @@ BFD_JUMP_TABLE macros. + . bfd_boolean (*_bfd_is_target_special_symbol) (bfd *, asymbol *); + . alent * (*_get_lineno) (bfd *, struct bfd_symbol *); + . bfd_boolean (*_bfd_find_nearest_line) +-. (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma, +-. const char **, const char **, unsigned int *); +-. bfd_boolean (*_bfd_find_nearest_line_discriminator) +-. (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma, ++. (bfd *, struct bfd_symbol **, struct bfd_section *, bfd_vma, + . const char **, const char **, unsigned int *, unsigned int *); + . bfd_boolean (*_bfd_find_line) + . (bfd *, struct bfd_symbol **, struct bfd_symbol *, +--- a/bfd/tekhex.c ++++ b/bfd/tekhex.c +@@ -935,6 +935,7 @@ tekhex_print_symbol (bfd *abfd, + #define tekhex_bfd_is_local_label_name bfd_generic_is_local_label_name + #define tekhex_get_lineno _bfd_nosymbols_get_lineno + #define tekhex_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define tekhex_find_line _bfd_nosymbols_find_line + #define tekhex_find_inliner_info _bfd_nosymbols_find_inliner_info + #define tekhex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define tekhex_read_minisymbols _bfd_generic_read_minisymbols +--- a/bfd/versados.c ++++ b/bfd/versados.c +@@ -794,6 +794,7 @@ versados_canonicalize_reloc (bfd *abfd, + #define versados_bfd_is_local_label_name bfd_generic_is_local_label_name + #define versados_get_lineno _bfd_nosymbols_get_lineno + #define versados_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define versados_find_line _bfd_nosymbols_find_line + #define versados_find_inliner_info _bfd_nosymbols_find_inliner_info + #define versados_make_empty_symbol _bfd_generic_make_empty_symbol + #define versados_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +--- a/bfd/vms-alpha.c ++++ b/bfd/vms-alpha.c +@@ -4575,10 +4575,14 @@ module_find_nearest_line (bfd *abfd, struct module *module, bfd_vma addr, + location. */ + + static bfd_boolean +-_bfd_vms_find_nearest_dst_line (bfd *abfd, asection *section, +- asymbol **symbols ATTRIBUTE_UNUSED, +- bfd_vma offset, const char **file, +- const char **func, unsigned int *line) ++_bfd_vms_find_nearest_line (bfd *abfd, ++ asymbol **symbols ATTRIBUTE_UNUSED, ++ asection *section, ++ bfd_vma offset, ++ const char **file, ++ const char **func, ++ unsigned int *line, ++ unsigned int *discriminator) + { + struct module *module; + +@@ -4588,6 +4592,8 @@ _bfd_vms_find_nearest_dst_line (bfd *abfd, asection *section, + *file = NULL; + *func = NULL; + *line = 0; ++ if (discriminator) ++ *discriminator = 0; + + /* We can't do anything if there is no DST (debug symbol table). */ + if (PRIV (dst_section) == NULL) +@@ -4607,26 +4613,6 @@ _bfd_vms_find_nearest_dst_line (bfd *abfd, asection *section, + + return FALSE; + } +- +-/* Likewise but with a discriminator. */ +- +-static bfd_boolean +-_bfd_vms_find_nearest_line_discriminator (bfd *abfd, +- asection *section, +- asymbol **symbols, +- bfd_vma offset, +- const char **filename_ptr, +- const char **functionname_ptr, +- unsigned int *line_ptr, +- unsigned int *discriminator) +-{ +- *discriminator = 0; +- +- return _bfd_vms_find_nearest_dst_line (abfd, section, symbols, offset, +- filename_ptr, functionname_ptr, +- line_ptr); +-} +- + + /* Canonicalizations. */ + /* Set name, value, section and flags of SYM from E. */ +@@ -9207,9 +9193,8 @@ bfd_vms_get_data (bfd *abfd) + #define alpha_vms_get_lineno _bfd_nosymbols_get_lineno + #define alpha_vms_find_inliner_info _bfd_nosymbols_find_inliner_info + #define alpha_vms_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +-#define alpha_vms_find_nearest_line _bfd_vms_find_nearest_dst_line +-#define _bfd_generic_find_nearest_line_discriminator \ +- _bfd_vms_find_nearest_line_discriminator ++#define alpha_vms_find_nearest_line _bfd_vms_find_nearest_line ++#define alpha_vms_find_line _bfd_nosymbols_find_line + #define alpha_vms_bfd_is_local_label_name vms_bfd_is_local_label_name + + /* Generic table. */ +--- a/bfd/xsym.c ++++ b/bfd/xsym.c +@@ -33,6 +33,7 @@ + #define bfd_sym_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) + #define bfd_sym_get_lineno _bfd_nosymbols_get_lineno + #define bfd_sym_find_nearest_line _bfd_nosymbols_find_nearest_line ++#define bfd_sym_find_line _bfd_nosymbols_find_line + #define bfd_sym_find_inliner_info _bfd_nosymbols_find_inliner_info + #define bfd_sym_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + #define bfd_sym_read_minisymbols _bfd_generic_read_minisymbols --- binutils-2.25.1.orig/debian/patches/pr17488.diff +++ binutils-2.25.1/debian/patches/pr17488.diff @@ -0,0 +1,175 @@ +# DP: Fix PR ld/17488, segfault on powerpc64 + +bfd/ + +2014-10-16 Alan Modra + + * elf64-ppc.c (ppc64_elf_before_check_relocs): Do .opd processing + even when output is not ppc64 ELF. Remove redundant tests on + type of input bfd. + +ld/ + +2014-10-16 Alan Modra + + PR 17488 + * emultempl/ppc64elf.em (gld${EMULATION_NAME}_finish): Don't attempt + to access ELF header e_flags when not ppc64 ELF output. + +--- a/bfd/elf64-ppc.c ++++ b/bfd/elf64-ppc.c +@@ -4962,81 +4962,77 @@ ppc64_elf_before_check_relocs (bfd *ibfd, struct bfd_link_info *info) + { + struct ppc_link_hash_table *htab; + struct ppc_link_hash_entry **p, *eh; ++ asection *opd = bfd_get_section_by_name (ibfd, ".opd"); + +- if (!is_ppc64_elf (info->output_bfd)) +- return TRUE; +- htab = ppc_hash_table (info); +- if (htab == NULL) +- return FALSE; +- +- if (is_ppc64_elf (ibfd)) ++ if (opd != NULL && opd->size != 0) + { +- asection *opd = bfd_get_section_by_name (ibfd, ".opd"); +- +- if (opd != NULL && opd->size != 0) ++ if (abiversion (ibfd) == 0) ++ set_abiversion (ibfd, 1); ++ else if (abiversion (ibfd) == 2) + { +- if (abiversion (ibfd) == 0) +- set_abiversion (ibfd, 1); +- else if (abiversion (ibfd) == 2) +- { +- info->callbacks->einfo (_("%P: %B .opd not allowed in ABI" +- " version %d\n"), +- ibfd, abiversion (ibfd)); +- bfd_set_error (bfd_error_bad_value); +- return FALSE; +- } +- +- if ((ibfd->flags & DYNAMIC) == 0 +- && (opd->flags & SEC_RELOC) != 0 +- && opd->reloc_count != 0 +- && !bfd_is_abs_section (opd->output_section)) +- { +- /* Garbage collection needs some extra help with .opd sections. +- We don't want to necessarily keep everything referenced by +- relocs in .opd, as that would keep all functions. Instead, +- if we reference an .opd symbol (a function descriptor), we +- want to keep the function code symbol's section. This is +- easy for global symbols, but for local syms we need to keep +- information about the associated function section. */ +- bfd_size_type amt; +- asection **opd_sym_map; +- +- amt = opd->size * sizeof (*opd_sym_map) / 8; +- opd_sym_map = bfd_zalloc (ibfd, amt); +- if (opd_sym_map == NULL) +- return FALSE; +- ppc64_elf_section_data (opd)->u.opd.func_sec = opd_sym_map; +- BFD_ASSERT (ppc64_elf_section_data (opd)->sec_type == sec_normal); +- ppc64_elf_section_data (opd)->sec_type = sec_opd; +- } ++ info->callbacks->einfo (_("%P: %B .opd not allowed in ABI" ++ " version %d\n"), ++ ibfd, abiversion (ibfd)); ++ bfd_set_error (bfd_error_bad_value); ++ return FALSE; + } + +- /* For input files without an explicit abiversion in e_flags +- we should have flagged any with symbol st_other bits set +- as ELFv1 and above flagged those with .opd as ELFv2. +- Set the output abiversion if not yet set, and for any input +- still ambiguous, take its abiversion from the output. +- Differences in ABI are reported later. */ +- if (abiversion (info->output_bfd) == 0) +- set_abiversion (info->output_bfd, abiversion (ibfd)); +- else if (abiversion (ibfd) == 0) +- set_abiversion (ibfd, abiversion (info->output_bfd)); +- +- p = &htab->dot_syms; +- while ((eh = *p) != NULL) ++ if ((ibfd->flags & DYNAMIC) == 0 ++ && (opd->flags & SEC_RELOC) != 0 ++ && opd->reloc_count != 0 ++ && !bfd_is_abs_section (opd->output_section)) + { +- *p = NULL; +- if (&eh->elf == htab->elf.hgot) +- ; +- else if (htab->elf.hgot == NULL +- && strcmp (eh->elf.root.root.string, ".TOC.") == 0) +- htab->elf.hgot = &eh->elf; +- else if (!add_symbol_adjust (eh, info)) ++ /* Garbage collection needs some extra help with .opd sections. ++ We don't want to necessarily keep everything referenced by ++ relocs in .opd, as that would keep all functions. Instead, ++ if we reference an .opd symbol (a function descriptor), we ++ want to keep the function code symbol's section. This is ++ easy for global symbols, but for local syms we need to keep ++ information about the associated function section. */ ++ bfd_size_type amt; ++ asection **opd_sym_map; ++ ++ amt = opd->size * sizeof (*opd_sym_map) / 8; ++ opd_sym_map = bfd_zalloc (ibfd, amt); ++ if (opd_sym_map == NULL) + return FALSE; +- p = &eh->u.next_dot_sym; ++ ppc64_elf_section_data (opd)->u.opd.func_sec = opd_sym_map; ++ BFD_ASSERT (ppc64_elf_section_data (opd)->sec_type == sec_normal); ++ ppc64_elf_section_data (opd)->sec_type = sec_opd; + } + } + ++ if (!is_ppc64_elf (info->output_bfd)) ++ return TRUE; ++ htab = ppc_hash_table (info); ++ if (htab == NULL) ++ return FALSE; ++ ++ /* For input files without an explicit abiversion in e_flags ++ we should have flagged any with symbol st_other bits set ++ as ELFv1 and above flagged those with .opd as ELFv2. ++ Set the output abiversion if not yet set, and for any input ++ still ambiguous, take its abiversion from the output. ++ Differences in ABI are reported later. */ ++ if (abiversion (info->output_bfd) == 0) ++ set_abiversion (info->output_bfd, abiversion (ibfd)); ++ else if (abiversion (ibfd) == 0) ++ set_abiversion (ibfd, abiversion (info->output_bfd)); ++ ++ p = &htab->dot_syms; ++ while ((eh = *p) != NULL) ++ { ++ *p = NULL; ++ if (&eh->elf == htab->elf.hgot) ++ ; ++ else if (htab->elf.hgot == NULL ++ && strcmp (eh->elf.root.root.string, ".TOC.") == 0) ++ htab->elf.hgot = &eh->elf; ++ else if (!add_symbol_adjust (eh, info)) ++ return FALSE; ++ p = &eh->u.next_dot_sym; ++ } ++ + /* Clear the list for non-ppc64 input files. */ + p = &htab->dot_syms; + while ((eh = *p) != NULL) +--- a/ld/emultempl/ppc64elf.em ++++ b/ld/emultempl/ppc64elf.em +@@ -531,7 +531,8 @@ gld${EMULATION_NAME}_finish (void) + /* e_entry on PowerPC64 points to the function descriptor for + _start. If _start is missing, default to the first function + descriptor in the .opd section. */ +- if ((elf_elfheader (link_info.output_bfd)->e_flags & EF_PPC64_ABI) == 1) ++ if (stub_file != NULL ++ && (elf_elfheader (link_info.output_bfd)->e_flags & EF_PPC64_ABI) == 1) + entry_section = ".opd"; + + if (params.emit_stub_syms < 0) --- binutils-2.25.1.orig/debian/patches/pr17493.diff +++ binutils-2.25.1/debian/patches/pr17493.diff @@ -0,0 +1,49 @@ +# DP: Fix PR gas/17493. + +--- a/gas/config/tc-i386.c ++++ a/gas/config/tc-i386.c +@@ -7985,7 +7985,7 @@ i386_finalize_immediate (segT exp_seg ATTRIBUTE_UNUSED, expressionS *exp, + return 0; + } + #endif +- else if (!intel_syntax && exp->X_op == O_register) ++ else if (!intel_syntax && exp_seg == reg_section) + { + if (imm_start) + as_bad (_("illegal immediate register operand %s"), imm_start); +--- a/gas/testsuite/gas/i386/inval-equ-2.l ++++ a/gas/testsuite/gas/i386/inval-equ-2.l +@@ -7,15 +7,15 @@ GAS LISTING .* + + [ ]*1[ ]+\.globl bar1 + [ ]*2[ ]+\.set bar1,$%eax\+1$ +-[ ]*3[ ]+\?\?\?\? A12A0000 mov bar1,%eax +-[ ]*3[ ]+00 ++[ ]*3[ ]+\?\?\?\? A1...... mov bar1,%eax ++[ ]*3[ ]+.. + [ ]*4[ ]+\.set bar2,$%eax\+1$ +-[ ]*5[ ]+\?\?\?\? A12A0000 mov bar2,%eax +-[ ]*5[ ]+00 ++[ ]*5[ ]+\?\?\?\? A1...... mov bar2,%eax ++[ ]*5[ ]+.. + [ ]*6[ ]+\.globl bar2 + [ ]*7[ ]+\.set bar3,$%eax\+1$ +-[ ]*8[ ]+\?\?\?\? A12A0000 mov bar3,%eax ++[ ]*8[ ]+\?\?\?\? A1...... mov bar3,%eax + .* Error: can't make global register symbol `bar1' + .* Error: can't make global register symbol `bar2' + .* Error: can't make global register symbol `bar3' +-[ ]*8[ ]+00 ++[ ]*8[ ]+.. +--- a/gas/write.c ++++ a/gas/write.c +@@ -836,7 +836,8 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, + if (symsec == NULL) + abort (); + +- if (bfd_is_abs_section (symsec)) ++ if (bfd_is_abs_section (symsec) ++ || symsec == reg_section) + { + /* The fixup_segment routine normally will not use this + symbol in a relocation. */ --- binutils-2.25.1.orig/debian/patches/pr18427.diff +++ binutils-2.25.1/debian/patches/pr18427.diff @@ -0,0 +1,130 @@ +From: John David Anglin +Date: Thu, 11 Jun 2015 22:50:39 +0000 (-0400) +Subject: tc-hppa.c: Speed up search for last label +X-Git-Url: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff_plain;h=18c208b2292f3c61097dee99053ecab78b393e46 + +tc-hppa.c: Speed up search for last label +--- + +2015-06-11 John David Anglin + + PR gas/18427 + * gas/config/tc-hppa.c (last_label_symbol): Declare. + (pa_get_label): Return last label in current space/segment or NULL. + (pa_define_label): Record last label and add to root. + (pa_undefine_label): Remove last label from root. + +diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c +index 57d7e96..06e222d 100644 +--- a/gas/config/tc-hppa.c ++++ b/gas/config/tc-hppa.c +@@ -606,6 +606,9 @@ static int within_procedure; + seen in each subspace. */ + static label_symbol_struct *label_symbols_rootp = NULL; + ++/* Last label symbol */ ++static label_symbol_struct last_label_symbol; ++ + /* Nonzero when strict matching is enabled. Zero otherwise. + + Each opcode in the table has a flag which indicates whether or +@@ -1114,19 +1117,17 @@ pa_check_eof (void) + static label_symbol_struct * + pa_get_label (void) + { +- label_symbol_struct *label_chain; ++ label_symbol_struct *label_chain = label_symbols_rootp; + +- for (label_chain = label_symbols_rootp; +- label_chain; +- label_chain = label_chain->lss_next) ++ if (label_chain) + { + #ifdef OBJ_SOM +- if (current_space == label_chain->lss_space && label_chain->lss_label) +- return label_chain; ++ if (current_space == label_chain->lss_space && label_chain->lss_label) ++ return label_chain; + #endif + #ifdef OBJ_ELF +- if (now_seg == label_chain->lss_segment && label_chain->lss_label) +- return label_chain; ++ if (now_seg == label_chain->lss_segment && label_chain->lss_label) ++ return label_chain; + #endif + } + +@@ -1139,28 +1140,23 @@ pa_get_label (void) + void + pa_define_label (symbolS *symbol) + { +- label_symbol_struct *label_chain = pa_get_label (); ++ label_symbol_struct *label_chain = label_symbols_rootp; + +- if (label_chain) +- label_chain->lss_label = symbol; +- else +- { +- /* Create a new label entry and add it to the head of the chain. */ +- label_chain = xmalloc (sizeof (label_symbol_struct)); +- label_chain->lss_label = symbol; ++ if (!label_chain) ++ label_chain = &last_label_symbol; ++ ++ label_chain->lss_label = symbol; + #ifdef OBJ_SOM +- label_chain->lss_space = current_space; ++ label_chain->lss_space = current_space; + #endif + #ifdef OBJ_ELF +- label_chain->lss_segment = now_seg; ++ label_chain->lss_segment = now_seg; + #endif +- label_chain->lss_next = NULL; + +- if (label_symbols_rootp) +- label_chain->lss_next = label_symbols_rootp; ++ /* Not used. */ ++ label_chain->lss_next = NULL; + +- label_symbols_rootp = label_chain; +- } ++ label_symbols_rootp = label_chain; + + #ifdef OBJ_ELF + dwarf2_emit_label (symbol); +@@ -1173,33 +1169,7 @@ pa_define_label (symbolS *symbol) + static void + pa_undefine_label (void) + { +- label_symbol_struct *label_chain; +- label_symbol_struct *prev_label_chain = NULL; +- +- for (label_chain = label_symbols_rootp; +- label_chain; +- label_chain = label_chain->lss_next) +- { +- if (1 +-#ifdef OBJ_SOM +- && current_space == label_chain->lss_space && label_chain->lss_label +-#endif +-#ifdef OBJ_ELF +- && now_seg == label_chain->lss_segment && label_chain->lss_label +-#endif +- ) +- { +- /* Remove the label from the chain and free its memory. */ +- if (prev_label_chain) +- prev_label_chain->lss_next = label_chain->lss_next; +- else +- label_symbols_rootp = label_chain->lss_next; +- +- free (label_chain); +- break; +- } +- prev_label_chain = label_chain; +- } ++ label_symbols_rootp = NULL; + } + + /* An HPPA-specific version of fix_new. This is required because the HPPA --- binutils-2.25.1.orig/debian/patches/series +++ binutils-2.25.1/debian/patches/series @@ -0,0 +1,36 @@ +#branch-updates.diff +#branch-version.diff +001_ld_makefile_patch.patch +002_gprof_profile_arcs.patch +003_gprof_see_also_monitor.patch +006_better_file_error.patch +012_check_ldrunpath_length.patch +013_bash_in_ld_testsuite.patch +#014_hash_style-both.patch +128_ppc64_powerpc_biarch.patch +129_multiarch_libpath.patch +130_gold_disable_testsuite_build.patch +131_ld_bootstrap_testsuite.patch +135_bfd_version.patch +157_ar_scripts_with_tilde.patch +158_ld_system_root.patch +161_gold_dummy_zoption.diff +170_doc_fixes.diff + +# only applied for GFDL builds +164_ld_doc_remove_xref.diff + +gprof-build.diff +aarch64-libpath.diff +#pr-ld-16428.diff +mips64-default-n64.diff + +# patches taken from the trunk +aarch64-gold-updates.diff +aarch64-gold-updates2.diff +aarch64-bogus-assertion.diff +aarch64-enable-targets.diff +arm-ld-unique-tests.diff +aarch64-thunderx.diff +pr18427.diff +fix-Bsymbolic-functions.diff --- binutils-2.25.1.orig/debian/rules +++ binutils-2.25.1/debian/rules @@ -0,0 +1,1598 @@ +#!/usr/bin/make -f +# debian/rules file - for binutils (2.20) +# Based on sample debian/rules file - for GNU Hello (1.3). +# Copyright 1994,1995 by Ian Jackson. +# Copyright 1998-2007 James Troup. +# Portions Copyright 2008-2015 Canonical Ltd. +# Portions Copyright 2008-2015 Matthias Klose. +# I hereby give you perpetual unlimited permission to copy, +# modify and relicense this file, provided that you do not remove +# my name from the file itself. (I assert my moral right of +# paternity under the Copyright, Designs and Patents Act 1988.) +# This file may have to be extensively modified + +############################################################################### + +p_bin = binutils +p_dev = $(p_bin)-dev +p_mul = $(p_bin)-multiarch +p_mdev = $(p_mul)-dev +p_doc = $(p_bin)-doc +p_hppa64 = $(p_bin)-hppa64-linux-gnu +p_src = $(p_bin)-source +p_static = $(p_bin)-static +p_udeb = $(p_static)-udeb + +distribution := $(shell lsb_release -is) +distrelease := $(shell lsb_release -cs) +ifeq ($(distrelease),n/a) + distrelease := sid +endif + +# BACKPORT is used for cross builds for a -source package not conflicting +# with the source package of the native package. +ifeq ($(BACKPORT),true) + p_src = $(p_bin)-$(VERSION)-source +else + p_src = $(p_bin)-source +endif + +pwd := $(shell pwd) +d = debian/tmp +d_bin = $(d) +d_dev = debian/$(p_dev) +d_mul = debian/$(p_mul) +d_mdev = debian/$(p_mdev) +d_doc = debian/$(p_doc) +d_hppa64 = debian/$(p_hppa64) +d_src = debian/$(p_src) +d_static = debian/$(p_static) +d_udeb = debian/$(p_udeb) + +install_dir = install -d -m 755 +install_file = install -m 644 +install_script = install -m 755 +install_binary = install -m 755 -s + +vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) +DPKG_VARS := $(shell dpkg-architecture) +DEB_BUILD_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH) +DEB_HOST_GNU_CPU ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_CPU) +DEB_HOST_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH) + +ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy jessie)) + ifeq ($(DEB_HOST_GNU_TYPE),i586-linux-gnu) + DEB_BUILD_GNU_TYPE = i686-linux-gnu + DEB_HOST_GNU_CPU = i686 + DEB_HOST_GNU_TYPE = i686-linux-gnu + TRIPLET_SYMLINK = i586-linux-gnu + endif +endif + +src_name := $(shell dpkg-parsechangelog -S Source) +ifeq ($(src_name),binutils) + with_native = yes + with_cross = yes + same_source = yes + CROSS_ARCHS ?= s390x ppc64el powerpc arm64 armhf armel mips mipsel # mips64 mips64el +else + # binutils-ports ... + with_cross = yes + CROSS_ARCHS ?= m68k sh4 mips64 mips64el +endif + +ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32 hppa)) + with_hppa64 = yes +endif + +HOST_ARCHS_armhf = amd64 i386 x32 arm64 +HOST_ARCHS_armel = amd64 i386 x32 arm64 +HOST_ARCHS_s390x = amd64 i386 x32 +HOST_ARCHS_powerpc = amd64 i386 x32 ppc64el +HOST_ARCHS_arm64 = amd64 i386 x32 +HOST_ARCHS_ppc64el = amd64 i386 x32 +HOST_ARCHS_mips = amd64 i386 x32 +HOST_ARCHS_mipsel = amd64 i386 x32 +HOST_ARCHS_mips64 = amd64 i386 x32 +HOST_ARCHS_mips64el = amd64 i386 x32 + +ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32)) + # +else ifeq ($(DEB_HOST_ARCH),arm64) + CROSS_ARCHS = armel armhf +else ifeq ($(DEB_HOST_ARCH),ppc64el) + CROSS_ARCHS = powerpc +else + CROSS_ARCHS = +endif +CROSS_ARCH = $(subst .,,$(suffix $@)) +_gnu_type = $(shell dpkg-architecture -a$(1) -qDEB_HOST_GNU_TYPE -f 2>/dev/null) +_multiarch = $(shell dpkg-architecture -a$(1) -qDEB_HOST_MULTIARCH -f 2>/dev/null) +CROSS_GNU_TYPE = $(call _gnu_type,$(CROSS_ARCH)) +P_CROSS = binutils-$(CROSS_GNU_TYPE) +D_CROSS = debian/binutils-$(CROSS_GNU_TYPE) + +# If $(TARGET) is not set, try reading debian/target +ifeq (,$(TARGET)) + ifneq (,$(wildcard debian/target)) + TARGET := $(shell cat debian/target 2>/dev/null) + endif +endif + +ifneq (,$(TARGET)) + with_native = + with_cross = + same_source = + # Support TARGET both as Debian architecture specification (e.g. arm), + # and as the target name (e.g. arm-linux-gnu). + try_convert := $(shell dpkg-architecture -f -a$(TARGET) -qDEB_HOST_GNU_TYPE 2>/dev/null) + ifneq ($(try_convert),) + override TARGET := $(try_convert) + endif + DPKG_TARGET_VARS := $(shell dpkg-architecture -f -t$(TARGET)) + DEB_TARGET_MULTIARCH = $(call vafilt,$(DPKG_TARGET_VARS),DEB_HOST_MULTIARCH) + DEB_TARGET_ARCH = $(call vafilt,$(DPKG_TARGET_VARS),DEB_HOST_ARCH) +else + DEB_TARGET_MULTIARCH = $(DEB_HOST_MULTIARCH) + DEB_TARGET_ARCH = $(DEB_HOST_ARCH) +endif + +ifneq (,$(TARGET)) + APPEND_TOOLLIBDIR=yes + export APPEND_TOOLLIBDIR +endif + +ifeq (,$(DEB_HOST_MULTIARCH)) + ifeq ($(DEB_HOST_ARCH),i386) + DEB_HOST_MULTIARCH = i386-linux-gnu + else + DEB_HOST_MULTIARCH = $(DEB_HOST_GNU_TYPE) + endif +endif + +SHELL = /bin/bash + +gold_targets = \ + amd64 arm64 armel armhf i386 \ + mips mipsel mipsn32 mipsn32el mips64 mips64el \ + powerpc powerpcspe ppc64 ppc64el \ + sparc sparc64 x32 hurd-i386 + +ifneq (,$(filter $(DEB_HOST_ARCH), $(gold_targets))) + with_gold = yes + gold_provides = -Vgold:Provides=binutils-gold +endif + +with_multiarch := yes +with_static := yes + +CC = gcc +CXX = g++ +CFLAGS = -g -O2 -Wno-format-security +STRIP = strip --remove-section=.comment --remove-section=.note +CROSS := +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + CROSS := $(DEB_HOST_GNU_TYPE)- + CC = $(CROSS)gcc + CXX = $(CROSS)g++ + STRIP= $(CURDIR)/debian/strip.cross + install_binary = install -m 755 -s --strip-program="$(STRIP)" +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS = -g -O0 +endif + +# this outputs 0 or 1 depending on whether a macro appears in the *default* cpp +# -dM -P output; this is used to test the toolchain *default* configuration +check_cpp = $(shell $(CROSS)cpp -dM -P /dev/null | grep -q '^\#define $(1)' && echo 1 || echo 0) + +# testsuite doesn't expect to be built with -mthumb +# TODO if the testsuite is only broken with Thumb-2 (and not with "Thumb-1"), +# we should test for __thumb2__ instead +ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf)) + ifeq ($(call check_cpp,__thumb__),1) + CFLAGS += -marm + endif +endif + +SPACE = $(EMPTY) $(EMPTY) +COMMA = , +CHANGELOG_VARS := $(shell dpkg-parsechangelog | \ + sed -n 's/ /_/g;/^[^_]/s/^$[^:]*$:_$.*$/\1=\2/p') + +DEB_VERSION := $(call vafilt,$(CHANGELOG_VARS),Version) +DEB_SVERSION := $(shell echo $(DEB_VERSION) | sed 's/+b[0-9][0-9]*$$//') +DEB_UPSTREAM := $(firstword $(subst -,$(SPACE),$(DEB_VERSION))) + +VERSION := $(shell sed -n 's/^ *VERSION=$.*$/\1/p' bfd/configure | head -1 | tr -d \') +DATE := $(shell sed -n 's/.* $[0-9]*$$$/\1/p' bfd/version.h) +ifneq (,$(DATE)) +# DATE_EXT := .$(DATE) +endif +BUILD_DATE := $(shell dpkg-parsechangelog | sed -n -e 's/^Date: //p') + +is_rc = yes +is_rc = + +ifneq ($(DEB_UPSTREAM),$(VERSION)$(DATE_EXT)) + $(error upstream ($(DEB_UPSTREAM)) and debian ($(VERSION)$(DATE_EXT)) version mismatch) +endif + +STATIC_UDEB = $(p_udeb)_$(DEB_VERSION)_$(DEB_HOST_ARCH).udeb + +SINGLE_VERSION= $(VERSION)-system +MULTI_VERSION = $(VERSION)-multiarch +HPPA64_VERSION= $(VERSION)-hppa64 + +ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy dapper hardy jaunty karmic lucid maverick natty oneiric precise quantal raring saucy trusty utopic)) + DPKG_DEV = dpkg-dev (>= 1.17.11), +endif + +NJOBS = +# Support parallel= in DEB_BUILD_OPTIONS (see #209008) +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) +endif +ifneq (,$(findstring nogold,$(DEB_BUILD_OPTIONS))) + with_gold = disabled in DEB_BUILD_OPTIONS +endif +ifneq (,$(findstring nostat,$(DEB_BUILD_OPTIONS))) + with_static = disabled in DEB_BUILD_OPTIONS +endif +ifneq (,$(findstring nomult,$(DEB_BUILD_OPTIONS))) + with_multiarch = disabled in DEB_BUILD_OPTIONS +endif + +# PF is the installation prefix for the package without the leading slash. +# It's "usr" for gcc releases, so use this if not explicitly set +ifeq ($(PF),) + PF = usr +endif + +# Don't include docs with GFDL invariant sections +GFDL_INVARIANT_FREE := yes +ifeq ($(distribution),Ubuntu) + GFDL_INVARIANT_FREE := no +endif + +gfdl_toplevel_texinfo_files = \ + bfd/doc/bfd.texinfo \ + bfd/doc/bfdint.texi \ + ld/ldint.texinfo + +gfdl_generated_files = \ + bfd/doc/bfd.info + +######################################## + +CONFARGS = \ + --enable-shared \ + --enable-plugins \ + --enable-threads \ + --prefix=/$(PF) \ + --enable-deterministic-archives \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) \ + --with-pkgversion="GNU Binutils for $(distribution)" + +# not yet ready for GCC 4.9 +CONFARGS += --disable-werror + +DEB_TARGET_MULTIARCH32_amd64 = i386-linux-gnu +DEB_TARGET_MULTIARCHX32_amd64 = x86_64-linux-gnux32 + +DEB_TARGET_MULTIARCH32_x32 = i386-linux-gnu +DEB_TARGET_MULTIARCH64_x32 = x86_64-linux-gnu + +DEB_TARGET_MULTIARCH32_powerpc = powerpc-linux-gnu + +DEB_TARGET_MULTIARCH32_s390x = s390-linux-gnu + +DEB_TARGET_MULTIARCH32_sparc64 = sparc-linux-gnu + +DEB_TARGET_MULTIARCH32_kfreebsd-amd64 = i386-kfreebsd-gnu + +DEB_TARGET_MULTIARCH64_i386 = x86_64-linux-gnu +DEB_TARGET_MULTIARCHX32_i386 = x86_64-linux-gnux32 + +DEB_TARGET_MULTIARCH64_powerpc = powerpc64-linux-gnu + +DEB_TARGET_MULTIARCH64_sparc = sparc64-linux-gnu + +DEB_TARGET_MULTIARCH64_s390 = s390x-linux-gnu + +DEB_TARGET_MULTIARCH64_kfreebsd-i386 = x86_64-kfreebsd-gnu + +DEB_TARGET_MULTIARCH64_mips = mips64-linux-gnuabi64 +DEB_TARGET_MULTIARCHN32_mips = mips64-linux-gnuabin32 + +DEB_TARGET_MULTIARCH64_mipsel = mips64el-linux-gnuabi64 +DEB_TARGET_MULTIARCHN32_mipsel = mips64el-linux-gnuabin32 + +DEB_TARGET_MULTIARCH64_mipsn32 = mips64-linux-gnuabi64 +DEB_TARGET_MULTIARCH32_mipsn32 = mips-linux-gnu + +DEB_TARGET_MULTIARCH64_mipsn32el = mips64el-linux-gnuabi64 +DEB_TARGET_MULTIARCH32_mipsn32el = mipsel-linux-gnu + +DEB_TARGET_MULTIARCH32_mips64 = mips-linux-gnu +DEB_TARGET_MULTIARCHN32_mips64 = mips64-linux-gnuabin32 + +DEB_TARGET_MULTIARCH32_mips64el = mipsel-linux-gnu +DEB_TARGET_MULTIARCHN32_mipselel = mips64el-linux-gnuabin32 + +DEB_TARGET_MULTIARCH32_arm64 = aarch64_ilp32-linux-gnu + +SET_MULTIARCH_ENV = \ + DEB_TARGET_MULTIARCH=$(call _multiarch,$1) \ + $(if $(DEB_TARGET_MULTIARCH32_$1) ,DEB_TARGET_MULTIARCH32=$(DEB_TARGET_MULTIARCH32_$1)) \ + $(if $(DEB_TARGET_MULTIARCH64_$1) ,DEB_TARGET_MULTIARCH64=$(DEB_TARGET_MULTIARCH64_$1)) \ + $(if $(DEB_TARGET_MULTIARCHX32_$1),DEB_TARGET_MULTIARCHX32=$(DEB_TARGET_MULTIARCHX32_$1)) \ + $(if $(DEB_TARGET_MULTIARCHN32_$1),DEB_TARGET_MULTIARCHN32=$(DEB_TARGET_MULTIARCHN32_$1)) + +CONFARGS_TARGET_sparc = --enable-targets=sparc64-linux-gnu +CONFLICTS_TARGET_sparc = -VextraConflicts="libc6-dev-sparc64 (<< 2.2.5-7)" + +CONFARGS_TARGET_sparc64 = --enable-targets=sparc-linux-gnu +CONFLICTS_TARGET_sparc64 = -VextraConflicts="libc6-dev-sparc64 (<< 2.2.5-7)" + +CONFARGS_TARGET_powerpc = --enable-targets=powerpc64-linux-gnu + +CONFARGS_TARGET_ppc64 = --enable-targets=powerpc-linux-gnu + +CONFARGS_TARGET_ppc64el = --enable-targets=powerpc-linux-gnu + +CONFARGS_TARGET_s390 = --enable-targets=s390x-linux-gnu + +CONFARGS_TARGET_s390x = --enable-targets=s390-linux-gnu + +CONFARGS_TARGET_amd64 = --enable-targets=x86_64-linux-gnux32,x86_64-pep + +CONFARGS_TARGET_i386 = --enable-targets=x86_64-linux-gnu,x86_64-linux-gnux32,x86_64-pep + +CONFARGS_TARGET_x32 = --enable-targets=x86_64-linux-gnu,x86_64-pep + +CONFLICTS_TARGET_amd64 = -VextraConflicts="binutils-mingw-w64-i686 (<< 2.23.52.20130612-1+3), binutils-mingw-w64-x86-64 (<< 2.23.52.20130612-1+3)" +CONFLICTS_TARGET_i386 = $(CONFLICTS_TARGET_amd64) +CONFLICTS_TARGET_x32 = $(CONFLICTS_TARGET_amd64) + +CONFARGS_TARGET_kfreebsd-i386 = --enable-targets=x86_64-kfreebsd-gnu + +CONFARGS_TARGET_mips = --enable-targets=mips64-linux-gnuabi64,mips64-linux-gnuabin32 + +CONFARGS_TARGET_mipsel = --enable-targets=mips64el-linux-gnuabi64,mips64el-linux-gnuabin32 + +CONFARGS_TARGET_mipsn32 = --enable-targets=mips64-linux-gnuabi64,mips-linux-gnu + +CONFARGS_TARGET_mipsn32el = --enable-targets=mips64el-linux-gnuabi64,mipsel-linux-gnu + +CONFARGS_TARGET_mips64 = --enable-targets=mips64-linux-gnuabin32,mips-linux-gnu + +CONFARGS_TARGET_mips64el = --enable-targets=mips64el-linux-gnuabin32,mipsel-linux-gnu + +CONFARGS_TARGET_aarch64 = --enable-targets=aarch64_be-linux-gnu + +with_check := yes +ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + with_check := disabled through DEB_BUILD_OPTIONS +endif +ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf mips mipsel sparc)) + ignore_regressions := regressions ignored on architecture $(DEB_HOST_ARCH) +endif + +ignore_regressions := regressions ignored on architecture $(DEB_HOST_ARCH) + +with_strip := yes +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + with_strip := disabled through DEB_BUILD_OPTIONS +endif + +source_files = $(addprefix $(shell basename $(pwd))/, \ + $(filter-out stamps .pc CVS debian builddir-% test-summary%, $(wildcard *))) + +############################################################################### + +################# +# patch targets # +################# + +patch: stamps/patch +stamps/patch: +ifneq ($(PATCHED_SOURCES),yes) + QUILT_PATCHES=$(CURDIR)/debian/patches \ + quilt --quiltrc /dev/null push -a || test $$? = 2 +endif + @mkdir -p stamps + touch $@ + +unpatch: + QUILT_PATCHES=$(CURDIR)/debian/patches \ + quilt --quiltrc /dev/null pop -a -R || test $$? = 2 + rm -rf .pc + +update-patches: + export QUILT_PATCHES=$(CURDIR)/debian/patches; \ + export QUILT_REFRESH_ARGS="--no-timestamps --no-index -pab"; \ + export QUILT_DIFF_ARGS="--no-timestamps --no-index -pab"; \ + while quilt push; do quilt refresh; done + +############################################################################### + +################ +# clean target # +################ + +clean: unpatch + $(checkdir) + rm -rf stamps + rm -rf builddir-* + rm -rf stamps + find . -name \*.gmo -o -name \*~ -o -name \*.info ! -name sysroff.info | xargs -r rm -f + rm -f $(pwd)/test-summary* + rm -rf $(d_bin) $(d_dev) $(d_mul) $(d_mdev) $(d_doc) $(d_hppa64) $(d_src) + $(foreach ca,$(CROSS_ARCHS), rm -rf debian/binutils-$(call _gnu_type,$(ca)); ) + rm -rf $(d_static) $(d_udeb) + rm -rf debian/patched debian/tmp debian/files* debian/substvars + rm -f debian/*.orig debian/*.rej + rm -rf $(d_cross) debian/files debian/substvars +ifneq (,$(TARGET)) + rm -rf builddir-$(TARGET) +endif + + for i in debian/*.in; do \ + case "$$i" in debian/control*.in) continue; esac; \ + rm -f $${i%*.in}; \ + done + + rm -f *-stamp + +############################################################################### + +stamps/control: debian/control.in $(if $(TARGET),debian/control.cross.in) $(if $(filter yes, $(with_cross)),debian/control.cross.in) +ifneq (,$(TARGET)) + sed "s/@dpkg_dev@/$(DPKG_DEV)/;/^$$/ q" < debian/control.in > debian/control + sed -e "s/@target@/$$(echo -n $(TARGET) | sed s/_/-/g)/" \ + < debian/control.cross.in >> debian/control +else + sed -e 's/@dpkg_dev@/$(DPKG_DEV)/' \ + debian/control.in > debian/control + ifeq ($(with_cross),yes) + $(foreach ca,$(CROSS_ARCHS), \ + sed \ + -e 's/@host_archs@/$(HOST_ARCHS_$(ca))/g' \ + -e 's/@target@/$(shell dpkg-architecture -a$(ca) -qDEB_HOST_GNU_TYPE 2>/dev/null)/g' \ + debian/control.cross.in \ + | $(if $(filter yes,$(same_source)), grep -v '^Built-Using', cat) \ + >> debian/control; \ + ) + endif +endif +ifneq (,$(CROSS)) + sed -e "s/__TARGET__/$$(echo -n $(CROSS) | sed s/_/-/g)/" \ + < debian/strip.cross.in >> debian/strip.cross + chmod 755 debian/strip.cross +endif + @mkdir -p stamps + touch $@ + +####################### +# single-arch targets # +####################### + +SINGLE_CONFARGS = $(CONFARGS) $(CONFARGS_TARGET_$(DEB_HOST_ARCH)) +ifeq ($(with_gold),yes) + SINGLE_CONFARGS += --enable-ld=default --enable-gold +endif + +stamps/configure-single: stamps/patch + $(checkdir) + @echo BEGIN $@ +ifeq ($(with_check),yes) + @if echo "spawn true" | /usr/bin/expect -f - >/dev/null; then \ + : ; \ + else \ + echo "expect is failing on your system with the above error, which means the"; \ + echo "testsuite will fail. Please resolve the above issues and retry the build."; \ + echo "-----------------------------------------------------------------------------"; \ + exit 1; \ + fi +endif + + rm -rf stamps/configure-single builddir-single + mkdir builddir-single + cd builddir-single && env CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" \ + $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \ + ../configure --with-sysroot=/ $(SINGLE_CONFARGS) + $(MAKE) -C builddir-single configure-host + touch $@ + +stamps/build-single: stamps/configure-single + $(checkdir) + @echo BEGIN $@ + env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \ + $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \ + $(MAKE) -C builddir-single/bfd headers \ + LDFLAGS="-Wl,-z,relro" + env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \ + $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \ + $(MAKE) $(NJOBS) -C builddir-single \ + LDFLAGS="-Wl,-z,relro" +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +ifeq ($(with_check),yes) + -env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \ + $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \ + $(MAKE) -C builddir-single -k check + cat builddir-single/binutils/binutils.sum \ + builddir-single/gas/testsuite/gas.sum \ + builddir-single/ld/ld.sum >> $(pwd)/test-summary + set -e; \ + if [ ! -f /usr/share/doc/binutils/test-summary.gz ]; then \ + echo "No test results available for the installed binutils version"; \ + elif [ -x /usr/bin/python3 ]; then \ + echo "Test results, compared with installed binutils:"; \ + zcat /usr/share/doc/binutils/test-summary.gz > test-summary-installed; \ + if python3 debian/test-suite-compare.py test-summary-installed test-summary; then \ + : ; \ + elif [ -n "$(ignore_regressions)" ]; then \ + echo "$(ignore_regressions)"; \ + else \ + case "$(DEB_HOST_ARCH)" in \ + powerpc) \ + echo "WARNING: ignoring test results";; \ + *) \ + false;; \ + esac; \ + fi; \ + else \ + echo "python3 not installed, not comparing test results."; \ + fi +endif +endif + touch $@ + + +############################################################################### + +##################### +# multiarch targets # +##################### + +multiarch_targets += \ + aarch64-linux-gnu \ + aarch64_be-linux-gnu \ + alpha-linux-gnu \ + arm-linux-gnueabi \ + i686-linux-gnu \ + m32r-linux-gnu \ + m68k-linux-gnu \ + m68k-rtems \ + powerpc-linux-gnu \ + powerpc64-linux-gnu \ + powerpc64le-linux-gnu \ + s390x-linux-gnu \ + sh-linux-gnu \ + sh64-linux-gnu \ + sparc-linux-gnu \ + sparc64-linux-gnu \ + x86_64-linux-gnu \ + x86_64-linux-gnux32 \ + x86_64-pep + +# try to work around #758830 +ifeq ($(DEB_HOST_ARCH),sh4) + multiarch_targets := $(filter-out hppa-linux-gnu, $(multiarch_targets)) +endif + +stamps/configure-multi: stamps/patch + $(checkdir) + @echo BEGIN $@ + rm -rf stamps/configure-multi \ + builddir-multi + mkdir builddir-multi + cd builddir-multi \ + && env CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" \ + $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \ + ../configure $(CONFARGS) \ + --with-sysroot=/ \ + --enable-targets=$(subst $(SPACE),$(COMMA),$(multiarch_targets)) + $(MAKE) -C builddir-multi configure-host + touch $@ + +stamps/build-multi: stamps/configure-multi + $(checkdir) + @echo BEGIN $@ + $(MAKE) -C builddir-multi/bfd headers + env MAKE="$(MAKE) VERSION=$(MULTI_VERSION)" \ + $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \ + $(MAKE) $(NJOBS) -C builddir-multi \ + LDFLAGS="-Wl,-z,relro" + touch $@ + +############################################################################### + +################# +# cross targets # +################# + +stamps/configure.%: stamps/patch + $(checkdir) + @echo BEGIN $@ + rm -rf $@ builddir-$* + mkdir builddir-$* + cd builddir-$* \ + && env CC="$(CC)" CXX="$(CXX)" \ + $(call SET_MULTIARCH_ENV,$*) \ + ../configure \ + $(CONFARGS) \ + $(CONFARGS_TARGET_$(*)) \ + $(if $(filter $*, $(gold_targets)),--enable-ld=default --enable-gold) \ + --target=$(CROSS_GNU_TYPE) + touch $@ + +stamps/build.%: stamps/configure.% + $(checkdir) + @echo BEGIN $@ + env MAKE="$(MAKE) VERSION=$(VERSION)-$*" \ + $(call SET_MULTIARCH_ENV,$*) \ + $(MAKE) -C builddir-$* $(NJOBS) \ + CFLAGS="$(CFLAGS)" \ + LDFLAGS="-Wl,-z,relro" + touch $@ + +stamps/install.%: stamps/build.% + $(checkdir) + @echo BEGIN $@ + rm -rf $(D_CROSS) + env MAKE="$(MAKE) VERSION=$(VERSION)-$*" \ + $(MAKE) -C builddir-$* prefix=$(pwd)/$(D_CROSS)/$(PF) \ + mandir=$(pwd)/$(D_CROSS)/$(PF)/share/man install + rm -rf \ + $(D_CROSS)/$(PF)/lib* \ + $(D_CROSS)/$(PF)/share/info \ + $(D_CROSS)/$(PF)/share/locale + + mkdir -p $(D_CROSS)/$(PF)/lib + set -e; \ + d_src=$(D_CROSS)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(CROSS_GNU_TYPE)/lib; \ + d_dst=$(D_CROSS)/$(PF)/lib; \ + for lib in libbfd libopcodes; do \ + mv $$d_src/$$lib*$*.so $$d_dst/.; \ + ln -sf ../../../lib/$$lib-$(VERSION)-$*.so $$d_src/$$lib.so; \ + mv $$d_src/$$lib.a $$d_dst/$${lib}-$(VERSION)-$*.a; \ + ln -sf ../../../lib/$$lib-$(VERSION)-$*.a $$d_src/$$lib.a; \ + done + $(call strip_package, $(P_CROSS),$(D_CROSS),.) + chmod ugo-x $(D_CROSS)/$(PF)/lib/*.so + + : # Get rid of .la files since libtool obviously has no idea about transient paths + rm -f $(D_CROSS)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(CROSS_GNU_TYPE)/lib/*.la + + if which strip-nondeterminism >/dev/null 2>&1; then \ + find $(D_CROSS) -name '*.a' -print0 \ + | xargs -0r strip-nondeterminism --type ar; \ + fi + + : # no spu toolchain + rm -f $(D_CROSS)/$(PF)/bin/*embedspu + + : # symlink man pages + mv $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-ld.1 \ + $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-ld.bfd.1 + gzip -9n $(D_CROSS)/$(PF)/share/man/man1/* + for i in $(D_CROSS)/$(PF)/share/man/man1/*; do \ + b=$$(basename $$i | sed 's/$(CROSS_GNU_TYPE)-//'); \ + ln -sf $$b $$i; \ + done + ln -sf $(CROSS_GNU_TYPE)-ld.bfd.1.gz \ + $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-ld.1.gz + + : # gold man pages + $(if $(filter $*, $(gold_targets)), \ + ln -sf ld.gold.1.gz $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-ld.gold.1.gz; \ + ln -sf dwp.1.gz $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-dwp.1.gz; \ + ) + + : # Don't want /usr/-linux to exist in any package, don't ship development files + rm -rf $(D_CROSS)/$(PF)/$(DEB_HOST_GNU_TYPE) + + rm -f $(D_CROSS)/$(PF)/lib/*.a + rm -f $(D_CROSS)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(CROSS_GNU_TYPE)/lib/*.a + + : # remove RPATH + chrpath -k -d $$(file $(D_CROSS)/usr/bin/*|awk -F: '/ ELF/ {print $$1}') + ln -sf $(CROSS_GNU_TYPE)-ld.bfd $(D_CROSS)/usr/bin/$(CROSS_GNU_TYPE)-ld + + : # replace hard links with soft links + for i in $(D_CROSS)/usr/$(CROSS_GNU_TYPE)/bin/*; do \ + ln -sf ../../bin/$(CROSS_GNU_TYPE)-$$(basename $$i) $$i; \ + done + touch $@ + +############################################################################### + +################# +# static target # +################# + +stamps/configure-static: stamps/patch + $(checkdir) + @echo BEGIN $@ + rm -rf stamps/configure-static \ + builddir-static + mkdir builddir-static + cd builddir-static \ + && env CC="$(CC)" CXX="$(CXX)" CFLAGS="-g0 -Os" ../configure \ + $(filter-out --enable-shared --enable-plugins --enable-targets=%, $(CONFARGS)) + $(MAKE) -C builddir-static configure-bfd + $(MAKE) -C builddir-static configure-ld + touch $@ + +stamps/build-static: stamps/configure-static + $(checkdir) + @echo BEGIN $@ + $(MAKE) $(NJOBS) -C builddir-static/libiberty CCLD='$(CC) -all-static' + $(MAKE) $(NJOBS) -C builddir-static/bfd CCLD='$(CC) -all-static' + $(MAKE) $(NJOBS) -C builddir-static/ld CCLD='$(CC) -all-static' + touch $@ + +############################################################################### + +################# +# hppa64 target # +################# + +stamps/configure-hppa64: stamps/patch + $(checkdir) + @echo BEGIN $@ + rm -rf stamps/configure-hppa64 \ + builddir-hppa64 + mkdir builddir-hppa64 + cd builddir-hppa64 \ + && env CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" ../configure \ + $(filter-out --enable-targets=%, $(CONFARGS)) \ + --target=hppa64-linux-gnu + $(MAKE) -C builddir-hppa64 configure-host + touch $@ + +stamps/build-hppa64: stamps/configure-hppa64 + $(checkdir) + @echo BEGIN $@ + $(MAKE) -C builddir-hppa64/bfd headers + env MAKE="$(MAKE) VERSION=$(HPPA64_VERSION)" \ + $(MAKE) $(NJOBS) -C builddir-hppa64 + touch $@ + +############################################################################### + +pre-build: +#ifneq (,$(filter $(DEB_HOST_ARCH), amd64)) +# @echo Build it ... +#else +# @echo Explicitely fail the build for architecture $(DEB_HOST_ARCH) +# false +#endif + +build_stamps = stamps/build-single +ifeq ($(with_multiarch),yes) + build_stamps += stamps/build-multi +endif +ifeq ($(with_hppa64),yes) + build_stamps += stamps/build-hppa64 +endif +ifeq ($(with_cross),yes) + build_stamps += $(foreach ca,$(CROSS_ARCHS), stamps/build.$(ca)) +endif +ifneq (,$(TARGET)) + ifneq (,$(findstring static-cross,$(DEB_BUILD_OPTIONS))) + build_stamps = stamps/build-static-cross + else + build_stamps = stamps/build-cross + endif +endif +ifeq ($(BACKPORT),true) + build_stamps := + with_check := no +endif + +build: pre-build stamps/build +build-arch: pre-build stamps/build +build-indep: pre-build stamps/build +stamps/build: $(build_stamps) + touch $@ + +############################################################################### + +################## +# install target # +################## + +install_stamps = stamps/install +ifeq ($(with_hppa64),yes) + install_stamps += stamps/install-hppa64 +endif +ifeq ($(with_cross),yes) + install_stamps += $(foreach ca,$(CROSS_ARCHS), stamps/install.$(ca)) +endif +ifeq ($(with_static),yes) + install_stamps += stamps/install-static +endif +ifneq (,$(TARGET)) + ifneq (,$(findstring static-cross,$(DEB_BUILD_OPTIONS))) + install_stamps = stamps/install-static-cross + else + install_stamps = stamps/install-cross + endif +endif +ifeq ($(BACKPORT),true) + install_stamps := +endif +install: $(install_stamps) +stamps/install: checkroot stamps/build + $(checkdir) + + rm -fr $(d_bin) $(d_dev) $(d_mul) $(d_mdev) $(d_doc) $(d_src) + $(install_dir) $(d_bin) $(d_dev) $(d_mul) $(d_mdev) $(d_doc) $(d_src) + + : # install binutils and -dev stuff + env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \ + $(MAKE) -C builddir-single \ + CFLAGS="$(CFLAGS)" prefix=$(pwd)/$(d_bin)/$(PF) \ + mandir=$(pwd)/$(d_bin)/$(PF)/share/man \ + infodir=$(pwd)/$(d_doc)/$(PF)/share/info install + +ifeq ($(with_multiarch),yes) + : # now install binutils-multiarch stuff + env MAKE="$(MAKE) VERSION=$(MULTI_VERSION)" \ + $(MAKE) -C builddir-multi \ + CFLAGS="$(CFLAGS)" \ + prefix=$(pwd)/$(d_mul)/$(PF) \ + mandir=$(pwd)/$(d_mul)/$(PF)/share/man \ + infodir=$(pwd)/$(d_doc)/$(PF)/share/info install +endif + + : # fix bfd.h, removing the safety inclusion guard + awk '/PR 14072/,/^#endif/ {next} {print}' $(d_bin)/$(PF)/include/bfd.h \ + > $(d_bin)/$(PF)/include/bfd.h.new + mv $(d_bin)/$(PF)/include/bfd.h.new $(d_bin)/$(PF)/include/bfd.h + + : # fix multilib conflicts of generated values by __WORDSIZE-based expressions + sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$$~#include ~;}' \ + -e 's/^#define BFD_DEFAULT_TARGET_SIZE $32\|64$ *$$/#define BFD_DEFAULT_TARGET_SIZE __WORDSIZE/' \ + -e 's/^#define BFD_HOST_64BIT_LONG [01] *$$/#define BFD_HOST_64BIT_LONG (__WORDSIZE == 64)/' \ + -e 's/^#define BFD_HOST_64_BIT $long $\?long *$$/#if __WORDSIZE == 32\ +#define BFD_HOST_64_BIT long long\ +#else\ +#define BFD_HOST_64_BIT long\ +#endif/' \ + -e 's/^#define BFD_HOST_U_64_BIT unsigned $long $\?long *$$/#define BFD_HOST_U_64_BIT unsigned BFD_HOST_64_BIT/' \ + $(d_bin)/$(PF)/include/bfd.h + + : # copy plugin-api.h ... + cp -f include/plugin-api.h $(d_bin)/$(PF)/include + + : # We don't need to distribute everything in binutils and -dev + rm -rf $(d_bin)/$(PF)/include/obstack.h + rm -f $(d_bin)/$(PF)/man/man1/configure.1 + rm -f $(d_doc)/$(PF)/share/info/configure.* $(d_doc)/$(PF)/share/info/standards.* + : # *sigh*, bugs.debian.org/213524 + rm -f $(d_doc)/$(PF)/share/info/dir* + +ifeq ($(with_multiarch),yes) + : # Now get rid of just about everything in binutils-multiarch + rm -rf $(d_mul)/$(PF)/man $(d_mul)/$(PF)/info $(d_mul)/$(PF)/include + rm -rf $(d_mul)/$(PF)/share/man $(d_mul)/$(PF)/share/info $(d_mul)/$(PF)/share/locale + + : # elfedit (even with its --input-mach option) + : # is the same for all targets. + rm -f $(d_mul)/$(PF)/bin/elfedit + + : # c++filt does not link to libbfd for anything more than + : # the help message, and its behavior does not vary + : # between arches aside from the --version message. + rm -f $(d_mul)/$(PF)/bin/c++filt + + : # As gas/README points out (search for --enable-targets), + : # multi-arch gas is not ready yet. + rm -f $(d_mul)/$(PF)/bin/as + rm -f $(d_mul)/$(PF)/bin/ld + rm -f $(d_mul)/$(PF)/bin/ld.bfd + rm -f $(d_mul)/$(PF)/bin/ld.gold + rm -fr $(d_mul)/$(PF)/lib/ldscripts + + ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64 ppc64el)) + rm -f $(d_mul)/$(PF)/bin/embedspu + endif +endif + + $(install_dir) $(d_dev)/$(PF)/include/ $(d_dev)/$(PF)/lib/ + mv $(d_bin)/$(PF)/include/* $(d_dev)/$(PF)/include/ + mv $(d_bin)/$(PF)/lib/*.a $(d_bin)/$(PF)/lib/libbfd.so $(d_bin)/$(PF)/lib/libopcodes.so \ + $(d_dev)/$(PF)/lib/ + +ifeq ($(with_multiarch),yes) + $(install_dir) $(d_mdev)/$(PF)/lib/ + mv $(d_mul)/$(PF)/lib/libbfd.so \ + $(d_mdev)/$(PF)/lib/libbfd-multiarch.so + mv $(d_mul)/$(PF)/lib/libopcodes.so \ + $(d_mdev)/$(PF)/lib/libopcodes-multiarch.so + rm -f $(d_mul)/$(PF)/lib/*.la $(d_mul)/$(PF)/lib/*.a + rm -f $(d_mul)/$(PF)/lib*/libiberty* +endif + + : # Get rid of .la files since libtool obviously has no idea about transient paths + rm -f $(d_bin)/$(PF)/lib/*.la + + chmod ugo-x $(d_bin)/$(PF)/lib/*.so + $(call strip_package, $(p_bin), $(d_bin)) +ifeq ($(with_multiarch),yes) + chmod ugo-x $(d_mul)/$(PF)/lib/*.so + $(call strip_package, $(p_mul), $(d_mul)) +endif + + if which strip-nondeterminism >/dev/null 2>&1; then \ + find $(d_dev) -name '*.a' -print0 \ + | xargs -0r strip-nondeterminism --type ar; \ + fi + + : # Don't want /usr/-linux to exist in any package + rm -rf $(d_bin)/$(PF)/$(DEB_HOST_GNU_TYPE) + + : # Remove windres manpages + rm -f $(d_bin)/$(PF)/share/man/man1/windres.1 + +ifeq ($(with_multiarch),yes) + rm -rf $(d_mul)/$(PF)/$(DEB_HOST_GNU_TYPE) + rm -f $(d_mul)/$(PF)/share/man/man1/windres.1 +endif + + rm -f $(d_bin)/$(PF)/bin/ld + ln -s ld.bfd $(d_bin)/$(PF)/bin/ld +ifeq ($(with_gold),yes) + ln -s ld.gold $(d_bin)/$(PF)/bin/gold + mv $(d_bin)/$(PF)/share/man/man1/ld.1 \ + $(d_bin)/$(PF)/share/man/man1/ld.bfd.1 + ln -s ld.bfd.1.gz $(d_bin)/$(PF)/share/man/man1/ld.1.gz + ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + if which help2man >/dev/null 2>&1; then \ + help2man -N -n 'The GNU ELF linker' $(d_bin)/$(PF)/bin/ld.gold \ + | sed 's,$(d_bin)/$(PF)/bin/,,g' > debian/ld.gold.1; \ + help2man -N -n 'The DWARF packaging utility' $(d_bin)/$(PF)/bin/dwp \ + | sed 's,$(d_bin)/$(PF)/bin/,,g' > debian/dwp.1; \ + fi + endif + cp debian/dwp.1 $(d_bin)/$(PF)/share/man/man1/ + cp debian/ld.gold.1 $(d_bin)/$(PF)/share/man/man1/ + ln -s ld.gold.1.gz $(d_bin)/$(PF)/share/man/man1/gold.1.gz + + : # install a symlink for the gold linker + $(install_dir) $(d_bin)/$(PF)/lib/gold-ld + ln -s ../../bin/ld.gold $(d_bin)/$(PF)/lib/gold-ld/ld +endif + : # install a symlink for the old linker + $(install_dir) $(d_bin)/$(PF)/lib/compat-ld + ln -s ../../bin/ld.bfd $(d_bin)/$(PF)/lib/compat-ld/ld + + : # Remove empty directory + rmdir $(d_bin)/$(PF)/include/ + + : # Provide $(DEB_HOST_GNU_TYPE)- prefixed binaries + for i in \ + addr2line ar as c++filt elfedit gprof ld ld.bfd \ + $(if $(with_gold),ld.gold dwp) \ + nm objcopy objdump ranlib readelf size strings strip; \ + do \ + ln -sf $$i $(d_bin)/$(PF)/bin/$(DEB_HOST_GNU_TYPE)-$$i; \ + ln -sf $$i.1.gz $(d_bin)/$(PF)/share/man/man1/$(DEB_HOST_GNU_TYPE)-$$i.1.gz; \ + done + +ifneq (,$(filter $(DEB_HOST_ARCH),i386 kfreebsd-i386 hurd-i386)) +# temporary i586-* symlinks for stretch/sid + ifneq (,$(TRIPLET_SYMLINK)) + for i in \ + addr2line ar as c++filt elfedit gprof ld ld.bfd \ + $(if $(with_gold),ld.gold dwp) \ + nm objcopy objdump ranlib readelf size strings strip; \ + do \ + ln -sf $$i $(d_bin)/$(PF)/bin/$(TRIPLET_SYMLINK)-$$i; \ + ln -sf $$i.1.gz $(d_bin)/$(PF)/share/man/man1/$(TRIPLET_SYMLINK)-$$i.1.gz; \ + done + endif +# temporary i486-* symlinks for jessie/sid + ifeq ($(DEB_HOST_GNU_CPU),i586) + gnutype=$(subst i586,i486,$(DEB_HOST_GNU_TYPE)); \ + for i in \ + addr2line ar as c++filt elfedit gprof ld ld.bfd \ + $(if $(with_gold),ld.gold dwp) \ + nm objcopy objdump ranlib readelf size strings strip; \ + do \ + ln -sf $$i $(d_bin)/$(PF)/bin/$$gnutype-$$i; \ + ln -sf $$i.1.gz $(d_bin)/$(PF)/share/man/man1/$$gnutype-$$i.1.gz; \ + done + endif +# for backports to wheezy and squeeze + ifeq ($(DEB_HOST_GNU_CPU),i486) + gnutype=$(subst i486,i586,$(DEB_HOST_GNU_TYPE)); \ + for i in \ + addr2line ar as c++filt elfedit gprof ld ld.bfd \ + $(if $(with_gold),ld.gold dwp) \ + nm objcopy objdump ranlib readelf size strings strip; \ + do \ + ln -sf $$i $(d_bin)/$(PF)/bin/$$gnutype-$$i; \ + ln -sf $$i.1.gz $(d_bin)/$(PF)/share/man/man1/$$gnutype-$$i.1.gz; \ + done + endif +endif + + touch $@ + +stamps/install-hppa64: checkroot stamps/build-hppa64 + $(checkdir) + + rm -fr $(d_hppa64) + $(install_dir) $(d_hppa64) + $(install_dir) $(d_hppa64)/$(PF)/lib + + : # install binutils-hppa64 stuff + env MAKE="$(MAKE) VERSION=$(HPPA64_VERSION)" \ + $(MAKE) -C builddir-hppa64 \ + CFLAGS="$(CFLAGS)" \ + prefix=$(pwd)/$(d_hppa64)/$(PF)/ \ + mandir=$(pwd)/$(d_hppa64)/$(PF)/share/man \ + infodir=$(pwd)/$(d_hppa64)/$(PF)/share/info install + + : # move shared libs to the standard path + mv $(d_hppa64)/$(PF)/$(DEB_HOST_GNU_TYPE)/hppa64-linux-gnu/lib/lib*-*.so \ + $(d_hppa64)/$(PF)/lib/. + + : # Now get rid of just about everything in binutils-hppa64 + rm -rf $(d_hppa64)/$(PF)/man + rm -rf $(d_hppa64)/$(PF)/info + rm -rf $(d_hppa64)/$(PF)/include + rm -rf $(d_hppa64)/$(PF)/share + rm -rf $(d_hppa64)/$(PF)/hppa-linux-gnu + rm -rf $(d_hppa64)/$(PF)/lib/libiberty.a + + $(call strip_package, $(p_hppa64), $(d_hppa64)) + chmod ugo-x $(d_hppa64)/$(PF)/lib/*.so + + : # Don't want /usr/-linux to exist in any package + rm -rf $(d_hppa64)/$(PF)/$(DEB_HOST_GNU_TYPE) + + touch $@ + +stamps/install-static: checkroot stamps/build-static + $(checkdir) + + rm -fr $(d_static) $(d_udeb) + $(install_dir) $(d_static) $(d_udeb) + + : # Copy static ld-new into /bin for both -static and -static-udeb + $(install_dir) $(d_static)/bin + $(install_binary) builddir-static/ld/ld-new $(d_static)/bin/ld_static + $(install_dir) $(d_udeb)/bin + $(install_binary) builddir-static/ld/ld-new $(d_udeb)/bin/ld_static +ifeq ($(with_strip),yes) + pkg_create_dbgsym $(p_static) $(d_static) || true + $(STRIP) --strip-unneeded $(d_static)/bin/ld_static $(d_udeb)/bin/ld_static +endif + + touch $@ + +############################################################################### + +####################### +# binary-indep target # +####################### + +binary-indep: checkroot build install + $(checkdir) + + rm -f debian/files debian/substvars + +# Cross builds do not have documentation packages +ifeq (,$(TARGET)) + + $(install_dir) $(d_doc)/DEBIAN + +ifeq ($(GFDL_INVARIANT_FREE),yes) + rm -f $(d_doc)/$(PF)/share/info/bfd.info* + rm -f $(d_doc)/$(PF)/share/info/bfdint.info* + rm -f $(d_doc)/$(PF)/share/info/ldint.info* +endif + +ifneq ($(BACKPORT),true) + $(install_dir) $(d_doc)/$(PF)/share/doc/$(p_doc)/ + $(install_file) debian/changelog $(d_doc)/$(PF)/share/doc/$(p_doc)/changelog.Debian + $(install_file) debian/copyright $(d_doc)/$(PF)/share/doc/$(p_doc)/ + for i in bfd gas gprof ld; do \ + ln -sf ../$(p_bin)/$$i $(d_doc)/$(PF)/share/doc/$(p_doc)/$$i; \ + done + find $(d_doc)/$(PF)/share/doc/$(p_doc) -maxdepth 1 -type f ! -name copyright | xargs gzip -9n + gzip -9n $(d_doc)/$(PF)/share/info/* + + dpkg-gencontrol -P$(d_doc) -p$(p_doc) + chown -R root:root $(d_doc) + chmod -R go=rX $(d_doc) + find $(d_doc) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_doc) .. + + $(install_dir) $(d_src)/$(PF)/share/doc/$(p_src)/ + $(install_file) debian/changelog $(d_src)/$(PF)/share/doc/$(p_src)/changelog.Debian + $(install_file) debian/copyright $(d_src)/$(PF)/share/doc/$(p_src)/ + find $(d_src)/$(PF)/share/doc/$(p_src) -maxdepth 1 -type f ! -name copyright | xargs gzip -9n +endif # ifndef BACKPORT + + $(install_dir) $(d_src)/DEBIAN + $(install_dir) $(d_src)/$(PF)/src/binutils/patches + $(install_file) debian/patches/* $(d_src)/$(PF)/src/binutils/patches/ + cd .. && find $(source_files) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' && \ + find $(source_files) -type f -print0 | LC_ALL=C sort -z | \ + tar --null -T - -c --xz --exclude=CVS --mode=go=rX,u+rw,a-s \ + -f $(pwd)/$(d_src)/$(PF)/src/binutils/binutils-$(VERSION).tar.xz \ + $(source_files) + + tar cf - $$(find './debian' -mindepth 1 $ \ + -path './debian/binutils*' -type d -prune -o \ + -path './debian/patches' -prune -o \ + -path './debian/tmp*' -prune -o \ + -path './debian/.bzr*' -prune -o \ + -path './debian/files' -prune -o \ + -print $ ) \ + | tar -x -C $(d_src)/$(PF)/src/binutils -f - + -chmod 755 $(d_src)/$(PF)/src/binutils/debian/*.{pre,post}{inst,rm} + chmod 755 $(d_src)/$(PF)/src/binutils/debian/test-suite-compare.py + + dpkg-gencontrol -P$(d_src) -p$(p_src) + chown -R root:root $(d_src) + chmod -R go=rX $(d_src) + find $(d_src) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_src) .. + +endif + +############################################################################### + +####################### +# binary-arch target # +####################### + +binary.%: stamps/install.% + rm -rf $(D_CROSS)/$(PF)/share/info + + rm -rf $(D_CROSS)/DEBIAN + + : # make lintian happy + $(install_dir) $(D_CROSS)/$(PF)/share/lintian/overrides + sed 's/@PKG@/$(P_CROSS)/' debian/binutils-cross.overrides \ + > $(D_CROSS)/$(PF)/share/lintian/overrides/$(P_CROSS) + + : # install maintainer scrtips + $(install_dir) $(D_CROSS)/$(PF)/share/doc/$(P_CROSS) + $(install_file) debian/changelog \ + $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/changelog.Debian + $(install_file) debian/copyright debian/README.cross \ + $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/ + gzip -9nf $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/changelog.Debian + + for pkg in bfd gas gprof ld; do \ + ln -sf ../binutils/$$pkg \ + $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/$$pkg; \ + done + + $(install_dir) $(D_CROSS)/DEBIAN + if [ "$(is_rc)" = yes ]; then \ + nver=$$(echo $(DEB_UPSTREAM) | awk -F. '{ OFS="."; NF--; $$NF=$$NF+1; print }'); \ + else \ + nver=$$(echo $(DEB_UPSTREAM) | awk -F. '{ OFS="."; $$NF=$$NF+1; print }'); \ + fi; \ + date_ext=$(DATE_EXT); \ + [ "$(is_rc)" = yes ] && date_ext=; \ + sed -e 's/@VER@/$(VERSION)/g' \ + -e 's/@DEB_VER@/$(DEB_VERSION)/g' \ + -e 's/@DEB_UVER@/$(DEB_UPSTREAM)/g' \ + -e "s/@DEB_NVER@/$$nver/g" \ + -e "s/@DATE_EXT@/$$date_ext/g" \ + -e 's/@ARCH@/$*/g' \ + -e "s/@PKG@/$(P_CROSS)/g" \ + debian/binutils-cross.shlibs.in > $(D_CROSS)/DEBIAN/shlibs + $(install_script) debian/binutils.postinst $(D_CROSS)/DEBIAN/postinst + $(install_script) debian/binutils.postrm $(D_CROSS)/DEBIAN/postrm + + rm -f debian/substvars + dpkg-shlibdeps $(D_CROSS)/$(PF)/bin/* + dpkg-gencontrol -P$(D_CROSS) -p$(P_CROSS) \ + -VBuilt-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W binutils-source)" + chown -R root:root $(D_CROSS) + chmod -R go=rX $(D_CROSS) + find $(D_CROSS) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(D_CROSS) .. + +binary-arch: checkroot build install \ + $(if $(filter yes, $(with_cross)),$(foreach ca,$(CROSS_ARCHS), binary.$(ca))) + $(checkdir) + +ifneq ($(BACKPORT),true) +# Process the following only if $(TARGET) is set +ifneq (,$(TARGET)) + test "" != "$(TARGET)" + + rm -rf $(d_cross)/$(PF)/share/info $(d_cross)/$(PF)/share/man + + $(install_dir) $(d_cross)/DEBIAN + + $(install_dir) $(d_cross)/$(PF)/share/doc/$(p_cross)/ + $(install_file) debian/changelog $(d_cross)/$(PF)/share/doc/$(p_cross)/changelog.Debian + $(install_file) debian/copyright debian/README.cross $(d_cross)/$(PF)/share/doc/$(p_cross)/ + gzip -9nf $(d_cross)/$(PF)/share/doc/$(p_cross)/changelog.Debian + + for pkg in bfd gas gprof ld; do \ + ln -sf ../binutils/$$pkg $(d_cross)/$(PF)/share/doc/$(p_cross)/$$pkg; \ + done + + rm -f debian/substvars + dpkg-shlibdeps $(d_cross)/$(PF)/bin/* + dpkg-gencontrol -P$(d_cross) -p$(p_cross) \ + -VBuilt-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W binutils-source)" + find $(d_cross) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_cross) .. + +else + : # generate some control & helper files + if [ "$(is_rc)" = yes ]; then \ + nver=$$(echo $(DEB_UPSTREAM) | awk -F. '{ OFS="."; NF--; $$NF=$$NF+1; print }'); \ + else \ + nver=$$(echo $(DEB_UPSTREAM) | awk -F. '{ OFS="."; $$NF=$$NF+1; print }'); \ + fi; \ + for i in debian/*.in; do \ + case "$$i" in debian/control.in|debian/control.cross.in) continue; esac; \ + date_ext=$(DATE_EXT); \ + case "$$i" in debian/*.shlibs.in) [ "$(is_rc)" = yes ] && date_ext=; esac; \ + sed -e 's/@VER@/$(VERSION)/g' \ + -e 's/@DEB_VER@/$(DEB_VERSION)/g' \ + -e 's/@DEB_SVER@/$(DEB_SVERSION)/g' \ + -e 's/@DEB_UVER@/$(DEB_UPSTREAM)/g' \ + -e "s/@DEB_NVER@/$$nver/g" \ + -e "s/@DATE_EXT@/$$date_ext/g" \ + -e 's/@DEB_ARCH@/$(DEB_HOST_ARCH)/g' \ + -e "s/@dpkg_dev@/$(DPKG_DEV)/" \ + $$i > $${i%*.in}; \ + case "$$i" in *.post*|*.pre*) chmod 755 $${i%*.in}; esac; \ + done + + : # install bug reporting information + $(install_file) -D debian/$(p_bin).presubj \ + $(d_bin)/$(PF)/share/bug/$(p_bin)/presubj +ifeq ($(with_multiarch),yes) + $(install_dir) $(d_mul)/$(PF)/share/bug + ln -sf $(p_bin) $(d_mul)/$(PF)/share/bug/$(p_mul) +endif +ifeq ($(with_hppa64),yes) + $(install_dir) $(d_hppa64)/$(PF)/share/bug + ln -sf $(p_bin) $(d_hppa64)/$(PF)/share/bug/$(p_hppa64) +endif + + : # make lintian happy + $(install_file) -D debian/$(p_bin).overrides \ + $(d_bin)/$(PF)/share/lintian/overrides/$(p_bin) +ifeq ($(with_multiarch),yes) + $(install_file) -D debian/$(p_mul).overrides \ + $(d_mul)/$(PF)/share/lintian/overrides/$(p_mul) + $(install_file) -D debian/$(p_mdev).overrides \ + $(d_mdev)/$(PF)/share/lintian/overrides/$(p_mdev) +endif +ifeq ($(with_static),yes) + $(install_file) -D debian/$(p_static).overrides \ + $(d_static)/$(PF)/share/lintian/overrides/$(p_static) + $(install_file) -D debian/$(p_udeb).overrides \ + $(d_udeb)/$(PF)/share/lintian/overrides/$(p_udeb) +endif +ifeq ($(with_hppa64),yes) + $(install_file) -D debian/$(p_hppa64).overrides \ + $(d_hppa64)/$(PF)/share/lintian/overrides/$(p_hppa64) +endif + + : # install maintainer scrtips + $(install_dir) $(d_bin)/DEBIAN + $(install_script) debian/binutils.postinst $(d_bin)/DEBIAN/postinst + $(install_script) debian/binutils.postrm $(d_bin)/DEBIAN/postrm + $(install_file) debian/binutils.shlibs $(d_bin)/DEBIAN/shlibs + + $(install_dir) $(d_dev)/DEBIAN + +ifeq ($(with_multiarch),yes) + $(install_dir) $(d_mul)/DEBIAN + $(install_script) debian/binutils-multiarch.preinst $(d_mul)/DEBIAN/preinst + $(install_script) debian/binutils-multiarch.postinst $(d_mul)/DEBIAN/postinst + $(install_script) debian/binutils-multiarch.prerm $(d_mul)/DEBIAN/prerm + $(install_script) debian/binutils-multiarch.postrm $(d_mul)/DEBIAN/postrm + $(install_file) debian/binutils-multiarch.shlibs $(d_mul)/DEBIAN/shlibs +endif + +ifeq ($(with_static),yes) + $(install_dir) $(d_static)/DEBIAN + $(install_script) debian/binutils-static.preinst $(d_static)/DEBIAN/preinst + $(install_dir) $(d_udeb)/DEBIAN +endif + +ifeq ($(with_hppa64),yes) + $(install_dir) $(d_hppa64)/DEBIAN + $(install_script) debian/$(p_hppa64).postinst $(d_hppa64)/DEBIAN/postinst + $(install_script) debian/$(p_hppa64).postrm $(d_hppa64)/DEBIAN/postrm + $(install_file) debian/$(p_hppa64).shlibs $(d_hppa64)/DEBIAN/shlibs +endif + + : # install docs + $(install_dir) $(d_bin)/$(PF)/share/doc/$(p_bin)/ + $(install_file) debian/changelog $(d_bin)/$(PF)/share/doc/$(p_bin)/changelog.Debian + $(install_file) debian/copyright $(d_bin)/$(PF)/share/doc/$(p_bin)/ + +ifeq ($(with_static),yes) + $(install_dir) $(d_static)/$(PF)/share/doc/$(p_static)/ + $(install_file) debian/changelog $(d_static)/$(PF)/share/doc/$(p_static)/changelog.Debian + $(install_file) debian/copyright $(d_static)/$(PF)/share/doc/$(p_static)/ +endif + + $(install_dir) $(d_dev)/$(PF)/share/doc/ + ln -sf $(p_bin) $(d_dev)/$(PF)/share/doc/$(p_dev) +ifeq ($(with_multiarch),yes) + $(install_dir) $(d_mul)/$(PF)/share/doc/ + ln -sf $(p_bin) $(d_mul)/$(PF)/share/doc/$(p_mul) + $(install_dir) $(d_mdev)/$(PF)/share/doc/ + ln -sf $(p_mul) $(d_mdev)/$(PF)/share/doc/$(p_mdev) +endif +ifeq ($(with_hppa64),yes) + $(install_dir) $(d_hppa64)/$(PF)/share/doc/ + ln -sf $(p_bin) $(d_hppa64)/$(PF)/share/doc/$(p_hppa64) +endif + +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +ifeq ($(with_check),yes) + : # remove user and date from test-summary for reproducible builds + sed -i -e '/Test Run By/d' $(pwd)/test-summary + $(install_file) $(pwd)/test-summary $(d_bin)/$(PF)/share/doc/$(p_bin)/ +endif +endif + $(install_file) binutils/NEWS debian/README.cross \ + $(d_bin)/$(PF)/share/doc/$(p_bin)/ + + $(install_file) binutils/ChangeLog $(d_bin)/$(PF)/share/doc/$(p_bin)/changelog + + for pkg in bfd gas gprof ld; do \ + $(install_dir) $(d_bin)/$(PF)/share/doc/$(p_bin)/$$pkg; \ + done + $(install_file) bfd/ChangeLog bfd/PORTING bfd/TODO \ + $(d_bin)/$(PF)/share/doc/$(p_bin)/bfd/ + $(install_file) gas/ChangeLog gas/NEWS $(d_bin)/$(PF)/share/doc/$(p_bin)/gas/ + $(install_file) gprof/ChangeLog gprof/TODO gprof/TEST \ + $(d_bin)/$(PF)/share/doc/$(p_bin)/gprof/ + $(install_file) ld/ChangeLog ld/TODO ld/NEWS \ + $(d_bin)/$(PF)/share/doc/$(p_bin)/ld/ + + : # These only exist in H. J. Lu releases not GNU ones. + for dir in binutils bfd gas gprof ld; do \ + if [ -f $$dir/ChangeLog.linux ]; then \ + $(install_file) $$dir/ChangeLog.linux $(d_bin)/$(PF)/share/doc/$(p_bin)/$$dir/; \ + fi; \ + done + + : # Copy bbconv.pl to the doc dir for use by interested people + $(install_file) gprof/bbconv.pl $(d_bin)/$(PF)/share/doc/$(p_bin)/gprof/. + + : # Compress stuff that needs it + gzip -9n $(d_bin)/$(PF)/share/man/man1/*.1 + find $(d_bin)/$(PF)/share/doc/$(p_bin)/ -type f ! -name copyright -a ! -name bbconv.pl | xargs gzip -9n +ifeq ($(with_static),yes) + find $(d_static)/$(PF)/share/doc/$(p_static)/ -type f ! -name copyright | xargs gzip -9n +endif + + : # Finish it all up + find $(d_bin) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps + dpkg-gencontrol -P$(d_bin) -p$(p_bin) $(CONFLICTS_TARGET_$(DEB_HOST_ARCH)) $(gold_provides) + cd $(d_bin) && find -type f ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums + + rm -f debian/substvars + dpkg-gencontrol -P$(d_dev) -p$(p_dev) + cd $(d_dev) && find -type f ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums + +ifeq ($(with_multiarch),yes) + rm -f debian/substvars + find $(d_mul) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps + dpkg-gencontrol -P$(d_mul) -p$(p_mul) + cd $(d_mul) && find -type f ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums + + rm -f debian/substvars + mkdir -p $(d_mdev)/DEBIAN + dpkg-gencontrol -P$(d_mdev) -p$(p_mdev) + cd $(d_mdev) && find -type f ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs -r md5sum > DEBIAN/md5sums +endif + +ifeq ($(with_static),yes) + dpkg-gencontrol -P$(d_static) -p$(p_static) + dpkg-gencontrol -P$(d_udeb) -p$(p_udeb) -fdebian/files~ + dpkg-distaddfile $(STATIC_UDEB) debian-installer optional +endif + +ifeq ($(with_hppa64),yes) + rm -f debian/substvars + find $(d_hppa64) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps + dpkg-gencontrol -P$(d_hppa64) -p$(p_hppa64) + cd $(d_hppa64) && find -type f ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums +endif + + chown -R root:root $(d_bin) $(d_dev) + chmod -R go=rX $(d_bin) $(d_dev) + find $(d_bin) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_bin) .. + find $(d_dev) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_dev) .. +ifeq ($(with_multiarch),yes) + chown -R root:root $(d_mul) + chmod -R go=rX $(d_mul) + find $(d_mul) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_mul) .. + + chown -R root:root $(d_mdev) + chmod -R go=rX $(d_mdev) + find $(d_mdev) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_mdev) .. +endif +ifeq ($(with_static),yes) + chown -R root:root $(d_static) $(d_udeb) + chmod -R go=rX $(d_static) $(d_udeb) + find $(d_static) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_static) .. + find $(d_udeb) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_udeb) ../$(STATIC_UDEB) +endif +ifeq ($(with_hppa64),yes) + chown -R root:root $(d_hppa64) + chmod -R go=rX $(d_hppa64) + find $(d_hppa64) -depth -newermt '$(BUILD_DATE)' -print0 | \ + xargs -0r touch --no-dereference --date='$(BUILD_DATE)' + dpkg --build $(d_hppa64) .. +endif + +endif # Process the following only if $(TARGET) is set +endif # ifndef BACKPORT +############################################################################### + +################# +# cross targets # +################# + +# Process the following only if $(TARGET) is set +ifneq (,$(TARGET)) + +p_cross = $(subst _,-,binutils-$(TARGET)) +d_cross = debian/$(p_cross) + +#----------------------------------------------------------------- +# sysroot options +ifdef WITH_SYSROOT + with_sysroot = $(WITH_SYSROOT) +endif +ifdef WITH_BUILD_SYSROOT + with_build_sysroot = $(WITH_BUILD_SYSROOT) +endif + +ifneq ($(with_sysroot),) + CONFARGS += --with-sysroot=$(with_sysroot) +endif +ifneq ($(with_build_sysroot),) + CONFARGS += --with-build-sysroot=$(with_build_sysroot) +endif +ifeq ($(with_gold),yes) + CONFARGS += --enable-ld=default --enable-gold +endif + +stamps/configure-cross: stamps/patch + $(checkdir) + test "" != "$(TARGET)" + rm -rf stamps/configure-cross builddir-$(TARGET) + mkdir builddir-$(TARGET) + cd builddir-$(TARGET) \ + && env CC="$(CC)" CXX="$(CXX)" ../configure \ + $(CONFARGS) \ + --target=$(TARGET) + touch $@ + +stamps/build-cross: stamps/configure-cross + $(checkdir) + test "" != "$(TARGET)" + $(MAKE) -C builddir-$(TARGET) $(NJOBS) CFLAGS="$(CFLAGS)" + touch $@ + +stamps/install-cross: stamps/build-cross + $(checkdir) + test "" != "$(TARGET)" + rm -rf $(d_cross) + $(MAKE) -C builddir-$(TARGET) prefix=$(pwd)/$(d_cross)/$(PF) \ + mandir=$(pwd)/$(d_cross)/$(PF)/share/man install + rm -rf $(d_cross)/$(PF)/lib* $(d_cross)/$(PF)/info $(d_cross)/$(PF)/share/locale + + $(call strip_package, $(p_cross), $(d_cross),$(DEB_HOST_GNU_TYPE)/$(TARGET)) + chmod ugo-x $(d_cross)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(TARGET)/lib/*.so + + : # Get rid of .la files since libtool obviously has no idea about transient paths + rm -f $(d_cross)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(TARGET)/lib/*.la + + gzip -9n $(d_cross)/$(PF)/share/man/man1/* + touch $@ + +stamps/configure-host-cross: stamps/configure-cross + $(checkdir) + test "" != "$(TARGET)" + $(MAKE) configure-host -C builddir-$(TARGET) $(NJOBS) CFLAGS="$(CFLAGS)" + touch $@ + +stamps/build-static-cross: stamps/configure-host-cross + $(checkdir) + test "" != "$(TARGET)" + $(MAKE) -C builddir-$(TARGET) $(NJOBS) CFLAGS="$(CFLAGS)" LDFLAGS="-all-static" + touch $@ + +stamps/install-static-cross: stamps/build-static-cross stamps/install-cross + +binary-cross: + @echo "Please use dpkg-buildpackage instead of calling binary-cross directly; see README.cross" + @false + +endif # ifneq ($(TARGET),) + +############################################################################### + +define checkdir + test -f bfd/elf32.c -a -f debian/rules +endef + +ifeq ($(with_strip),yes) +# strip_package:

+define strip_package + : # Strip shared libraries + if which pkg_create_dbgsym >/dev/null 2>&1; then \ + pkg_create_dbgsym $1 $2; \ + fi + $(STRIP) --strip-unneeded $2/$(PF)/$3/lib/libbfd-*so + $(STRIP) --strip-unneeded $2/$(PF)/$3/lib/libopcodes-*so + $(STRIP) $$(file $2/$(PF)/bin/* |awk -F: '$$0 !~ /script/ {print $$1}') +endef +else +define strip_package +endef +endif + +remove-gfdl-files: +ifeq ($(GFDL_INVARIANT_FREE),yes) + for i in $(gfdl_toplevel_texinfo_files); do \ + if [ -f $$i ]; then \ + sed "s/@name@/$$(basename $$i)/g" debian/gfdl.texi > $$i; \ + fi; \ + done + rm -f $(gfdl_generated_files) +endif + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +checkroot: + $(checkdir) + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot + +.PRECIOUS: stamps/patch stamps/configure.% stamps/build.% stamps/install.% --- binutils-2.25.1.orig/debian/source.lintian-overrides +++ binutils-2.25.1/debian/source.lintian-overrides @@ -0,0 +1,5 @@ +# handled via diversions +binutils source: binaries-have-file-conflict + +# wrong positive +binutils source: license-problem-gfdl-invariants --- binutils-2.25.1.orig/debian/source/format +++ binutils-2.25.1/debian/source/format @@ -0,0 +1 @@ +1.0 --- binutils-2.25.1.orig/debian/strip.cross.in +++ binutils-2.25.1/debian/strip.cross.in @@ -0,0 +1,3 @@ +#! /bin/sh + +__TARGET__strip --remove-section=.comment --remove-section=.note $* --- binutils-2.25.1.orig/debian/test-suite-compare.py +++ binutils-2.25.1/debian/test-suite-compare.py @@ -0,0 +1,230 @@ +#!/usr/bin/python3 + +# Quick'n'dirty regression check for dejagnu testsuites +# Copyright (C) 2003, 2004, 2005, 2006, 2007 James Troup + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU;5B General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +################################################################################ + +import optparse +import os +import sys + +################################################################################ + +def fubar(msg, exit_code=1): + sys.stderr.write("E: %s\n" % (msg)) + sys.exit(exit_code) + +def warn(msg): + sys.stderr.write("W: %s\n" % (msg)) + +def info(msg): + sys.stderr.write("I: %s\n" % (msg)) + +################################################################################ + +def read_testsummary(filename): + results = {} + file = open(filename) + for line in file.readlines(): + if not line: + continue + if line.startswith("Running"): + s = line.split() + if "/" in s[1]: + x = s[1] + if x.find("/testsuite/") == -1: + fubar("Can't find /testsuite/ in '%s'." % (x)) + # 'Running /home/james/debian/packages/binutils/binutils-2.14.90.0.7/gas/testsuite/gas/hppa/unsorted/unsorted.exp ...' -> 'gas/hppa/unsorted/unsorted.exp' + # ... since using basename() isn't dupe safe. + section = x[x.find("/testsuite/"):].replace("/testsuite/","").split()[0] + + # Tests can be duplicated, e.g. hppa/basic/basic.exp + # is run twice, once for hppa-linux and once for + # hppa64-linux. This is of course a horrible bodge, + # but I can't think of anything trivial and better off + # hand. + + if section in results: + extra = 1 + too_many = 10 + while section in results and extra < too_many: + section = "%s.%s" % (section, extra) + extra += 1 + if extra >= too_many: + fubar("gave up trying to unduplicate %s." % (section)) + + results[section] = {} + continue + + got_state = 0 + for state in [ "PASS", "XPASS", "FAIL", "XFAIL", "UNRESOLVED", + "UNTESTED", "UNSUPPORTED" ]: + if line.startswith(state): + s = line.split(':') + state = s[0] + test = ':'.join(s[1:]).strip() + if test in results: + warn("%s/%s is duplicated." % (section, test)) + results[section][test] = state + got_state = 1 + break + + if got_state: + continue + + return results + +################################################################################ + +def compare_results(old, new): + total_num = 0 + pass_count = 0 + fail_count = 0 + xfail_count = 0 + untested_count = 0 + regression_count = 0 + progression_count = 0 + change_count = 0 + + for section in list(new.keys()): + for test in list(new[section].keys()): + state = new[section][test] + + # Stats pr0n + total_num += 1 + if state == "PASS" or state == "XPASS": + pass_count += 1 + elif state == "FAIL" or state == "UNRESOLVED": + fail_count += 1 + elif state == "XFAIL": + xfail_count += 1 + elif state == "UNTESTED": + untested_count += 1 + + # Compare to old + if section not in old: + continue + if test not in old[section]: + continue + old_state = old[section][test] + if state == "PASS": + if old_state != "PASS": + progression_count += 1 + info("[%s] progression (%s -> %s): %s" % (section, old_state, state, test)) + elif state == "XPASS": + if old_state != "XPASS" and old_state != "PASS": + progression_count += 1 + warn("[%s] %s: %s" % (section, state, test)) + elif state == "FAIL": + if old_state != "FAIL": + regression_count += 1 + warn("[%s] REGRESSION (%s -> %s): %s" % (section, old_state, state, test)) + elif state == "XFAIL": + if old_state != "XFAIL": + change_count += 1 + info("[%s] change (%s -> %s): %s" % (section, old_state, state, test)) + elif state == "UNRESOLVED": + if old_state != "UNRESOLVED" and old_state != "FAIL": + regression_count += 1 + warn("[%s] REGRESSION (%s -> %s): %s" % (section, old_state, state, test)) + if old_state == "FAIL": + change_count += 1 + info("[%s] change (%s -> %s): %s" % (section, old_state, state, test)) + elif state == "UNTESTED": + if old_state != "UNTESTED": + change_count += 1 + warn("[%s] REGRESSION (%s -> %s): %s" % (section, old_state, state, test)) + + if regression_count: + print("%d REGRESSIONS (%.2f%%)." % (regression_count, (float(regression_count)/total_num)*100)) + if progression_count: + print("%d progressions (%.2f%%)." % (progression_count, (float(progression_count)/total_num)*100)) + + if change_count: + print("%d changes (%.2f%%)." % (change_count, (float(change_count)/total_num)*100)) + + print("%d tests: %d pass (%.2f%%), %d fail (%.2f%%), %d xfail (%.2f%%) %d untested (%.2f%%)." \ + % (total_num, pass_count, (float(pass_count)/total_num)*100, + fail_count, (float(fail_count)/total_num)*100, + xfail_count, (float(xfail_count)/total_num)*100, + untested_count, (float(untested_count)/total_num)*100)) + + if regression_count: + sys.exit(1) + +################################################################################ + +def compare_multiple(directory, first_version, second_version): + architectures = [ "alpha", "arm", "hppa", "i386", "ia64", "mips", + "m68k", "mipsel", "powerpc", "s390", "sparc" ] + + for arch in architectures: + print("*********************************** %s ******************************" % (arch)) + second_filename = "%s/%s_%s" % (directory, second_version, arch) + if not os.path.exists(second_filename): + print(" -- NOT AVAILABLE --") + continue + + new = read_testsummary(second_filename) + first_filename = "%s/%s_%s" % (directory, first_version, arch) + old = read_testsummary(first_filename) + compare_results(old, new) + +################################################################################ + +def init(): + """Initalization, including parsing of options.""" + + usage = """usage: %prog [OPTIONS] +compare (binutils) dejagnu testsuite results. + +Example usage: + + test-suite-compare.py binutils-2.17/test-summary binutils-2.18/test-summary + +Or to compare across all architectures (with test results stored in a +'test-summary' directory): + + test-suite-compare.py -mtest-summary 2.17-3 2.18-1""" + parser = optparse.OptionParser(usage) + parser.add_option("-m", "--multiple", dest="multiple", + nargs=1, type="string", + help="compare multiple architectures") + (options, args) = parser.parse_args() + + if len(args) > 2 or len(args) < 2: + parser.error("takes 2 arguments (old and new)") + (old_version, new_version) = args + + return options, old_version, new_version + +################################################################################ + +def main(): + (options, old_version, new_version) = init() + if options.multiple: + compare_multiple(options.multiple, old_version, new_version) + else: + old = read_testsummary(old_version) + new = read_testsummary(new_version) + compare_results(old, new) + +################################################################################ + +if __name__ == '__main__': + main() --- binutils-2.25.1.orig/debian/tests/build +++ binutils-2.25.1/debian/tests/build @@ -0,0 +1 @@ +#!/bin/true --- binutils-2.25.1.orig/debian/tests/control +++ binutils-2.25.1/debian/tests/control @@ -0,0 +1,9 @@ +Tests: build +Depends: build-essential +Restrictions: build-needed + +Tests: libc-link +Depends: build-essential + +Tests: shlib-build +Depends: build-essential --- binutils-2.25.1.orig/debian/tests/libc-link +++ binutils-2.25.1/debian/tests/libc-link @@ -0,0 +1,29 @@ +#!/bin/sh +# autopkgtest check: Build and run a simple program against libc, to verify +# basic binutils compile-time and run-time linking functionality. +# +# (C) 2012 Canonical Ltd. +# Author: Martin Pitt + +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +cat < libctest.c +#include +#include + +int main() +{ + assert (1 > 0); + assert (strcmp ("hello", "hello") == 0); + return 0; +} +EOF + +gcc -o libctest libctest.c +echo "build: OK" +[ -x libctest ] +./libctest +echo "run: OK" --- binutils-2.25.1.orig/debian/tests/shlib-build +++ binutils-2.25.1/debian/tests/shlib-build @@ -0,0 +1,44 @@ +#!/bin/sh +# autopkgtest check: Build and link against a simple shared library, to test +# basic binutils compile-time and run-time linking functionality. +# +# (C) 2012 Canonical Ltd. +# Author: Martin Pitt + +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +cat < testlib.c + +int ultimate_answer() +{ + return 42; +} +EOF + +gcc -Wall -Werror -shared -o libultimate.so testlib.c +echo "library build: OK" + +# should export the symbol +nm -D libultimate.so | grep -q 'T ultimate_answer' + +# link it against a program +cat < testprog.c +#include + +int ultimate_answer(); + +int main() +{ + assert (ultimate_answer() == 42); + return 0; +} +EOF + +gcc -Wall -Werror -L . -o testprog testprog.c -lultimate +echo "program build: OK" +[ -x testprog ] +LD_LIBRARY_PATH=. ./testprog +echo "run: OK" --- binutils-2.25.1.orig/debian/watch +++ binutils-2.25.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnu.org/gnu/binutils/binutils-([\d\.]*).tar.gz