mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-08-21 01:44:16 -05:00
Compare commits
5 Commits
devkitARM_
...
devkitPPC_
| Author | SHA1 | Date | |
|---|---|---|---|
|
f1428f47e8 | ||
|
|
1a3f555292 | ||
|
|
6ea8070246 | ||
|
|
57928f194f | ||
|
|
6628e681e2 |
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# devkitARM release 65
|
# devkitARM release 65
|
||||||
# devkitPPC release 45.2
|
# devkitPPC release 46
|
||||||
# devkitA64 release 27
|
# devkitA64 release 27
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -1,507 +0,0 @@
|
|||||||
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
|
|
||||||
index ec856764519..436098cbcc2 100644
|
|
||||||
--- a/bfd/elf-bfd.h
|
|
||||||
+++ b/bfd/elf-bfd.h
|
|
||||||
@@ -1966,6 +1966,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 d38e0afff2e..372e6615931 100644
|
|
||||||
--- a/bfd/elf.c
|
|
||||||
+++ b/bfd/elf.c
|
|
||||||
@@ -7321,6 +7321,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 4592bd6da27..dc27042cfe2 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. */
|
|
||||||
@@ -6916,11 +6922,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);
|
|
||||||
@@ -7060,6 +7068,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:
|
|
||||||
@@ -7083,7 +7095,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);
|
|
||||||
@@ -7178,7 +7190,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);
|
|
||||||
@@ -7227,7 +7239,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);
|
|
||||||
@@ -7553,6 +7565,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
|
|
||||||
@@ -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_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)
|
|
||||||
@@ -8790,6 +8820,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
|
|
||||||
@@ -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.
|
|
||||||
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))
|
|
||||||
@@ -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. */
|
|
||||||
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;
|
|
||||||
@@ -8861,6 +8900,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
|
||||||
htab->variant_pcs = 1;
|
|
||||||
|
|
||||||
}
|
|
||||||
+ }
|
|
||||||
else
|
|
||||||
{
|
|
||||||
h->plt.offset = (bfd_vma) - 1;
|
|
||||||
@@ -8873,9 +8913,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;
|
|
||||||
@@ -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.
|
|
||||||
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))
|
|
||||||
@@ -8901,7 +8938,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))
|
|
||||||
@@ -8937,7 +8974,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
|
|
||||||
@@ -9019,7 +9056,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;
|
|
||||||
|
|
||||||
@@ -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
|
|
||||||
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
|
|
||||||
@@ -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. */
|
|
||||||
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;
|
|
||||||
@@ -9607,8 +9647,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;
|
|
||||||
@@ -9643,7 +9692,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. */
|
|
||||||
@@ -9665,7 +9714,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;
|
|
||||||
@@ -10312,6 +10362,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 d47bdbf9937..b6f76d5c8d7 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 3f67f8b09d9..eb8e8e1596e 100644
|
|
||||||
--- a/ld/emultempl/elf.em
|
|
||||||
+++ b/ld/emultempl/elf.em
|
|
||||||
@@ -572,6 +572,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
|
|
||||||
@@ -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. */
|
|
||||||
+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. */
|
|
||||||
|
|
||||||
@@ -1206,8 +1209,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_bwrite (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,
|
|
||||||
@@ -1286,6 +1374,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 f82bd9234a7..96173dcd671 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,507 +0,0 @@
|
|||||||
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,363 +0,0 @@
|
|||||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
|
||||||
index 95c91ee02be..4711542eee5 100644
|
|
||||||
--- a/gcc/config.gcc
|
|
||||||
+++ b/gcc/config.gcc
|
|
||||||
@@ -1195,7 +1195,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
|
||||||
tmake_file="${tmake_file} aarch64/t-aarch64"
|
|
||||||
case $target in
|
|
||||||
aarch64-*-elf*)
|
|
||||||
+ default_use_cxa_atexit=yes
|
|
||||||
use_gcc_stdint=wrap
|
|
||||||
+ tm_file="${tm_file} devkitpro.h"
|
|
||||||
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
|
|
||||||
+ extra_options="${extra_options} devkitpro.opt"
|
|
||||||
+ case ${enable_threads} in
|
|
||||||
+ "" | yes | posix) thread_file='posix' ;;
|
|
||||||
+ esac
|
|
||||||
;;
|
|
||||||
aarch64-*-fuchsia*)
|
|
||||||
tm_file="${tm_file} fuchsia.h"
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
|
||||||
index 5396da9b2d6..87235d680ad 100644
|
|
||||||
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
|
||||||
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
|
||||||
@@ -22,6 +22,7 @@
|
|
||||||
#ifndef GCC_AARCH64_ELF_RAW_H
|
|
||||||
#define GCC_AARCH64_ELF_RAW_H
|
|
||||||
|
|
||||||
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
|
||||||
#define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
|
|
||||||
#define ENDFILE_SPEC \
|
|
||||||
" crtend%O%s crtn%O%s " \
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
|
||||||
index a05c0d3ded1..5551807e4c6 100644
|
|
||||||
--- a/gcc/config/aarch64/aarch64-opts.h
|
|
||||||
+++ b/gcc/config/aarch64/aarch64-opts.h
|
|
||||||
@@ -80,7 +80,8 @@ enum aarch64_tp_reg {
|
|
||||||
AARCH64_TPIDR_EL1 = 1,
|
|
||||||
AARCH64_TPIDR_EL2 = 2,
|
|
||||||
AARCH64_TPIDR_EL3 = 3,
|
|
||||||
- AARCH64_TPIDRRO_EL0 = 4
|
|
||||||
+ AARCH64_TPIDRRO_EL0 = 4,
|
|
||||||
+ AARCH64_TP_SOFT = 5
|
|
||||||
};
|
|
||||||
|
|
||||||
/* SVE vector register sizes. */
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
|
|
||||||
index 1beec94629d..90a9ec580f8 100644
|
|
||||||
--- a/gcc/config/aarch64/aarch64.cc
|
|
||||||
+++ b/gcc/config/aarch64/aarch64.cc
|
|
||||||
@@ -21060,8 +21060,24 @@ aarch64_load_tp (rtx target)
|
|
||||||
|| !register_operand (target, Pmode))
|
|
||||||
target = gen_reg_rtx (Pmode);
|
|
||||||
|
|
||||||
- /* Can return in any reg. */
|
|
||||||
- emit_insn (gen_aarch64_load_tp_hard (target));
|
|
||||||
+ if (TARGET_HARD_TP)
|
|
||||||
+ {
|
|
||||||
+ /* Can return in any reg. */
|
|
||||||
+ emit_insn (gen_aarch64_load_tp_hard (target));
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ /* Always returned in r0. Immediately copy the result into a pseudo,
|
|
||||||
+ otherwise other uses of r0 (e.g. setting up function arguments) may
|
|
||||||
+ clobber the value. */
|
|
||||||
+
|
|
||||||
+ rtx tmp;
|
|
||||||
+
|
|
||||||
+ emit_insn (gen_aarch64_load_tp_soft ());
|
|
||||||
+
|
|
||||||
+ tmp = gen_rtx_REG (DImode, R0_REGNUM);
|
|
||||||
+ emit_move_insn (target, tmp);
|
|
||||||
+ }
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
|
||||||
index 4fa1dfc7906..43a01fe3d56 100644
|
|
||||||
--- a/gcc/config/aarch64/aarch64.h
|
|
||||||
+++ b/gcc/config/aarch64/aarch64.h
|
|
||||||
@@ -1377,6 +1377,10 @@ typedef struct
|
|
||||||
/* Check TLS Descriptors mechanism is selected. */
|
|
||||||
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
|
||||||
|
|
||||||
+/* Check selected thread pointer access sequence to use. */
|
|
||||||
+#define TARGET_HARD_TP (aarch64_tpidr_reg != AARCH64_TP_SOFT)
|
|
||||||
+#define TARGET_SOFT_TP (aarch64_tpidr_reg == AARCH64_TP_SOFT)
|
|
||||||
+
|
|
||||||
extern enum aarch64_code_model aarch64_cmodel;
|
|
||||||
|
|
||||||
/* When using the tiny addressing model conditional and unconditional branches
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
|
||||||
index dbde066f747..3e3198bf52f 100644
|
|
||||||
--- a/gcc/config/aarch64/aarch64.md
|
|
||||||
+++ b/gcc/config/aarch64/aarch64.md
|
|
||||||
@@ -7436,11 +7436,22 @@
|
|
||||||
(define_insn "aarch64_load_tp_hard"
|
|
||||||
[(set (match_operand:DI 0 "register_operand" "=r")
|
|
||||||
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
|
||||||
- ""
|
|
||||||
+ "TARGET_HARD_TP"
|
|
||||||
"* return aarch64_output_load_tp (operands[0]);"
|
|
||||||
[(set_attr "type" "mrs")]
|
|
||||||
)
|
|
||||||
|
|
||||||
+(define_insn "aarch64_load_tp_soft"
|
|
||||||
+ [(set (reg:DI 0) (unspec:DI [(const_int 0)] UNSPEC_TLS))
|
|
||||||
+ (clobber (reg:DI IP0_REGNUM))
|
|
||||||
+ (clobber (reg:DI IP1_REGNUM))
|
|
||||||
+ (clobber (reg:DI LR_REGNUM))
|
|
||||||
+ (clobber (reg:CC CC_REGNUM))]
|
|
||||||
+ "TARGET_SOFT_TP"
|
|
||||||
+ "bl\\t__aarch64_read_tp\\t// aarch64_load_tp_soft"
|
|
||||||
+ [(set_attr "type" "branch")]
|
|
||||||
+)
|
|
||||||
+
|
|
||||||
;; The TLS ABI specifically requires that the compiler does not schedule
|
|
||||||
;; instructions in the TLS stubs, in order to enable linker relaxation.
|
|
||||||
;; Therefore we treat the stubs as an atomic sequence.
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
|
||||||
index 6356c419399..a6907ed0a0b 100644
|
|
||||||
--- a/gcc/config/aarch64/aarch64.opt
|
|
||||||
+++ b/gcc/config/aarch64/aarch64.opt
|
|
||||||
@@ -128,6 +128,9 @@ Enum(tp_reg) String(tpidr_el3) Value(AARCH64_TPIDR_EL3)
|
|
||||||
EnumValue
|
|
||||||
Enum(tp_reg) String(tpidrro_el0) Value(AARCH64_TPIDRRO_EL0)
|
|
||||||
|
|
||||||
+EnumValue
|
|
||||||
+Enum(tp_reg) String(soft) Value(AARCH64_TP_SOFT)
|
|
||||||
+
|
|
||||||
mtp=
|
|
||||||
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
|
|
||||||
long aarch64_stack_protector_guard_offset = 0
|
|
||||||
|
|
||||||
moutline-atomics
|
|
||||||
-Target Var(aarch64_flag_outline_atomics) Init(2) Save
|
|
||||||
+Target Var(aarch64_flag_outline_atomics) Save
|
|
||||||
Generate local calls to out-of-line atomic operations.
|
|
||||||
|
|
||||||
-param=aarch64-vect-compare-costs=
|
|
||||||
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
|
||||||
index 78713558e7d..76c0914d8ce 100644
|
|
||||||
--- a/gcc/config/aarch64/t-aarch64
|
|
||||||
+++ b/gcc/config/aarch64/t-aarch64
|
|
||||||
@@ -208,8 +208,10 @@ aarch64-ldp-fusion.o: $(srcdir)/config/aarch64/aarch64-ldp-fusion.cc \
|
|
||||||
$(srcdir)/config/aarch64/aarch64-ldp-fusion.cc
|
|
||||||
|
|
||||||
comma=,
|
|
||||||
-MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
|
|
||||||
-MULTILIB_DIRNAMES = $(subst $(comma), ,$(TM_MULTILIB_CONFIG))
|
|
||||||
+MULTILIB_OPTIONS = mcmodel=large fPIC
|
|
||||||
+MULTILIB_DIRNAMES = large pic
|
|
||||||
+MULTILIB_REQUIRED = mcmodel=large fPIC
|
|
||||||
+MULTILIB_MATCHES = fPIC=fpic fPIC=fpie fPIC=fPIE
|
|
||||||
|
|
||||||
insn-conditions.md: s-check-sve-md
|
|
||||||
s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
|
|
||||||
diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..a25459e4352
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/gcc/config/devkitpro.h
|
|
||||||
@@ -0,0 +1,32 @@
|
|
||||||
+/* Definitions for devkitPro toolchains.
|
|
||||||
+ Copyright (C) 2016-2018 Free Software Foundation, Inc.
|
|
||||||
+
|
|
||||||
+ This file is part of GCC.
|
|
||||||
+
|
|
||||||
+ GCC is free software; you can redistribute it and/or modify it
|
|
||||||
+ under the terms of the GNU General Public License as published
|
|
||||||
+ by the Free Software Foundation; either version 3, or (at your
|
|
||||||
+ option) any later version.
|
|
||||||
+
|
|
||||||
+ GCC is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
||||||
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
|
||||||
+ License for more details.
|
|
||||||
+
|
|
||||||
+ Under Section 7 of GPL version 3, you are granted additional
|
|
||||||
+ permissions described in the GCC Runtime Library Exception, version
|
|
||||||
+ 3.1, as published by the Free Software Foundation.
|
|
||||||
+
|
|
||||||
+ You should have received a copy of the GNU General Public License and
|
|
||||||
+ a copy of the GCC Runtime Library Exception along with this program;
|
|
||||||
+ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
||||||
+ <http://www.gnu.org/licenses/>. */
|
|
||||||
+
|
|
||||||
+#undef TARGET_OS_CPP_BUILTINS
|
|
||||||
+#define TARGET_OS_CPP_BUILTINS() \
|
|
||||||
+ do { \
|
|
||||||
+ builtin_define ("__DEVKITA64__"); \
|
|
||||||
+ builtin_define ("__DEVKITPRO__"); \
|
|
||||||
+ } while (0)
|
|
||||||
+
|
|
||||||
+
|
|
||||||
diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..9acbbf9d27c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/gcc/config/devkitpro.opt
|
|
||||||
@@ -0,0 +1,29 @@
|
|
||||||
+; Options for devkitPro toolchains.
|
|
||||||
+
|
|
||||||
+; Copyright (C) 2011-2018 Free Software Foundation, Inc.
|
|
||||||
+;
|
|
||||||
+; This file is part of GCC.
|
|
||||||
+;
|
|
||||||
+; GCC is free software; you can redistribute it and/or modify it under
|
|
||||||
+; the terms of the GNU General Public License as published by the Free
|
|
||||||
+; Software Foundation; either version 3, or (at your option) any later
|
|
||||||
+; version.
|
|
||||||
+;
|
|
||||||
+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
||||||
+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
+; for more details.
|
|
||||||
+;
|
|
||||||
+; You should have received a copy of the GNU General Public License
|
|
||||||
+; along with GCC; see the file COPYING3. If not see
|
|
||||||
+; <http://www.gnu.org/licenses/>.
|
|
||||||
+
|
|
||||||
+; See the GCC internals manual (options.texi) for a description of
|
|
||||||
+; this file's format.
|
|
||||||
+
|
|
||||||
+; Please try to keep this file in ASCII collating order.
|
|
||||||
+
|
|
||||||
+pthread
|
|
||||||
+Driver
|
|
||||||
+
|
|
||||||
+; 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
|
|
||||||
index 42563982e42..923dc198a7e 100644
|
|
||||||
--- a/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)
|
|
||||||
for NT system dlls is in 0x70000000 to 0x78000000 range.
|
|
||||||
If we allocate at bottom we need to reserve the address as early
|
|
||||||
as possible and at the same point in each invocation. */
|
|
||||||
-
|
|
||||||
+
|
|
||||||
+#if __MINGW64__
|
|
||||||
+ size = UINT64_C(64 * 1024 * 1024 * 1024);
|
|
||||||
+#endif
|
|
||||||
res = VirtualAlloc (NULL, size,
|
|
||||||
MEM_RESERVE | MEM_TOP_DOWN,
|
|
||||||
PAGE_NOACCESS);
|
|
||||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
|
||||||
index 728332b8153..47fc03eb8c8 100644
|
|
||||||
--- a/gcc/gcc.cc
|
|
||||||
+++ b/gcc/gcc.cc
|
|
||||||
@@ -881,6 +881,11 @@ proper position among the other output files. */
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifndef LIBGLOSS_SPEC
|
|
||||||
+# define LIBGLOSS_SPEC "-lsysbase"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+
|
|
||||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
|
||||||
#ifndef STARTFILE_SPEC
|
|
||||||
#define STARTFILE_SPEC \
|
|
||||||
@@ -1208,6 +1213,7 @@ static const char *link_spec = LINK_SPEC;
|
|
||||||
static const char *lib_spec = LIB_SPEC;
|
|
||||||
static const char *link_gomp_spec = "";
|
|
||||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
|
||||||
+static const char *libgloss_spec = LIBGLOSS_SPEC;
|
|
||||||
static const char *endfile_spec = ENDFILE_SPEC;
|
|
||||||
static const char *startfile_spec = STARTFILE_SPEC;
|
|
||||||
static const char *linker_name_spec = LINKER_NAME;
|
|
||||||
@@ -1720,6 +1726,7 @@ static struct spec_list static_specs[] =
|
|
||||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
|
||||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
|
||||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
|
||||||
+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec),
|
|
||||||
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
|
||||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
|
||||||
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
|
|
||||||
index 38d3859a73c..f97358d9787 100644
|
|
||||||
--- a/libgcc/crtstuff.c
|
|
||||||
+++ b/libgcc/crtstuff.c
|
|
||||||
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
|
||||||
|
|
||||||
#ifdef OBJECT_FORMAT_ELF
|
|
||||||
|
|
||||||
-#if DEFAULT_USE_CXA_ATEXIT
|
|
||||||
+#if 1 /* DEFAULT_USE_CXA_ATEXIT */
|
|
||||||
/* Declare the __dso_handle variable. It should have a unique value
|
|
||||||
in every shared-object; in a main program its value is zero. The
|
|
||||||
object should in any case be protected. This means the instance
|
|
||||||
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
|
||||||
index 33c2d8ff630..2a0a9c1e87e 100644
|
|
||||||
--- a/libgcc/gthr.h
|
|
||||||
+++ b/libgcc/gthr.h
|
|
||||||
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
||||||
/* The pe-coff weak support isn't fully compatible to ELF's weak.
|
|
||||||
For static libraries it might would work, but as we need to deal
|
|
||||||
with shared versions too, we disable it for mingw-targets. */
|
|
||||||
-#ifdef __MINGW32__
|
|
||||||
+#if defined(__MINGW32__) || defined(__DEVKITA64__)
|
|
||||||
#undef GTHREAD_USE_WEAK
|
|
||||||
#define GTHREAD_USE_WEAK 0
|
|
||||||
#endif
|
|
||||||
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
|
||||||
index 422a0f4bd0a..ee09ada9170 100644
|
|
||||||
--- a/libstdc++-v3/include/Makefile.am
|
|
||||||
+++ b/libstdc++-v3/include/Makefile.am
|
|
||||||
@@ -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/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
|
||||||
+ -e 's/_GLIBCXX___DEVKITA64_GLIBCXX___/__DEVKITA64__/g' \
|
|
||||||
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
|
||||||
< $< > $@
|
|
||||||
|
|
||||||
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
|
||||||
index 9fd4ab4848c..beea48941a3 100644
|
|
||||||
--- a/libstdc++-v3/include/Makefile.in
|
|
||||||
+++ b/libstdc++-v3/include/Makefile.in
|
|
||||||
@@ -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/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
|
||||||
+ -e 's/_GLIBCXX___DEVKITA64_GLIBCXX___/__DEVKITA64__/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
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
@@ -1,578 +0,0 @@
|
|||||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
|
||||||
index 95c91ee02be..19f003c7952 100644
|
|
||||||
--- a/gcc/config.gcc
|
|
||||||
+++ b/gcc/config.gcc
|
|
||||||
@@ -1482,6 +1482,11 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems* | arm*-*-fuchsia*)
|
|
||||||
tm_file="$tm_file newlib-stdint.h"
|
|
||||||
tmake_file="${tmake_file} arm/t-bpabi"
|
|
||||||
use_gcc_stdint=wrap
|
|
||||||
+ tm_file="${tm_file} devkitpro.h"
|
|
||||||
+ extra_options="${extra_options} devkitpro.opt"
|
|
||||||
+ case ${enable_threads} in
|
|
||||||
+ "" | yes | posix) thread_file='posix' ;;
|
|
||||||
+ esac
|
|
||||||
;;
|
|
||||||
arm*-*-fuchsia*)
|
|
||||||
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
|
|
||||||
index 451b15fe9f9..c9efaf21c8c 100644
|
|
||||||
--- a/gcc/config/arm/arm-cpus.in
|
|
||||||
+++ b/gcc/config/arm/arm-cpus.in
|
|
||||||
@@ -416,7 +416,7 @@ begin arch armv6k
|
|
||||||
tune for mpcore
|
|
||||||
tune flags CO_PROC
|
|
||||||
base 6K
|
|
||||||
- isa ARMv6k
|
|
||||||
+ isa ARMv6k VFPv2 FP_DBL
|
|
||||||
option fp add VFPv2 FP_DBL
|
|
||||||
optalias vfpv2 fp
|
|
||||||
option nofp remove ALL_FP
|
|
||||||
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
|
|
||||||
index aa64e50edeb..99cc8199ec5 100644
|
|
||||||
--- a/gcc/config/arm/t-arm-elf
|
|
||||||
+++ b/gcc/config/arm/t-arm-elf
|
|
||||||
@@ -16,120 +16,22 @@
|
|
||||||
# along with GCC; see the file COPYING3. If not see
|
|
||||||
# <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
-# Build a very basic set of libraries that should cater for most cases.
|
|
||||||
-
|
|
||||||
-# Single-precision floating-point is NOT supported; we don't build a
|
|
||||||
-# suitable library for that. Use the rm-profile config in that case.
|
|
||||||
-
|
|
||||||
-# PART 1 - Useful groups of options
|
|
||||||
-
|
|
||||||
-dp_fpus := vfp vfpv2 vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16 \
|
|
||||||
- neon neon-vfpv3 neon-fp16 vfpv4 neon-vfpv4 vfpv4-d16 \
|
|
||||||
- fpv5-d16 fp-armv8 neon-fp-armv8 crypto-neon-fp-armv8 \
|
|
||||||
- vfp3
|
|
||||||
-
|
|
||||||
-sp_fpus := vfpv3xd vfpv3xd-fp16 fpv4-sp-d16 fpv5-sp-d16
|
|
||||||
-
|
|
||||||
-v7a_fps := vfpv3 vfpv3-fp16 vfpv4 simd neon-fp16 neon-vfpv4
|
|
||||||
-v7ve_fps := vfpv3-d16 vfpv3 vfpv3-d16-fp16 vfpv3-fp16 vfpv4 neon \
|
|
||||||
- neon-fp16 simd
|
|
||||||
-
|
|
||||||
-# Not all these permutations exist for all architecture variants, but
|
|
||||||
-# it seems to work ok.
|
|
||||||
-v8_fps := simd fp16 crypto fp16+crypto dotprod fp16fml
|
|
||||||
-
|
|
||||||
-v9_fps := simd fp16 crypto fp16+crypto dotprod fp16fml
|
|
||||||
-
|
|
||||||
-# We don't do anything special with these. Pre-v4t probably doesn't work.
|
|
||||||
-all_early_nofp := armv4 armv4t armv5t
|
|
||||||
-
|
|
||||||
-all_early_arch := armv5tej armv6 armv6j armv6k armv6z armv6kz \
|
|
||||||
- armv6zk armv6t2 iwmmxt iwmmxt2
|
|
||||||
-
|
|
||||||
-all_v7_a_r := armv7-a armv7ve armv7-r
|
|
||||||
-
|
|
||||||
-all_v8_archs := armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a \
|
|
||||||
- armv8.5-a armv8.6-a
|
|
||||||
-
|
|
||||||
-all_v9_archs := armv9-a
|
|
||||||
-
|
|
||||||
-# No floating point variants, require thumb1 softfp
|
|
||||||
-all_nofp_t := armv6-m armv6s-m armv8-m.base
|
|
||||||
-
|
|
||||||
-all_nofp_t2 := armv7-m
|
|
||||||
-
|
|
||||||
-all_sp_only := armv7e-m armv8-m.main
|
|
||||||
-
|
|
||||||
-MULTILIB_OPTIONS =
|
|
||||||
-MULTILIB_DIRNAMES =
|
|
||||||
+MULTILIB_OPTIONS = mthumb mbig-endian march=armv6k march=armv6s-m mfloat-abi=hard mfloat-abi=soft
|
|
||||||
+MULTILIB_DIRNAMES = thumb be armv6k v6-m fpu nofp
|
|
||||||
MULTILIB_EXCEPTIONS =
|
|
||||||
MULTILIB_MATCHES =
|
|
||||||
-MULTILIB_REUSE =
|
|
||||||
-
|
|
||||||
-# PART 2 - multilib build rules
|
|
||||||
-
|
|
||||||
-MULTILIB_OPTIONS += marm/mthumb
|
|
||||||
-MULTILIB_DIRNAMES += arm thumb
|
|
||||||
-
|
|
||||||
-MULTILIB_OPTIONS += mfpu=auto
|
|
||||||
-MULTILIB_DIRNAMES += autofp
|
|
||||||
-
|
|
||||||
-MULTILIB_OPTIONS += march=armv5te+fp/march=armv7+fp
|
|
||||||
-MULTILIB_DIRNAMES += v5te v7
|
|
||||||
-
|
|
||||||
-MULTILIB_OPTIONS += mfloat-abi=hard
|
|
||||||
-MULTILIB_DIRNAMES += fpu
|
|
||||||
-
|
|
||||||
-# Build a total of 4 library variants (base options plus the following):
|
|
||||||
-MULTILIB_REQUIRED += mthumb
|
|
||||||
-MULTILIB_REQUIRED += marm/mfpu=auto/march=armv5te+fp/mfloat-abi=hard
|
|
||||||
-MULTILIB_REQUIRED += mthumb/mfpu=auto/march=armv7+fp/mfloat-abi=hard
|
|
||||||
-
|
|
||||||
-# PART 3 - Match rules
|
|
||||||
-
|
|
||||||
-# Map all supported FPUs onto mfpu=auto
|
|
||||||
-MULTILIB_MATCHES += $(foreach FPU, $(dp_fpus), \
|
|
||||||
- mfpu?auto=mfpu?$(FPU))
|
|
||||||
-
|
|
||||||
-MULTILIB_MATCHES += march?armv5te+fp=march?armv5te
|
|
||||||
-
|
|
||||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_early_arch), \
|
|
||||||
- march?armv5te+fp=march?$(ARCH) \
|
|
||||||
- march?armv5te+fp=march?$(ARCH)+fp)
|
|
||||||
-
|
|
||||||
-MULTILIB_MATCHES += march?armv7+fp=march?armv7
|
|
||||||
-
|
|
||||||
-MULTILIB_MATCHES += $(foreach FPARCH, $(v7a_fps), \
|
|
||||||
- march?armv7+fp=march?armv7-a+$(FPARCH))
|
|
||||||
-
|
|
||||||
-MULTILIB_MATCHES += $(foreach FPARCH, $(v7ve_fps), \
|
|
||||||
- march?armv7+fp=march?armv7ve+$(FPARCH))
|
|
||||||
-
|
|
||||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v7_a_r), \
|
|
||||||
- march?armv7+fp=march?$(ARCH) \
|
|
||||||
- march?armv7+fp=march?$(ARCH)+fp)
|
|
||||||
|
|
||||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v8_archs), \
|
|
||||||
- march?armv7+fp=march?$(ARCH) \
|
|
||||||
- $(foreach FPARCH, $(v8_fps), \
|
|
||||||
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
|
|
||||||
+MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard mthumb/march=armv6s-m/mfloat-abi=soft
|
|
||||||
|
|
||||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v9_archs), \
|
|
||||||
- march?armv7+fp=march?$(ARCH) \
|
|
||||||
- $(foreach FPARCH, $(v9_fps), \
|
|
||||||
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
|
|
||||||
|
|
||||||
-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \
|
|
||||||
- march?armv7+fp=march?$(ARCH)+fp.dp)
|
|
||||||
+MULTILIB_MATCHES += march?armv6k=mtune?mpcore
|
|
||||||
+MULTILIB_MATCHES += march?armv6k=mcpu?mpcore
|
|
||||||
|
|
||||||
-# PART 4 - Reuse rules
|
|
||||||
+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m0
|
|
||||||
+MULTILIB_MATCHES += march?armv6s-m=mtune?cortex-m0
|
|
||||||
+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m0plus
|
|
||||||
+MULTILIB_MATCHES += march?armv6s-m=mtune?cortex-m0plus
|
|
||||||
+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m1
|
|
||||||
+MULTILIB_MATCHES += march?armv6s-m=mtune?cortex-m1
|
|
||||||
|
|
||||||
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto
|
|
||||||
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp
|
|
||||||
-MULTILIB_REUSE += mthumb=mthumb/march.armv5te+fp
|
|
||||||
-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=marm/march.armv5te+fp/mfloat-abi.hard
|
|
||||||
-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=march.armv5te+fp/mfloat-abi.hard
|
|
||||||
-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=mfpu.auto/march.armv5te+fp/mfloat-abi.hard
|
|
||||||
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
|
|
||||||
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/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
|
|
||||||
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
|
|
||||||
index 6b313042f20..7b39702224a 100644
|
|
||||||
--- a/gcc/config/arm/unknown-elf.h
|
|
||||||
+++ b/gcc/config/arm/unknown-elf.h
|
|
||||||
@@ -29,7 +29,7 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Now we define the strings used to build the spec file. */
|
|
||||||
-#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
|
|
||||||
+#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s"
|
|
||||||
|
|
||||||
#undef STARTFILE_SPEC
|
|
||||||
#define STARTFILE_SPEC \
|
|
||||||
@@ -93,4 +93,5 @@
|
|
||||||
udivmoddi4, which will depend on the exception unwind routines,
|
|
||||||
which will depend on abort, which is defined in libc. */
|
|
||||||
#undef LINK_GCC_C_SEQUENCE_SPEC
|
|
||||||
-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %{!nolibc:%L} --end-group"
|
|
||||||
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
|
||||||
+
|
|
||||||
diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..180a9ea8553
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/gcc/config/devkitpro.h
|
|
||||||
@@ -0,0 +1,27 @@
|
|
||||||
+/* Definitions for devkitPro toolchains.
|
|
||||||
+ Copyright (C) 2016-2018 Free Software Foundation, Inc.
|
|
||||||
+ This file is part of GCC.
|
|
||||||
+ GCC is free software; you can redistribute it and/or modify it
|
|
||||||
+ under the terms of the GNU General Public License as published
|
|
||||||
+ by the Free Software Foundation; either version 3, or (at your
|
|
||||||
+ option) any later version.
|
|
||||||
+ GCC is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
||||||
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
|
||||||
+ License for more details.
|
|
||||||
+ Under Section 7 of GPL version 3, you are granted additional
|
|
||||||
+ permissions described in the GCC Runtime Library Exception, version
|
|
||||||
+ 3.1, as published by the Free Software Foundation.
|
|
||||||
+ You should have received a copy of the GNU General Public License and
|
|
||||||
+ a copy of the GCC Runtime Library Exception along with this program;
|
|
||||||
+ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
||||||
+ <http://www.gnu.org/licenses/>. */
|
|
||||||
+
|
|
||||||
+#undef TARGET_OS_CPP_BUILTINS
|
|
||||||
+#define TARGET_OS_CPP_BUILTINS() \
|
|
||||||
+ do { \
|
|
||||||
+ builtin_define ("__DEVKITPRO__"); \
|
|
||||||
+ builtin_define ("__DEVKITARM__"); \
|
|
||||||
+ } while (0)
|
|
||||||
+
|
|
||||||
+
|
|
||||||
diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000000..9acbbf9d27c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/gcc/config/devkitpro.opt
|
|
||||||
@@ -0,0 +1,29 @@
|
|
||||||
+; Options for devkitPro toolchains.
|
|
||||||
+
|
|
||||||
+; Copyright (C) 2011-2018 Free Software Foundation, Inc.
|
|
||||||
+;
|
|
||||||
+; This file is part of GCC.
|
|
||||||
+;
|
|
||||||
+; GCC is free software; you can redistribute it and/or modify it under
|
|
||||||
+; the terms of the GNU General Public License as published by the Free
|
|
||||||
+; Software Foundation; either version 3, or (at your option) any later
|
|
||||||
+; version.
|
|
||||||
+;
|
|
||||||
+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
||||||
+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
+; for more details.
|
|
||||||
+;
|
|
||||||
+; You should have received a copy of the GNU General Public License
|
|
||||||
+; along with GCC; see the file COPYING3. If not see
|
|
||||||
+; <http://www.gnu.org/licenses/>.
|
|
||||||
+
|
|
||||||
+; See the GCC internals manual (options.texi) for a description of
|
|
||||||
+; this file's format.
|
|
||||||
+
|
|
||||||
+; Please try to keep this file in ASCII collating order.
|
|
||||||
+
|
|
||||||
+pthread
|
|
||||||
+Driver
|
|
||||||
+
|
|
||||||
+; 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
|
|
||||||
index 728332b8153..47fc03eb8c8 100644
|
|
||||||
--- a/gcc/gcc.cc
|
|
||||||
+++ b/gcc/gcc.cc
|
|
||||||
@@ -881,6 +881,11 @@ proper position among the other output files. */
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifndef LIBGLOSS_SPEC
|
|
||||||
+# define LIBGLOSS_SPEC "-lsysbase"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+
|
|
||||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
|
||||||
#ifndef STARTFILE_SPEC
|
|
||||||
#define STARTFILE_SPEC \
|
|
||||||
@@ -1208,6 +1213,7 @@ static const char *link_spec = LINK_SPEC;
|
|
||||||
static const char *lib_spec = LIB_SPEC;
|
|
||||||
static const char *link_gomp_spec = "";
|
|
||||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
|
||||||
+static const char *libgloss_spec = LIBGLOSS_SPEC;
|
|
||||||
static const char *endfile_spec = ENDFILE_SPEC;
|
|
||||||
static const char *startfile_spec = STARTFILE_SPEC;
|
|
||||||
static const char *linker_name_spec = LINKER_NAME;
|
|
||||||
@@ -1720,6 +1726,7 @@ static struct spec_list static_specs[] =
|
|
||||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
|
||||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
|
||||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
|
||||||
+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec),
|
|
||||||
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
|
||||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
|
||||||
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
|
|
||||||
index dddddc7c444..c2502597953 100644
|
|
||||||
--- a/libgcc/config/arm/t-bpabi
|
|
||||||
+++ b/libgcc/config/arm/t-bpabi
|
|
||||||
@@ -17,4 +17,4 @@ SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver
|
|
||||||
# On ARM, specifying -fnon-call-exceptions will needlessly pull in
|
|
||||||
# the unwinder in simple programs which use 64-bit division. Omitting
|
|
||||||
# the option is safe.
|
|
||||||
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
|
|
||||||
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
|
|
||||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
|
||||||
index 38d3859a73c..f97358d9787 100644
|
|
||||||
--- a/libgcc/crtstuff.c
|
|
||||||
+++ b/libgcc/crtstuff.c
|
|
||||||
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
|
||||||
|
|
||||||
#ifdef OBJECT_FORMAT_ELF
|
|
||||||
|
|
||||||
-#if DEFAULT_USE_CXA_ATEXIT
|
|
||||||
+#if 1 /* DEFAULT_USE_CXA_ATEXIT */
|
|
||||||
/* Declare the __dso_handle variable. It should have a unique value
|
|
||||||
in every shared-object; in a main program its value is zero. The
|
|
||||||
object should in any case be protected. This means the instance
|
|
||||||
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
|
||||||
index 33c2d8ff630..e23c2a7990f 100644
|
|
||||||
--- a/libgcc/gthr.h
|
|
||||||
+++ b/libgcc/gthr.h
|
|
||||||
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
||||||
/* The pe-coff weak support isn't fully compatible to ELF's weak.
|
|
||||||
For static libraries it might would work, but as we need to deal
|
|
||||||
with shared versions too, we disable it for mingw-targets. */
|
|
||||||
-#ifdef __MINGW32__
|
|
||||||
+#ifdef __MINGW32__ || defined(__DEVKITARM__)
|
|
||||||
#undef GTHREAD_USE_WEAK
|
|
||||||
#define GTHREAD_USE_WEAK 0
|
|
||||||
#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
|
|
||||||
index 422a0f4bd0a..42185df9517 100644
|
|
||||||
--- a/libstdc++-v3/include/Makefile.am
|
|
||||||
+++ b/libstdc++-v3/include/Makefile.am
|
|
||||||
@@ -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/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
|
||||||
+ -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
|
|
||||||
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
|
||||||
< $< > $@
|
|
||||||
|
|
||||||
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
|
||||||
index 9fd4ab4848c..0b7ba4021ee 100644
|
|
||||||
--- a/libstdc++-v3/include/Makefile.in
|
|
||||||
+++ b/libstdc++-v3/include/Makefile.in
|
|
||||||
@@ -336,6 +336,7 @@ prefix = @prefix@
|
|
||||||
program_transform_name = @program_transform_name@
|
|
||||||
psdir = @psdir@
|
|
||||||
python_mod_dir = @python_mod_dir@
|
|
||||||
+runstatedir = @runstatedir@
|
|
||||||
sbindir = @sbindir@
|
|
||||||
sharedstatedir = @sharedstatedir@
|
|
||||||
srcdir = @srcdir@
|
|
||||||
@@ -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/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
|
||||||
+ -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/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
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
@@ -12,7 +12,7 @@ index da892988f5d..6b8efb9bbdb 100644
|
|||||||
.fixup ${RELOCATING-0} : { *(.fixup) }
|
.fixup ${RELOCATING-0} : { *(.fixup) }
|
||||||
.got1 ${RELOCATING-0} : { *(.got1) }
|
.got1 ${RELOCATING-0} : { *(.got1) }
|
||||||
diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
|
diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
|
||||||
index 37f1aeb780c..f8de8aacc44 100644
|
index e55bfe846cd..f160e290bce 100644
|
||||||
--- a/opcodes/ppc-opc.c
|
--- a/opcodes/ppc-opc.c
|
||||||
+++ b/opcodes/ppc-opc.c
|
+++ b/opcodes/ppc-opc.c
|
||||||
@@ -4988,7 +4988,7 @@ const unsigned int num_powerpc_operands = ARRAY_SIZE (powerpc_operands);
|
@@ -4988,7 +4988,7 @@ const unsigned int num_powerpc_operands = ARRAY_SIZE (powerpc_operands);
|
||||||
File diff suppressed because it is too large
Load Diff
1474
dkppc/patches/gcc-14.2.0.patch
Normal file
1474
dkppc/patches/gcc-14.2.0.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -7049,7 +7049,7 @@ index 000000000..2bada9736
|
|||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/fpathconf.c b/libgloss/libsysbase/fpathconf.c
|
diff --git a/libgloss/libsysbase/fpathconf.c b/libgloss/libsysbase/fpathconf.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..453f64870
|
index 000000000..9cba92a72
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/fpathconf.c
|
+++ b/libgloss/libsysbase/fpathconf.c
|
||||||
@@ -0,0 +1,30 @@
|
@@ -0,0 +1,30 @@
|
||||||
@@ -7069,7 +7069,7 @@ index 000000000..453f64870
|
|||||||
+ struct _reent *r = _REENT;
|
+ struct _reent *r = _REENT;
|
||||||
+
|
+
|
||||||
+ if ( NULL == handle ) {
|
+ if ( NULL == handle ) {
|
||||||
+ errno = EINVAL;
|
+ errno = EBADF;
|
||||||
+ return ret;
|
+ return ret;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
@@ -7085,10 +7085,10 @@ index 000000000..453f64870
|
|||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/fstat.c b/libgloss/libsysbase/fstat.c
|
diff --git a/libgloss/libsysbase/fstat.c b/libgloss/libsysbase/fstat.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..32267b828
|
index 000000000..94924d802
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/fstat.c
|
+++ b/libgloss/libsysbase/fstat.c
|
||||||
@@ -0,0 +1,32 @@
|
@@ -0,0 +1,35 @@
|
||||||
+#include "config.h"
|
+#include "config.h"
|
||||||
+#include <_ansi.h>
|
+#include <_ansi.h>
|
||||||
+#include <_syslist.h>
|
+#include <_syslist.h>
|
||||||
@@ -7108,7 +7108,10 @@ index 000000000..32267b828
|
|||||||
+ if(fileDesc!=-1) {
|
+ if(fileDesc!=-1) {
|
||||||
+ handle = __get_handle(fileDesc);
|
+ handle = __get_handle(fileDesc);
|
||||||
+
|
+
|
||||||
+ if ( NULL == handle ) return ret;
|
+ if ( NULL == handle ) {
|
||||||
|
+ errno = EBADF;
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ dev = handle->device;
|
+ dev = handle->device;
|
||||||
+
|
+
|
||||||
@@ -7123,7 +7126,7 @@ index 000000000..32267b828
|
|||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/fsync.c b/libgloss/libsysbase/fsync.c
|
diff --git a/libgloss/libsysbase/fsync.c b/libgloss/libsysbase/fsync.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..fb06cb6d1
|
index 000000000..e63e3762b
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/fsync.c
|
+++ b/libgloss/libsysbase/fsync.c
|
||||||
@@ -0,0 +1,34 @@
|
@@ -0,0 +1,34 @@
|
||||||
@@ -7147,7 +7150,7 @@ index 000000000..fb06cb6d1
|
|||||||
+ handle = __get_handle(fileDesc);
|
+ handle = __get_handle(fileDesc);
|
||||||
+
|
+
|
||||||
+ if ( NULL == handle ) {
|
+ if ( NULL == handle ) {
|
||||||
+ errno = EINVAL;
|
+ errno = EBADF;
|
||||||
+ return ret;
|
+ return ret;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
@@ -7163,7 +7166,7 @@ index 000000000..fb06cb6d1
|
|||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/ftruncate.c b/libgloss/libsysbase/ftruncate.c
|
diff --git a/libgloss/libsysbase/ftruncate.c b/libgloss/libsysbase/ftruncate.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..0cd7d0fc4
|
index 000000000..94b4a3761
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/ftruncate.c
|
+++ b/libgloss/libsysbase/ftruncate.c
|
||||||
@@ -0,0 +1,34 @@
|
@@ -0,0 +1,34 @@
|
||||||
@@ -7187,7 +7190,7 @@ index 000000000..0cd7d0fc4
|
|||||||
+ handle = __get_handle(fileDesc);
|
+ handle = __get_handle(fileDesc);
|
||||||
+
|
+
|
||||||
+ if ( NULL == handle ) {
|
+ if ( NULL == handle ) {
|
||||||
+ r->_errno = EINVAL;
|
+ r->_errno=EBADF;
|
||||||
+ return ret;
|
+ return ret;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
@@ -7732,10 +7735,10 @@ index 000000000..d7a988359
|
|||||||
+
|
+
|
||||||
diff --git a/libgloss/libsysbase/lseek.c b/libgloss/libsysbase/lseek.c
|
diff --git a/libgloss/libsysbase/lseek.c b/libgloss/libsysbase/lseek.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..39ef385b1
|
index 000000000..c5568e338
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/lseek.c
|
+++ b/libgloss/libsysbase/lseek.c
|
||||||
@@ -0,0 +1,35 @@
|
@@ -0,0 +1,38 @@
|
||||||
+#include "config.h"
|
+#include "config.h"
|
||||||
+#include <_ansi.h>
|
+#include <_ansi.h>
|
||||||
+#include <_syslist.h>
|
+#include <_syslist.h>
|
||||||
@@ -7757,7 +7760,10 @@ index 000000000..39ef385b1
|
|||||||
+
|
+
|
||||||
+ handle = __get_handle(fileDesc);
|
+ handle = __get_handle(fileDesc);
|
||||||
+
|
+
|
||||||
+ if ( NULL == handle ) return ret;
|
+ if ( NULL == handle ) {
|
||||||
|
+ r->_errno=EBADF;
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ dev = handle->device;
|
+ dev = handle->device;
|
||||||
+
|
+
|
||||||
@@ -7941,10 +7947,10 @@ index 000000000..a696c9ab9
|
|||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/read.c b/libgloss/libsysbase/read.c
|
diff --git a/libgloss/libsysbase/read.c b/libgloss/libsysbase/read.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..9c548d830
|
index 000000000..30505c7b6
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/read.c
|
+++ b/libgloss/libsysbase/read.c
|
||||||
@@ -0,0 +1,32 @@
|
@@ -0,0 +1,35 @@
|
||||||
+#include "config.h"
|
+#include "config.h"
|
||||||
+#include <_ansi.h>
|
+#include <_ansi.h>
|
||||||
+#include <_syslist.h>
|
+#include <_syslist.h>
|
||||||
@@ -7964,7 +7970,10 @@ index 000000000..9c548d830
|
|||||||
+ if(fileDesc!=-1) {
|
+ if(fileDesc!=-1) {
|
||||||
+ handle = __get_handle(fileDesc);
|
+ handle = __get_handle(fileDesc);
|
||||||
+
|
+
|
||||||
+ if ( NULL == handle ) return ret;
|
+ if ( NULL == handle ) {
|
||||||
|
+ r->_errno=EBADF;
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ dev = handle->device;
|
+ dev = handle->device;
|
||||||
+
|
+
|
||||||
@@ -8919,10 +8928,10 @@ index 000000000..2c2998250
|
|||||||
+#endif /* __WARNING_H__ */
|
+#endif /* __WARNING_H__ */
|
||||||
diff --git a/libgloss/libsysbase/write.c b/libgloss/libsysbase/write.c
|
diff --git a/libgloss/libsysbase/write.c b/libgloss/libsysbase/write.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..04198e854
|
index 000000000..baf0d6ae5
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/write.c
|
+++ b/libgloss/libsysbase/write.c
|
||||||
@@ -0,0 +1,31 @@
|
@@ -0,0 +1,34 @@
|
||||||
+#include "config.h"
|
+#include "config.h"
|
||||||
+#include <_ansi.h>
|
+#include <_ansi.h>
|
||||||
+#include <_syslist.h>
|
+#include <_syslist.h>
|
||||||
@@ -8942,7 +8951,10 @@ index 000000000..04198e854
|
|||||||
+ if(fileDesc!=-1) {
|
+ if(fileDesc!=-1) {
|
||||||
+ handle = __get_handle(fileDesc);
|
+ handle = __get_handle(fileDesc);
|
||||||
+
|
+
|
||||||
+ if ( NULL == handle ) return ret;
|
+ if ( NULL == handle ) {
|
||||||
|
+ r->_errno=EBADF;
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ dev = handle->device;
|
+ dev = handle->device;
|
||||||
+
|
+
|
||||||
@@ -9019,11 +9031,11 @@ index ef5038e68..32a1d5e0b 100644
|
|||||||
.stab 0 : { *(.stab) }
|
.stab 0 : { *(.stab) }
|
||||||
diff --git a/libgloss/rs6000/crtmain.c b/libgloss/rs6000/crtmain.c
|
diff --git a/libgloss/rs6000/crtmain.c b/libgloss/rs6000/crtmain.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..bd25d775d
|
index 000000000..7f8850624
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/rs6000/crtmain.c
|
+++ b/libgloss/rs6000/crtmain.c
|
||||||
@@ -0,0 +1,18 @@
|
@@ -0,0 +1,20 @@
|
||||||
+#include <unistd.h>
|
+#include <stdlib.h>
|
||||||
+
|
+
|
||||||
+struct __argv {
|
+struct __argv {
|
||||||
+ int argvMagic; //!< argv magic number, set to 0x5f617267 ('_arg') if valid
|
+ int argvMagic; //!< argv magic number, set to 0x5f617267 ('_arg') if valid
|
||||||
@@ -9037,10 +9049,28 @@ index 000000000..bd25d775d
|
|||||||
+void __init();
|
+void __init();
|
||||||
+void SYS_PreMain();
|
+void SYS_PreMain();
|
||||||
+
|
+
|
||||||
|
+int main(int argc, char **argv);
|
||||||
|
+
|
||||||
+void __crtmain() {
|
+void __crtmain() {
|
||||||
+ SYS_PreMain();
|
+ SYS_PreMain();
|
||||||
+ exit ( main(__system_argv->argc,__system_argv->argv) );
|
+ exit ( main(__system_argv->argc,__system_argv->argv) );
|
||||||
+}
|
+}
|
||||||
|
diff --git a/libgloss/rs6000/mbx-print.c b/libgloss/rs6000/mbx-print.c
|
||||||
|
index 64472ee68..5a16e1ab7 100644
|
||||||
|
--- a/libgloss/rs6000/mbx-print.c
|
||||||
|
+++ b/libgloss/rs6000/mbx-print.c
|
||||||
|
@@ -15,7 +15,10 @@
|
||||||
|
|
||||||
|
/*
|
||||||
|
* print -- do a raw print of a string
|
||||||
|
- */
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <unistd.h>
|
||||||
|
+
|
||||||
|
void
|
||||||
|
print (ptr)
|
||||||
|
char *ptr;
|
||||||
diff --git a/libgloss/rs6000/mbx.ld b/libgloss/rs6000/mbx.ld
|
diff --git a/libgloss/rs6000/mbx.ld b/libgloss/rs6000/mbx.ld
|
||||||
index cedf4e867..99d849e90 100644
|
index cedf4e867..99d849e90 100644
|
||||||
--- a/libgloss/rs6000/mbx.ld
|
--- a/libgloss/rs6000/mbx.ld
|
||||||
@@ -9053,6 +9083,77 @@ index cedf4e867..99d849e90 100644
|
|||||||
/* These are needed for ELF backends which have not yet been
|
/* These are needed for ELF backends which have not yet been
|
||||||
converted to the new style linker. */
|
converted to the new style linker. */
|
||||||
.stab 0 : { *(.stab) }
|
.stab 0 : { *(.stab) }
|
||||||
|
diff --git a/libgloss/rs6000/mvme-print.c b/libgloss/rs6000/mvme-print.c
|
||||||
|
index 8d195424e..bae0eaf7c 100644
|
||||||
|
--- a/libgloss/rs6000/mvme-print.c
|
||||||
|
+++ b/libgloss/rs6000/mvme-print.c
|
||||||
|
@@ -17,6 +17,10 @@
|
||||||
|
* write -- write some bytes to the output device.
|
||||||
|
*/
|
||||||
|
|
||||||
|
+void __outln( char *ptr, char *q);
|
||||||
|
+void __outstr( char *ptr, char *q);
|
||||||
|
+void __pcrlf();
|
||||||
|
+
|
||||||
|
int
|
||||||
|
write (fd, ptr, len)
|
||||||
|
int fd;
|
||||||
|
diff --git a/libgloss/rs6000/sim-abort.c b/libgloss/rs6000/sim-abort.c
|
||||||
|
index e1b59cf19..faeb93153 100644
|
||||||
|
--- a/libgloss/rs6000/sim-abort.c
|
||||||
|
+++ b/libgloss/rs6000/sim-abort.c
|
||||||
|
@@ -14,6 +14,9 @@
|
||||||
|
* they apply.
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#include <unistd.h>
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+
|
||||||
|
void abort(void)
|
||||||
|
{
|
||||||
|
write (2, "Abort called.\n", sizeof("Abort called.\n")-1);
|
||||||
|
diff --git a/libgloss/rs6000/sim-inbyte.c b/libgloss/rs6000/sim-inbyte.c
|
||||||
|
index 787b68976..44b273dff 100644
|
||||||
|
--- a/libgloss/rs6000/sim-inbyte.c
|
||||||
|
+++ b/libgloss/rs6000/sim-inbyte.c
|
||||||
|
@@ -14,6 +14,8 @@
|
||||||
|
* they apply.
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#include <unistd.h>
|
||||||
|
+
|
||||||
|
int
|
||||||
|
inbyte ()
|
||||||
|
{
|
||||||
|
diff --git a/libgloss/rs6000/sim-print.c b/libgloss/rs6000/sim-print.c
|
||||||
|
index c0b9adced..911d8f4a2 100644
|
||||||
|
--- a/libgloss/rs6000/sim-print.c
|
||||||
|
+++ b/libgloss/rs6000/sim-print.c
|
||||||
|
@@ -15,7 +15,10 @@
|
||||||
|
|
||||||
|
/*
|
||||||
|
* print -- do a raw print of a string
|
||||||
|
- */
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <unistd.h>
|
||||||
|
+
|
||||||
|
void
|
||||||
|
print (ptr)
|
||||||
|
char *ptr;
|
||||||
|
diff --git a/libgloss/rs6000/sim-sbrk.c b/libgloss/rs6000/sim-sbrk.c
|
||||||
|
index 5c8bd6522..9cf7de25d 100644
|
||||||
|
--- a/libgloss/rs6000/sim-sbrk.c
|
||||||
|
+++ b/libgloss/rs6000/sim-sbrk.c
|
||||||
|
@@ -17,6 +17,8 @@
|
||||||
|
extern char _end[];
|
||||||
|
static char *curbrk = _end;
|
||||||
|
|
||||||
|
+int brk(char *curbrk);
|
||||||
|
+
|
||||||
|
char *
|
||||||
|
sbrk (incr)
|
||||||
|
int incr;
|
||||||
diff --git a/libgloss/rs6000/xilinx.ld b/libgloss/rs6000/xilinx.ld
|
diff --git a/libgloss/rs6000/xilinx.ld b/libgloss/rs6000/xilinx.ld
|
||||||
index 75b2a12b6..40a4a1e4b 100644
|
index 75b2a12b6..40a4a1e4b 100644
|
||||||
--- a/libgloss/rs6000/xilinx.ld
|
--- a/libgloss/rs6000/xilinx.ld
|
||||||
@@ -9337,24 +9438,27 @@ index fa3e26879..4da1a374e 100644
|
|||||||
__END_DECLS
|
__END_DECLS
|
||||||
|
|
||||||
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
|
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
|
||||||
index 5dcc77a80..c53fce983 100644
|
index 5dcc77a80..fdf232649 100644
|
||||||
--- a/newlib/libc/include/sys/config.h
|
--- a/newlib/libc/include/sys/config.h
|
||||||
+++ b/newlib/libc/include/sys/config.h
|
+++ b/newlib/libc/include/sys/config.h
|
||||||
@@ -4,8 +4,18 @@
|
@@ -4,8 +4,21 @@
|
||||||
#include <machine/ieeefp.h> /* floating point macros */
|
#include <machine/ieeefp.h> /* floating point macros */
|
||||||
#include <sys/features.h> /* POSIX defs */
|
#include <sys/features.h> /* POSIX defs */
|
||||||
|
|
||||||
-#ifdef __aarch64__
|
-#ifdef __aarch64__
|
||||||
+#ifdef __DEVKITARM__
|
+#ifdef __DEVKITARM__
|
||||||
+#define __DYNAMIC_REENT__
|
+#define __DYNAMIC_REENT__
|
||||||
|
+#define MALLOC_ALIGNMENT_THRESHOLD 32
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+#ifdef __DEVKITA64__
|
+#ifdef __DEVKITA64__
|
||||||
#define MALLOC_ALIGNMENT 16
|
#define MALLOC_ALIGNMENT 16
|
||||||
|
+#define MALLOC_ALIGNMENT_THRESHOLD 32
|
||||||
+#define __DYNAMIC_REENT__
|
+#define __DYNAMIC_REENT__
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+#ifdef __DEVKITPPC__
|
+#ifdef __DEVKITPPC__
|
||||||
|
+#define MALLOC_ALIGNMENT_THRESHOLD 64
|
||||||
+#define __BUFSIZ__ 32768
|
+#define __BUFSIZ__ 32768
|
||||||
+#define __DYNAMIC_REENT__
|
+#define __DYNAMIC_REENT__
|
||||||
#endif
|
#endif
|
||||||
@@ -10121,7 +10225,7 @@ index 8664dc3e5..dbaba0264 100644
|
|||||||
fp->_r -= resid;
|
fp->_r -= resid;
|
||||||
fp->_p += resid;
|
fp->_p += resid;
|
||||||
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
|
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
|
||||||
index b9c75bbf8..d748d5dc8 100644
|
index b9c75bbf8..bc65acc2a 100644
|
||||||
--- a/newlib/libc/stdio/makebuf.c
|
--- a/newlib/libc/stdio/makebuf.c
|
||||||
+++ b/newlib/libc/stdio/makebuf.c
|
+++ b/newlib/libc/stdio/makebuf.c
|
||||||
@@ -19,6 +19,7 @@
|
@@ -19,6 +19,7 @@
|
||||||
@@ -10132,12 +10236,15 @@ index b9c75bbf8..d748d5dc8 100644
|
|||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/unistd.h>
|
#include <sys/unistd.h>
|
||||||
@@ -50,7 +51,7 @@ __smakebuf_r (struct _reent *ptr,
|
@@ -50,7 +51,11 @@ __smakebuf_r (struct _reent *ptr,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
flags = __swhatbuf_r (ptr, fp, &size, &couldbetty);
|
flags = __swhatbuf_r (ptr, fp, &size, &couldbetty);
|
||||||
- if ((p = _malloc_r (ptr, size)) == NULL)
|
+#ifdef MALLOC_ALIGNMENT_THRESHOLD
|
||||||
+ if ((p = _memalign_r (ptr, 64, size)) == NULL)
|
+ if ((p = _memalign_r (ptr, MALLOC_ALIGNMENT_THRESHOLD, size)) == NULL)
|
||||||
|
+#else
|
||||||
|
if ((p = _malloc_r (ptr, size)) == NULL)
|
||||||
|
+#endif
|
||||||
{
|
{
|
||||||
if (!(fp->_flags & __SSTR))
|
if (!(fp->_flags & __SSTR))
|
||||||
{
|
{
|
||||||
@@ -10277,18 +10384,20 @@ index 710440389..985e720bf 100644
|
|||||||
|
|
||||||
#endif /* _WANT_REGISTER_FINI */
|
#endif /* _WANT_REGISTER_FINI */
|
||||||
diff --git a/newlib/libc/stdlib/malloc.c b/newlib/libc/stdlib/malloc.c
|
diff --git a/newlib/libc/stdlib/malloc.c b/newlib/libc/stdlib/malloc.c
|
||||||
index f5ac29208..3f21ea154 100644
|
index f5ac29208..7d016a653 100644
|
||||||
--- a/newlib/libc/stdlib/malloc.c
|
--- a/newlib/libc/stdlib/malloc.c
|
||||||
+++ b/newlib/libc/stdlib/malloc.c
|
+++ b/newlib/libc/stdlib/malloc.c
|
||||||
@@ -161,7 +161,10 @@ Supporting OS subroutines required: <<sbrk>>. */
|
@@ -161,7 +161,12 @@ Supporting OS subroutines required: <<sbrk>>. */
|
||||||
void *
|
void *
|
||||||
malloc (size_t nbytes) /* get a block */
|
malloc (size_t nbytes) /* get a block */
|
||||||
{
|
{
|
||||||
- return _malloc_r (_REENT, nbytes);
|
- return _malloc_r (_REENT, nbytes);
|
||||||
+ if (nbytes < 64)
|
+#ifdef MALLOC_ALIGNMENT_THRESHOLD
|
||||||
+ return _malloc_r (_REENT, nbytes);
|
+ if (nbytes >= MALLOC_ALIGNMENT_THRESHOLD)
|
||||||
|
+ return _memalign_r (_REENT, MALLOC_ALIGNMENT_THRESHOLD, nbytes);
|
||||||
+ else
|
+ else
|
||||||
+ return _memalign_r (_REENT, 64, nbytes);
|
+#endif
|
||||||
|
+ return _malloc_r (_REENT, nbytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
@@ -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 45.2" \
|
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 46" \
|
||||||
$CROSS_PARAMS \
|
$CROSS_PARAMS \
|
||||||
$CROSS_GCC_PARAMS \
|
$CROSS_GCC_PARAMS \
|
||||||
$EXTRA_GCC_PARAMS \
|
$EXTRA_GCC_PARAMS \
|
||||||
|
|||||||
@@ -39,8 +39,8 @@ case "$VERSION" in
|
|||||||
toolchain=DEVKITARM
|
toolchain=DEVKITARM
|
||||||
;;
|
;;
|
||||||
"2" )
|
"2" )
|
||||||
GCC_VER=13.2.0
|
GCC_VER=14.2.0
|
||||||
BINUTILS_VER=2.42
|
BINUTILS_VER=2.43.1
|
||||||
MN_BINUTILS_VER=2.24
|
MN_BINUTILS_VER=2.24
|
||||||
NEWLIB_VER=4.4.0.20231231
|
NEWLIB_VER=4.4.0.20231231
|
||||||
basedir='dkppc'
|
basedir='dkppc'
|
||||||
|
|||||||
Reference in New Issue
Block a user