Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/binutils/dist merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/587473e4be75
branches:  trunk
changeset: 816836:587473e4be75
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jul 28 12:25:07 2016 +0000

description:
merge conflicts

diffstat:

 external/gpl3/binutils/dist/bfd/ChangeLog                             |  539 +++++++--
 external/gpl3/binutils/dist/bfd/archive.c                             |    2 +-
 external/gpl3/binutils/dist/bfd/coff-alpha.c                          |    2 +-
 external/gpl3/binutils/dist/bfd/coffcode.h                            |    2 +
 external/gpl3/binutils/dist/bfd/configure                             |   20 +-
 external/gpl3/binutils/dist/bfd/dwarf2.c                              |    4 +-
 external/gpl3/binutils/dist/bfd/elf-bfd.h                             |    8 +-
 external/gpl3/binutils/dist/bfd/elf32-arm.c                           |  107 +-
 external/gpl3/binutils/dist/bfd/elf32-avr.c                           |   36 +-
 external/gpl3/binutils/dist/bfd/elf32-hppa.c                          |    9 +
 external/gpl3/binutils/dist/bfd/elf32-i386.c                          |  135 +-
 external/gpl3/binutils/dist/bfd/elf32-ppc.c                           |    1 +
 external/gpl3/binutils/dist/bfd/elf64-ppc.c                           |   81 +-
 external/gpl3/binutils/dist/bfd/elf64-x86-64.c                        |   89 +-
 external/gpl3/binutils/dist/bfd/elflink.c                             |   87 +-
 external/gpl3/binutils/dist/bfd/version.h                             |    2 +-
 external/gpl3/binutils/dist/binutils/ChangeLog                        |   57 +-
 external/gpl3/binutils/dist/binutils/Makefile.in                      |    1 +
 external/gpl3/binutils/dist/binutils/configure                        |   20 +-
 external/gpl3/binutils/dist/binutils/doc/addr2line.1                  |    2 +-
 external/gpl3/binutils/dist/binutils/doc/ar.1                         |    2 +-
 external/gpl3/binutils/dist/binutils/doc/binutils.info                |  Bin 
 external/gpl3/binutils/dist/binutils/doc/binutils.texi                |    2 +-
 external/gpl3/binutils/dist/binutils/doc/cxxfilt.man                  |    2 +-
 external/gpl3/binutils/dist/binutils/doc/dlltool.1                    |    2 +-
 external/gpl3/binutils/dist/binutils/doc/elfedit.1                    |    2 +-
 external/gpl3/binutils/dist/binutils/doc/nlmconv.1                    |    2 +-
 external/gpl3/binutils/dist/binutils/doc/nm.1                         |    2 +-
 external/gpl3/binutils/dist/binutils/doc/objcopy.1                    |    4 +-
 external/gpl3/binutils/dist/binutils/doc/objdump.1                    |    2 +-
 external/gpl3/binutils/dist/binutils/doc/ranlib.1                     |    2 +-
 external/gpl3/binutils/dist/binutils/doc/readelf.1                    |    2 +-
 external/gpl3/binutils/dist/binutils/doc/size.1                       |    2 +-
 external/gpl3/binutils/dist/binutils/doc/strings.1                    |    2 +-
 external/gpl3/binutils/dist/binutils/doc/strip.1                      |    2 +-
 external/gpl3/binutils/dist/binutils/doc/windmc.1                     |    2 +-
 external/gpl3/binutils/dist/binutils/doc/windres.1                    |    2 +-
 external/gpl3/binutils/dist/binutils/objcopy.c                        |    1 +
 external/gpl3/binutils/dist/gas/ChangeLog                             |  213 +++-
 external/gpl3/binutils/dist/gas/config/tc-mips.c                      |   42 +-
 external/gpl3/binutils/dist/gas/configure                             |   58 +-
 external/gpl3/binutils/dist/gas/configure.ac                          |   29 +
 external/gpl3/binutils/dist/gas/doc/as.1                              |   15 +-
 external/gpl3/binutils/dist/gas/doc/as.info                           |  Bin 
 external/gpl3/binutils/dist/gas/testsuite/ChangeLog                   |   19 +-
 external/gpl3/binutils/dist/gas/testsuite/gas/mips/mips.exp           |    3 +
 external/gpl3/binutils/dist/gas/write.c                               |    1 -
 external/gpl3/binutils/dist/include/elf/ChangeLog                     |  126 ++-
 external/gpl3/binutils/dist/include/opcode/ChangeLog                  |  137 ++-
 external/gpl3/binutils/dist/ld/ChangeLog                              |  559 +++++++++-
 external/gpl3/binutils/dist/ld/configure                              |   20 +-
 external/gpl3/binutils/dist/ld/emultempl/elf32.em                     |   33 +-
 external/gpl3/binutils/dist/ld/emultempl/mmo.em                       |   30 +-
 external/gpl3/binutils/dist/ld/emultempl/pe.em                        |   30 +-
 external/gpl3/binutils/dist/ld/emultempl/pep.em                       |   30 +-
 external/gpl3/binutils/dist/ld/ld.texinfo                             |   12 +-
 external/gpl3/binutils/dist/ld/lexsup.c                               |   11 +-
 external/gpl3/binutils/dist/ld/testsuite/ChangeLog                    |   15 +-
 external/gpl3/binutils/dist/ld/testsuite/ld-aarch64/farcall-section.d |    5 -
 external/gpl3/binutils/dist/ld/testsuite/ld-aarch64/farcall-section.s |   19 -
 external/gpl3/binutils/dist/ld/testsuite/ld-powerpc/powerpc.exp       |   10 +
 external/gpl3/binutils/dist/opcodes/ChangeLog                         |   57 +-
 external/gpl3/binutils/dist/opcodes/configure                         |   20 +-
 external/gpl3/binutils/dist/opcodes/ppc-opc.c                         |   70 +-
 64 files changed, 2203 insertions(+), 600 deletions(-)

