mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-08-21 09:54:03 -05:00
Compare commits
27 Commits
devkitPPC_
...
devkitA64_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2429e9ee7d | ||
|
|
f0b081246c | ||
|
|
a280f18794 | ||
|
|
c012acf8d8 | ||
|
|
19217fdc51 | ||
|
|
aad3392808 | ||
|
|
7b0a333842 | ||
|
|
41922724cb | ||
|
|
2422223439 | ||
|
|
23afd9959c | ||
|
|
03bc549c5c | ||
|
|
5ae950ae8b | ||
|
|
c62e968c1e | ||
|
|
ee693ddac0 | ||
|
|
ff5a6b07d3 | ||
|
|
80f5db66de | ||
|
|
4ef6c0321a | ||
|
|
b4e8b963f3 | ||
|
|
dbd33d2312 | ||
|
|
3f5312c34a | ||
|
|
1ac48f5437 | ||
|
|
9d8f579c1c | ||
|
|
de681b1691 | ||
|
|
dfb3d82a96 | ||
|
|
7318227e11 | ||
|
|
c04144a5cf | ||
|
|
c5f34ab49b |
@@ -1,8 +1,8 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# devkitARM release 62
|
# devkitARM release 64
|
||||||
# devkitPPC release 44.2
|
# devkitPPC release 45.2
|
||||||
# devkitA64 release 23
|
# devkitA64 release 25.1
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
if [ 0 -eq 1 ] ; then
|
if [ 0 -eq 1 ] ; then
|
||||||
@@ -27,8 +27,8 @@ echo
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
DKARM_RULES_VER=1.5.0
|
DKARM_RULES_VER=1.5.1
|
||||||
DKARM_CRTLS_VER=1.2.2
|
DKARM_CRTLS_VER=1.2.5
|
||||||
|
|
||||||
DKPPC_RULES_VER=1.2.1
|
DKPPC_RULES_VER=1.2.1
|
||||||
|
|
||||||
@@ -72,20 +72,18 @@ fi
|
|||||||
. ./select_toolchain.sh
|
. ./select_toolchain.sh
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# Get preferred installation directory and set paths to the sources
|
# Legacy versions of these scripts allowed the selection of a prefix which is
|
||||||
|
# no longer supported. Since adopting pacman and providing precompiled binaries
|
||||||
|
# of "portlibs" everything we distribute is intended to work within opt/devkitpro
|
||||||
|
#
|
||||||
|
# Rather than attempting to repackage our work for exotic linux distributions it
|
||||||
|
# would be much better for everyone concerned if efforts were made to provide
|
||||||
|
# pacman and whatever support is necessary to allow the binaries we distribute to
|
||||||
|
# work as expected.
|
||||||
|
#
|
||||||
|
# See https://github.com/devkitPro/pacman and https://devkitpro.org/wiki/devkitPro_pacman
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
INSTALLDIR=/opt/devkitpro
|
||||||
if [ ! -z "$BUILD_DKPRO_INSTALLDIR" ] ; then
|
|
||||||
INSTALLDIR="$BUILD_DKPRO_INSTALLDIR"
|
|
||||||
else
|
|
||||||
echo
|
|
||||||
echo "Please enter the directory where you would like '$package' to be installed:"
|
|
||||||
echo "for mingw/msys you must use <drive>:/<install path> or you will have include path problems"
|
|
||||||
echo "this is the top level directory for devkitpro, i.e. e:/devkitPro"
|
|
||||||
|
|
||||||
read -e INSTALLDIR
|
|
||||||
echo
|
|
||||||
fi
|
|
||||||
|
|
||||||
[ ! -z "$INSTALLDIR" ] && mkdir -p $INSTALLDIR && touch $INSTALLDIR/nonexistantfile && rm $INSTALLDIR/nonexistantfile || exit 1;
|
[ ! -z "$INSTALLDIR" ] && mkdir -p $INSTALLDIR && touch $INSTALLDIR/nonexistantfile && rm $INSTALLDIR/nonexistantfile || exit 1;
|
||||||
|
|
||||||
|
|||||||
@@ -13,12 +13,6 @@
|
|||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
BUILD_DKPRO_PACKAGE=0
|
BUILD_DKPRO_PACKAGE=0
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# Toolchain installation directory, comment if not specified
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
#BUILD_DKPRO_INSTALLDIR=/opt/devkitpro
|
|
||||||
#BUILD_DKPRO_INSTALLDIR=c:/devkitPro
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# Path to previously downloaded source packages, comment if not specified
|
# Path to previously downloaded source packages, comment if not specified
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
|
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
|
||||||
index 5741c60264..fb5d9d069c 100644
|
index ec856764519..436098cbcc2 100644
|
||||||
--- a/bfd/elf-bfd.h
|
--- a/bfd/elf-bfd.h
|
||||||
+++ b/bfd/elf-bfd.h
|
+++ b/bfd/elf-bfd.h
|
||||||
@@ -1789,6 +1789,14 @@ struct output_elf_obj_tdata
|
@@ -1966,6 +1966,14 @@ struct output_elf_obj_tdata
|
||||||
asection *sec;
|
asection *sec;
|
||||||
} build_id;
|
} package_metadata;
|
||||||
|
|
||||||
+ /* Data for .nx-module-name. */
|
+ /* Data for .nx-module-name. */
|
||||||
+ struct
|
+ struct
|
||||||
+ {
|
+ {
|
||||||
+ bfd_boolean (*after_write_object_contents) (bfd *);
|
+ bool (*after_write_object_contents) (bfd *);
|
||||||
+ const char *name;
|
+ const char *name;
|
||||||
+ asection *sec;
|
+ asection *sec;
|
||||||
+ } nx_module_name;
|
+ } nx_module_name;
|
||||||
@@ -18,29 +18,29 @@ index 5741c60264..fb5d9d069c 100644
|
|||||||
bfd_size_type program_header_size;
|
bfd_size_type program_header_size;
|
||||||
|
|
||||||
diff --git a/bfd/elf.c b/bfd/elf.c
|
diff --git a/bfd/elf.c b/bfd/elf.c
|
||||||
index eb3e1828e9..bc6bb48804 100644
|
index d38e0afff2e..372e6615931 100644
|
||||||
--- a/bfd/elf.c
|
--- a/bfd/elf.c
|
||||||
+++ b/bfd/elf.c
|
+++ b/bfd/elf.c
|
||||||
@@ -6514,6 +6514,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
|
@@ -7321,6 +7321,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
|
||||||
if (!bed->s->write_shdrs_and_ehdr (abfd))
|
if (!bed->s->write_shdrs_and_ehdr (abfd))
|
||||||
return FALSE;
|
return false;
|
||||||
|
|
||||||
+ /* Write out the NX module name. */
|
+ /* Write out the NX module name. */
|
||||||
+ if (t->o->nx_module_name.after_write_object_contents != NULL)
|
+ if (t->o->nx_module_name.after_write_object_contents != NULL)
|
||||||
+ {
|
+ {
|
||||||
+ failed = !(*t->o->nx_module_name.after_write_object_contents) (abfd);
|
+ failed = !(*t->o->nx_module_name.after_write_object_contents) (abfd);
|
||||||
+ if (failed)
|
+ if (failed)
|
||||||
+ return FALSE;
|
+ return false;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
/* This is last since write_shdrs_and_ehdr can touch i_shdrp[0]. */
|
/* This is last since write_shdrs_and_ehdr can touch i_shdrp[0]. */
|
||||||
if (t->o->build_id.after_write_object_contents != NULL)
|
if (t->o->build_id.after_write_object_contents != NULL
|
||||||
return (*t->o->build_id.after_write_object_contents) (abfd);
|
&& !(*t->o->build_id.after_write_object_contents) (abfd))
|
||||||
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
|
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
|
||||||
index faa27611d4..888af6bcd8 100644
|
index 4592bd6da27..dc27042cfe2 100644
|
||||||
--- a/bfd/elfnn-aarch64.c
|
--- a/bfd/elfnn-aarch64.c
|
||||||
+++ b/bfd/elfnn-aarch64.c
|
+++ b/bfd/elfnn-aarch64.c
|
||||||
@@ -2341,6 +2341,12 @@ enum elf_aarch64_stub_type
|
@@ -2441,6 +2441,12 @@ enum elf_aarch64_stub_type
|
||||||
aarch64_stub_erratum_843419_veneer,
|
aarch64_stub_erratum_843419_veneer,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
struct elf_aarch64_stub_hash_entry
|
struct elf_aarch64_stub_hash_entry
|
||||||
{
|
{
|
||||||
/* Base hash table entry structure. */
|
/* Base hash table entry structure. */
|
||||||
@@ -6436,11 +6442,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
@@ -6916,11 +6922,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
Elf_Internal_Sym *sym;
|
Elf_Internal_Sym *sym;
|
||||||
asection *sec;
|
asection *sec;
|
||||||
struct elf_link_hash_entry *h;
|
struct elf_link_hash_entry *h;
|
||||||
@@ -62,12 +62,12 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
bfd_reloc_status_type r;
|
bfd_reloc_status_type r;
|
||||||
arelent bfd_reloc;
|
arelent bfd_reloc;
|
||||||
char sym_type;
|
char sym_type;
|
||||||
bfd_boolean unresolved_reloc = FALSE;
|
bool unresolved_reloc = false;
|
||||||
+ bfd_boolean resolved_to_zero = FALSE;
|
+ bool resolved_to_zero = false;
|
||||||
char *error_message = NULL;
|
char *error_message = NULL;
|
||||||
|
|
||||||
r_symndx = ELFNN_R_SYM (rel->r_info);
|
r_symndx = ELFNN_R_SYM (rel->r_info);
|
||||||
@@ -6576,6 +6584,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
@@ -7060,6 +7068,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
h, &unresolved_reloc,
|
h, &unresolved_reloc,
|
||||||
save_addend, &addend, sym);
|
save_addend, &addend, sym);
|
||||||
|
|
||||||
@@ -78,7 +78,7 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
switch (elfNN_aarch64_bfd_reloc_from_type (input_bfd, r_type))
|
switch (elfNN_aarch64_bfd_reloc_from_type (input_bfd, r_type))
|
||||||
{
|
{
|
||||||
case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
|
case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
|
||||||
@@ -6599,7 +6611,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
@@ -7083,7 +7095,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
need_relocs =
|
need_relocs =
|
||||||
(!bfd_link_executable (info) || indx != 0) &&
|
(!bfd_link_executable (info) || indx != 0) &&
|
||||||
(h == NULL
|
(h == NULL
|
||||||
@@ -87,7 +87,7 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
|| h->root.type != bfd_link_hash_undefweak);
|
|| h->root.type != bfd_link_hash_undefweak);
|
||||||
|
|
||||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||||
@@ -6694,7 +6706,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
@@ -7178,7 +7190,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
need_relocs =
|
need_relocs =
|
||||||
(!bfd_link_executable (info) || indx != 0) &&
|
(!bfd_link_executable (info) || indx != 0) &&
|
||||||
(h == NULL
|
(h == NULL
|
||||||
@@ -96,7 +96,7 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
|| h->root.type != bfd_link_hash_undefweak);
|
|| h->root.type != bfd_link_hash_undefweak);
|
||||||
|
|
||||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||||
@@ -6743,7 +6755,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
@@ -7227,7 +7239,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
|
bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
|
||||||
|
|
||||||
need_relocs = (h == NULL
|
need_relocs = (h == NULL
|
||||||
@@ -105,17 +105,14 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
|| h->root.type != bfd_link_hash_undefweak);
|
|| h->root.type != bfd_link_hash_undefweak);
|
||||||
|
|
||||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||||
@@ -7086,6 +7098,26 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
|
@@ -7553,6 +7565,23 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
|
||||||
return FALSE;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
+/* Remove undefined weak symbol from the dynamic symbol table if it
|
+/* Remove undefined weak symbol from the dynamic symbol table if it
|
||||||
+ is resolved to 0. */
|
+ is resolved to 0. */
|
||||||
+
|
+
|
||||||
+extern bfd_boolean
|
+static bool
|
||||||
+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,
|
+elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *info,
|
||||||
+ struct elf_link_hash_entry *h)
|
+ struct elf_link_hash_entry *h)
|
||||||
+{
|
+{
|
||||||
@@ -126,21 +123,21 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
+ _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
|
+ _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
|
||||||
+ h->dynstr_index);
|
+ h->dynstr_index);
|
||||||
+ }
|
+ }
|
||||||
+ return TRUE;
|
+ return true;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
/* Adjust a symbol defined by a dynamic object and referenced by a
|
/* Adjust a symbol defined by a dynamic object and referenced by a
|
||||||
regular object. The current definition is in some section of the
|
regular object. The current definition is in some section of the
|
||||||
dynamic object, but we're not including those sections. We have to
|
dynamic object, but we're not including those sections. We have to
|
||||||
@@ -8286,6 +8318,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -8771,6 +8800,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
struct elf_aarch64_link_hash_table *htab;
|
struct elf_aarch64_link_hash_table *htab;
|
||||||
struct elf_aarch64_link_hash_entry *eh;
|
struct elf_aarch64_link_hash_entry *eh;
|
||||||
struct elf_dyn_relocs *p;
|
struct elf_dyn_relocs *p;
|
||||||
+ bfd_boolean resolved_to_zero;
|
+ bool resolved_to_zero;
|
||||||
|
|
||||||
/* An example of a bfd_link_hash_indirect symbol is versioned
|
/* An example of a bfd_link_hash_indirect symbol is versioned
|
||||||
symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
|
symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
|
||||||
@@ -8305,6 +8338,10 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -8790,6 +8820,10 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
info = (struct bfd_link_info *) inf;
|
info = (struct bfd_link_info *) inf;
|
||||||
htab = elf_aarch64_hash_table (info);
|
htab = elf_aarch64_hash_table (info);
|
||||||
|
|
||||||
@@ -151,7 +148,7 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
/* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
|
/* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
|
||||||
here if it is defined and referenced in a non-shared object. */
|
here if it is defined and referenced in a non-shared object. */
|
||||||
if (h->type == STT_GNU_IFUNC
|
if (h->type == STT_GNU_IFUNC
|
||||||
@@ -8314,7 +8351,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -8799,7 +8833,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
{
|
{
|
||||||
/* Make sure this symbol is output as a dynamic symbol.
|
/* Make sure this symbol is output as a dynamic symbol.
|
||||||
Undefined weak syms won't yet be marked as dynamic. */
|
Undefined weak syms won't yet be marked as dynamic. */
|
||||||
@@ -160,9 +157,9 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
&& h->root.type == bfd_link_hash_undefweak)
|
&& h->root.type == bfd_link_hash_undefweak)
|
||||||
{
|
{
|
||||||
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
||||||
@@ -8348,6 +8385,11 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -8833,6 +8867,11 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
of relaxing into these from the large model PLT entries. */
|
of relaxing into these from the large model PLT entries. */
|
||||||
s->size += PLT_SMALL_ENTRY_SIZE;
|
s->size += htab->plt_entry_size;
|
||||||
|
|
||||||
+ /* There should be no PLT relocations against resolved undefined
|
+ /* There should be no PLT relocations against resolved undefined
|
||||||
+ weak symbols in the executable. */
|
+ weak symbols in the executable. */
|
||||||
@@ -172,15 +169,15 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
/* We also need to make an entry in the .got.plt section, which
|
/* We also need to make an entry in the .got.plt section, which
|
||||||
will be placed in the .got section by the linker script. */
|
will be placed in the .got section by the linker script. */
|
||||||
htab->root.sgotplt->size += GOT_ENTRY_SIZE;
|
htab->root.sgotplt->size += GOT_ENTRY_SIZE;
|
||||||
@@ -8370,6 +8412,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -8861,6 +8900,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
htab->variant_pcs = 1;
|
||||||
|
|
||||||
htab->root.srelplt->reloc_count++;
|
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
h->plt.offset = (bfd_vma) - 1;
|
h->plt.offset = (bfd_vma) - 1;
|
||||||
@@ -8382,9 +8425,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -8873,9 +8913,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
h->needs_plt = 0;
|
h->needs_plt = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -189,8 +186,8 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
-
|
-
|
||||||
if (h->got.refcount > 0)
|
if (h->got.refcount > 0)
|
||||||
{
|
{
|
||||||
bfd_boolean dyn;
|
bool dyn;
|
||||||
@@ -8396,7 +8436,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -8887,7 +8924,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
|
||||||
/* Make sure this symbol is output as a dynamic symbol.
|
/* Make sure this symbol is output as a dynamic symbol.
|
||||||
Undefined weak syms won't yet be marked as dynamic. */
|
Undefined weak syms won't yet be marked as dynamic. */
|
||||||
@@ -199,7 +196,7 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
&& h->root.type == bfd_link_hash_undefweak)
|
&& h->root.type == bfd_link_hash_undefweak)
|
||||||
{
|
{
|
||||||
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
||||||
@@ -8410,7 +8450,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -8901,7 +8938,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
{
|
{
|
||||||
h->got.offset = htab->root.sgot->size;
|
h->got.offset = htab->root.sgot->size;
|
||||||
htab->root.sgot->size += GOT_ENTRY_SIZE;
|
htab->root.sgot->size += GOT_ENTRY_SIZE;
|
||||||
@@ -208,7 +205,7 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
|| h->root.type != bfd_link_hash_undefweak)
|
|| h->root.type != bfd_link_hash_undefweak)
|
||||||
&& (bfd_link_pic (info)
|
&& (bfd_link_pic (info)
|
||||||
|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
|
|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
|
||||||
@@ -8446,7 +8486,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -8937,7 +8974,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
}
|
}
|
||||||
|
|
||||||
indx = h && h->dynindx != -1 ? h->dynindx : 0;
|
indx = h && h->dynindx != -1 ? h->dynindx : 0;
|
||||||
@@ -217,16 +214,16 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
|| h->root.type != bfd_link_hash_undefweak)
|
|| h->root.type != bfd_link_hash_undefweak)
|
||||||
&& (!bfd_link_executable (info)
|
&& (!bfd_link_executable (info)
|
||||||
|| indx != 0
|
|| indx != 0
|
||||||
@@ -8512,7 +8552,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -9019,7 +9056,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
visibility. */
|
visibility. */
|
||||||
if (eh->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak)
|
if (h->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
|
||||||
+ if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT || resolved_to_zero
|
+ if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT || resolved_to_zero
|
||||||
|| UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
|| UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
||||||
eh->dyn_relocs = NULL;
|
h->dyn_relocs = NULL;
|
||||||
|
|
||||||
@@ -8532,7 +8572,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -9039,7 +9076,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
symbols which turn out to need copy relocs or are not
|
symbols which turn out to need copy relocs or are not
|
||||||
dynamic. */
|
dynamic. */
|
||||||
|
|
||||||
@@ -237,20 +234,20 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
&& ((h->def_dynamic
|
&& ((h->def_dynamic
|
||||||
&& !h->def_regular)
|
&& !h->def_regular)
|
||||||
|| (htab->root.dynamic_sections_created
|
|| (htab->root.dynamic_sections_created
|
||||||
@@ -8543,6 +8585,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
@@ -9050,6 +9089,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
Undefined weak syms won't yet be marked as dynamic. */
|
Undefined weak syms won't yet be marked as dynamic. */
|
||||||
if (h->dynindx == -1
|
if (h->dynindx == -1
|
||||||
&& !h->forced_local
|
&& !h->forced_local
|
||||||
+ && !resolved_to_zero
|
+ && !resolved_to_zero
|
||||||
&& h->root.type == bfd_link_hash_undefweak
|
&& h->root.type == bfd_link_hash_undefweak
|
||||||
&& !bfd_elf_link_record_dynamic_symbol (info, h))
|
&& !bfd_elf_link_record_dynamic_symbol (info, h))
|
||||||
return FALSE;
|
return false;
|
||||||
@@ -9163,8 +9206,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
@@ -9607,8 +9647,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||||
Elf_Internal_Sym *sym)
|
Elf_Internal_Sym *sym)
|
||||||
{
|
{
|
||||||
struct elf_aarch64_link_hash_table *htab;
|
struct elf_aarch64_link_hash_table *htab;
|
||||||
+ struct elf_aarch64_link_hash_entry *eh;
|
+ struct elf_aarch64_link_hash_entry *eh;
|
||||||
+ bfd_boolean local_undefweak;
|
+ bool local_undefweak;
|
||||||
htab = elf_aarch64_hash_table (info);
|
htab = elf_aarch64_hash_table (info);
|
||||||
|
|
||||||
+ eh = (struct elf_aarch64_link_hash_entry *) h;
|
+ eh = (struct elf_aarch64_link_hash_entry *) h;
|
||||||
@@ -263,8 +260,8 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
if (h->plt.offset != (bfd_vma) - 1)
|
if (h->plt.offset != (bfd_vma) - 1)
|
||||||
{
|
{
|
||||||
asection *plt, *gotplt, *relplt;
|
asection *plt, *gotplt, *relplt;
|
||||||
@@ -9199,7 +9251,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
@@ -9643,7 +9692,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||||
return FALSE;
|
return false;
|
||||||
|
|
||||||
elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
|
elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
|
||||||
- if (!h->def_regular)
|
- if (!h->def_regular)
|
||||||
@@ -272,12 +269,8 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
{
|
{
|
||||||
/* Mark the symbol as undefined, rather than as defined in
|
/* Mark the symbol as undefined, rather than as defined in
|
||||||
the .plt section. */
|
the .plt section. */
|
||||||
@@ -9218,10 +9270,11 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
@@ -9665,7 +9714,8 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||||
}
|
&& elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
|
||||||
|
|
||||||
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
|
/* Undefined weak symbol in static PIE resolves to 0 without
|
||||||
any dynamic relocations. */
|
any dynamic relocations. */
|
||||||
- && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
- && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
||||||
@@ -286,7 +279,7 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
{
|
{
|
||||||
Elf_Internal_Rela rela;
|
Elf_Internal_Rela rela;
|
||||||
bfd_byte *loc;
|
bfd_byte *loc;
|
||||||
@@ -9715,6 +9768,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
|
@@ -10312,6 +10362,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
|
||||||
#define elf_backend_init_index_section \
|
#define elf_backend_init_index_section \
|
||||||
_bfd_elf_init_2_index_sections
|
_bfd_elf_init_2_index_sections
|
||||||
|
|
||||||
@@ -296,90 +289,31 @@ index faa27611d4..888af6bcd8 100644
|
|||||||
#define elf_backend_finish_dynamic_sections \
|
#define elf_backend_finish_dynamic_sections \
|
||||||
elfNN_aarch64_finish_dynamic_sections
|
elfNN_aarch64_finish_dynamic_sections
|
||||||
|
|
||||||
diff --git a/ld/Makefile.am b/ld/Makefile.am
|
|
||||||
index c2c798b4fe..a0073d27fe 100644
|
|
||||||
--- a/ld/Makefile.am
|
|
||||||
+++ b/ld/Makefile.am
|
|
||||||
@@ -1509,19 +1509,23 @@ ens32knbsd.c: $(srcdir)/emulparams/ns32knbsd.sh \
|
|
||||||
$(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 --git a/ld/Makefile.in b/ld/Makefile.in
|
|
||||||
index fc687fc516..7d85865d92 100644
|
|
||||||
--- a/ld/Makefile.in
|
|
||||||
+++ b/ld/Makefile.in
|
|
||||||
@@ -3114,18 +3114,22 @@ ens32knbsd.c: $(srcdir)/emulparams/ns32knbsd.sh \
|
|
||||||
|
|
||||||
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 \
|
|
||||||
diff --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
|
diff --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
|
||||||
index 4a59342722..2aa1ec7712 100644
|
index 8f68e517b45..260a590e69e 100644
|
||||||
--- a/ld/emulparams/aarch64elf.sh
|
--- a/ld/emulparams/aarch64elf.sh
|
||||||
+++ b/ld/emulparams/aarch64elf.sh
|
+++ b/ld/emulparams/aarch64elf.sh
|
||||||
@@ -1,3 +1,5 @@
|
@@ -1,3 +1,5 @@
|
||||||
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
+source_sh ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||||
+
|
+
|
||||||
ARCH=aarch64
|
ARCH=aarch64
|
||||||
MACHINE=
|
MACHINE=
|
||||||
NOP=0x1f2003d5
|
NOP=0x1f2003d5
|
||||||
diff --git a/ld/emulparams/aarch64elf32.sh b/ld/emulparams/aarch64elf32.sh
|
diff --git a/ld/emulparams/aarch64elf32.sh b/ld/emulparams/aarch64elf32.sh
|
||||||
index 38bcd4bbb0..da0f411feb 100644
|
index 5a08d9e29f1..e4c9abf85a1 100644
|
||||||
--- a/ld/emulparams/aarch64elf32.sh
|
--- a/ld/emulparams/aarch64elf32.sh
|
||||||
+++ b/ld/emulparams/aarch64elf32.sh
|
+++ b/ld/emulparams/aarch64elf32.sh
|
||||||
@@ -1,3 +1,5 @@
|
@@ -1,3 +1,5 @@
|
||||||
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
+source_sh ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||||
+
|
+
|
||||||
ARCH="aarch64:ilp32"
|
ARCH="aarch64:ilp32"
|
||||||
MACHINE=
|
MACHINE=
|
||||||
NOP=0x1f2003d5
|
NOP=0x1f2003d5
|
||||||
diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
|
diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
|
||||||
index 45e40b510c..916ef2086a 100644
|
index d47bdbf9937..b6f76d5c8d7 100644
|
||||||
--- a/ld/emultempl/aarch64elf.em
|
--- a/ld/emultempl/aarch64elf.em
|
||||||
+++ b/ld/emultempl/aarch64elf.em
|
+++ b/ld/emultempl/aarch64elf.em
|
||||||
@@ -380,7 +380,7 @@ PARSE_AND_LIST_LONGOPTS='
|
@@ -378,7 +378,7 @@ PARSE_AND_LIST_LONGOPTS='
|
||||||
{ "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
|
{ "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
|
||||||
'
|
'
|
||||||
|
|
||||||
@@ -388,25 +322,63 @@ index 45e40b510c..916ef2086a 100644
|
|||||||
fprintf (file, _(" --no-enum-size-warning Don'\''t warn about objects with incompatible\n"
|
fprintf (file, _(" --no-enum-size-warning Don'\''t warn about objects with incompatible\n"
|
||||||
" enum sizes\n"));
|
" enum sizes\n"));
|
||||||
fprintf (file, _(" --no-wchar-size-warning Don'\''t warn about objects with incompatible\n"
|
fprintf (file, _(" --no-wchar-size-warning Don'\''t warn about objects with incompatible\n"
|
||||||
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
|
diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
|
||||||
index f4f7ad6b4e..8428a54697 100644
|
index 3f67f8b09d9..eb8e8e1596e 100644
|
||||||
--- a/ld/emultempl/elf32.em
|
--- a/ld/emultempl/elf.em
|
||||||
+++ b/ld/emultempl/elf32.em
|
+++ b/ld/emultempl/elf.em
|
||||||
@@ -192,6 +192,9 @@ static char *depaudit; /* colon (typically) separated list of libs */
|
@@ -572,6 +572,7 @@ enum elf_options
|
||||||
/* Style of .note.gnu.build-id section. */
|
OPTION_EXCLUDE_LIBS,
|
||||||
static const char *emit_note_gnu_build_id;
|
OPTION_HASH_STYLE,
|
||||||
|
OPTION_BUILD_ID,
|
||||||
|
+ OPTION_NX_MODULE_NAME,
|
||||||
|
OPTION_PACKAGE_METADATA,
|
||||||
|
OPTION_AUDIT,
|
||||||
|
OPTION_COMPRESS_DEBUG
|
||||||
|
@@ -603,6 +604,7 @@ EOF
|
||||||
|
fi
|
||||||
|
fragment <<EOF
|
||||||
|
{"build-id", optional_argument, NULL, OPTION_BUILD_ID},
|
||||||
|
+ {"nx-module-name", optional_argument, NULL, OPTION_NX_MODULE_NAME},
|
||||||
|
{"package-metadata", optional_argument, NULL, OPTION_PACKAGE_METADATA},
|
||||||
|
{"compress-debug-sections", required_argument, NULL, OPTION_COMPRESS_DEBUG},
|
||||||
|
EOF
|
||||||
|
@@ -673,6 +675,16 @@ gld${EMULATION_NAME}_handle_option (int optc)
|
||||||
|
einfo (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
|
||||||
|
optarg);
|
||||||
|
break;
|
||||||
|
+ case OPTION_NX_MODULE_NAME:
|
||||||
|
+ if (ldelf_emit_nx_module_name != NULL)
|
||||||
|
+ {
|
||||||
|
+ free ((char *) ldelf_emit_nx_module_name);
|
||||||
|
+ ldelf_emit_nx_module_name = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (optarg == NULL)
|
||||||
|
+ optarg = "";
|
||||||
|
+ ldelf_emit_nx_module_name = xstrdup (optarg);
|
||||||
|
+ break;
|
||||||
|
EOF
|
||||||
|
|
||||||
|
if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
|
||||||
|
diff --git a/ld/ldelf.c b/ld/ldelf.c
|
||||||
|
index f9a6819366f..99e982ef5eb 100644
|
||||||
|
--- a/ld/ldelf.c
|
||||||
|
+++ b/ld/ldelf.c
|
||||||
|
@@ -55,6 +55,9 @@ const char *ldelf_emit_note_gnu_build_id;
|
||||||
|
/* Content of .note.package section. */
|
||||||
|
const char *ldelf_emit_note_fdo_package_metadata;
|
||||||
|
|
||||||
+/* NX module name. */
|
+/* NX module name. */
|
||||||
+static const char *emit_nx_module_name;
|
+const char *ldelf_emit_nx_module_name;
|
||||||
+
|
+
|
||||||
/* On Linux, it's possible to have different versions of the same
|
/* These variables are required to pass information back and forth
|
||||||
shared library linked against different versions of libc. The
|
between after_open and check_needed and stat_needed and vercheck. */
|
||||||
dynamic linker somehow tags which libc version to use in
|
|
||||||
@@ -1217,6 +1220,92 @@ setup_build_id (bfd *ibfd)
|
@@ -1206,8 +1209,93 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
|
||||||
return FALSE;
|
*save_input_bfd_tail = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
+static bfd_boolean
|
-/* This is called before calling plugin 'all symbols read' hook. */
|
||||||
|
+static bool
|
||||||
+write_nx_module_name (bfd *abfd)
|
+write_nx_module_name (bfd *abfd)
|
||||||
+{
|
+{
|
||||||
+ struct elf_obj_tdata *t = elf_tdata (abfd);
|
+ struct elf_obj_tdata *t = elf_tdata (abfd);
|
||||||
@@ -416,14 +388,14 @@ index f4f7ad6b4e..8428a54697 100644
|
|||||||
+ unsigned char *contents;
|
+ unsigned char *contents;
|
||||||
+ bfd_size_type size;
|
+ bfd_size_type size;
|
||||||
+ file_ptr position;
|
+ file_ptr position;
|
||||||
+
|
|
||||||
+ name = t->o->nx_module_name.name;
|
+ name = t->o->nx_module_name.name;
|
||||||
+ asec = t->o->nx_module_name.sec;
|
+ asec = t->o->nx_module_name.sec;
|
||||||
+ if (bfd_is_abs_section (asec->output_section))
|
+ if (bfd_is_abs_section (asec->output_section))
|
||||||
+ {
|
+ {
|
||||||
+ einfo (_("%P: warning: .nx-module-name section discarded,"
|
+ einfo (_("%P: warning: .nx-module-name section discarded,"
|
||||||
+ " --build-id ignored\n"));
|
+ " --build-id ignored\n"));
|
||||||
+ return TRUE;
|
+ return true;
|
||||||
+ }
|
+ }
|
||||||
+ i_shdr = &elf_section_data (asec->output_section)->this_hdr;
|
+ i_shdr = &elf_section_data (asec->output_section)->this_hdr;
|
||||||
+
|
+
|
||||||
@@ -450,21 +422,21 @@ index f4f7ad6b4e..8428a54697 100644
|
|||||||
+
|
+
|
||||||
+/* Make .nx-module-name section, and set up elf_tdata->nx_module_name. */
|
+/* Make .nx-module-name section, and set up elf_tdata->nx_module_name. */
|
||||||
+
|
+
|
||||||
+static bfd_boolean
|
+static bool
|
||||||
+setup_nx_module_name (bfd *ibfd, bfd *obfd)
|
+setup_nx_module_name (bfd *ibfd, bfd *obfd)
|
||||||
+{
|
+{
|
||||||
+ asection *s;
|
+ asection *s;
|
||||||
+ bfd_size_type size;
|
+ bfd_size_type size;
|
||||||
+ flagword flags;
|
+ flagword flags;
|
||||||
+
|
+
|
||||||
+ if (emit_nx_module_name[0] == '\0')
|
+ if (ldelf_emit_nx_module_name[0] == '\0')
|
||||||
+ {
|
+ {
|
||||||
+ /* Extract the basename of the output bfd and use it as the module name. */
|
+ /* Extract the basename of the output bfd and use it as the module name. */
|
||||||
+ char *dot_pos;
|
+ char *dot_pos;
|
||||||
+ free ((char *) emit_nx_module_name);
|
+ free ((char *) ldelf_emit_nx_module_name);
|
||||||
+ emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
|
+ ldelf_emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
|
||||||
+ emit_nx_module_name = xstrdup (emit_nx_module_name);
|
+ ldelf_emit_nx_module_name = xstrdup (ldelf_emit_nx_module_name);
|
||||||
+ dot_pos = strrchr (emit_nx_module_name, '.');
|
+ dot_pos = strrchr (ldelf_emit_nx_module_name, '.');
|
||||||
+ if (dot_pos != NULL)
|
+ if (dot_pos != NULL)
|
||||||
+ {
|
+ {
|
||||||
+ /* Remove extension. */
|
+ /* Remove extension. */
|
||||||
@@ -472,34 +444,35 @@ index f4f7ad6b4e..8428a54697 100644
|
|||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ size = 8 + strlen(emit_nx_module_name) + 1; /* extra null terminator for AMS */
|
+ size = 8 + strlen(ldelf_emit_nx_module_name) + 1; /* extra null terminator for AMS */
|
||||||
+ flags = (SEC_ALLOC | SEC_LOAD | SEC_IN_MEMORY
|
+ flags = (SEC_ALLOC | SEC_LOAD | SEC_IN_MEMORY
|
||||||
+ | SEC_LINKER_CREATED | SEC_READONLY | SEC_DATA);
|
+ | SEC_LINKER_CREATED | SEC_READONLY | SEC_DATA);
|
||||||
+ s = bfd_make_section_with_flags (ibfd, ".nx-module-name", flags);
|
+ s = bfd_make_section_with_flags (ibfd, ".nx-module-name", flags);
|
||||||
+ if (s != NULL && bfd_set_section_alignment (ibfd, s, 4))
|
+ if (s != NULL && bfd_set_section_alignment (s, 4))
|
||||||
+ {
|
+ {
|
||||||
+ struct elf_obj_tdata *t = elf_tdata (link_info.output_bfd);
|
+ struct elf_obj_tdata *t = elf_tdata (link_info.output_bfd);
|
||||||
+ t->o->nx_module_name.after_write_object_contents = &write_nx_module_name;
|
+ t->o->nx_module_name.after_write_object_contents = &write_nx_module_name;
|
||||||
+ t->o->nx_module_name.name = emit_nx_module_name;
|
+ t->o->nx_module_name.name = ldelf_emit_nx_module_name;
|
||||||
+ t->o->nx_module_name.sec = s;
|
+ t->o->nx_module_name.sec = s;
|
||||||
+ elf_section_type (s) = SHT_PROGBITS;
|
+ elf_section_type (s) = SHT_PROGBITS;
|
||||||
+ s->size = size;
|
+ s->size = size;
|
||||||
+ return TRUE;
|
+ return true;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ einfo (_("%P: warning: cannot create .nx-module-name section,"
|
+ einfo (_("%P: warning: cannot create .nx-module-name section,"
|
||||||
+ " --nx-module-name ignored\n"));
|
+ " --nx-module-name ignored\n"));
|
||||||
+ return FALSE;
|
+ return false;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
/* This is called after all the input files have been opened. */
|
+/* This is called before calling plugin 'all symbols read' hook. */
|
||||||
|
void
|
||||||
static void
|
ldelf_before_plugin_all_symbols_read (int use_libpath, int native,
|
||||||
@@ -1267,6 +1356,24 @@ gld${EMULATION_NAME}_after_open (void)
|
int is_linux, int is_freebsd,
|
||||||
|
@@ -1286,6 +1374,24 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (emit_nx_module_name != NULL)
|
+ if (ldelf_emit_nx_module_name != NULL)
|
||||||
+ {
|
+ {
|
||||||
+ /* Find an ELF input. */
|
+ /* Find an ELF input. */
|
||||||
+ for (abfd = link_info.input_bfds;
|
+ for (abfd = link_info.input_bfds;
|
||||||
@@ -512,93 +485,23 @@ index f4f7ad6b4e..8428a54697 100644
|
|||||||
+ /* If there are no ELF input files do not try to create a .nx-module-name section. */
|
+ /* If there are no ELF input files do not try to create a .nx-module-name section. */
|
||||||
+ if (abfd == NULL || !setup_nx_module_name (abfd, link_info.output_bfd))
|
+ if (abfd == NULL || !setup_nx_module_name (abfd, link_info.output_bfd))
|
||||||
+ {
|
+ {
|
||||||
+ free ((char *) emit_nx_module_name);
|
+ free ((char *) ldelf_emit_nx_module_name);
|
||||||
+ emit_nx_module_name = NULL;
|
+ ldelf_emit_nx_module_name = NULL;
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
get_elf_backend_data (link_info.output_bfd)->setup_gnu_properties (&link_info);
|
get_elf_backend_data (link_info.output_bfd)->setup_gnu_properties (&link_info);
|
||||||
|
|
||||||
if (bfd_link_relocatable (&link_info))
|
/* Do not allow executable files to be used as inputs to the link. */
|
||||||
@@ -2720,6 +2827,7 @@ enum elf_options
|
diff --git a/ld/ldelf.h b/ld/ldelf.h
|
||||||
OPTION_EXCLUDE_LIBS,
|
index f82bd9234a7..96173dcd671 100644
|
||||||
OPTION_HASH_STYLE,
|
--- a/ld/ldelf.h
|
||||||
OPTION_BUILD_ID,
|
+++ b/ld/ldelf.h
|
||||||
+ OPTION_NX_MODULE_NAME,
|
@@ -20,6 +20,7 @@
|
||||||
OPTION_AUDIT,
|
|
||||||
OPTION_COMPRESS_DEBUG
|
|
||||||
};
|
|
||||||
@@ -2750,6 +2858,7 @@ EOF
|
|
||||||
fi
|
|
||||||
fragment <<EOF
|
|
||||||
{"build-id", optional_argument, NULL, OPTION_BUILD_ID},
|
|
||||||
+ {"nx-module-name", optional_argument, NULL, OPTION_NX_MODULE_NAME},
|
|
||||||
{"compress-debug-sections", required_argument, NULL, OPTION_COMPRESS_DEBUG},
|
|
||||||
EOF
|
|
||||||
if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
|
|
||||||
@@ -2814,6 +2923,16 @@ gld${EMULATION_NAME}_handle_option (int optc)
|
|
||||||
einfo (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
|
|
||||||
optarg);
|
|
||||||
break;
|
|
||||||
+ case OPTION_NX_MODULE_NAME:
|
|
||||||
+ if (emit_nx_module_name != NULL)
|
|
||||||
+ {
|
|
||||||
+ free ((char *) emit_nx_module_name);
|
|
||||||
+ emit_nx_module_name = NULL;
|
|
||||||
+ }
|
|
||||||
+ if (optarg == NULL)
|
|
||||||
+ optarg = "";
|
|
||||||
+ emit_nx_module_name = xstrdup (optarg);
|
|
||||||
+ break;
|
|
||||||
EOF
|
|
||||||
|
|
||||||
if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
|
extern const char *ldelf_emit_note_gnu_build_id;
|
||||||
diff --git a/ld/ldgram.y b/ld/ldgram.y
|
extern const char *ldelf_emit_note_fdo_package_metadata;
|
||||||
index c3eadeb392..59ab143526 100644
|
+extern const char *ldelf_emit_nx_module_name;
|
||||||
--- a/ld/ldgram.y
|
|
||||||
+++ b/ld/ldgram.y
|
|
||||||
@@ -819,6 +819,7 @@ origin_spec:
|
|
||||||
ORIGIN '=' mustbe_exp
|
|
||||||
{
|
|
||||||
region->origin_exp = $3;
|
|
||||||
+ region->current = region->origin;
|
|
||||||
}
|
|
||||||
;
|
|
||||||
|
|
||||||
diff --git a/ld/ldlang.c b/ld/ldlang.c
|
extern void ldelf_after_parse (void);
|
||||||
index 33f6bda292..7161f4210a 100644
|
extern bool ldelf_load_symbols (lang_input_statement_type *);
|
||||||
--- a/ld/ldlang.c
|
|
||||||
+++ b/ld/ldlang.c
|
|
||||||
@@ -7381,9 +7381,6 @@ lang_process (void)
|
|
||||||
current_target = default_target;
|
|
||||||
lang_statement_iteration++;
|
|
||||||
open_input_bfds (statement_list.head, OPEN_BFD_NORMAL);
|
|
||||||
- /* open_input_bfds also handles assignments, so we can give values
|
|
||||||
- to symbolic origin/length now. */
|
|
||||||
- lang_do_memory_regions ();
|
|
||||||
|
|
||||||
#ifdef ENABLE_PLUGINS
|
|
||||||
if (link_info.lto_plugin_active)
|
|
||||||
@@ -7526,6 +7523,8 @@ lang_process (void)
|
|
||||||
/* PR 13683: We must rerun the assignments prior to running garbage
|
|
||||||
collection in order to make sure that all symbol aliases are resolved. */
|
|
||||||
lang_do_assignments (lang_mark_phase_enum);
|
|
||||||
+
|
|
||||||
+ lang_do_memory_regions();
|
|
||||||
expld.phase = lang_first_phase_enum;
|
|
||||||
|
|
||||||
/* Size up the common data. */
|
|
||||||
@@ -7610,11 +7609,8 @@ lang_process (void)
|
|
||||||
/* Fix any __start, __stop, .startof. or .sizeof. symbols. */
|
|
||||||
lang_finalize_start_stop ();
|
|
||||||
|
|
||||||
- /* Do all the assignments again, to report errors. Assignment
|
|
||||||
- statements are processed multiple times, updating symbols; In
|
|
||||||
- open_input_bfds, lang_do_assignments, and lang_size_sections.
|
|
||||||
- Since lang_relax_sections calls lang_do_assignments, symbols are
|
|
||||||
- also updated in ldemul_after_allocation. */
|
|
||||||
+ /* Do all the assignments, now that we know the final resting places
|
|
||||||
+ of all the symbols. */
|
|
||||||
lang_do_assignments (lang_final_phase_enum);
|
|
||||||
|
|
||||||
ldemul_finish ();
|
|
||||||
507
dka64/patches/binutils-2.42.patch
Normal file
507
dka64/patches/binutils-2.42.patch
Normal file
@@ -0,0 +1,507 @@
|
|||||||
|
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
|
||||||
|
index 3ed22fa6c52..16cec309746 100644
|
||||||
|
--- a/bfd/elf-bfd.h
|
||||||
|
+++ b/bfd/elf-bfd.h
|
||||||
|
@@ -1984,6 +1984,14 @@ struct output_elf_obj_tdata
|
||||||
|
asection *sec;
|
||||||
|
} package_metadata;
|
||||||
|
|
||||||
|
+ /* Data for .nx-module-name. */
|
||||||
|
+ struct
|
||||||
|
+ {
|
||||||
|
+ bool (*after_write_object_contents) (bfd *);
|
||||||
|
+ const char *name;
|
||||||
|
+ asection *sec;
|
||||||
|
+ } nx_module_name;
|
||||||
|
+
|
||||||
|
/* Records the result of `get_program_header_size'. */
|
||||||
|
bfd_size_type program_header_size;
|
||||||
|
|
||||||
|
diff --git a/bfd/elf.c b/bfd/elf.c
|
||||||
|
index 88c75ae3ce0..c4b5cda59a7 100644
|
||||||
|
--- a/bfd/elf.c
|
||||||
|
+++ b/bfd/elf.c
|
||||||
|
@@ -7359,6 +7359,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
|
||||||
|
if (!bed->s->write_shdrs_and_ehdr (abfd))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
+ /* Write out the NX module name. */
|
||||||
|
+ if (t->o->nx_module_name.after_write_object_contents != NULL)
|
||||||
|
+ {
|
||||||
|
+ failed = !(*t->o->nx_module_name.after_write_object_contents) (abfd);
|
||||||
|
+ if (failed)
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* This is last since write_shdrs_and_ehdr can touch i_shdrp[0]. */
|
||||||
|
if (t->o->build_id.after_write_object_contents != NULL
|
||||||
|
&& !(*t->o->build_id.after_write_object_contents) (abfd))
|
||||||
|
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
|
||||||
|
index 109517db4aa..36ea8726544 100644
|
||||||
|
--- a/bfd/elfnn-aarch64.c
|
||||||
|
+++ b/bfd/elfnn-aarch64.c
|
||||||
|
@@ -2441,6 +2441,12 @@ enum elf_aarch64_stub_type
|
||||||
|
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. */
|
||||||
|
@@ -6947,11 +6953,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
|
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;
|
||||||
|
bool unresolved_reloc = false;
|
||||||
|
+ bool resolved_to_zero = false;
|
||||||
|
char *error_message = NULL;
|
||||||
|
|
||||||
|
r_symndx = ELFNN_R_SYM (rel->r_info);
|
||||||
|
@@ -7091,6 +7099,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
|
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:
|
||||||
|
@@ -7114,7 +7126,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
|
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);
|
||||||
|
@@ -7209,7 +7221,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
|
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);
|
||||||
|
@@ -7258,7 +7270,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
|
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);
|
||||||
|
@@ -7584,6 +7596,23 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
+/* Remove undefined weak symbol from the dynamic symbol table if it
|
||||||
|
+ is resolved to 0. */
|
||||||
|
+
|
||||||
|
+static bool
|
||||||
|
+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
|
||||||
|
@@ -8802,6 +8831,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
struct elf_aarch64_link_hash_table *htab;
|
||||||
|
struct elf_aarch64_link_hash_entry *eh;
|
||||||
|
struct elf_dyn_relocs *p;
|
||||||
|
+ bool resolved_to_zero;
|
||||||
|
|
||||||
|
/* An example of a bfd_link_hash_indirect symbol is versioned
|
||||||
|
symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
|
||||||
|
@@ -8821,6 +8851,10 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
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
|
||||||
|
@@ -8830,7 +8864,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
{
|
||||||
|
/* 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))
|
||||||
|
@@ -8864,6 +8898,11 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
of relaxing into these from the large model PLT entries. */
|
||||||
|
s->size += htab->plt_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;
|
||||||
|
@@ -8892,6 +8931,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
htab->variant_pcs = 1;
|
||||||
|
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
else
|
||||||
|
{
|
||||||
|
h->plt.offset = (bfd_vma) - 1;
|
||||||
|
@@ -8904,9 +8944,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
bool dyn;
|
||||||
|
@@ -8918,7 +8955,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
|
||||||
|
/* 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))
|
||||||
|
@@ -8932,7 +8969,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
{
|
||||||
|
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))
|
||||||
|
@@ -8968,7 +9005,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
@@ -9050,7 +9087,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
visibility. */
|
||||||
|
if (h->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))
|
||||||
|
h->dyn_relocs = NULL;
|
||||||
|
|
||||||
|
@@ -9070,7 +9107,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
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
|
||||||
|
@@ -9081,6 +9120,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
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;
|
||||||
|
@@ -9638,8 +9678,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||||
|
Elf_Internal_Sym *sym)
|
||||||
|
{
|
||||||
|
struct elf_aarch64_link_hash_table *htab;
|
||||||
|
+ struct elf_aarch64_link_hash_entry *eh;
|
||||||
|
+ bool 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;
|
||||||
|
@@ -9674,7 +9723,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||||
|
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. */
|
||||||
|
@@ -9696,7 +9745,8 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||||
|
&& 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;
|
||||||
|
@@ -10343,6 +10393,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
|
||||||
|
#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 --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
|
||||||
|
index 8f68e517b45..260a590e69e 100644
|
||||||
|
--- a/ld/emulparams/aarch64elf.sh
|
||||||
|
+++ b/ld/emulparams/aarch64elf.sh
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+source_sh ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||||
|
+
|
||||||
|
ARCH=aarch64
|
||||||
|
MACHINE=
|
||||||
|
NOP=0x1f2003d5
|
||||||
|
diff --git a/ld/emulparams/aarch64elf32.sh b/ld/emulparams/aarch64elf32.sh
|
||||||
|
index 5a08d9e29f1..e4c9abf85a1 100644
|
||||||
|
--- a/ld/emulparams/aarch64elf32.sh
|
||||||
|
+++ b/ld/emulparams/aarch64elf32.sh
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+source_sh ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||||
|
+
|
||||||
|
ARCH="aarch64:ilp32"
|
||||||
|
MACHINE=
|
||||||
|
NOP=0x1f2003d5
|
||||||
|
diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
|
||||||
|
index b647909ae63..3e2d7a171b9 100644
|
||||||
|
--- a/ld/emultempl/aarch64elf.em
|
||||||
|
+++ b/ld/emultempl/aarch64elf.em
|
||||||
|
@@ -378,7 +378,7 @@ PARSE_AND_LIST_LONGOPTS='
|
||||||
|
{ "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 --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
|
||||||
|
index 71cec19fdc6..3fd0585dee6 100644
|
||||||
|
--- a/ld/emultempl/elf.em
|
||||||
|
+++ b/ld/emultempl/elf.em
|
||||||
|
@@ -574,6 +574,7 @@ enum elf_options
|
||||||
|
OPTION_EXCLUDE_LIBS,
|
||||||
|
OPTION_HASH_STYLE,
|
||||||
|
OPTION_BUILD_ID,
|
||||||
|
+ OPTION_NX_MODULE_NAME,
|
||||||
|
OPTION_PACKAGE_METADATA,
|
||||||
|
OPTION_AUDIT,
|
||||||
|
OPTION_COMPRESS_DEBUG
|
||||||
|
@@ -605,6 +606,7 @@ EOF
|
||||||
|
fi
|
||||||
|
fragment <<EOF
|
||||||
|
{"build-id", optional_argument, NULL, OPTION_BUILD_ID},
|
||||||
|
+ {"nx-module-name", optional_argument, NULL, OPTION_NX_MODULE_NAME},
|
||||||
|
{"package-metadata", optional_argument, NULL, OPTION_PACKAGE_METADATA},
|
||||||
|
{"compress-debug-sections", required_argument, NULL, OPTION_COMPRESS_DEBUG},
|
||||||
|
EOF
|
||||||
|
@@ -675,6 +677,16 @@ gld${EMULATION_NAME}_handle_option (int optc)
|
||||||
|
einfo (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
|
||||||
|
optarg);
|
||||||
|
break;
|
||||||
|
+ case OPTION_NX_MODULE_NAME:
|
||||||
|
+ if (ldelf_emit_nx_module_name != NULL)
|
||||||
|
+ {
|
||||||
|
+ free ((char *) ldelf_emit_nx_module_name);
|
||||||
|
+ ldelf_emit_nx_module_name = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (optarg == NULL)
|
||||||
|
+ optarg = "";
|
||||||
|
+ ldelf_emit_nx_module_name = xstrdup (optarg);
|
||||||
|
+ break;
|
||||||
|
EOF
|
||||||
|
|
||||||
|
if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
|
||||||
|
diff --git a/ld/ldelf.c b/ld/ldelf.c
|
||||||
|
index 2852851dcd5..0b1efa9675a 100644
|
||||||
|
--- a/ld/ldelf.c
|
||||||
|
+++ b/ld/ldelf.c
|
||||||
|
@@ -55,6 +55,9 @@ const char *ldelf_emit_note_gnu_build_id;
|
||||||
|
/* Content of .note.package section. */
|
||||||
|
const char *ldelf_emit_note_fdo_package_metadata;
|
||||||
|
|
||||||
|
+/* NX module name. */
|
||||||
|
+const char *ldelf_emit_nx_module_name;
|
||||||
|
+
|
||||||
|
/* These variables are required to pass information back and forth
|
||||||
|
between after_open and check_needed and stat_needed and vercheck. */
|
||||||
|
|
||||||
|
@@ -1209,8 +1212,93 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
|
||||||
|
*save_input_bfd_tail = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
-/* This is called before calling plugin 'all symbols read' hook. */
|
||||||
|
+static bool
|
||||||
|
+write_nx_module_name (bfd *abfd)
|
||||||
|
+{
|
||||||
|
+ struct elf_obj_tdata *t = elf_tdata (abfd);
|
||||||
|
+ const char *name;
|
||||||
|
+ asection *asec;
|
||||||
|
+ Elf_Internal_Shdr *i_shdr;
|
||||||
|
+ unsigned char *contents;
|
||||||
|
+ bfd_size_type size;
|
||||||
|
+ file_ptr position;
|
||||||
|
|
||||||
|
+ name = t->o->nx_module_name.name;
|
||||||
|
+ asec = t->o->nx_module_name.sec;
|
||||||
|
+ if (bfd_is_abs_section (asec->output_section))
|
||||||
|
+ {
|
||||||
|
+ einfo (_("%P: warning: .nx-module-name section discarded,"
|
||||||
|
+ " --build-id ignored\n"));
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+ i_shdr = &elf_section_data (asec->output_section)->this_hdr;
|
||||||
|
+
|
||||||
|
+ if (i_shdr->contents == NULL)
|
||||||
|
+ {
|
||||||
|
+ if (asec->contents == NULL)
|
||||||
|
+ asec->contents = (unsigned char *) xmalloc (asec->size);
|
||||||
|
+ contents = asec->contents;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ contents = i_shdr->contents + asec->output_offset;
|
||||||
|
+
|
||||||
|
+ size = asec->size;
|
||||||
|
+ bfd_h_put_32 (abfd, 0, &contents[0]);
|
||||||
|
+ bfd_h_put_32 (abfd, size - 9, &contents[4]);
|
||||||
|
+ memcpy (&contents[8], name, size - 9);
|
||||||
|
+ contents[size - 1] = 0; /* ensure null termination for AMS */
|
||||||
|
+
|
||||||
|
+ position = i_shdr->sh_offset + asec->output_offset;
|
||||||
|
+
|
||||||
|
+ return (bfd_seek (abfd, position, SEEK_SET) == 0
|
||||||
|
+ && bfd_write (contents, size, abfd) == size);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* Make .nx-module-name section, and set up elf_tdata->nx_module_name. */
|
||||||
|
+
|
||||||
|
+static bool
|
||||||
|
+setup_nx_module_name (bfd *ibfd, bfd *obfd)
|
||||||
|
+{
|
||||||
|
+ asection *s;
|
||||||
|
+ bfd_size_type size;
|
||||||
|
+ flagword flags;
|
||||||
|
+
|
||||||
|
+ if (ldelf_emit_nx_module_name[0] == '\0')
|
||||||
|
+ {
|
||||||
|
+ /* Extract the basename of the output bfd and use it as the module name. */
|
||||||
|
+ char *dot_pos;
|
||||||
|
+ free ((char *) ldelf_emit_nx_module_name);
|
||||||
|
+ ldelf_emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
|
||||||
|
+ ldelf_emit_nx_module_name = xstrdup (ldelf_emit_nx_module_name);
|
||||||
|
+ dot_pos = strrchr (ldelf_emit_nx_module_name, '.');
|
||||||
|
+ if (dot_pos != NULL)
|
||||||
|
+ {
|
||||||
|
+ /* Remove extension. */
|
||||||
|
+ *dot_pos = 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ size = 8 + strlen(ldelf_emit_nx_module_name) + 1; /* extra null terminator for AMS */
|
||||||
|
+ flags = (SEC_ALLOC | SEC_LOAD | SEC_IN_MEMORY
|
||||||
|
+ | SEC_LINKER_CREATED | SEC_READONLY | SEC_DATA);
|
||||||
|
+ s = bfd_make_section_with_flags (ibfd, ".nx-module-name", flags);
|
||||||
|
+ if (s != NULL && bfd_set_section_alignment (s, 4))
|
||||||
|
+ {
|
||||||
|
+ struct elf_obj_tdata *t = elf_tdata (link_info.output_bfd);
|
||||||
|
+ t->o->nx_module_name.after_write_object_contents = &write_nx_module_name;
|
||||||
|
+ t->o->nx_module_name.name = ldelf_emit_nx_module_name;
|
||||||
|
+ t->o->nx_module_name.sec = s;
|
||||||
|
+ elf_section_type (s) = SHT_PROGBITS;
|
||||||
|
+ s->size = size;
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ einfo (_("%P: warning: cannot create .nx-module-name section,"
|
||||||
|
+ " --nx-module-name ignored\n"));
|
||||||
|
+ return false;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* This is called before calling plugin 'all symbols read' hook. */
|
||||||
|
void
|
||||||
|
ldelf_before_plugin_all_symbols_read (int use_libpath, int native,
|
||||||
|
int is_linux, int is_freebsd,
|
||||||
|
@@ -1289,6 +1377,24 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (ldelf_emit_nx_module_name != NULL)
|
||||||
|
+ {
|
||||||
|
+ /* Find an ELF input. */
|
||||||
|
+ for (abfd = link_info.input_bfds;
|
||||||
|
+ abfd != (bfd *) NULL; abfd = abfd->link.next)
|
||||||
|
+ if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
|
||||||
|
+ && bfd_count_sections (abfd) != 0
|
||||||
|
+ && !((lang_input_statement_type *) abfd->usrdata)->flags.just_syms)
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ /* If there are no ELF input files do not try to create a .nx-module-name section. */
|
||||||
|
+ if (abfd == NULL || !setup_nx_module_name (abfd, link_info.output_bfd))
|
||||||
|
+ {
|
||||||
|
+ free ((char *) ldelf_emit_nx_module_name);
|
||||||
|
+ ldelf_emit_nx_module_name = NULL;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
get_elf_backend_data (link_info.output_bfd)->setup_gnu_properties (&link_info);
|
||||||
|
|
||||||
|
/* Do not allow executable files to be used as inputs to the link. */
|
||||||
|
diff --git a/ld/ldelf.h b/ld/ldelf.h
|
||||||
|
index 239194772c4..68516dbf45e 100644
|
||||||
|
--- a/ld/ldelf.h
|
||||||
|
+++ b/ld/ldelf.h
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
|
||||||
|
extern const char *ldelf_emit_note_gnu_build_id;
|
||||||
|
extern const char *ldelf_emit_note_fdo_package_metadata;
|
||||||
|
+extern const char *ldelf_emit_nx_module_name;
|
||||||
|
|
||||||
|
extern void ldelf_after_parse (void);
|
||||||
|
extern bool ldelf_load_symbols (lang_input_statement_type *);
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||||
index 648b3dc2110..ed605b28956 100644
|
index 95c91ee02be..4711542eee5 100644
|
||||||
--- a/gcc/config.gcc
|
--- a/gcc/config.gcc
|
||||||
+++ b/gcc/config.gcc
|
+++ b/gcc/config.gcc
|
||||||
@@ -1132,7 +1132,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
@@ -1195,7 +1195,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
||||||
tmake_file="${tmake_file} aarch64/t-aarch64"
|
tmake_file="${tmake_file} aarch64/t-aarch64"
|
||||||
case $target in
|
case $target in
|
||||||
aarch64-*-elf*)
|
aarch64-*-elf*)
|
||||||
@@ -18,7 +18,7 @@ index 648b3dc2110..ed605b28956 100644
|
|||||||
aarch64-*-fuchsia*)
|
aarch64-*-fuchsia*)
|
||||||
tm_file="${tm_file} fuchsia.h"
|
tm_file="${tm_file} fuchsia.h"
|
||||||
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
index ec45f23fa41..a208eabd806 100644
|
index 5396da9b2d6..87235d680ad 100644
|
||||||
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
@@ -22,6 +22,7 @@
|
@@ -22,6 +22,7 @@
|
||||||
@@ -30,27 +30,24 @@ index ec45f23fa41..a208eabd806 100644
|
|||||||
#define ENDFILE_SPEC \
|
#define ENDFILE_SPEC \
|
||||||
" crtend%O%s crtn%O%s " \
|
" crtend%O%s crtn%O%s " \
|
||||||
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
||||||
index a9f3e2715ca..0c7304e1d81 100644
|
index a05c0d3ded1..5551807e4c6 100644
|
||||||
--- a/gcc/config/aarch64/aarch64-opts.h
|
--- a/gcc/config/aarch64/aarch64-opts.h
|
||||||
+++ b/gcc/config/aarch64/aarch64-opts.h
|
+++ b/gcc/config/aarch64/aarch64-opts.h
|
||||||
@@ -52,6 +52,12 @@ enum aarch64_tls_type {
|
@@ -80,7 +80,8 @@ enum aarch64_tp_reg {
|
||||||
TLS_DESCRIPTORS
|
AARCH64_TPIDR_EL1 = 1,
|
||||||
|
AARCH64_TPIDR_EL2 = 2,
|
||||||
|
AARCH64_TPIDR_EL3 = 3,
|
||||||
|
- AARCH64_TPIDRRO_EL0 = 4
|
||||||
|
+ AARCH64_TPIDRRO_EL0 = 4,
|
||||||
|
+ AARCH64_TP_SOFT = 5
|
||||||
};
|
};
|
||||||
|
|
||||||
+/* Which thread pointer access sequence to use. */
|
/* SVE vector register sizes. */
|
||||||
+enum aarch64_tp_type {
|
|
||||||
+ TP_HARD,
|
|
||||||
+ TP_SOFT
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/* The code model defines the address generation strategy.
|
|
||||||
Most have a PIC and non-PIC variant. */
|
|
||||||
enum aarch64_code_model {
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
|
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
|
||||||
index f5db5379543..f582e5a7543 100644
|
index 1beec94629d..90a9ec580f8 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.cc
|
--- a/gcc/config/aarch64/aarch64.cc
|
||||||
+++ b/gcc/config/aarch64/aarch64.cc
|
+++ b/gcc/config/aarch64/aarch64.cc
|
||||||
@@ -19550,8 +19550,24 @@ aarch64_load_tp (rtx target)
|
@@ -21060,8 +21060,24 @@ aarch64_load_tp (rtx target)
|
||||||
|| !register_operand (target, Pmode))
|
|| !register_operand (target, Pmode))
|
||||||
target = gen_reg_rtx (Pmode);
|
target = gen_reg_rtx (Pmode);
|
||||||
|
|
||||||
@@ -78,32 +75,31 @@ index f5db5379543..f582e5a7543 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
||||||
index 73b09e20508..ad62b5080cc 100644
|
index 4fa1dfc7906..43a01fe3d56 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.h
|
--- a/gcc/config/aarch64/aarch64.h
|
||||||
+++ b/gcc/config/aarch64/aarch64.h
|
+++ b/gcc/config/aarch64/aarch64.h
|
||||||
@@ -1154,6 +1154,10 @@ typedef struct
|
@@ -1377,6 +1377,10 @@ typedef struct
|
||||||
/* Check TLS Descriptors mechanism is selected. */
|
/* Check TLS Descriptors mechanism is selected. */
|
||||||
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
||||||
|
|
||||||
+/* Check selected thread pointer access sequence to use. */
|
+/* Check selected thread pointer access sequence to use. */
|
||||||
+#define TARGET_HARD_TP (target_thread_pointer == TP_HARD)
|
+#define TARGET_HARD_TP (aarch64_tpidr_reg != AARCH64_TP_SOFT)
|
||||||
+#define TARGET_SOFT_TP (target_thread_pointer == TP_SOFT)
|
+#define TARGET_SOFT_TP (aarch64_tpidr_reg == AARCH64_TP_SOFT)
|
||||||
+
|
+
|
||||||
extern enum aarch64_code_model aarch64_cmodel;
|
extern enum aarch64_code_model aarch64_cmodel;
|
||||||
|
|
||||||
/* When using the tiny addressing model conditional and unconditional branches
|
/* When using the tiny addressing model conditional and unconditional branches
|
||||||
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
||||||
index 36d0bb3f718..cfa2f7efc7f 100644
|
index dbde066f747..3e3198bf52f 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.md
|
--- a/gcc/config/aarch64/aarch64.md
|
||||||
+++ b/gcc/config/aarch64/aarch64.md
|
+++ b/gcc/config/aarch64/aarch64.md
|
||||||
@@ -7068,11 +7068,22 @@
|
@@ -7436,11 +7436,22 @@
|
||||||
(define_insn "aarch64_load_tp_hard"
|
(define_insn "aarch64_load_tp_hard"
|
||||||
[(set (match_operand:DI 0 "register_operand" "=r")
|
[(set (match_operand:DI 0 "register_operand" "=r")
|
||||||
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
||||||
- ""
|
- ""
|
||||||
- "mrs\\t%0, tpidr_el0"
|
|
||||||
+ "TARGET_HARD_TP"
|
+ "TARGET_HARD_TP"
|
||||||
+ "mrs\\t%0, tpidr_el0\\t// aarch64_load_tp_hard"
|
"* return aarch64_output_load_tp (operands[0]);"
|
||||||
[(set_attr "type" "mrs")]
|
[(set_attr "type" "mrs")]
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -122,32 +118,20 @@ index 36d0bb3f718..cfa2f7efc7f 100644
|
|||||||
;; instructions in the TLS stubs, in order to enable linker relaxation.
|
;; instructions in the TLS stubs, in order to enable linker relaxation.
|
||||||
;; Therefore we treat the stubs as an atomic sequence.
|
;; Therefore we treat the stubs as an atomic sequence.
|
||||||
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
||||||
index 1d7967db9c0..17870f18b8b 100644
|
index 6356c419399..a6907ed0a0b 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.opt
|
--- a/gcc/config/aarch64/aarch64.opt
|
||||||
+++ b/gcc/config/aarch64/aarch64.opt
|
+++ b/gcc/config/aarch64/aarch64.opt
|
||||||
@@ -128,6 +128,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
|
@@ -128,6 +128,9 @@ Enum(tp_reg) String(tpidr_el3) Value(AARCH64_TPIDR_EL3)
|
||||||
EnumValue
|
EnumValue
|
||||||
Enum(aarch64_tls_size) String(48) Value(48)
|
Enum(tp_reg) String(tpidrro_el0) Value(AARCH64_TPIDRRO_EL0)
|
||||||
|
|
||||||
+mtp=
|
|
||||||
+Target RejectNegative Joined Enum(aarch64_tp_type) Var(target_thread_pointer) Init(TP_HARD)
|
|
||||||
+Specify how to access the thread pointer.
|
|
||||||
+
|
|
||||||
+Enum
|
|
||||||
+Name(aarch64_tp_type) Type(enum aarch64_tp_type)
|
|
||||||
+Valid arguments to -mtp=:
|
|
||||||
+
|
|
||||||
+EnumValue
|
+EnumValue
|
||||||
+Enum(aarch64_tp_type) String(hard) Value(TP_HARD)
|
+Enum(tp_reg) String(soft) Value(AARCH64_TP_SOFT)
|
||||||
+
|
+
|
||||||
+EnumValue
|
mtp=
|
||||||
+Enum(aarch64_tp_type) String(soft) Value(TP_SOFT)
|
Target RejectNegative Joined Enum(tp_reg) Var(aarch64_tpidr_reg) Init(AARCH64_TPIDR_EL0) Save
|
||||||
+
|
Specify the thread pointer register.
|
||||||
+
|
@@ -329,7 +332,7 @@ TargetVariable
|
||||||
march=
|
|
||||||
Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
|
|
||||||
Use features of architecture ARCH.
|
|
||||||
@@ -266,7 +281,7 @@ TargetVariable
|
|
||||||
long aarch64_stack_protector_guard_offset = 0
|
long aarch64_stack_protector_guard_offset = 0
|
||||||
|
|
||||||
moutline-atomics
|
moutline-atomics
|
||||||
@@ -155,13 +139,13 @@ index 1d7967db9c0..17870f18b8b 100644
|
|||||||
+Target Var(aarch64_flag_outline_atomics) Save
|
+Target Var(aarch64_flag_outline_atomics) Save
|
||||||
Generate local calls to out-of-line atomic operations.
|
Generate local calls to out-of-line atomic operations.
|
||||||
|
|
||||||
-param=aarch64-sve-compare-costs=
|
-param=aarch64-vect-compare-costs=
|
||||||
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
||||||
index a9a244ab6d6..a29f2772d63 100644
|
index 78713558e7d..76c0914d8ce 100644
|
||||||
--- a/gcc/config/aarch64/t-aarch64
|
--- a/gcc/config/aarch64/t-aarch64
|
||||||
+++ b/gcc/config/aarch64/t-aarch64
|
+++ b/gcc/config/aarch64/t-aarch64
|
||||||
@@ -177,8 +177,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
|
@@ -208,8 +208,10 @@ aarch64-ldp-fusion.o: $(srcdir)/config/aarch64/aarch64-ldp-fusion.cc \
|
||||||
$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
|
$(srcdir)/config/aarch64/aarch64-ldp-fusion.cc
|
||||||
|
|
||||||
comma=,
|
comma=,
|
||||||
-MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
|
-MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
|
||||||
@@ -246,8 +230,15 @@ index 00000000000..9acbbf9d27c
|
|||||||
+Driver
|
+Driver
|
||||||
+
|
+
|
||||||
+; This comment is to ensure we retain the blank line above.
|
+; This comment is to ensure we retain the blank line above.
|
||||||
|
diff --git a/gcc/config/devkitpro.opt.urls b/gcc/config/devkitpro.opt.urls
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..ab7b466aa71
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/gcc/config/devkitpro.opt.urls
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+; Autogenerated by regenerate-opt-urls.py from gcc/config/devkitpro.opt and generated HTML
|
||||||
diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
|
diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
|
||||||
index acff6138d63..8dc91b75f93 100644
|
index 42563982e42..923dc198a7e 100644
|
||||||
--- a/gcc/config/i386/host-mingw32.cc
|
--- a/gcc/config/i386/host-mingw32.cc
|
||||||
+++ b/gcc/config/i386/host-mingw32.cc
|
+++ b/gcc/config/i386/host-mingw32.cc
|
||||||
@@ -93,7 +93,10 @@ mingw32_gt_pch_get_address (size_t size, int)
|
@@ -93,7 +93,10 @@ mingw32_gt_pch_get_address (size_t size, int)
|
||||||
@@ -263,10 +254,10 @@ index acff6138d63..8dc91b75f93 100644
|
|||||||
MEM_RESERVE | MEM_TOP_DOWN,
|
MEM_RESERVE | MEM_TOP_DOWN,
|
||||||
PAGE_NOACCESS);
|
PAGE_NOACCESS);
|
||||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
||||||
index 16bb07f2cdc..22a181a3a1c 100644
|
index 728332b8153..47fc03eb8c8 100644
|
||||||
--- a/gcc/gcc.cc
|
--- a/gcc/gcc.cc
|
||||||
+++ b/gcc/gcc.cc
|
+++ b/gcc/gcc.cc
|
||||||
@@ -868,6 +868,11 @@ proper position among the other output files. */
|
@@ -881,6 +881,11 @@ proper position among the other output files. */
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -278,7 +269,7 @@ index 16bb07f2cdc..22a181a3a1c 100644
|
|||||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||||
#ifndef STARTFILE_SPEC
|
#ifndef STARTFILE_SPEC
|
||||||
#define STARTFILE_SPEC \
|
#define STARTFILE_SPEC \
|
||||||
@@ -1191,6 +1196,7 @@ static const char *link_spec = LINK_SPEC;
|
@@ -1208,6 +1213,7 @@ static const char *link_spec = LINK_SPEC;
|
||||||
static const char *lib_spec = LIB_SPEC;
|
static const char *lib_spec = LIB_SPEC;
|
||||||
static const char *link_gomp_spec = "";
|
static const char *link_gomp_spec = "";
|
||||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||||
@@ -286,7 +277,7 @@ index 16bb07f2cdc..22a181a3a1c 100644
|
|||||||
static const char *endfile_spec = ENDFILE_SPEC;
|
static const char *endfile_spec = ENDFILE_SPEC;
|
||||||
static const char *startfile_spec = STARTFILE_SPEC;
|
static const char *startfile_spec = STARTFILE_SPEC;
|
||||||
static const char *linker_name_spec = LINKER_NAME;
|
static const char *linker_name_spec = LINKER_NAME;
|
||||||
@@ -1701,6 +1707,7 @@ static struct spec_list static_specs[] =
|
@@ -1720,6 +1726,7 @@ static struct spec_list static_specs[] =
|
||||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||||
@@ -294,8 +285,21 @@ index 16bb07f2cdc..22a181a3a1c 100644
|
|||||||
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
||||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||||
INIT_STATIC_SPEC ("version", &compiler_version),
|
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||||
|
diff --git a/libcc1/configure b/libcc1/configure
|
||||||
|
index ea689a353c8..98f9d9b21b7 100755
|
||||||
|
--- a/libcc1/configure
|
||||||
|
+++ b/libcc1/configure
|
||||||
|
@@ -5119,7 +5119,7 @@ else
|
||||||
|
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
||||||
|
# nm: unknown option "B" ignored
|
||||||
|
case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
|
||||||
|
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
|
||||||
|
+ $tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
*)
|
||||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||||
index 93ff5b81dc5..20c0fe89a28 100644
|
index 38d3859a73c..f97358d9787 100644
|
||||||
--- a/libgcc/crtstuff.c
|
--- a/libgcc/crtstuff.c
|
||||||
+++ b/libgcc/crtstuff.c
|
+++ b/libgcc/crtstuff.c
|
||||||
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
||||||
@@ -308,7 +312,7 @@ index 93ff5b81dc5..20c0fe89a28 100644
|
|||||||
in every shared-object; in a main program its value is zero. The
|
in every shared-object; in a main program its value is zero. The
|
||||||
object should in any case be protected. This means the instance
|
object should in any case be protected. This means the instance
|
||||||
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
||||||
index 1989c0c86ed..f1c49b2d4b1 100644
|
index 33c2d8ff630..2a0a9c1e87e 100644
|
||||||
--- a/libgcc/gthr.h
|
--- a/libgcc/gthr.h
|
||||||
+++ b/libgcc/gthr.h
|
+++ b/libgcc/gthr.h
|
||||||
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
@@ -321,10 +325,10 @@ index 1989c0c86ed..f1c49b2d4b1 100644
|
|||||||
#define GTHREAD_USE_WEAK 0
|
#define GTHREAD_USE_WEAK 0
|
||||||
#endif
|
#endif
|
||||||
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
||||||
index a880e8ee227..c58249f986c 100644
|
index 422a0f4bd0a..ee09ada9170 100644
|
||||||
--- a/libstdc++-v3/include/Makefile.am
|
--- a/libstdc++-v3/include/Makefile.am
|
||||||
+++ b/libstdc++-v3/include/Makefile.am
|
+++ b/libstdc++-v3/include/Makefile.am
|
||||||
@@ -1417,6 +1417,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
@@ -1429,6 +1429,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||||
@@ -333,10 +337,10 @@ index a880e8ee227..c58249f986c 100644
|
|||||||
< $< > $@
|
< $< > $@
|
||||||
|
|
||||||
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
||||||
index 0ff875b280b..37820c57a0a 100644
|
index 9fd4ab4848c..beea48941a3 100644
|
||||||
--- a/libstdc++-v3/include/Makefile.in
|
--- a/libstdc++-v3/include/Makefile.in
|
||||||
+++ b/libstdc++-v3/include/Makefile.in
|
+++ b/libstdc++-v3/include/Makefile.in
|
||||||
@@ -1891,6 +1891,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
@@ -1903,6 +1903,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||||
@@ -344,3 +348,16 @@ index 0ff875b280b..37820c57a0a 100644
|
|||||||
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
||||||
< $< > $@
|
< $< > $@
|
||||||
|
|
||||||
|
diff --git a/lto-plugin/configure b/lto-plugin/configure
|
||||||
|
index 28f5dd79cd7..a79f318a4d6 100755
|
||||||
|
--- a/lto-plugin/configure
|
||||||
|
+++ b/lto-plugin/configure
|
||||||
|
@@ -6469,7 +6469,7 @@ else
|
||||||
|
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
||||||
|
# nm: unknown option "B" ignored
|
||||||
|
case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
|
||||||
|
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
|
||||||
|
+ $tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
*)
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -62,7 +62,7 @@ then
|
|||||||
--enable-lto \
|
--enable-lto \
|
||||||
--disable-tm-clone-registry \
|
--disable-tm-clone-registry \
|
||||||
--disable-__cxa_atexit \
|
--disable-__cxa_atexit \
|
||||||
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 23" \
|
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 26" \
|
||||||
$CROSS_PARAMS \
|
$CROSS_PARAMS \
|
||||||
$CROSS_GCC_PARAMS \
|
$CROSS_GCC_PARAMS \
|
||||||
$EXTRA_GCC_PARAMS \
|
$EXTRA_GCC_PARAMS \
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||||
index 6fd1594480a..92b82426f50 100644
|
index 95c91ee02be..19f003c7952 100644
|
||||||
--- a/gcc/config.gcc
|
--- a/gcc/config.gcc
|
||||||
+++ b/gcc/config.gcc
|
+++ b/gcc/config.gcc
|
||||||
@@ -1412,6 +1412,11 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems* | arm*-*-fuchsia*)
|
@@ -1482,6 +1482,11 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems* | arm*-*-fuchsia*)
|
||||||
tm_file="$tm_file newlib-stdint.h"
|
tm_file="$tm_file newlib-stdint.h"
|
||||||
tmake_file="${tmake_file} arm/t-bpabi"
|
tmake_file="${tmake_file} arm/t-bpabi"
|
||||||
use_gcc_stdint=wrap
|
use_gcc_stdint=wrap
|
||||||
@@ -15,7 +15,7 @@ index 6fd1594480a..92b82426f50 100644
|
|||||||
arm*-*-fuchsia*)
|
arm*-*-fuchsia*)
|
||||||
tm_file="${tm_file} fuchsia.h arm/fuchsia-elf.h glibc-stdint.h"
|
tm_file="${tm_file} fuchsia.h arm/fuchsia-elf.h glibc-stdint.h"
|
||||||
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
|
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
|
||||||
index f1fa3fa174c..2bb894b5b2d 100644
|
index 451b15fe9f9..c9efaf21c8c 100644
|
||||||
--- a/gcc/config/arm/arm-cpus.in
|
--- a/gcc/config/arm/arm-cpus.in
|
||||||
+++ b/gcc/config/arm/arm-cpus.in
|
+++ b/gcc/config/arm/arm-cpus.in
|
||||||
@@ -416,7 +416,7 @@ begin arch armv6k
|
@@ -416,7 +416,7 @@ begin arch armv6k
|
||||||
@@ -28,7 +28,7 @@ index f1fa3fa174c..2bb894b5b2d 100644
|
|||||||
optalias vfpv2 fp
|
optalias vfpv2 fp
|
||||||
option nofp remove ALL_FP
|
option nofp remove ALL_FP
|
||||||
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
|
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
|
||||||
index f7fc1460d1c..055f9d62385 100644
|
index aa64e50edeb..99cc8199ec5 100644
|
||||||
--- a/gcc/config/arm/t-arm-elf
|
--- a/gcc/config/arm/t-arm-elf
|
||||||
+++ b/gcc/config/arm/t-arm-elf
|
+++ b/gcc/config/arm/t-arm-elf
|
||||||
@@ -16,120 +16,22 @@
|
@@ -16,120 +16,22 @@
|
||||||
@@ -165,7 +165,7 @@ index f7fc1460d1c..055f9d62385 100644
|
|||||||
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
|
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
|
||||||
+MULTILIB_REUSE = mthumb/march.armv6s-m/mfloat-abi.soft=mthumb/march.armv6s-m
|
+MULTILIB_REUSE = mthumb/march.armv6s-m/mfloat-abi.soft=mthumb/march.armv6s-m
|
||||||
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
|
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
|
||||||
index 397ac3f68b9..b9a388f19be 100644
|
index 6b313042f20..7b39702224a 100644
|
||||||
--- a/gcc/config/arm/unknown-elf.h
|
--- a/gcc/config/arm/unknown-elf.h
|
||||||
+++ b/gcc/config/arm/unknown-elf.h
|
+++ b/gcc/config/arm/unknown-elf.h
|
||||||
@@ -29,7 +29,7 @@
|
@@ -29,7 +29,7 @@
|
||||||
@@ -252,11 +252,18 @@ index 00000000000..9acbbf9d27c
|
|||||||
+Driver
|
+Driver
|
||||||
+
|
+
|
||||||
+; This comment is to ensure we retain the blank line above.
|
+; This comment is to ensure we retain the blank line above.
|
||||||
|
diff --git a/gcc/config/devkitpro.opt.urls b/gcc/config/devkitpro.opt.urls
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..ab7b466aa71
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/gcc/config/devkitpro.opt.urls
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+; Autogenerated by regenerate-opt-urls.py from gcc/config/devkitpro.opt and generated HTML
|
||||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
||||||
index 16bb07f2cdc..22a181a3a1c 100644
|
index 728332b8153..47fc03eb8c8 100644
|
||||||
--- a/gcc/gcc.cc
|
--- a/gcc/gcc.cc
|
||||||
+++ b/gcc/gcc.cc
|
+++ b/gcc/gcc.cc
|
||||||
@@ -868,6 +868,11 @@ proper position among the other output files. */
|
@@ -881,6 +881,11 @@ proper position among the other output files. */
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -268,7 +275,7 @@ index 16bb07f2cdc..22a181a3a1c 100644
|
|||||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||||
#ifndef STARTFILE_SPEC
|
#ifndef STARTFILE_SPEC
|
||||||
#define STARTFILE_SPEC \
|
#define STARTFILE_SPEC \
|
||||||
@@ -1191,6 +1196,7 @@ static const char *link_spec = LINK_SPEC;
|
@@ -1208,6 +1213,7 @@ static const char *link_spec = LINK_SPEC;
|
||||||
static const char *lib_spec = LIB_SPEC;
|
static const char *lib_spec = LIB_SPEC;
|
||||||
static const char *link_gomp_spec = "";
|
static const char *link_gomp_spec = "";
|
||||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||||
@@ -276,7 +283,7 @@ index 16bb07f2cdc..22a181a3a1c 100644
|
|||||||
static const char *endfile_spec = ENDFILE_SPEC;
|
static const char *endfile_spec = ENDFILE_SPEC;
|
||||||
static const char *startfile_spec = STARTFILE_SPEC;
|
static const char *startfile_spec = STARTFILE_SPEC;
|
||||||
static const char *linker_name_spec = LINKER_NAME;
|
static const char *linker_name_spec = LINKER_NAME;
|
||||||
@@ -1701,6 +1707,7 @@ static struct spec_list static_specs[] =
|
@@ -1720,6 +1726,7 @@ static struct spec_list static_specs[] =
|
||||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||||
@@ -284,6 +291,19 @@ index 16bb07f2cdc..22a181a3a1c 100644
|
|||||||
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
||||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||||
INIT_STATIC_SPEC ("version", &compiler_version),
|
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||||
|
diff --git a/libcc1/configure b/libcc1/configure
|
||||||
|
index ea689a353c8..98f9d9b21b7 100755
|
||||||
|
--- a/libcc1/configure
|
||||||
|
+++ b/libcc1/configure
|
||||||
|
@@ -5119,7 +5119,7 @@ else
|
||||||
|
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
||||||
|
# nm: unknown option "B" ignored
|
||||||
|
case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
|
||||||
|
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
|
||||||
|
+ $tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
*)
|
||||||
diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
|
diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
|
||||||
index dddddc7c444..c2502597953 100644
|
index dddddc7c444..c2502597953 100644
|
||||||
--- a/libgcc/config/arm/t-bpabi
|
--- a/libgcc/config/arm/t-bpabi
|
||||||
@@ -295,7 +315,7 @@ index dddddc7c444..c2502597953 100644
|
|||||||
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
|
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
|
||||||
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
|
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
|
||||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||||
index 93ff5b81dc5..20c0fe89a28 100644
|
index 38d3859a73c..f97358d9787 100644
|
||||||
--- a/libgcc/crtstuff.c
|
--- a/libgcc/crtstuff.c
|
||||||
+++ b/libgcc/crtstuff.c
|
+++ b/libgcc/crtstuff.c
|
||||||
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
||||||
@@ -308,7 +328,7 @@ index 93ff5b81dc5..20c0fe89a28 100644
|
|||||||
in every shared-object; in a main program its value is zero. The
|
in every shared-object; in a main program its value is zero. The
|
||||||
object should in any case be protected. This means the instance
|
object should in any case be protected. This means the instance
|
||||||
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
||||||
index 1989c0c86ed..dc3220cdf3c 100644
|
index 33c2d8ff630..e23c2a7990f 100644
|
||||||
--- a/libgcc/gthr.h
|
--- a/libgcc/gthr.h
|
||||||
+++ b/libgcc/gthr.h
|
+++ b/libgcc/gthr.h
|
||||||
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
@@ -320,11 +340,202 @@ index 1989c0c86ed..dc3220cdf3c 100644
|
|||||||
#undef GTHREAD_USE_WEAK
|
#undef GTHREAD_USE_WEAK
|
||||||
#define GTHREAD_USE_WEAK 0
|
#define GTHREAD_USE_WEAK 0
|
||||||
#endif
|
#endif
|
||||||
|
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
||||||
|
index 21abaeb0778..0ef23891978 100755
|
||||||
|
--- a/libstdc++-v3/configure
|
||||||
|
+++ b/libstdc++-v3/configure
|
||||||
|
@@ -893,6 +893,7 @@ infodir
|
||||||
|
docdir
|
||||||
|
oldincludedir
|
||||||
|
includedir
|
||||||
|
+runstatedir
|
||||||
|
localstatedir
|
||||||
|
sharedstatedir
|
||||||
|
sysconfdir
|
||||||
|
@@ -1027,6 +1028,7 @@ datadir='${datarootdir}'
|
||||||
|
sysconfdir='${prefix}/etc'
|
||||||
|
sharedstatedir='${prefix}/com'
|
||||||
|
localstatedir='${prefix}/var'
|
||||||
|
+runstatedir='${localstatedir}/run'
|
||||||
|
includedir='${prefix}/include'
|
||||||
|
oldincludedir='/usr/include'
|
||||||
|
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||||
|
@@ -1279,6 +1281,15 @@ do
|
||||||
|
| -silent | --silent | --silen | --sile | --sil)
|
||||||
|
silent=yes ;;
|
||||||
|
|
||||||
|
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||||
|
+ | --runstate | --runstat | --runsta | --runst | --runs \
|
||||||
|
+ | --run | --ru | --r)
|
||||||
|
+ ac_prev=runstatedir ;;
|
||||||
|
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||||
|
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||||
|
+ | --run=* | --ru=* | --r=*)
|
||||||
|
+ runstatedir=$ac_optarg ;;
|
||||||
|
+
|
||||||
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||||
|
ac_prev=sbindir ;;
|
||||||
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||||
|
@@ -1416,7 +1427,7 @@ fi
|
||||||
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||||
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||||
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||||
|
- libdir localedir mandir
|
||||||
|
+ libdir localedir mandir runstatedir
|
||||||
|
do
|
||||||
|
eval ac_val=\$$ac_var
|
||||||
|
# Remove trailing slashes.
|
||||||
|
@@ -1569,6 +1580,7 @@ Fine tuning of the installation directories:
|
||||||
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||||
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||||
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||||
|
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||||
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||||
|
--includedir=DIR C header files [PREFIX/include]
|
||||||
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||||
|
@@ -5080,7 +5092,7 @@ else
|
||||||
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
|
since some C++ compilers masquerading as C compilers
|
||||||
|
incorrectly reject 9223372036854775807. */
|
||||||
|
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||||
|
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
|
? 1 : -1];
|
||||||
|
@@ -5126,7 +5138,7 @@ else
|
||||||
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
|
since some C++ compilers masquerading as C compilers
|
||||||
|
incorrectly reject 9223372036854775807. */
|
||||||
|
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||||
|
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
|
? 1 : -1];
|
||||||
|
@@ -5150,7 +5162,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
|
since some C++ compilers masquerading as C compilers
|
||||||
|
incorrectly reject 9223372036854775807. */
|
||||||
|
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||||
|
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
|
? 1 : -1];
|
||||||
|
@@ -5195,7 +5207,7 @@ else
|
||||||
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
|
since some C++ compilers masquerading as C compilers
|
||||||
|
incorrectly reject 9223372036854775807. */
|
||||||
|
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||||
|
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
|
? 1 : -1];
|
||||||
|
@@ -5219,7 +5231,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||||
|
since some C++ compilers masquerading as C compilers
|
||||||
|
incorrectly reject 9223372036854775807. */
|
||||||
|
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||||
|
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||||
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||||
|
&& LARGE_OFF_T % 2147483647 == 1)
|
||||||
|
? 1 : -1];
|
||||||
|
@@ -12280,7 +12292,7 @@ else
|
||||||
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||||
|
lt_status=$lt_dlunknown
|
||||||
|
cat > conftest.$ac_ext <<_LT_EOF
|
||||||
|
-#line 12283 "configure"
|
||||||
|
+#line 12295 "configure"
|
||||||
|
#include "confdefs.h"
|
||||||
|
|
||||||
|
#if HAVE_DLFCN_H
|
||||||
|
@@ -12386,7 +12398,7 @@ else
|
||||||
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||||
|
lt_status=$lt_dlunknown
|
||||||
|
cat > conftest.$ac_ext <<_LT_EOF
|
||||||
|
-#line 12389 "configure"
|
||||||
|
+#line 12401 "configure"
|
||||||
|
#include "confdefs.h"
|
||||||
|
|
||||||
|
#if HAVE_DLFCN_H
|
||||||
|
@@ -16182,7 +16194,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
|
||||||
|
# Fake what AC_TRY_COMPILE does.
|
||||||
|
|
||||||
|
cat > conftest.$ac_ext << EOF
|
||||||
|
-#line 16185 "configure"
|
||||||
|
+#line 16197 "configure"
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
typedef bool atomic_type;
|
||||||
|
@@ -16217,7 +16229,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
|
||||||
|
rm -f conftest*
|
||||||
|
|
||||||
|
cat > conftest.$ac_ext << EOF
|
||||||
|
-#line 16220 "configure"
|
||||||
|
+#line 16232 "configure"
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
typedef short atomic_type;
|
||||||
|
@@ -16252,7 +16264,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
|
||||||
|
rm -f conftest*
|
||||||
|
|
||||||
|
cat > conftest.$ac_ext << EOF
|
||||||
|
-#line 16255 "configure"
|
||||||
|
+#line 16267 "configure"
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
// NB: _Atomic_word not necessarily int.
|
||||||
|
@@ -16288,7 +16300,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
|
||||||
|
rm -f conftest*
|
||||||
|
|
||||||
|
cat > conftest.$ac_ext << EOF
|
||||||
|
-#line 16291 "configure"
|
||||||
|
+#line 16303 "configure"
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
typedef long long atomic_type;
|
||||||
|
@@ -16444,7 +16456,7 @@ $as_echo "mutex" >&6; }
|
||||||
|
# unnecessary for this test.
|
||||||
|
|
||||||
|
cat > conftest.$ac_ext << EOF
|
||||||
|
-#line 16447 "configure"
|
||||||
|
+#line 16459 "configure"
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
_Decimal32 d1;
|
||||||
|
@@ -16486,7 +16498,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||||
|
# unnecessary for this test.
|
||||||
|
|
||||||
|
cat > conftest.$ac_ext << EOF
|
||||||
|
-#line 16489 "configure"
|
||||||
|
+#line 16501 "configure"
|
||||||
|
template<typename T1, typename T2>
|
||||||
|
struct same
|
||||||
|
{ typedef T2 type; };
|
||||||
|
@@ -28575,6 +28587,8 @@ _ACEOF
|
||||||
|
|
||||||
|
$as_echo "#define HAVE_MEMALIGN 1" >>confdefs.h
|
||||||
|
|
||||||
|
+ $as_echo "#define HAVE_ALIGNED_ALLOC 1" >>confdefs.h
|
||||||
|
+
|
||||||
|
|
||||||
|
case "${target}" in
|
||||||
|
*-rtems*)
|
||||||
|
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
|
||||||
|
index 37396bd6ebb..1dadf658c08 100644
|
||||||
|
--- a/libstdc++-v3/configure.ac
|
||||||
|
+++ b/libstdc++-v3/configure.ac
|
||||||
|
@@ -378,6 +378,7 @@ dnl # rather than hardcoding that information.
|
||||||
|
|
||||||
|
AC_DEFINE(HAVE_ICONV)
|
||||||
|
AC_DEFINE(HAVE_MEMALIGN)
|
||||||
|
+ AC_DEFINE(HAVE_ALIGNED_ALLOC)
|
||||||
|
|
||||||
|
case "${target}" in
|
||||||
|
*-rtems*)
|
||||||
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
||||||
index a880e8ee227..2050e2e4ccf 100644
|
index 422a0f4bd0a..42185df9517 100644
|
||||||
--- a/libstdc++-v3/include/Makefile.am
|
--- a/libstdc++-v3/include/Makefile.am
|
||||||
+++ b/libstdc++-v3/include/Makefile.am
|
+++ b/libstdc++-v3/include/Makefile.am
|
||||||
@@ -1417,6 +1417,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
@@ -1429,6 +1429,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||||
@@ -333,7 +544,7 @@ index a880e8ee227..2050e2e4ccf 100644
|
|||||||
< $< > $@
|
< $< > $@
|
||||||
|
|
||||||
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
||||||
index 0ff875b280b..7d270fc3a83 100644
|
index 9fd4ab4848c..0b7ba4021ee 100644
|
||||||
--- a/libstdc++-v3/include/Makefile.in
|
--- a/libstdc++-v3/include/Makefile.in
|
||||||
+++ b/libstdc++-v3/include/Makefile.in
|
+++ b/libstdc++-v3/include/Makefile.in
|
||||||
@@ -336,6 +336,7 @@ prefix = @prefix@
|
@@ -336,6 +336,7 @@ prefix = @prefix@
|
||||||
@@ -344,7 +555,7 @@ index 0ff875b280b..7d270fc3a83 100644
|
|||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
sharedstatedir = @sharedstatedir@
|
sharedstatedir = @sharedstatedir@
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
@@ -1891,6 +1892,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
@@ -1903,6 +1904,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||||
@@ -352,3 +563,16 @@ index 0ff875b280b..7d270fc3a83 100644
|
|||||||
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
||||||
< $< > $@
|
< $< > $@
|
||||||
|
|
||||||
|
diff --git a/lto-plugin/configure b/lto-plugin/configure
|
||||||
|
index 28f5dd79cd7..a79f318a4d6 100755
|
||||||
|
--- a/lto-plugin/configure
|
||||||
|
+++ b/lto-plugin/configure
|
||||||
|
@@ -6469,7 +6469,7 @@ else
|
||||||
|
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
||||||
|
# nm: unknown option "B" ignored
|
||||||
|
case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
|
||||||
|
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
|
||||||
|
+ $tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
*)
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -10,7 +10,7 @@ cd $target/binutils
|
|||||||
|
|
||||||
if [ ! -f configured-binutils ]
|
if [ ! -f configured-binutils ]
|
||||||
then
|
then
|
||||||
CPPFLAGS="$cppflags $CPPFLAGS" LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
|
CPPFLAGS="$cppflags $CPPFLAGS" LDFLAGS="$ldflags $LDFLAGS" ../../binutils-$BINUTILS_VER/configure \
|
||||||
--prefix=$prefix --target=$target --disable-nls --disable-werror \
|
--prefix=$prefix --target=$target --disable-nls --disable-werror \
|
||||||
--enable-lto --enable-plugins \
|
--enable-lto --enable-plugins \
|
||||||
--enable-poison-system-directories \
|
--enable-poison-system-directories \
|
||||||
@@ -41,7 +41,7 @@ cd $target/gcc
|
|||||||
if [ ! -f configured-gcc ]
|
if [ ! -f configured-gcc ]
|
||||||
then
|
then
|
||||||
CPPFLAGS="$cppflags $CPPFLAGS" \
|
CPPFLAGS="$cppflags $CPPFLAGS" \
|
||||||
LDFLAGS="$ldflags" \
|
LDFLAGS="$ldflags $LDFLAGS" \
|
||||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||||
CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||||
LDFLAGS_FOR_TARGET="" \
|
LDFLAGS_FOR_TARGET="" \
|
||||||
@@ -66,7 +66,7 @@ then
|
|||||||
--with-system-zlib \
|
--with-system-zlib \
|
||||||
--disable-tm-clone-registry \
|
--disable-tm-clone-registry \
|
||||||
--disable-__cxa_atexit \
|
--disable-__cxa_atexit \
|
||||||
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 62" \
|
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 64" \
|
||||||
$CROSS_PARAMS \
|
$CROSS_PARAMS \
|
||||||
$CROSS_GCC_PARAMS \
|
$CROSS_GCC_PARAMS \
|
||||||
$EXTRA_GCC_PARAMS \
|
$EXTRA_GCC_PARAMS \
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -101,7 +101,7 @@ then
|
|||||||
--with-newlib \
|
--with-newlib \
|
||||||
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||||
--prefix=$prefix \
|
--prefix=$prefix \
|
||||||
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 44.2" \
|
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 45.2" \
|
||||||
$CROSS_PARAMS \
|
$CROSS_PARAMS \
|
||||||
$CROSS_GCC_PARAMS \
|
$CROSS_GCC_PARAMS \
|
||||||
$EXTRA_GCC_PARAMS \
|
$EXTRA_GCC_PARAMS \
|
||||||
|
|||||||
@@ -30,9 +30,9 @@ done
|
|||||||
|
|
||||||
case "$VERSION" in
|
case "$VERSION" in
|
||||||
"1" )
|
"1" )
|
||||||
GCC_VER=13.2.0
|
GCC_VER=14.1.0
|
||||||
BINUTILS_VER=2.41
|
BINUTILS_VER=2.42
|
||||||
NEWLIB_VER=4.3.0.20230120
|
NEWLIB_VER=4.4.0.20231231
|
||||||
basedir='dkarm-eabi'
|
basedir='dkarm-eabi'
|
||||||
package=devkitARM
|
package=devkitARM
|
||||||
target=arm-none-eabi
|
target=arm-none-eabi
|
||||||
@@ -40,18 +40,18 @@ case "$VERSION" in
|
|||||||
;;
|
;;
|
||||||
"2" )
|
"2" )
|
||||||
GCC_VER=13.2.0
|
GCC_VER=13.2.0
|
||||||
BINUTILS_VER=2.41
|
BINUTILS_VER=2.42
|
||||||
MN_BINUTILS_VER=2.24
|
MN_BINUTILS_VER=2.24
|
||||||
NEWLIB_VER=4.3.0.20230120
|
NEWLIB_VER=4.4.0.20231231
|
||||||
basedir='dkppc'
|
basedir='dkppc'
|
||||||
package=devkitPPC
|
package=devkitPPC
|
||||||
target=powerpc-eabi
|
target=powerpc-eabi
|
||||||
toolchain=DEVKITPPC
|
toolchain=DEVKITPPC
|
||||||
;;
|
;;
|
||||||
"3" )
|
"3" )
|
||||||
GCC_VER=13.2.0
|
GCC_VER=14.1.0
|
||||||
BINUTILS_VER=2.32
|
BINUTILS_VER=2.42
|
||||||
NEWLIB_VER=4.3.0.20230120
|
NEWLIB_VER=4.4.0.20231231
|
||||||
basedir='dka64'
|
basedir='dka64'
|
||||||
package=devkitA64
|
package=devkitA64
|
||||||
target=aarch64-none-elf
|
target=aarch64-none-elf
|
||||||
|
|||||||
Reference in New Issue
Block a user