mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-08-20 17:34:25 -05:00
Compare commits
8 Commits
devkitARM_
...
devkitA64_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c5f34ab49b | ||
|
|
eb428eb450 | ||
|
|
032100b82e | ||
|
|
d051cd518b | ||
|
|
5daf9f7bd1 | ||
|
|
f06196c43c | ||
|
|
5926a76d64 | ||
|
|
12a06c469f |
@@ -1,8 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
#---------------------------------------------------------------------------------
|
||||
# devkitARM release 61
|
||||
# devkitPPC release 43
|
||||
# devkitA64 release 22
|
||||
# devkitARM release 62
|
||||
# devkitPPC release 44.2
|
||||
# devkitA64 release 24
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
if [ 0 -eq 1 ] ; then
|
||||
@@ -27,12 +27,12 @@ echo
|
||||
|
||||
|
||||
|
||||
DKARM_RULES_VER=1.3.0
|
||||
DKARM_CRTLS_VER=1.2.1
|
||||
DKARM_RULES_VER=1.5.0
|
||||
DKARM_CRTLS_VER=1.2.2
|
||||
|
||||
DKPPC_RULES_VER=1.1.2
|
||||
DKPPC_RULES_VER=1.2.1
|
||||
|
||||
DKA64_RULES_VER=1.0.1
|
||||
DKA64_RULES_VER=1.1.1
|
||||
|
||||
OSXMIN=${OSXMIN:-10.9}
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
|
||||
index 5741c60264..fb5d9d069c 100644
|
||||
index ec856764519..436098cbcc2 100644
|
||||
--- a/bfd/elf-bfd.h
|
||||
+++ b/bfd/elf-bfd.h
|
||||
@@ -1789,6 +1789,14 @@ struct output_elf_obj_tdata
|
||||
@@ -1966,6 +1966,14 @@ struct output_elf_obj_tdata
|
||||
asection *sec;
|
||||
} build_id;
|
||||
} package_metadata;
|
||||
|
||||
+ /* Data for .nx-module-name. */
|
||||
+ struct
|
||||
+ {
|
||||
+ bfd_boolean (*after_write_object_contents) (bfd *);
|
||||
+ bool (*after_write_object_contents) (bfd *);
|
||||
+ const char *name;
|
||||
+ asection *sec;
|
||||
+ } nx_module_name;
|
||||
@@ -18,29 +18,29 @@ index 5741c60264..fb5d9d069c 100644
|
||||
bfd_size_type program_header_size;
|
||||
|
||||
diff --git a/bfd/elf.c b/bfd/elf.c
|
||||
index eb3e1828e9..bc6bb48804 100644
|
||||
index d38e0afff2e..372e6615931 100644
|
||||
--- a/bfd/elf.c
|
||||
+++ b/bfd/elf.c
|
||||
@@ -6514,6 +6514,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
|
||||
@@ -7321,6 +7321,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
|
||||
if (!bed->s->write_shdrs_and_ehdr (abfd))
|
||||
return FALSE;
|
||||
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;
|
||||
+ 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)
|
||||
return (*t->o->build_id.after_write_object_contents) (abfd);
|
||||
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 faa27611d4..888af6bcd8 100644
|
||||
index 4592bd6da27..dc27042cfe2 100644
|
||||
--- a/bfd/elfnn-aarch64.c
|
||||
+++ b/bfd/elfnn-aarch64.c
|
||||
@@ -2341,6 +2341,12 @@ enum elf_aarch64_stub_type
|
||||
@@ -2441,6 +2441,12 @@ enum elf_aarch64_stub_type
|
||||
aarch64_stub_erratum_843419_veneer,
|
||||
};
|
||||
|
||||
@@ -53,7 +53,7 @@ index faa27611d4..888af6bcd8 100644
|
||||
struct elf_aarch64_stub_hash_entry
|
||||
{
|
||||
/* Base hash table entry structure. */
|
||||
@@ -6436,11 +6442,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -6916,11 +6922,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
Elf_Internal_Sym *sym;
|
||||
asection *sec;
|
||||
struct elf_link_hash_entry *h;
|
||||
@@ -62,12 +62,12 @@ index faa27611d4..888af6bcd8 100644
|
||||
bfd_reloc_status_type r;
|
||||
arelent bfd_reloc;
|
||||
char sym_type;
|
||||
bfd_boolean unresolved_reloc = FALSE;
|
||||
+ bfd_boolean resolved_to_zero = FALSE;
|
||||
bool unresolved_reloc = false;
|
||||
+ bool resolved_to_zero = false;
|
||||
char *error_message = NULL;
|
||||
|
||||
r_symndx = ELFNN_R_SYM (rel->r_info);
|
||||
@@ -6576,6 +6584,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -7060,6 +7068,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
h, &unresolved_reloc,
|
||||
save_addend, &addend, sym);
|
||||
|
||||
@@ -78,7 +78,7 @@ index faa27611d4..888af6bcd8 100644
|
||||
switch (elfNN_aarch64_bfd_reloc_from_type (input_bfd, r_type))
|
||||
{
|
||||
case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
|
||||
@@ -6599,7 +6611,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -7083,7 +7095,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
need_relocs =
|
||||
(!bfd_link_executable (info) || indx != 0) &&
|
||||
(h == NULL
|
||||
@@ -87,7 +87,7 @@ index faa27611d4..888af6bcd8 100644
|
||||
|| h->root.type != bfd_link_hash_undefweak);
|
||||
|
||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||
@@ -6694,7 +6706,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -7178,7 +7190,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
need_relocs =
|
||||
(!bfd_link_executable (info) || indx != 0) &&
|
||||
(h == NULL
|
||||
@@ -96,7 +96,7 @@ index faa27611d4..888af6bcd8 100644
|
||||
|| h->root.type != bfd_link_hash_undefweak);
|
||||
|
||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||
@@ -6743,7 +6755,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -7227,7 +7239,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
|
||||
|
||||
need_relocs = (h == NULL
|
||||
@@ -105,17 +105,14 @@ index faa27611d4..888af6bcd8 100644
|
||||
|| h->root.type != bfd_link_hash_undefweak);
|
||||
|
||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||
@@ -7086,6 +7098,26 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
|
||||
return FALSE;
|
||||
@@ -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. */
|
||||
+
|
||||
+extern bfd_boolean
|
||||
+elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *, struct elf_link_hash_entry *);
|
||||
+
|
||||
+bfd_boolean
|
||||
+static bool
|
||||
+elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *info,
|
||||
+ struct elf_link_hash_entry *h)
|
||||
+{
|
||||
@@ -126,21 +123,21 @@ index faa27611d4..888af6bcd8 100644
|
||||
+ _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
|
||||
+ h->dynstr_index);
|
||||
+ }
|
||||
+ return TRUE;
|
||||
+ 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
|
||||
@@ -8286,6 +8318,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8771,6 +8800,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
struct elf_aarch64_link_hash_table *htab;
|
||||
struct elf_aarch64_link_hash_entry *eh;
|
||||
struct elf_dyn_relocs *p;
|
||||
+ bfd_boolean resolved_to_zero;
|
||||
+ bool resolved_to_zero;
|
||||
|
||||
/* An example of a bfd_link_hash_indirect symbol is versioned
|
||||
symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
|
||||
@@ -8305,6 +8338,10 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8790,6 +8820,10 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
info = (struct bfd_link_info *) inf;
|
||||
htab = elf_aarch64_hash_table (info);
|
||||
|
||||
@@ -151,7 +148,7 @@ index faa27611d4..888af6bcd8 100644
|
||||
/* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
|
||||
here if it is defined and referenced in a non-shared object. */
|
||||
if (h->type == STT_GNU_IFUNC
|
||||
@@ -8314,7 +8351,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8799,7 +8833,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
{
|
||||
/* Make sure this symbol is output as a dynamic symbol.
|
||||
Undefined weak syms won't yet be marked as dynamic. */
|
||||
@@ -160,9 +157,9 @@ index faa27611d4..888af6bcd8 100644
|
||||
&& h->root.type == bfd_link_hash_undefweak)
|
||||
{
|
||||
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
||||
@@ -8348,6 +8385,11 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8833,6 +8867,11 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
of relaxing into these from the large model PLT entries. */
|
||||
s->size += PLT_SMALL_ENTRY_SIZE;
|
||||
s->size += htab->plt_entry_size;
|
||||
|
||||
+ /* There should be no PLT relocations against resolved undefined
|
||||
+ weak symbols in the executable. */
|
||||
@@ -172,15 +169,15 @@ index faa27611d4..888af6bcd8 100644
|
||||
/* We also need to make an entry in the .got.plt section, which
|
||||
will be placed in the .got section by the linker script. */
|
||||
htab->root.sgotplt->size += GOT_ENTRY_SIZE;
|
||||
@@ -8370,6 +8412,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8861,6 +8900,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
htab->variant_pcs = 1;
|
||||
|
||||
htab->root.srelplt->reloc_count++;
|
||||
}
|
||||
+ }
|
||||
else
|
||||
{
|
||||
h->plt.offset = (bfd_vma) - 1;
|
||||
@@ -8382,9 +8425,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8873,9 +8913,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
h->needs_plt = 0;
|
||||
}
|
||||
|
||||
@@ -189,8 +186,8 @@ index faa27611d4..888af6bcd8 100644
|
||||
-
|
||||
if (h->got.refcount > 0)
|
||||
{
|
||||
bfd_boolean dyn;
|
||||
@@ -8396,7 +8436,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
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. */
|
||||
@@ -199,7 +196,7 @@ index faa27611d4..888af6bcd8 100644
|
||||
&& h->root.type == bfd_link_hash_undefweak)
|
||||
{
|
||||
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
||||
@@ -8410,7 +8450,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8901,7 +8938,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
{
|
||||
h->got.offset = htab->root.sgot->size;
|
||||
htab->root.sgot->size += GOT_ENTRY_SIZE;
|
||||
@@ -208,7 +205,7 @@ index faa27611d4..888af6bcd8 100644
|
||||
|| h->root.type != bfd_link_hash_undefweak)
|
||||
&& (bfd_link_pic (info)
|
||||
|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
|
||||
@@ -8446,7 +8486,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8937,7 +8974,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
}
|
||||
|
||||
indx = h && h->dynindx != -1 ? h->dynindx : 0;
|
||||
@@ -217,16 +214,16 @@ index faa27611d4..888af6bcd8 100644
|
||||
|| h->root.type != bfd_link_hash_undefweak)
|
||||
&& (!bfd_link_executable (info)
|
||||
|| indx != 0
|
||||
@@ -8512,7 +8552,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -9019,7 +9056,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
visibility. */
|
||||
if (eh->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak)
|
||||
if (h->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak)
|
||||
{
|
||||
- if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
||||
+ if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT || resolved_to_zero
|
||||
|| UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
||||
eh->dyn_relocs = NULL;
|
||||
h->dyn_relocs = NULL;
|
||||
|
||||
@@ -8532,7 +8572,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -9039,7 +9076,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
symbols which turn out to need copy relocs or are not
|
||||
dynamic. */
|
||||
|
||||
@@ -237,20 +234,20 @@ index faa27611d4..888af6bcd8 100644
|
||||
&& ((h->def_dynamic
|
||||
&& !h->def_regular)
|
||||
|| (htab->root.dynamic_sections_created
|
||||
@@ -8543,6 +8585,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -9050,6 +9089,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
Undefined weak syms won't yet be marked as dynamic. */
|
||||
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;
|
||||
@@ -9163,8 +9206,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
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;
|
||||
+ bfd_boolean local_undefweak;
|
||||
+ bool local_undefweak;
|
||||
htab = elf_aarch64_hash_table (info);
|
||||
|
||||
+ eh = (struct elf_aarch64_link_hash_entry *) h;
|
||||
@@ -263,8 +260,8 @@ index faa27611d4..888af6bcd8 100644
|
||||
if (h->plt.offset != (bfd_vma) - 1)
|
||||
{
|
||||
asection *plt, *gotplt, *relplt;
|
||||
@@ -9199,7 +9251,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
return FALSE;
|
||||
@@ -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)
|
||||
@@ -272,12 +269,8 @@ index faa27611d4..888af6bcd8 100644
|
||||
{
|
||||
/* Mark the symbol as undefined, rather than as defined in
|
||||
the .plt section. */
|
||||
@@ -9218,10 +9270,11 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
}
|
||||
|
||||
if (h->got.offset != (bfd_vma) - 1
|
||||
- && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
|
||||
+ && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
|
||||
@@ -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))
|
||||
@@ -286,7 +279,7 @@ index faa27611d4..888af6bcd8 100644
|
||||
{
|
||||
Elf_Internal_Rela rela;
|
||||
bfd_byte *loc;
|
||||
@@ -9715,6 +9768,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
|
||||
@@ -10312,6 +10362,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
|
||||
#define elf_backend_init_index_section \
|
||||
_bfd_elf_init_2_index_sections
|
||||
|
||||
@@ -296,90 +289,31 @@ index faa27611d4..888af6bcd8 100644
|
||||
#define elf_backend_finish_dynamic_sections \
|
||||
elfNN_aarch64_finish_dynamic_sections
|
||||
|
||||
diff --git a/ld/Makefile.am b/ld/Makefile.am
|
||||
index c2c798b4fe..a0073d27fe 100644
|
||||
--- a/ld/Makefile.am
|
||||
+++ b/ld/Makefile.am
|
||||
@@ -1509,19 +1509,23 @@ ens32knbsd.c: $(srcdir)/emulparams/ns32knbsd.sh \
|
||||
$(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
|
||||
|
||||
eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
|
||||
- $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
||||
+ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
|
||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
||||
|
||||
eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
|
||||
- $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
||||
+ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
|
||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
||||
|
||||
eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
|
||||
- $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
||||
+ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
|
||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
||||
|
||||
eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
|
||||
- $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
||||
+ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
|
||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
||||
|
||||
eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \
|
||||
diff --git a/ld/Makefile.in b/ld/Makefile.in
|
||||
index fc687fc516..7d85865d92 100644
|
||||
--- a/ld/Makefile.in
|
||||
+++ b/ld/Makefile.in
|
||||
@@ -3114,18 +3114,22 @@ ens32knbsd.c: $(srcdir)/emulparams/ns32knbsd.sh \
|
||||
|
||||
eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
|
||||
$(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
||||
|
||||
eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
|
||||
$(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
||||
|
||||
eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
|
||||
$(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
||||
|
||||
eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
|
||||
$(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
||||
|
||||
eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \
|
||||
diff --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
|
||||
index 4a59342722..2aa1ec7712 100644
|
||||
index 8f68e517b45..260a590e69e 100644
|
||||
--- a/ld/emulparams/aarch64elf.sh
|
||||
+++ b/ld/emulparams/aarch64elf.sh
|
||||
@@ -1,3 +1,5 @@
|
||||
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||
+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 38bcd4bbb0..da0f411feb 100644
|
||||
index 5a08d9e29f1..e4c9abf85a1 100644
|
||||
--- a/ld/emulparams/aarch64elf32.sh
|
||||
+++ b/ld/emulparams/aarch64elf32.sh
|
||||
@@ -1,3 +1,5 @@
|
||||
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||
+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 45e40b510c..916ef2086a 100644
|
||||
index d47bdbf9937..b6f76d5c8d7 100644
|
||||
--- a/ld/emultempl/aarch64elf.em
|
||||
+++ b/ld/emultempl/aarch64elf.em
|
||||
@@ -380,7 +380,7 @@ PARSE_AND_LIST_LONGOPTS='
|
||||
@@ -378,7 +378,7 @@ PARSE_AND_LIST_LONGOPTS='
|
||||
{ "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
|
||||
'
|
||||
|
||||
@@ -388,25 +322,63 @@ index 45e40b510c..916ef2086a 100644
|
||||
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/elf32.em b/ld/emultempl/elf32.em
|
||||
index f4f7ad6b4e..8428a54697 100644
|
||||
--- a/ld/emultempl/elf32.em
|
||||
+++ b/ld/emultempl/elf32.em
|
||||
@@ -192,6 +192,9 @@ static char *depaudit; /* colon (typically) separated list of libs */
|
||||
/* Style of .note.gnu.build-id section. */
|
||||
static const char *emit_note_gnu_build_id;
|
||||
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. */
|
||||
+static const char *emit_nx_module_name;
|
||||
+const char *ldelf_emit_nx_module_name;
|
||||
+
|
||||
/* On Linux, it's possible to have different versions of the same
|
||||
shared library linked against different versions of libc. The
|
||||
dynamic linker somehow tags which libc version to use in
|
||||
@@ -1217,6 +1220,92 @@ setup_build_id (bfd *ibfd)
|
||||
return FALSE;
|
||||
/* 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;
|
||||
}
|
||||
|
||||
+static bfd_boolean
|
||||
-/* 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);
|
||||
@@ -416,14 +388,14 @@ index f4f7ad6b4e..8428a54697 100644
|
||||
+ 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;
|
||||
+ return true;
|
||||
+ }
|
||||
+ i_shdr = &elf_section_data (asec->output_section)->this_hdr;
|
||||
+
|
||||
@@ -450,21 +422,21 @@ index f4f7ad6b4e..8428a54697 100644
|
||||
+
|
||||
+/* Make .nx-module-name section, and set up elf_tdata->nx_module_name. */
|
||||
+
|
||||
+static bfd_boolean
|
||||
+static bool
|
||||
+setup_nx_module_name (bfd *ibfd, bfd *obfd)
|
||||
+{
|
||||
+ asection *s;
|
||||
+ bfd_size_type size;
|
||||
+ flagword flags;
|
||||
+
|
||||
+ if (emit_nx_module_name[0] == '\0')
|
||||
+ if (ldelf_emit_nx_module_name[0] == '\0')
|
||||
+ {
|
||||
+ /* Extract the basename of the output bfd and use it as the module name. */
|
||||
+ char *dot_pos;
|
||||
+ free ((char *) emit_nx_module_name);
|
||||
+ emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
|
||||
+ emit_nx_module_name = xstrdup (emit_nx_module_name);
|
||||
+ dot_pos = strrchr (emit_nx_module_name, '.');
|
||||
+ 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. */
|
||||
@@ -472,34 +444,35 @@ index f4f7ad6b4e..8428a54697 100644
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ size = 8 + strlen(emit_nx_module_name) + 1; /* extra null terminator for AMS */
|
||||
+ size = 8 + strlen(ldelf_emit_nx_module_name) + 1; /* extra null terminator for AMS */
|
||||
+ flags = (SEC_ALLOC | SEC_LOAD | SEC_IN_MEMORY
|
||||
+ | 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 (ibfd, s, 4))
|
||||
+ 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 = emit_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;
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ einfo (_("%P: warning: cannot create .nx-module-name section,"
|
||||
+ " --nx-module-name ignored\n"));
|
||||
+ return FALSE;
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
/* This is called after all the input files have been opened. */
|
||||
|
||||
static void
|
||||
@@ -1267,6 +1356,24 @@ gld${EMULATION_NAME}_after_open (void)
|
||||
+/* 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 (emit_nx_module_name != NULL)
|
||||
+ if (ldelf_emit_nx_module_name != NULL)
|
||||
+ {
|
||||
+ /* Find an ELF input. */
|
||||
+ for (abfd = link_info.input_bfds;
|
||||
@@ -512,93 +485,23 @@ index f4f7ad6b4e..8428a54697 100644
|
||||
+ /* If there are no ELF input files do not try to create a .nx-module-name section. */
|
||||
+ if (abfd == NULL || !setup_nx_module_name (abfd, link_info.output_bfd))
|
||||
+ {
|
||||
+ free ((char *) emit_nx_module_name);
|
||||
+ emit_nx_module_name = NULL;
|
||||
+ 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);
|
||||
|
||||
if (bfd_link_relocatable (&link_info))
|
||||
@@ -2720,6 +2827,7 @@ enum elf_options
|
||||
OPTION_EXCLUDE_LIBS,
|
||||
OPTION_HASH_STYLE,
|
||||
OPTION_BUILD_ID,
|
||||
+ OPTION_NX_MODULE_NAME,
|
||||
OPTION_AUDIT,
|
||||
OPTION_COMPRESS_DEBUG
|
||||
};
|
||||
@@ -2750,6 +2858,7 @@ EOF
|
||||
fi
|
||||
fragment <<EOF
|
||||
{"build-id", optional_argument, NULL, OPTION_BUILD_ID},
|
||||
+ {"nx-module-name", optional_argument, NULL, OPTION_NX_MODULE_NAME},
|
||||
{"compress-debug-sections", required_argument, NULL, OPTION_COMPRESS_DEBUG},
|
||||
EOF
|
||||
if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
|
||||
@@ -2814,6 +2923,16 @@ gld${EMULATION_NAME}_handle_option (int optc)
|
||||
einfo (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
|
||||
optarg);
|
||||
break;
|
||||
+ case OPTION_NX_MODULE_NAME:
|
||||
+ if (emit_nx_module_name != NULL)
|
||||
+ {
|
||||
+ free ((char *) emit_nx_module_name);
|
||||
+ emit_nx_module_name = NULL;
|
||||
+ }
|
||||
+ if (optarg == NULL)
|
||||
+ optarg = "";
|
||||
+ emit_nx_module_name = xstrdup (optarg);
|
||||
+ break;
|
||||
EOF
|
||||
/* 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 @@
|
||||
|
||||
if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
|
||||
diff --git a/ld/ldgram.y b/ld/ldgram.y
|
||||
index c3eadeb392..59ab143526 100644
|
||||
--- a/ld/ldgram.y
|
||||
+++ b/ld/ldgram.y
|
||||
@@ -819,6 +819,7 @@ origin_spec:
|
||||
ORIGIN '=' mustbe_exp
|
||||
{
|
||||
region->origin_exp = $3;
|
||||
+ region->current = region->origin;
|
||||
}
|
||||
;
|
||||
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;
|
||||
|
||||
diff --git a/ld/ldlang.c b/ld/ldlang.c
|
||||
index 33f6bda292..7161f4210a 100644
|
||||
--- a/ld/ldlang.c
|
||||
+++ b/ld/ldlang.c
|
||||
@@ -7381,9 +7381,6 @@ lang_process (void)
|
||||
current_target = default_target;
|
||||
lang_statement_iteration++;
|
||||
open_input_bfds (statement_list.head, OPEN_BFD_NORMAL);
|
||||
- /* open_input_bfds also handles assignments, so we can give values
|
||||
- to symbolic origin/length now. */
|
||||
- lang_do_memory_regions ();
|
||||
|
||||
#ifdef ENABLE_PLUGINS
|
||||
if (link_info.lto_plugin_active)
|
||||
@@ -7526,6 +7523,8 @@ lang_process (void)
|
||||
/* PR 13683: We must rerun the assignments prior to running garbage
|
||||
collection in order to make sure that all symbol aliases are resolved. */
|
||||
lang_do_assignments (lang_mark_phase_enum);
|
||||
+
|
||||
+ lang_do_memory_regions();
|
||||
expld.phase = lang_first_phase_enum;
|
||||
|
||||
/* Size up the common data. */
|
||||
@@ -7610,11 +7609,8 @@ lang_process (void)
|
||||
/* Fix any __start, __stop, .startof. or .sizeof. symbols. */
|
||||
lang_finalize_start_stop ();
|
||||
|
||||
- /* Do all the assignments again, to report errors. Assignment
|
||||
- statements are processed multiple times, updating symbols; In
|
||||
- open_input_bfds, lang_do_assignments, and lang_size_sections.
|
||||
- Since lang_relax_sections calls lang_do_assignments, symbols are
|
||||
- also updated in ldemul_after_allocation. */
|
||||
+ /* Do all the assignments, now that we know the final resting places
|
||||
+ of all the symbols. */
|
||||
lang_do_assignments (lang_final_phase_enum);
|
||||
|
||||
ldemul_finish ();
|
||||
extern void ldelf_after_parse (void);
|
||||
extern bool ldelf_load_symbols (lang_input_statement_type *);
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index 6fd1594480a..31deea1c63b 100644
|
||||
index 648b3dc2110..ed605b28956 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -1132,7 +1132,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
||||
@@ -17,19 +17,6 @@ index 6fd1594480a..31deea1c63b 100644
|
||||
;;
|
||||
aarch64-*-fuchsia*)
|
||||
tm_file="${tm_file} fuchsia.h"
|
||||
diff --git a/gcc/config/aarch64/aarch64-builtins.cc b/gcc/config/aarch64/aarch64-builtins.cc
|
||||
index cc6b7c01fd1..44d53659a2f 100644
|
||||
--- a/gcc/config/aarch64/aarch64-builtins.cc
|
||||
+++ b/gcc/config/aarch64/aarch64-builtins.cc
|
||||
@@ -1547,7 +1547,7 @@ aarch64_scalar_builtin_type_p (aarch64_simd_type t)
|
||||
|
||||
/* Enable AARCH64_FL_* flags EXTRA_FLAGS on top of the base Advanced SIMD
|
||||
set. */
|
||||
-aarch64_simd_switcher::aarch64_simd_switcher (unsigned int extra_flags)
|
||||
+aarch64_simd_switcher::aarch64_simd_switcher (uint64_t extra_flags)
|
||||
: m_old_asm_isa_flags (aarch64_asm_isa_flags),
|
||||
m_old_general_regs_only (TARGET_GENERAL_REGS_ONLY)
|
||||
{
|
||||
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
index ec45f23fa41..a208eabd806 100644
|
||||
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
@@ -59,29 +46,11 @@ index a9f3e2715ca..0c7304e1d81 100644
|
||||
/* The code model defines the address generation strategy.
|
||||
Most have a PIC and non-PIC variant. */
|
||||
enum aarch64_code_model {
|
||||
diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h
|
||||
index 63339fa47df..02b4d3cbb8f 100644
|
||||
--- a/gcc/config/aarch64/aarch64-protos.h
|
||||
+++ b/gcc/config/aarch64/aarch64-protos.h
|
||||
@@ -733,11 +733,11 @@ const unsigned int AARCH64_BUILTIN_CLASS = (1 << AARCH64_BUILTIN_SHIFT) - 1;
|
||||
class aarch64_simd_switcher
|
||||
{
|
||||
public:
|
||||
- aarch64_simd_switcher (unsigned int extra_flags = 0);
|
||||
+ aarch64_simd_switcher (uint64_t extra_flags = 0);
|
||||
~aarch64_simd_switcher ();
|
||||
|
||||
private:
|
||||
- unsigned long m_old_asm_isa_flags;
|
||||
+ uint64_t m_old_asm_isa_flags;
|
||||
bool m_old_general_regs_only;
|
||||
};
|
||||
|
||||
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
|
||||
index 0f04ab9fba0..c524a2f76ba 100644
|
||||
index f5db5379543..f582e5a7543 100644
|
||||
--- a/gcc/config/aarch64/aarch64.cc
|
||||
+++ b/gcc/config/aarch64/aarch64.cc
|
||||
@@ -19555,8 +19555,24 @@ aarch64_load_tp (rtx target)
|
||||
@@ -19550,8 +19550,24 @@ aarch64_load_tp (rtx target)
|
||||
|| !register_operand (target, Pmode))
|
||||
target = gen_reg_rtx (Pmode);
|
||||
|
||||
@@ -109,7 +78,7 @@ index 0f04ab9fba0..c524a2f76ba 100644
|
||||
}
|
||||
|
||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
||||
index 155cace6afe..93ff5264a2e 100644
|
||||
index 73b09e20508..ad62b5080cc 100644
|
||||
--- a/gcc/config/aarch64/aarch64.h
|
||||
+++ b/gcc/config/aarch64/aarch64.h
|
||||
@@ -1154,6 +1154,10 @@ typedef struct
|
||||
@@ -124,7 +93,7 @@ index 155cace6afe..93ff5264a2e 100644
|
||||
|
||||
/* 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 022eef80bc1..2024af16a17 100644
|
||||
index 36d0bb3f718..cfa2f7efc7f 100644
|
||||
--- a/gcc/config/aarch64/aarch64.md
|
||||
+++ b/gcc/config/aarch64/aarch64.md
|
||||
@@ -7068,11 +7068,22 @@
|
||||
@@ -62,7 +62,7 @@ then
|
||||
--enable-lto \
|
||||
--disable-tm-clone-registry \
|
||||
--disable-__cxa_atexit \
|
||||
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 22.1" \
|
||||
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 24" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
$EXTRA_GCC_PARAMS \
|
||||
|
||||
@@ -1,992 +0,0 @@
|
||||
diff --git a/config/gthr.m4 b/config/gthr.m4
|
||||
index 4b937306ad0..bfd0375bd60 100644
|
||||
--- a/config/gthr.m4
|
||||
+++ b/config/gthr.m4
|
||||
@@ -13,6 +13,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
|
||||
case $1 in
|
||||
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
||||
dce) thread_header=config/pa/gthr-dce.h ;;
|
||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||
gcn) thread_header=config/gcn/gthr-gcn.h ;;
|
||||
lynx) thread_header=config/gthr-lynx.h ;;
|
||||
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
||||
diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
|
||||
index 3b0d83ffc60..6e063b6ccd0 100644
|
||||
--- a/gcc/config/i386/host-mingw32.cc
|
||||
+++ b/gcc/config/i386/host-mingw32.cc
|
||||
@@ -45,7 +45,11 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
|
||||
static inline void w32_error(const char*, const char*, int, const char*);
|
||||
|
||||
/* FIXME: Is this big enough? */
|
||||
+#if __MINGW64__
|
||||
+static const size_t pch_VA_max_size = UINT64_C(64 * 1024 * 1024 * 1024);
|
||||
+#else
|
||||
static const size_t pch_VA_max_size = 128 * 1024 * 1024;
|
||||
+#endif
|
||||
|
||||
/* Granularity for reserving address space. */
|
||||
static size_t va_granularity = 0x10000;
|
||||
diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
|
||||
index 098f658e74f..50c74877deb 100644
|
||||
--- a/gcc/config/newlib-stdint.h
|
||||
+++ b/gcc/config/newlib-stdint.h
|
||||
@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
/* newlib uses 32-bit long in certain cases for all non-SPU
|
||||
targets. */
|
||||
#ifndef STDINT_LONG32
|
||||
-#define STDINT_LONG32 (LONG_TYPE_SIZE == 32)
|
||||
+#define STDINT_LONG32 0
|
||||
#endif
|
||||
|
||||
#define SIG_ATOMIC_TYPE "int"
|
||||
diff --git a/gcc/config/rs6000/eabi.h b/gcc/config/rs6000/eabi.h
|
||||
index e58283fe5d4..161767b2b08 100644
|
||||
--- a/gcc/config/rs6000/eabi.h
|
||||
+++ b/gcc/config/rs6000/eabi.h
|
||||
@@ -36,6 +36,8 @@
|
||||
builtin_assert ("system=embedded"); \
|
||||
builtin_assert ("cpu=powerpc"); \
|
||||
builtin_assert ("machine=powerpc"); \
|
||||
+ builtin_define ("__DEVKITPPC__"); \
|
||||
+ builtin_define ("__DEVKITPRO__"); \
|
||||
TARGET_OS_SYSV_CPP_BUILTINS (); \
|
||||
} \
|
||||
while (0)
|
||||
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
|
||||
index bc48f450210..7ba76802670 100644
|
||||
--- a/gcc/config/rs6000/rs6000.h
|
||||
+++ b/gcc/config/rs6000/rs6000.h
|
||||
@@ -199,6 +199,7 @@ ASM_OPT_ANY
|
||||
/* -mcpu=native handling only makes sense with compiler running on
|
||||
an PowerPC chip. If changing this condition, also change
|
||||
the condition in driver-rs6000.cc. */
|
||||
+#if 0
|
||||
#if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
|
||||
/* In driver-rs6000.cc. */
|
||||
extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||
@@ -210,6 +211,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||
#else
|
||||
#define ASM_CPU_NATIVE_SPEC "%(asm_default)"
|
||||
#endif
|
||||
+#endif
|
||||
+#define ASM_CPU_NATIVE_SPEC "%(asm_default)"
|
||||
|
||||
#ifndef CC1_CPU_SPEC
|
||||
#ifdef HAVE_LOCAL_CPU_DETECT
|
||||
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
||||
index 7e2519de5d4..bedfaf31808 100644
|
||||
--- a/gcc/config/rs6000/sysv4.h
|
||||
+++ b/gcc/config/rs6000/sysv4.h
|
||||
@@ -589,7 +589,11 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
/* Default starting address if specified. */
|
||||
#define LINK_START_SPEC "\
|
||||
-%{mads : %(link_start_ads) ; \
|
||||
+%{mgcn|mogc : %(link_start_ogc) ; \
|
||||
+ mvgc : %(link_start_vgc) ; \
|
||||
+ mgcbios : %(link_start_gcb) ; \
|
||||
+ mrvl : %(link_start_rvl) ; \
|
||||
+ mads : %(link_start_ads) ; \
|
||||
myellowknife : %(link_start_yellowknife) ; \
|
||||
mmvme : %(link_start_mvme) ; \
|
||||
msim : %(link_start_sim) ; \
|
||||
@@ -620,7 +624,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
/* Any specific OS flags. */
|
||||
#define LINK_OS_SPEC "\
|
||||
-%{mads : %(link_os_ads) ; \
|
||||
+%{mgcn|mogc|mvgc|mgcbios|mrvl : %(link_os_ogc) ; \
|
||||
+ mads : %(link_os_ads) ; \
|
||||
myellowknife : %(link_os_yellowknife) ; \
|
||||
mmvme : %(link_os_mvme) ; \
|
||||
msim : %(link_os_sim) ; \
|
||||
@@ -635,7 +640,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
/* Override rs6000.h definition. */
|
||||
#undef CPP_SPEC
|
||||
#define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
|
||||
-%{mads : %(cpp_os_ads) ; \
|
||||
+%{mgcn : %(cpp_os_gcn) ; \
|
||||
+ mogc|mvgc|mgcbios : %(cpp_os_ogc) ; \
|
||||
+ mrvl : %(cpp_os_rvl) ; \
|
||||
+ mads : %(cpp_os_ads) ; \
|
||||
myellowknife : %(cpp_os_yellowknife) ; \
|
||||
mmvme : %(cpp_os_mvme) ; \
|
||||
msim : %(cpp_os_sim) ; \
|
||||
@@ -649,7 +657,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
#undef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC "\
|
||||
-%{mads : %(startfile_ads) ; \
|
||||
+%{mgcn : %(startfile_gcn) ; \
|
||||
+ mogc|mvgc|mgcbios : %(startfile_ogc) ; \
|
||||
+ mrvl : %(startfile_ogc) ; \
|
||||
+ mads : %(startfile_ads) ; \
|
||||
myellowknife : %(startfile_yellowknife) ; \
|
||||
mmvme : %(startfile_mvme) ; \
|
||||
msim : %(startfile_sim) ; \
|
||||
@@ -663,7 +674,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
#undef LIB_SPEC
|
||||
#define LIB_SPEC "\
|
||||
-%{mads : %(lib_ads) ; \
|
||||
+%{mgcn|mogc|mvgc|mgcbios|mrvl : %(lib_ogc) ; \
|
||||
+ mads : %(lib_ads) ; \
|
||||
myellowknife : %(lib_yellowknife) ; \
|
||||
mmvme : %(lib_mvme) ; \
|
||||
msim : %(lib_sim) ; \
|
||||
@@ -673,11 +685,12 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
mcall-openbsd: %(lib_openbsd) ; \
|
||||
: %(lib_default) }"
|
||||
|
||||
-#define LIB_DEFAULT_SPEC "-lc"
|
||||
+#define LIB_DEFAULT_SPEC "--start-group -lsysbase -lc --end-group"
|
||||
|
||||
#undef ENDFILE_SPEC
|
||||
#define ENDFILE_SPEC "\
|
||||
-%{mads : %(endfile_ads) ; \
|
||||
+%{mgcn|mogc|mvgc|mgcbios|mrvl : %(endfile_ogc) ; \
|
||||
+ mads : %(endfile_ads) ; \
|
||||
myellowknife : %(endfile_yellowknife) ; \
|
||||
mmvme : %(endfile_mvme) ; \
|
||||
msim : %(endfile_sim) ; \
|
||||
@@ -693,16 +706,27 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
/* Motorola ADS support. */
|
||||
#define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
|
||||
+#define LIB_OGC_SPEC "--start-group -lsysbase -lc --end-group"
|
||||
|
||||
#define STARTFILE_ADS_SPEC "ecrti.o%s crt0.o%s crtbegin.o%s"
|
||||
+#define STARTFILE_OGC_SPEC "ecrti.o%s crtbegin.o%s crtmain.o%s"
|
||||
|
||||
#define ENDFILE_ADS_SPEC "crtend.o%s ecrtn.o%s"
|
||||
+#define ENDFILE_OGC_SPEC "crtend.o%s ecrtn.o%s"
|
||||
|
||||
#define LINK_START_ADS_SPEC "-T ads.ld%s"
|
||||
+#define LINK_START_OGC_SPEC "-T ogc.ld%s"
|
||||
+#define LINK_START_RVL_SPEC "-T rvl.ld%s"
|
||||
+#define LINK_START_VGC_SPEC "-T vgcogc.ld%s"
|
||||
+#define LINK_START_GCB_SPEC "-T gcbogc.ld%s"
|
||||
|
||||
#define LINK_OS_ADS_SPEC ""
|
||||
+#define LINK_OS_OGC_SPEC "--gc-sections"
|
||||
|
||||
#define CPP_OS_ADS_SPEC ""
|
||||
+#define CPP_OS_GCN_SPEC "-D__gamecube__ -ffunction-sections -fdata-sections"
|
||||
+#define CPP_OS_OGC_SPEC "-D__gamecube__ -DHW_DOL -ffunction-sections -fdata-sections"
|
||||
+#define CPP_OS_RVL_SPEC "-D__wii__ -DHW_RVL -ffunction-sections -fdata-sections"
|
||||
|
||||
/* Motorola Yellowknife support. */
|
||||
#define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
|
||||
@@ -850,6 +874,7 @@ ncrtn.o%s"
|
||||
#undef SUBTARGET_EXTRA_SPECS
|
||||
#define SUBTARGET_EXTRA_SPECS \
|
||||
{ "crtsavres_default", CRTSAVRES_DEFAULT_SPEC }, \
|
||||
+ { "lib_ogc", LIB_OGC_SPEC }, \
|
||||
{ "lib_ads", LIB_ADS_SPEC }, \
|
||||
{ "lib_yellowknife", LIB_YELLOWKNIFE_SPEC }, \
|
||||
{ "lib_mvme", LIB_MVME_SPEC }, \
|
||||
@@ -859,6 +884,7 @@ ncrtn.o%s"
|
||||
{ "lib_netbsd", LIB_NETBSD_SPEC }, \
|
||||
{ "lib_openbsd", LIB_OPENBSD_SPEC }, \
|
||||
{ "lib_default", LIB_DEFAULT_SPEC }, \
|
||||
+ { "startfile_ogc", STARTFILE_OGC_SPEC }, \
|
||||
{ "startfile_ads", STARTFILE_ADS_SPEC }, \
|
||||
{ "startfile_yellowknife", STARTFILE_YELLOWKNIFE_SPEC }, \
|
||||
{ "startfile_mvme", STARTFILE_MVME_SPEC }, \
|
||||
@@ -868,6 +894,7 @@ ncrtn.o%s"
|
||||
{ "startfile_netbsd", STARTFILE_NETBSD_SPEC }, \
|
||||
{ "startfile_openbsd", STARTFILE_OPENBSD_SPEC }, \
|
||||
{ "startfile_default", STARTFILE_DEFAULT_SPEC }, \
|
||||
+ { "endfile_ogc", ENDFILE_OGC_SPEC }, \
|
||||
{ "endfile_ads", ENDFILE_ADS_SPEC }, \
|
||||
{ "endfile_yellowknife", ENDFILE_YELLOWKNIFE_SPEC }, \
|
||||
{ "endfile_mvme", ENDFILE_MVME_SPEC }, \
|
||||
@@ -879,7 +906,11 @@ ncrtn.o%s"
|
||||
{ "endfile_default", ENDFILE_DEFAULT_SPEC }, \
|
||||
{ "link_shlib", LINK_SHLIB_SPEC }, \
|
||||
{ "link_start", LINK_START_SPEC }, \
|
||||
+ { "link_start_vgc", LINK_START_VGC_SPEC }, \
|
||||
+ { "link_start_gcb", LINK_START_GCB_SPEC }, \
|
||||
+ { "link_start_rvl", LINK_START_RVL_SPEC }, \
|
||||
{ "link_start_ads", LINK_START_ADS_SPEC }, \
|
||||
+ { "link_start_ogc", LINK_START_OGC_SPEC }, \
|
||||
{ "link_start_yellowknife", LINK_START_YELLOWKNIFE_SPEC }, \
|
||||
{ "link_start_mvme", LINK_START_MVME_SPEC }, \
|
||||
{ "link_start_sim", LINK_START_SIM_SPEC }, \
|
||||
@@ -889,6 +920,7 @@ ncrtn.o%s"
|
||||
{ "link_start_openbsd", LINK_START_OPENBSD_SPEC }, \
|
||||
{ "link_start_default", LINK_START_DEFAULT_SPEC }, \
|
||||
{ "link_os", LINK_OS_SPEC }, \
|
||||
+ { "link_os_ogc", LINK_OS_OGC_SPEC }, \
|
||||
{ "link_os_ads", LINK_OS_ADS_SPEC }, \
|
||||
{ "link_os_yellowknife", LINK_OS_YELLOWKNIFE_SPEC }, \
|
||||
{ "link_os_mvme", LINK_OS_MVME_SPEC }, \
|
||||
@@ -900,6 +932,9 @@ ncrtn.o%s"
|
||||
{ "link_os_default", LINK_OS_DEFAULT_SPEC }, \
|
||||
{ "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
|
||||
{ "link_secure_plt", LINK_SECURE_PLT_SPEC }, \
|
||||
+ { "cpp_os_gcn", CPP_OS_GCN_SPEC }, \
|
||||
+ { "cpp_os_ogc", CPP_OS_OGC_SPEC }, \
|
||||
+ { "cpp_os_rvl", CPP_OS_RVL_SPEC }, \
|
||||
{ "cpp_os_ads", CPP_OS_ADS_SPEC }, \
|
||||
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
|
||||
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
|
||||
diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
|
||||
index ac75d67b19a..bdee36872f8 100644
|
||||
--- a/gcc/config/rs6000/sysv4.opt
|
||||
+++ b/gcc/config/rs6000/sysv4.opt
|
||||
@@ -124,6 +124,26 @@ mads
|
||||
Target RejectNegative
|
||||
Link with libads.a, libc.a and crt0.o.
|
||||
|
||||
+mgcn
|
||||
+Target RejectNegative
|
||||
+Link with libsysbase.a and libc.a, use ogc linker script
|
||||
+
|
||||
+mogc
|
||||
+Target RejectNegative
|
||||
+Link with libsysbase.a and libc.a, use ogc linker script
|
||||
+
|
||||
+mgcbios
|
||||
+Target RejectNegative
|
||||
+Link with libsysbase.a and libc.a, use gcbogc linker script
|
||||
+
|
||||
+mvgc
|
||||
+Target RejectNegative
|
||||
+Link with libsysbase.a and libc.a, use gcbogc linker script
|
||||
+
|
||||
+mrvl
|
||||
+Target RejectNegative
|
||||
+Link with libsysbase.a and libc.a, use rvl linker script
|
||||
+
|
||||
myellowknife
|
||||
Target RejectNegative
|
||||
Link with libyk.a, libc.a and crt0.o.
|
||||
diff --git a/gcc/configure b/gcc/configure
|
||||
index 5ce0557719a..a1c59e87b83 100755
|
||||
--- a/gcc/configure
|
||||
+++ b/gcc/configure
|
||||
@@ -12884,7 +12884,7 @@ case ${enable_threads} in
|
||||
# default
|
||||
target_thread_file='single'
|
||||
;;
|
||||
- aix | dce | lynx | mipssde | posix | rtems | \
|
||||
+ aix | dce | dkp | lynx | mipssde | posix | rtems | \
|
||||
single | tpf | vxworks | win32)
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||||
index 23bee7010a3..4540b6d3aee 100644
|
||||
--- a/gcc/configure.ac
|
||||
+++ b/gcc/configure.ac
|
||||
@@ -1994,7 +1994,7 @@ case ${enable_threads} in
|
||||
# default
|
||||
target_thread_file='single'
|
||||
;;
|
||||
- aix | dce | lynx | mipssde | posix | rtems | \
|
||||
+ aix | dce | dkp | lynx | mipssde | posix | rtems | \
|
||||
single | tpf | vxworks | win32)
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
|
||||
index cf224657260..38683e58cb3 100644
|
||||
--- a/libgcc/config/rs6000/crtrestvr.S
|
||||
+++ b/libgcc/config/rs6000/crtrestvr.S
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
/* On PowerPC64 Linux, these functions are provided by the linker. */
|
||||
#ifndef __powerpc64__
|
||||
-
|
||||
+#if 0
|
||||
#undef __ALTIVEC__
|
||||
#define __ALTIVEC__ 1
|
||||
#include "ppc-asm.h"
|
||||
@@ -86,3 +86,4 @@ FUNC_END(_restvr_20)
|
||||
CFI_ENDPROC
|
||||
|
||||
#endif
|
||||
+#endif
|
||||
diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
|
||||
index 65e791741f7..631be3ec5ba 100644
|
||||
--- a/libgcc/config/rs6000/crtsavevr.S
|
||||
+++ b/libgcc/config/rs6000/crtsavevr.S
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
/* On PowerPC64 Linux, these functions are provided by the linker. */
|
||||
#ifndef __powerpc64__
|
||||
-
|
||||
+#if 0
|
||||
#undef __ALTIVEC__
|
||||
#define __ALTIVEC__ 1
|
||||
#include "ppc-asm.h"
|
||||
@@ -86,3 +86,4 @@ FUNC_END(_savevr_20)
|
||||
CFI_ENDPROC
|
||||
|
||||
#endif
|
||||
+#endif
|
||||
diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
|
||||
new file mode 100644
|
||||
index 00000000000..26180aa7f36
|
||||
--- /dev/null
|
||||
+++ b/libgcc/config/rs6000/gthr-dkp.c
|
||||
@@ -0,0 +1,319 @@
|
||||
+/* Threads compatibility routines for libgcc2 and libobjc. */
|
||||
+/* Compile this one with gcc. */
|
||||
+/* Copyright (C) 1997-2016 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/>. */
|
||||
+
|
||||
+#define _BUILDING_LIBGCC
|
||||
+#include "gthr-dkp.h"
|
||||
+#include <stddef.h>
|
||||
+
|
||||
+
|
||||
+int
|
||||
+__gthread_active_p (void)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(active)) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_active();
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
|
||||
+ void *__args)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(create)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_create(__threadid, __func, __args);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_join (__gthread_t __threadid, void **__value_ptr)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(join)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_join(__threadid, __value_ptr);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_detach (__gthread_t __threadid)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(detach)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_detach(__threadid);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_equal (__gthread_t __t1, __gthread_t __t2)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(equal)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_equal(__t1, __t2);
|
||||
+}
|
||||
+
|
||||
+__gthread_t
|
||||
+__gthread_self (void)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(self)) {
|
||||
+ __gthread_t result = { 0 };
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_self();
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_yield (void)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(yield)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_yield();
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_once (__gthread_once_t *__once, void (*__func) (void))
|
||||
+{
|
||||
+ if (!__has_gthr_impl(once)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_once(__once, __func);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
|
||||
+{
|
||||
+ if (!__has_gthr_impl(key_create)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_key_create(__key, __dtor);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_key_delete (__gthread_key_t __key)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(key_delete)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_key_delete(__key);
|
||||
+}
|
||||
+
|
||||
+void *
|
||||
+__gthread_getspecific (__gthread_key_t __key)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(getspecific)) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_getspecific(__key);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(setspecific)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_setspecific(__key, __ptr);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (__has_gthr_impl(mutex_init_function)) {
|
||||
+ __gthr_impl_mutex_init_function(__mutex);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(mutex_destroy)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_mutex_destroy(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_lock (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(mutex_lock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_mutex_lock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(mutex_trylock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_mutex_trylock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(mutex_unlock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_mutex_unlock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(recursive_mutex_init_function)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_recursive_mutex_init_function(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(recursive_mutex_lock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_recursive_mutex_lock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(recursive_mutex_trylock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_recursive_mutex_trylock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(recursive_mutex_unlock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_recursive_mutex_unlock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(recursive_mutex_destroy)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_recursive_mutex_destroy(__mutex);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+__gthread_cond_init_function (__gthread_cond_t *__cond)
|
||||
+{
|
||||
+ if (__has_gthr_impl(cond_init_function)) {
|
||||
+ __gthr_impl_cond_init_function(__cond);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_broadcast (__gthread_cond_t *__cond)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(cond_broadcast)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_cond_broadcast(__cond);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_signal (__gthread_cond_t *__cond)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(cond_signal)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_cond_signal(__cond);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(cond_wait)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_cond_wait(__cond, __mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
||||
+ const __gthread_time_t *__abs_timeout)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(cond_timedwait)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_cond_timedwait(__cond, __mutex, __abs_timeout);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
|
||||
+ __gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(cond_wait_recursive)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_cond_wait_recursive(__cond, __mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_destroy (__gthread_cond_t* __cond)
|
||||
+{
|
||||
+ if (!__has_gthr_impl(cond_destroy)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthr_impl_cond_destroy(__cond);
|
||||
+}
|
||||
diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
|
||||
new file mode 100644
|
||||
index 00000000000..72ecf82ab83
|
||||
--- /dev/null
|
||||
+++ b/libgcc/config/rs6000/gthr-dkp.h
|
||||
@@ -0,0 +1,187 @@
|
||||
+/* Threads compatibility routines for libgcc2 and libobjc. */
|
||||
+/* Compile this one with gcc. */
|
||||
+/* Copyright (C) 1997-2016 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/>. */
|
||||
+
|
||||
+#ifndef _GLIBCXX_GCC_GTHR_DKP_H
|
||||
+#define _GLIBCXX_GCC_GTHR_DKP_H
|
||||
+
|
||||
+#define __GTHREADS 1
|
||||
+#define __GTHREADS_CXX0X 1
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
+typedef void * __gthread_t;
|
||||
+typedef struct { int padding[7]; } __gthread_cond_t;
|
||||
+typedef struct { int padding; } __gthread_key_t;
|
||||
+typedef struct { int padding[11]; } __gthread_mutex_t;
|
||||
+typedef struct { int padding; } __gthread_once_t;
|
||||
+typedef struct { int padding[11]; } __gthread_recursive_mutex_t;
|
||||
+typedef struct timespec __gthread_time_t;
|
||||
+
|
||||
+#define __GTHREAD_HAS_COND 1
|
||||
+#define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
|
||||
+
|
||||
+#define __GTHREAD_ONCE_INIT { 0 }
|
||||
+#define __GTHREAD_TIME_INIT { 0, 0 }
|
||||
+
|
||||
+#define __GTHREAD_COND_INIT_FUNCTION __gthread_cond_init_function
|
||||
+#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
|
||||
+#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
|
||||
+
|
||||
+#ifdef _BUILDING_LIBGCC
|
||||
+#define __GTHR_IMPL(_name) __attribute__((weak)) __gthr_impl_##_name
|
||||
+#define __has_gthr_impl(_name) (&__gthr_impl_##_name)
|
||||
+#else
|
||||
+#define __GTHR_IMPL(_name) __gthr_impl_##_name
|
||||
+#endif
|
||||
+
|
||||
+int __GTHR_IMPL(active) (void);
|
||||
+int __GTHR_IMPL(create) (__gthread_t *__threadid, void *(*__func) (void*), void *__args);
|
||||
+int __GTHR_IMPL(join) (__gthread_t __threadid, void **__value_ptr);
|
||||
+int __GTHR_IMPL(detach) (__gthread_t __threadid);
|
||||
+int __GTHR_IMPL(equal) (__gthread_t __t1, __gthread_t __t2);
|
||||
+__gthread_t __GTHR_IMPL(self) (void);
|
||||
+int __GTHR_IMPL(yield) (void);
|
||||
+int __GTHR_IMPL(once) (__gthread_once_t *__once, void (*__func) (void));
|
||||
+int __GTHR_IMPL(key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
|
||||
+int __GTHR_IMPL(key_delete) (__gthread_key_t __key);
|
||||
+void * __GTHR_IMPL(getspecific) (__gthread_key_t __key);
|
||||
+int __GTHR_IMPL(setspecific) (__gthread_key_t __key, const void *__ptr);
|
||||
+void __GTHR_IMPL(mutex_init_function) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(mutex_destroy) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(mutex_lock) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(mutex_trylock) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(mutex_unlock) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
|
||||
+void __GTHR_IMPL(cond_init_function) (__gthread_cond_t *__cond);
|
||||
+int __GTHR_IMPL(cond_broadcast) (__gthread_cond_t *__cond);
|
||||
+int __GTHR_IMPL(cond_signal) (__gthread_cond_t *__cond);
|
||||
+int __GTHR_IMPL(cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
||||
+ const __gthread_time_t *__abs_timeout);
|
||||
+int __GTHR_IMPL(cond_wait_recursive) (__gthread_cond_t *__cond,
|
||||
+ __gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(cond_destroy) (__gthread_cond_t* __cond);
|
||||
+
|
||||
+int
|
||||
+__gthread_active_p (void);
|
||||
+
|
||||
+int
|
||||
+__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
|
||||
+ void *__args);
|
||||
+
|
||||
+int
|
||||
+__gthread_join (__gthread_t __threadid, void **__value_ptr);
|
||||
+
|
||||
+int
|
||||
+__gthread_detach (__gthread_t __threadid);
|
||||
+
|
||||
+int
|
||||
+__gthread_equal (__gthread_t __t1, __gthread_t __t2);
|
||||
+
|
||||
+__gthread_t
|
||||
+__gthread_self (void);
|
||||
+
|
||||
+int
|
||||
+__gthread_yield (void);
|
||||
+
|
||||
+int
|
||||
+__gthread_once (__gthread_once_t *__once, void (*__func) (void));
|
||||
+
|
||||
+int
|
||||
+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *));
|
||||
+
|
||||
+int
|
||||
+__gthread_key_delete (__gthread_key_t __key);
|
||||
+
|
||||
+void *
|
||||
+__gthread_getspecific (__gthread_key_t __key);
|
||||
+
|
||||
+int
|
||||
+__gthread_setspecific (__gthread_key_t __key, const void *__ptr);
|
||||
+
|
||||
+void
|
||||
+__gthread_mutex_init_function (__gthread_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_lock (__gthread_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex);
|
||||
+
|
||||
+void
|
||||
+__gthread_cond_init_function (__gthread_cond_t *__cond);
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_broadcast (__gthread_cond_t *__cond);
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_signal (__gthread_cond_t *__cond);
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
||||
+ const __gthread_time_t *__abs_timeout);
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
|
||||
+ __gthread_recursive_mutex_t *__mutex);
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_destroy (__gthread_cond_t* __cond);
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
|
||||
diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
|
||||
index fb812d3801f..7f6669d530f 100644
|
||||
--- a/libgcc/config/rs6000/t-ppccomm
|
||||
+++ b/libgcc/config/rs6000/t-ppccomm
|
||||
@@ -1,4 +1,5 @@
|
||||
LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c \
|
||||
+ $(srcdir)/config/rs6000/gthr-dkp.c \
|
||||
$(srcdir)/config/rs6000/tramp.S
|
||||
|
||||
# This can't end up in shared libgcc
|
||||
diff --git a/libgcc/configure b/libgcc/configure
|
||||
index 1f9b2ac578b..539fd961156 100755
|
||||
--- a/libgcc/configure
|
||||
+++ b/libgcc/configure
|
||||
@@ -5689,6 +5689,7 @@ tm_file="${tm_file_}"
|
||||
case $target_thread_file in
|
||||
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
||||
dce) thread_header=config/pa/gthr-dce.h ;;
|
||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||
gcn) thread_header=config/gcn/gthr-gcn.h ;;
|
||||
lynx) thread_header=config/gthr-lynx.h ;;
|
||||
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||
index b98b86a5a88..3f62b3616d2 100644
|
||||
--- a/libgcc/crtstuff.c
|
||||
+++ b/libgcc/crtstuff.c
|
||||
@@ -325,7 +325,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/libstdc++-v3/configure b/libstdc++-v3/configure
|
||||
index eac60392121..d1c85de1e34 100755
|
||||
--- a/libstdc++-v3/configure
|
||||
+++ b/libstdc++-v3/configure
|
||||
@@ -15765,6 +15765,7 @@ $as_echo "$target_thread_file" >&6; }
|
||||
case $target_thread_file in
|
||||
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
||||
dce) thread_header=config/pa/gthr-dce.h ;;
|
||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||
gcn) thread_header=config/gcn/gthr-gcn.h ;;
|
||||
lynx) thread_header=config/gthr-lynx.h ;;
|
||||
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
||||
diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream
|
||||
index e62a1ade3c2..5f8ec3a1495 100644
|
||||
--- a/libstdc++-v3/include/std/fstream
|
||||
+++ b/libstdc++-v3/include/std/fstream
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
// This can be overridden by the target's os_defines.h
|
||||
#ifndef _GLIBCXX_BUFSIZ
|
||||
-# define _GLIBCXX_BUFSIZ BUFSIZ
|
||||
+# define _GLIBCXX_BUFSIZ (BUFSIZ+1)
|
||||
#endif
|
||||
|
||||
namespace std _GLIBCXX_VISIBILITY(default)
|
||||
diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc
|
||||
index c85b9aed40b..a8f3f4a50d2 100644
|
||||
--- a/libstdc++-v3/libsupc++/eh_alloc.cc
|
||||
+++ b/libstdc++-v3/libsupc++/eh_alloc.cc
|
||||
@@ -85,6 +85,7 @@ namespace
|
||||
{
|
||||
public:
|
||||
pool();
|
||||
+ ~pool();
|
||||
|
||||
_GLIBCXX_NODISCARD void *allocate (std::size_t);
|
||||
void free (void *);
|
||||
@@ -136,6 +137,15 @@ namespace
|
||||
first_free_entry->next = NULL;
|
||||
}
|
||||
|
||||
+ pool::~pool()
|
||||
+ {
|
||||
+ if (arena)
|
||||
+ {
|
||||
+ ::free(arena);
|
||||
+ arena = 0;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
void *pool::allocate (std::size_t size)
|
||||
{
|
||||
__gnu_cxx::__scoped_lock sentry(emergency_mutex);
|
||||
diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc
|
||||
index 435368fa5c5..75b78c384b4 100644
|
||||
--- a/libstdc++-v3/src/c++17/fs_ops.cc
|
||||
+++ b/libstdc++-v3/src/c++17/fs_ops.cc
|
||||
@@ -1123,6 +1123,7 @@ fs::permissions(const path& p, perms prms, perm_options opts,
|
||||
}
|
||||
|
||||
int err = 0;
|
||||
+#ifndef __DEVKITPPC__
|
||||
#if _GLIBCXX_USE_FCHMODAT
|
||||
const int flag = (nofollow && is_symlink(st)) ? AT_SYMLINK_NOFOLLOW : 0;
|
||||
if (::fchmodat(AT_FDCWD, p.c_str(), static_cast<mode_t>(prms), flag))
|
||||
@@ -1132,6 +1133,7 @@ fs::permissions(const path& p, perms prms, perm_options opts,
|
||||
ec = std::__unsupported();
|
||||
else if (posix::chmod(p.c_str(), static_cast<posix::mode_t>(prms)))
|
||||
err = errno;
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
if (err)
|
||||
diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h
|
||||
index 978e8724154..f773d3b9b62 100644
|
||||
--- a/libstdc++-v3/src/filesystem/ops-common.h
|
||||
+++ b/libstdc++-v3/src/filesystem/ops-common.h
|
||||
@@ -481,6 +481,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
|
||||
return false;
|
||||
}
|
||||
|
||||
+#ifndef __DEVKITPPC__
|
||||
#if defined _GLIBCXX_USE_FCHMOD && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS
|
||||
if (::fchmod(out.fd, from_st->st_mode))
|
||||
#elif defined _GLIBCXX_USE_FCHMODAT && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS
|
||||
@@ -492,6 +493,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
|
||||
ec.assign(errno, std::generic_category());
|
||||
return false;
|
||||
}
|
||||
+#endif
|
||||
|
||||
size_t count = from_st->st_size;
|
||||
#if defined _GLIBCXX_USE_SENDFILE && ! defined _GLIBCXX_FILESYSTEM_IS_WINDOWS
|
||||
diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc
|
||||
index 896a4918ace..59a155b840e 100644
|
||||
--- a/libstdc++-v3/src/filesystem/ops.cc
|
||||
+++ b/libstdc++-v3/src/filesystem/ops.cc
|
||||
@@ -971,6 +971,7 @@ fs::permissions(const path& p, perms prms, error_code& ec) noexcept
|
||||
}
|
||||
|
||||
int err = 0;
|
||||
+#ifndef __DEVKITPPC__
|
||||
#if _GLIBCXX_USE_FCHMODAT
|
||||
const int flag = (nofollow && is_symlink(st)) ? AT_SYMLINK_NOFOLLOW : 0;
|
||||
if (::fchmodat(AT_FDCWD, p.c_str(), static_cast<mode_t>(prms), flag))
|
||||
@@ -980,6 +981,7 @@ fs::permissions(const path& p, perms prms, error_code& ec) noexcept
|
||||
ec = std::__unsupported();
|
||||
else if (posix::chmod(p.c_str(), static_cast<mode_t>(prms)))
|
||||
err = errno;
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
if (err)
|
||||
@@ -10065,6 +10065,45 @@ index df966f929..106d99e94 100644
|
||||
#include <_ansi.h>
|
||||
#include <reent.h>
|
||||
#include <newlib.h>
|
||||
diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c
|
||||
index 710440389..985e720bf 100644
|
||||
--- a/newlib/libc/stdlib/__call_atexit.c
|
||||
+++ b/newlib/libc/stdlib/__call_atexit.c
|
||||
@@ -21,6 +21,7 @@ struct _atexit *__atexit = _NULL;
|
||||
|
||||
#ifdef _WANT_REGISTER_FINI
|
||||
|
||||
+#if 0
|
||||
/* If "__libc_fini" is defined, finalizers (either
|
||||
"__libc_fini_array", or "_fini", as appropriate) will be run after
|
||||
all user-specified atexit handlers. For example, you can define
|
||||
@@ -36,6 +37,7 @@ struct _atexit *__atexit = _NULL;
|
||||
used with multiple BSPs, some of which register finalizers from
|
||||
startup code, while others defer to the C library. */
|
||||
extern char __libc_fini __attribute__((weak));
|
||||
+#endif
|
||||
|
||||
/* Register the application finalization function with atexit. These
|
||||
finalizers should run last. Therefore, we want to call atexit as
|
||||
@@ -46,6 +48,7 @@ register_fini(void) __attribute__((constructor (0)));
|
||||
static void
|
||||
register_fini(void)
|
||||
{
|
||||
+#if 0
|
||||
if (&__libc_fini) {
|
||||
#ifdef _HAVE_INITFINI_ARRAY
|
||||
extern void __libc_fini_array (void);
|
||||
@@ -55,6 +58,10 @@ register_fini(void)
|
||||
atexit (_fini);
|
||||
#endif
|
||||
}
|
||||
+#else
|
||||
+ extern void __fini (void);
|
||||
+ atexit (__fini);
|
||||
+#endif
|
||||
}
|
||||
|
||||
#endif /* _WANT_REGISTER_FINI */
|
||||
diff --git a/newlib/libc/stdlib/mlock.c b/newlib/libc/stdlib/mlock.c
|
||||
index 23aa10173..ba88eb9fb 100644
|
||||
--- a/newlib/libc/stdlib/mlock.c
|
||||
|
||||
@@ -101,7 +101,7 @@ then
|
||||
--with-newlib \
|
||||
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||
--prefix=$prefix \
|
||||
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 43" \
|
||||
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 44.2" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
$EXTRA_GCC_PARAMS \
|
||||
@@ -144,6 +144,7 @@ then
|
||||
--target=$target \
|
||||
--prefix=$prefix \
|
||||
--enable-newlib-mb \
|
||||
--enable-newlib-register-fini \
|
||||
|| { echo "Error configuring newlib"; exit 1; }
|
||||
touch configured-newlib
|
||||
fi
|
||||
|
||||
@@ -39,8 +39,8 @@ case "$VERSION" in
|
||||
toolchain=DEVKITARM
|
||||
;;
|
||||
"2" )
|
||||
GCC_VER=13.1.0
|
||||
BINUTILS_VER=2.40
|
||||
GCC_VER=13.2.0
|
||||
BINUTILS_VER=2.41
|
||||
MN_BINUTILS_VER=2.24
|
||||
NEWLIB_VER=4.3.0.20230120
|
||||
basedir='dkppc'
|
||||
@@ -49,8 +49,8 @@ case "$VERSION" in
|
||||
toolchain=DEVKITPPC
|
||||
;;
|
||||
"3" )
|
||||
GCC_VER=13.1.0
|
||||
BINUTILS_VER=2.32
|
||||
GCC_VER=13.2.0
|
||||
BINUTILS_VER=2.41
|
||||
NEWLIB_VER=4.3.0.20230120
|
||||
basedir='dka64'
|
||||
package=devkitA64
|
||||
|
||||
Reference in New Issue
Block a user