diffs (truncated from 4974 to 300 lines):

diff -r 5f9aa210ce73 -r 587473e4be75 external/gpl3/binutils/dist/bfd/ChangeLog
--- a/external/gpl3/binutils/dist/bfd/ChangeLog Thu Jul 28 12:18:51 2016 +0000
+++ b/external/gpl3/binutils/dist/bfd/ChangeLog Thu Jul 28 12:25:07 2016 +0000
@@ -1,3 +1,301 @@
+2016-06-29  Tristan Gingold  <gingold%adacore.com@localhost>
+
+       * version.m4: Bump version to 2.26.1
+       * configure: Regenerate.
+
+2016-06-29  Tristan Gingold  <gingold%adacore.com@localhost>
+
+       * development.sh: Set development to false.
+
+2016-06-28  Alan Modra  <amodra%gmail.com@localhost>
+
+       Apply from master
+       2016-05-19  Alan Modra  <amodra%gmail.com@localhost>
+       * elf64-ppc.c (ppc64_elf_branch_reloc): Check for NULL owner
+       before dereferencing.
+
+2016-06-28  Alan Modra  <amodra%gmail.com@localhost>
+
+       PR ld/19264
+       * elf64-ppc.c (STUB_SHRINK_ITER): Define.
+       (ppc64_elf_size_stubs): Exit stub sizing loop past STUB_SHRINK_ITER
+       if shrinking stubs.
+       (ppc64_elf_size_stubs): Adjust to suit.
+
+2016-06-14  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj%atmel.com@localhost>
+
+       Backport from master
+       2016-06-14  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj%atmel.com@localhost>
+
+       PR ld/20254
+       * elf32-avr.c (elf32_avr_relax_delete_bytes): Adjust reloc
+       offsets until reloc_toaddr.
+
+2016-06-14  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-06-13  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/20244
+       * elf32-i386.c (elf_i386_relocate_section): Add the .got.plt
+       section address for R_386_GOT32/R_386_GOT32X relocations against
+       IFUNC symbols if there is no base register and return error for
+       PIC.
+
+       2016-06-13  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       * elf32-i386.c (elf_i386_relocate_section): Simplify IFUNC
+       GOT32 adjustment for static executables.
+
+2016-06-14  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-06-11  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/20244
+       * elf32-i386.c (elf_i386_relocate_section): When relocating
+       R_386_GOT32, return error without a base register for PIC and
+       subtract the .got.plt section address only with a base register.
+
+2016-06-13  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj%atmel.com@localhost>
+
+       Backport from master
+       2016-06-08  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj%atmel.com@localhost>
+
+       PR ld/20221
+       * elf32-avr.c (elf32_avr_relax_delete_bytes): Adjust syms
+       and relocs only if shrinking occurred.
+
+2016-06-09  Alan Modra  <amodra%gmail.com@localhost>
+
+       PR ld/20159
+       PR ld/16467
+       * elflink.c (_bfd_elf_merge_symbol): Revert PR16467 change.
+       (_bfd_elf_add_default_symbol): Don't indirect to/from defined
+       symbol given a version by a script different to the version
+       of the symbol being added.
+       (elf_link_add_object_symbols): Use _bfd_elf_strtab_save and
+       _bfd_elf_strtab_restore.  Don't fudge dynstr references.
+       * elf-strtab.c (_bfd_elf_strtab_restore_size): Delete.
+       (struct strtab_save): New.
+       (_bfd_elf_strtab_save, _bfd_elf_strtab_restore): New functions.
+       * elf-bfd.h (_bfd_elf_strtab_restore_size): Delete.
+       (_bfd_elf_strtab_save, _bfd_elf_strtab_restore): Declare.
+
+2016-05-20  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-05-20  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       * elf32-i386.c (elf_i386_check_relocs): Don't check R_386_GOT32
+       when setting need_convert_load.
+
+       2016-05-19  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/20117
+       * elf32-i386.c (elf_i386_convert_load): Don't convert
+       R_386_GOT32.
+
+2016-05-18  Christophe Monat  <christophe.monat%st.com@localhost>
+
+       Backport from master
+       2016-05-09  Christophe Monat  <christophe.monat%st.com@localhost>
+
+       PR ld/20030
+       * elf32-arm.c (is_thumb2_vldm): Account for T1 (DP) encoding.
+       (stm32l4xx_need_create_replacing_stub): Rename ambiguous nb_regs
+       to nb_words.
+       (create_instruction_vldmia): Add is_dp to disambiguate SP/DP
+       encoding.
+       (create_instruction_vldmdb): Likewise.
+       (stm32l4xx_create_replacing_stub_vldm): is_dp detects DP encoding,
+       uses it to re-encode.
+
+2016-05-15  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-05-13  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/20093
+       * elf64-x86-64.c (elf_x86_64_convert_load_reloc): Don't convert
+       GOTPCREL relocation against large section.
+
+       * elflink.c (bfd_elf_final_link): Likewise.
+
+2016-05-11  Alan Modra  <amodra%gmail.com@localhost>
+
+       PR 20060
+       * elf64-ppc.c (ppc64_elf_tls_setup): Clear forced_local.
+       * elf32-ppc.c (ppc_elf_tls_setup): Likewise.
+
+2016-04-30  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-04-27  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/20006
+       * elf64-x86-64.c (elf_x86_64_convert_load): Skip debug sections
+       when estimating distances between output sections.
+
+2016-03-29  Toni Spets  <toni.spets%iki.fi@localhost>
+
+       PR 19878
+       * coffcode.h (coff_write_object_contents): Revert accidental
+       2014-11-10 change.
+
+2016-03-17  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-03-15  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/19827
+       * elf32-i386.c (elf_i386_check_relocs): Bind defined symbol
+       locally in PIE.
+       (elf_i386_relocate_section): Likewise.
+       * elf64-x86-64.c (elf_x86_64_check_relocs): Likewise.
+       (elf_x86_64_relocate_section): Likewise.
+
+2016-03-15  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-01-30  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/19539
+       * elf32-i386.c (elf_i386_reloc_type_class): Check relocation
+       against STT_GNU_IFUNC symbol only with dynamic symbols.
+       * elf64-x86-64.c (elf_x86_64_reloc_type_class): Likewise.
+
+2016-03-15  Nick Clifton  <nickc%redhat.com@localhost>
+
+       Backport from master:
+       2016-03-09  Leon Winter  <winter-gcc%bfw-online.de@localhost>
+
+       PR ld/19623
+       * cofflink.c (_bfd_coff_generic_relocate_section): Do not apply
+       relocations against absolute symbols.
+
+2016-03-14  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-01-28  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR binutils/19523
+       * dwarf2.c (_bfd_dwarf2_slurp_debug_info): Set BFD_DECOMPRESS to
+       decompress debug sections.
+
+2016-03-09  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/19579
+       Backport from master
+       2016-03-08  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       * elflink.c (_bfd_elf_merge_symbol): Group common symbol checking
+       together.
+
+       2016-03-04  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       * elflink.c (_bfd_elf_merge_symbol): Treat common symbol in
+       executable as definition if the new definition comes from a
+       shared library.
+
+2016-03-09  Nick Clifton  <nickc%redhat.com@localhost>
+           Alan Modra  <amodra%gmail.com@localhost>
+
+       PR binutils/19775
+       * archive.c (bfd_generic_openr_next_archived_file): Allow zero
+       length elements in the archive.
+       * coff-alpha.c (alpha_ecoff_openr_next_archived_file): Likewise.
+
+2016-03-01  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/19752
+       Backport from master
+       2015-12-18  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       * coff-x86_64.c (coff_amd64_reloc): Fix formatting.
+
+       2015-12-18  Nick Clifton  <nickc%redhat.com@localhost>
+
+       * coff-i386.c (coff_i386_reloc): Fix formatting.
+
+2016-02-26  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-02-24  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/19698
+       * elflink.c (bfd_elf_record_link_assignment): Set versioned if
+       symbol version is unknown.
+
+2016-02-26  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-02-01  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/19553
+       * elflink.c (elf_link_add_object_symbols): Don't add DT_NEEDED
+       if a symbol from a library loaded via DT_NEEDED doesn't match
+       the symbol referenced by regular object.
+
+2016-02-26  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-02-24  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       * elf32-i386.c (elf_i386_allocate_dynrelocs): Set plt_got.offset
+       to (bfd_vma) -1 when setting needs_plt to 0.
+       * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
+
+2016-02-26  Alan Modra  <amodra%gmail.com@localhost>
+
+       * elf64-ppc.c (create_linkage_sections): Create sfpr when
+       save_restore_funcs, rest of sections when not relocatable.
+       (ppc64_elf_init_stub_bfd): Always call create_linkage_sections.
+       (sfpr_define): Define all symbols on emitted code.
+       (ppc64_elf_func_desc_adjust): Adjust for sfpr now being created
+       when relocatable.  Move sfpr_define loop earlier.
+
+2016-02-25  Jiong Wang  <jiong.wang%arm.com@localhost>
+
+       Backport from master
+       2016-01-21  Jiong Wang  <jiong.wang%arm.com@localhost>
+
+       * elfnn-aarch64.c (aarch64_type_of_stub): Allow insert long branch
+       veneer for sym_sec != input_sec.
+       (elfNN_aarch64_size_stub): Support STT_SECTION symbol.
+       (elfNN_aarch64_final_link_relocate): Take rela addend into account when
+       calculation destination.
+
+2016-02-10  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-02-10  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/19601
+       * elf32-i386.c (elf_i386_relocate_section): Mask off the least
+       significant bit in GOT offset for R_386_GOT32X.
+
+2016-02-02  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       Backport from master
+       2016-02-02  H.J. Lu  <hongjiu.lu%intel.com@localhost>
+
+       PR ld/19542
+       * elf64-x86-64.c (elf_x86_64_convert_load): Store the estimated
+       distances in the compressed_size field of the output section.
+
+2016-02-01  John David Anglin  <danglin%gcc.gnu.org@localhost>
+
+       PR ld/19526
+       * elf32-hppa.c (elf32_hppa_final_link): Don't sort non-regular output
+       files.
+       * elf64-hppa.c (elf32_hppa_final_link): Likewise.  Remove retval.
+
+2016-01-25  Tristan Gingold  <gingold%adacore.com@localhost>
+
+       * version.m4: Bump version to 2.26.0



Home | Main Index | Thread Index | Old Index