update devkitA64 binutils

build-devkit.sh

@@ -206,7 +206,7 @@ fi
 patchdir=$(pwd)/$basedir/patches
 scriptdir=$(pwd)/$basedir/scripts
 
-archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.xz"
+archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.xz"
 
 if [ $VERSION -eq 1 ]; then
 
@@ -260,7 +260,7 @@ cd $BUILDSCRIPTDIR
 mkdir -p $BUILDDIR
 cd $BUILDDIR
 
-extract_and_patch binutils $BINUTILS_VER bz2
+extract_and_patch binutils $BINUTILS_VER xz
 extract_and_patch gcc $GCC_VER xz
 extract_and_patch newlib $NEWLIB_VER gz
 extract_and_patch gdb $GDB_VER xz

dka64/patches/binutils-2.31.1.patch

@@ -0,0 +1,346 @@
+diff -NBaur binutils-2.31.1/bfd/elfnn-aarch64.c binutils-2.31.1-dka64/bfd/elfnn-aarch64.c
+--- binutils-2.31.1/bfd/elfnn-aarch64.c	2018-06-25 12:44:16.000000000 +0100
++++ binutils-2.31.1-dka64/bfd/elfnn-aarch64.c	2018-07-27 18:11:15.757082269 +0100
+@@ -2342,6 +2342,12 @@
+   aarch64_stub_erratum_843419_veneer,
+ };
+ 
++/* Is an undefined weak symbol resolved to 0 ? */
++#define UNDEFINED_WEAK_RESOLVED_TO_ZERO(INFO, EH)               \
++  ((EH)->root.root.type == bfd_link_hash_undefweak              \
++   && bfd_link_executable (INFO)                                \
++   && !(INFO)->dynamic_undefined_weak)
++
+ struct elf_aarch64_stub_hash_entry
+ {
+   /* Base hash table entry structure.  */
+@@ -6370,11 +6376,13 @@
+       Elf_Internal_Sym *sym;
+       asection *sec;
+       struct elf_link_hash_entry *h;
++      struct elf_aarch64_link_hash_entry *eh;
+       bfd_vma relocation;
+       bfd_reloc_status_type r;
+       arelent bfd_reloc;
+       char sym_type;
+       bfd_boolean unresolved_reloc = FALSE;
++      bfd_boolean resolved_to_zero = FALSE;
+       char *error_message = NULL;
+ 
+       r_symndx = ELFNN_R_SYM (rel->r_info);
+@@ -6509,6 +6517,10 @@
+ 					       h, &unresolved_reloc,
+ 					       save_addend, &addend, sym);
+ 
++      eh = (struct elf_aarch64_link_hash_entry *) h;
++      resolved_to_zero = (eh != NULL
++                          && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
++
+       switch (elfNN_aarch64_bfd_reloc_from_type (input_bfd, r_type))
+ 	{
+ 	case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
+@@ -6532,7 +6544,7 @@
+ 	      need_relocs =
+ 		(!bfd_link_executable (info) || indx != 0) &&
+ 		(h == NULL
+-		 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++		 || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 		 || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -6627,7 +6639,7 @@
+ 	      need_relocs =
+ 		(!bfd_link_executable (info) || indx != 0) &&
+ 		(h == NULL
+-		 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++		 || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 		 || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -6676,7 +6688,7 @@
+ 	      bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
+ 
+ 	      need_relocs = (h == NULL
+-			     || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++			     || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 			     || h->root.type != bfd_link_hash_undefweak);
+ 
+ 	      BFD_ASSERT (globals->root.srelgot != NULL);
+@@ -7019,6 +7031,26 @@
+   return FALSE;
+ }
+ 
++/* Remove undefined weak symbol from the dynamic symbol table if it
++   is resolved to 0.   */
++
++extern bfd_boolean
++elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *, struct elf_link_hash_entry *);
++
++bfd_boolean
++elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *info,
++                             struct elf_link_hash_entry *h)
++{
++  if (h->dynindx != -1
++      && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, elf_aarch64_hash_entry (h)))
++    {
++      h->dynindx = -1;
++      _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
++                              h->dynstr_index);
++    }
++  return TRUE;
++}
++
+ /* Adjust a symbol defined by a dynamic object and referenced by a
+    regular object.  The current definition is in some section of the
+    dynamic object, but we're not including those sections.  We have to
+@@ -8221,6 +8253,7 @@
+   struct elf_aarch64_link_hash_table *htab;
+   struct elf_aarch64_link_hash_entry *eh;
+   struct elf_dyn_relocs *p;
++  bfd_boolean resolved_to_zero;
+ 
+   /* An example of a bfd_link_hash_indirect symbol is versioned
+      symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
+@@ -8240,6 +8273,10 @@
+   info = (struct bfd_link_info *) inf;
+   htab = elf_aarch64_hash_table (info);
+ 
++  eh = (struct elf_aarch64_link_hash_entry *) h;
++  eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
++  resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
++
+   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
+      here if it is defined and referenced in a non-shared object.  */
+   if (h->type == STT_GNU_IFUNC
+@@ -8249,7 +8286,7 @@
+     {
+       /* Make sure this symbol is output as a dynamic symbol.
+ 	 Undefined weak syms won't yet be marked as dynamic.  */
+-      if (h->dynindx == -1 && !h->forced_local
++      if (h->dynindx == -1 && !h->forced_local && !resolved_to_zero
+ 	  && h->root.type == bfd_link_hash_undefweak)
+ 	{
+ 	  if (!bfd_elf_link_record_dynamic_symbol (info, h))
+@@ -8283,6 +8320,11 @@
+ 	     of relaxing into these from the large model PLT entries.  */
+ 	  s->size += PLT_SMALL_ENTRY_SIZE;
+ 
++          /* There should be no PLT relocations against resolved undefined
++             weak symbols in the executable.  */
++          if (!resolved_to_zero)
++            {
++
+ 	  /* We also need to make an entry in the .got.plt section, which
+ 	     will be placed in the .got section by the linker script.  */
+ 	  htab->root.sgotplt->size += GOT_ENTRY_SIZE;
+@@ -8305,6 +8347,7 @@
+ 
+ 	  htab->root.srelplt->reloc_count++;
+ 	}
++	}
+       else
+ 	{
+ 	  h->plt.offset = (bfd_vma) - 1;
+@@ -8317,9 +8360,6 @@
+       h->needs_plt = 0;
+     }
+ 
+-  eh = (struct elf_aarch64_link_hash_entry *) h;
+-  eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
+-
+   if (h->got.refcount > 0)
+     {
+       bfd_boolean dyn;
+@@ -8331,7 +8371,7 @@
+ 
+       /* Make sure this symbol is output as a dynamic symbol.
+ 	 Undefined weak syms won't yet be marked as dynamic.  */
+-      if (dyn && h->dynindx == -1 && !h->forced_local
++      if (dyn && h->dynindx == -1 && !h->forced_local && !resolved_to_zero
+ 	  && h->root.type == bfd_link_hash_undefweak)
+ 	{
+ 	  if (!bfd_elf_link_record_dynamic_symbol (info, h))
+@@ -8345,7 +8385,7 @@
+ 	{
+ 	  h->got.offset = htab->root.sgot->size;
+ 	  htab->root.sgot->size += GOT_ENTRY_SIZE;
+-	  if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++	  if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 	       || h->root.type != bfd_link_hash_undefweak)
+ 	      && (bfd_link_pic (info)
+ 		  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
+@@ -8381,7 +8421,7 @@
+ 	    }
+ 
+ 	  indx = h && h->dynindx != -1 ? h->dynindx : 0;
+-	  if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
++	  if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
+ 	       || h->root.type != bfd_link_hash_undefweak)
+ 	      && (!bfd_link_executable (info)
+ 		  || indx != 0
+@@ -8447,7 +8487,7 @@
+ 	 visibility.  */
+       if (eh->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak)
+ 	{
+-	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
++	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT || resolved_to_zero
+ 	      || UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
+ 	    eh->dyn_relocs = NULL;
+ 
+@@ -8467,7 +8507,9 @@
+ 	 symbols which turn out to need copy relocs or are not
+ 	 dynamic.  */
+ 
+-      if (!h->non_got_ref
++      if (!(h->non_got_ref
++           || (h->root.type == bfd_link_hash_undefweak
++               && !resolved_to_zero))
+ 	  && ((h->def_dynamic
+ 	       && !h->def_regular)
+ 	      || (htab->root.dynamic_sections_created
+@@ -8478,6 +8520,7 @@
+ 	     Undefined weak syms won't yet be marked as dynamic.  */
+ 	  if (h->dynindx == -1
+ 	      && !h->forced_local
++	      && !resolved_to_zero
+ 	      && h->root.type == bfd_link_hash_undefweak
+ 	      && !bfd_elf_link_record_dynamic_symbol (info, h))
+ 	    return FALSE;
+@@ -9098,8 +9141,17 @@
+ 				     Elf_Internal_Sym *sym)
+ {
+   struct elf_aarch64_link_hash_table *htab;
++  struct elf_aarch64_link_hash_entry *eh;
++  bfd_boolean local_undefweak;
+   htab = elf_aarch64_hash_table (info);
+ 
++  eh = (struct elf_aarch64_link_hash_entry *) h;
++
++  /* We keep PLT/GOT entries without dynamic PLT/GOT relocations for
++     resolved undefined weak symbols in executable so that their
++     references have value 0 at run-time.  */
++  local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
++
+   if (h->plt.offset != (bfd_vma) - 1)
+     {
+       asection *plt, *gotplt, *relplt;
+@@ -9134,7 +9186,7 @@
+ 	return FALSE;
+ 
+       elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
+-      if (!h->def_regular)
++      if (!local_undefweak && !h->def_regular)
+ 	{
+ 	  /* Mark the symbol as undefined, rather than as defined in
+ 	     the .plt section.  */
+@@ -9153,10 +9205,11 @@
+     }
+ 
+   if (h->got.offset != (bfd_vma) - 1
+-      && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
++      && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL 
+       /* Undefined weak symbol in static PIE resolves to 0 without
+ 	 any dynamic relocations.  */
+-      && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
++      && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)
++      && !local_undefweak)
+     {
+       Elf_Internal_Rela rela;
+       bfd_byte *loc;
+@@ -9650,6 +9703,9 @@
+ #define elf_backend_init_index_section		\
+   _bfd_elf_init_2_index_sections
+ 
++#define elf_backend_fixup_symbol		\
++  elfNN_aarch64_elf_fixup_symbol
++
+ #define elf_backend_finish_dynamic_sections	\
+   elfNN_aarch64_finish_dynamic_sections
+ 
+diff -NBaur binutils-2.31.1/ld/emulparams/aarch64elf32.sh binutils-2.31.1-dka64/ld/emulparams/aarch64elf32.sh
+--- binutils-2.31.1/ld/emulparams/aarch64elf32.sh	2018-06-24 19:38:57.000000000 +0100
++++ binutils-2.31.1-dka64/ld/emulparams/aarch64elf32.sh	2018-07-27 18:04:52.585317513 +0100
+@@ -1,3 +1,5 @@
++. ${srcdir}/emulparams/dynamic_undefined_weak.sh
++
+ ARCH="aarch64:ilp32"
+ MACHINE=
+ NOP=0x1f2003d5
+diff -NBaur binutils-2.31.1/ld/emulparams/aarch64elf.sh binutils-2.31.1-dka64/ld/emulparams/aarch64elf.sh
+--- binutils-2.31.1/ld/emulparams/aarch64elf.sh	2018-06-24 19:38:57.000000000 +0100
++++ binutils-2.31.1-dka64/ld/emulparams/aarch64elf.sh	2018-07-27 18:04:52.585317513 +0100
+@@ -1,3 +1,5 @@
++. ${srcdir}/emulparams/dynamic_undefined_weak.sh
++
+ ARCH=aarch64
+ MACHINE=
+ NOP=0x1f2003d5
+diff -NBaur binutils-2.31.1/ld/emultempl/aarch64elf.em binutils-2.31.1-dka64/ld/emultempl/aarch64elf.em
+--- binutils-2.31.1/ld/emultempl/aarch64elf.em	2018-06-26 12:27:20.000000000 +0100
++++ binutils-2.31.1-dka64/ld/emultempl/aarch64elf.em	2018-07-27 18:04:52.585317513 +0100
+@@ -380,7 +380,7 @@
+   { "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
+ '
+ 
+-PARSE_AND_LIST_OPTIONS='
++PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}'
+   fprintf (file, _("  --no-enum-size-warning      Don'\''t warn about objects with incompatible\n"
+ 		   "                                enum sizes\n"));
+   fprintf (file, _("  --no-wchar-size-warning     Don'\''t warn about objects with incompatible\n"
+diff -NBaur binutils-2.31.1/ld/Makefile.am binutils-2.31.1-dka64/ld/Makefile.am
+--- binutils-2.31.1/ld/Makefile.am	2018-06-24 19:38:57.000000000 +0100
++++ binutils-2.31.1-dka64/ld/Makefile.am	2018-07-27 18:04:52.585317513 +0100
+@@ -1495,19 +1495,23 @@
+   $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
+-  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
++  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \
+diff -NBaur binutils-2.31.1/ld/Makefile.in binutils-2.31.1-dka64/ld/Makefile.in
+--- binutils-2.31.1/ld/Makefile.in	2018-07-18 08:46:21.000000000 +0100
++++ binutils-2.31.1-dka64/ld/Makefile.in	2018-07-27 18:04:52.585317513 +0100
+@@ -3097,18 +3097,22 @@
+ 
+ eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
+   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
++  $(srcdir)/emulparams/dynamic_undefined_weak.sh \
+   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 
+ eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \

select_toolchain.sh

@@ -52,7 +52,7 @@ case "$VERSION" in
   ;;
   "3" )
     GCC_VER=8.1.0
-    BINUTILS_VER=2.30
+    BINUTILS_VER=2.31.1
     NEWLIB_VER=3.0.0
     GDB_VER=8.0
     basedir='dka64'