mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-08-20 17:34:25 -05:00
Compare commits
48 Commits
devkitARM_
...
devkitA64_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c5f34ab49b | ||
|
|
eb428eb450 | ||
|
|
032100b82e | ||
|
|
d051cd518b | ||
|
|
5daf9f7bd1 | ||
|
|
f06196c43c | ||
|
|
5926a76d64 | ||
|
|
12a06c469f | ||
|
|
67729ec64c | ||
|
|
d0a05636ab | ||
|
|
7d1a2ac929 | ||
|
|
9332465b06 | ||
|
|
3b8a45ed5b | ||
|
|
cc0e589e56 | ||
|
|
06e7ade19c | ||
|
|
dec683a0ed | ||
|
|
4319248cf8 | ||
|
|
80a329157a | ||
|
|
c8273a1082 | ||
|
|
4defc0f22b | ||
|
|
d158002ce3 | ||
|
|
62b6ba1484 | ||
|
|
e3dca6f33f | ||
|
|
db4e394ab8 | ||
|
|
8f6a2cf470 | ||
|
|
3429d8162f | ||
|
|
a048d2e89c | ||
|
|
94cabdf12a | ||
|
|
6a2cfec336 | ||
|
|
7b03d726b6 | ||
|
|
9df0987259 | ||
|
|
923724a397 | ||
|
|
cd5e224d6a | ||
|
|
b280c0af31 | ||
|
|
776be5894d | ||
|
|
87f8584b86 | ||
|
|
84ca4f5c18 | ||
|
|
a07a271bdb | ||
|
|
026a498a51 | ||
|
|
b5de354a1e | ||
|
|
ca6cded363 | ||
|
|
149a2358b8 | ||
|
|
426c8d0e62 | ||
|
|
a33bf405d2 | ||
|
|
eac2e40528 | ||
|
|
e377ef05f6 | ||
|
|
67b8703a8c | ||
|
|
df8b66a808 |
14
README.TXT
14
README.TXT
@@ -24,9 +24,9 @@ For building gcc libgmp, libmpfr and libmpc are required - these are built as
|
||||
static libraries to make packaging simpler. If you're building the tools for
|
||||
personal use then the versions packaged by your chosen distro should suffice.
|
||||
|
||||
http://gmplib.org/
|
||||
http://www.mpfr.org/
|
||||
http://www.multiprecision.org/
|
||||
https://gmplib.org/
|
||||
https://www.mpfr.org/
|
||||
https://www.multiprecision.org/
|
||||
|
||||
sudo apt-get install libgmp-dev libmpfr-dev libmpc-dev
|
||||
|
||||
@@ -34,10 +34,10 @@ Some of the tools for devkitARM and devkitPPC also require FreeImage, zlib,
|
||||
expat, and libusb. Again these are built as static libraries for ease of
|
||||
packaging but you can probably use the versions supplied by your distro.
|
||||
|
||||
http://freeimage.sourceforge.net/
|
||||
http://www.zlib.net
|
||||
http://www.libusb.org
|
||||
http://expat.sourceforge.net/
|
||||
https://freeimage.sourceforge.net/
|
||||
https://www.zlib.net
|
||||
https://www.libusb.org
|
||||
https://expat.sourceforge.net/
|
||||
|
||||
sudo apt-get install libfreeimage-dev zlib1g-dev libusb-dev libudev-dev libexpat1-dev
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
#---------------------------------------------------------------------------------
|
||||
# devkitARM release 58
|
||||
# devkitPPC release 40
|
||||
# devkitA64 release 19
|
||||
# devkitARM release 62
|
||||
# devkitPPC release 44.2
|
||||
# devkitA64 release 24
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
if [ 0 -eq 1 ] ; then
|
||||
@@ -27,12 +27,12 @@ echo
|
||||
|
||||
|
||||
|
||||
DKARM_RULES_VER=1.2.1
|
||||
DKARM_CRTLS_VER=1.1.1
|
||||
DKARM_RULES_VER=1.5.0
|
||||
DKARM_CRTLS_VER=1.2.2
|
||||
|
||||
DKPPC_RULES_VER=1.1.0
|
||||
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,7 +1,56 @@
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.cc 2022-05-02 21:50:30.090088643 +0100
|
||||
@@ -19417,8 +19417,24 @@
|
||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index 648b3dc2110..ed605b28956 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -1132,7 +1132,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 ec45f23fa41..a208eabd806 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 a9f3e2715ca..0c7304e1d81 100644
|
||||
--- a/gcc/config/aarch64/aarch64-opts.h
|
||||
+++ b/gcc/config/aarch64/aarch64-opts.h
|
||||
@@ -52,6 +52,12 @@ enum aarch64_tls_type {
|
||||
TLS_DESCRIPTORS
|
||||
};
|
||||
|
||||
+/* Which thread pointer access sequence to use. */
|
||||
+enum aarch64_tp_type {
|
||||
+ TP_HARD,
|
||||
+ TP_SOFT
|
||||
+};
|
||||
+
|
||||
/* The code model defines the address generation strategy.
|
||||
Most have a PIC and non-PIC variant. */
|
||||
enum aarch64_code_model {
|
||||
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
|
||||
index f5db5379543..f582e5a7543 100644
|
||||
--- a/gcc/config/aarch64/aarch64.cc
|
||||
+++ b/gcc/config/aarch64/aarch64.cc
|
||||
@@ -19550,8 +19550,24 @@ aarch64_load_tp (rtx target)
|
||||
|| !register_operand (target, Pmode))
|
||||
target = gen_reg_rtx (Pmode);
|
||||
|
||||
@@ -28,21 +77,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.cc gcc-12.1.0-RC-2
|
||||
return target;
|
||||
}
|
||||
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-elf-raw.h 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-elf-raw.h 2022-05-02 21:50:30.086094234 +0100
|
||||
@@ -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 -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.h 2022-05-02 21:50:30.090088643 +0100
|
||||
@@ -1245,6 +1245,10 @@
|
||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
||||
index 73b09e20508..ad62b5080cc 100644
|
||||
--- a/gcc/config/aarch64/aarch64.h
|
||||
+++ b/gcc/config/aarch64/aarch64.h
|
||||
@@ -1154,6 +1154,10 @@ typedef struct
|
||||
/* Check TLS Descriptors mechanism is selected. */
|
||||
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
||||
|
||||
@@ -53,19 +92,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.h gcc-12.1.0-RC-20
|
||||
extern enum aarch64_code_model aarch64_cmodel;
|
||||
|
||||
/* When using the tiny addressing model conditional and unconditional branches
|
||||
@@ -1290,7 +1294,7 @@
|
||||
#define MCPU_TO_MARCH_SPEC_FUNCTIONS \
|
||||
{ "rewrite_mcpu", aarch64_rewrite_mcpu },
|
||||
|
||||
-#if defined(__aarch64__)
|
||||
+#if 0 // defined(__aarch64__)
|
||||
extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||
#define HAVE_LOCAL_CPU_DETECT
|
||||
# define EXTRA_SPEC_FUNCTIONS \
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.md 2022-05-02 21:50:30.090088643 +0100
|
||||
@@ -6899,11 +6899,22 @@
|
||||
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
||||
index 36d0bb3f718..cfa2f7efc7f 100644
|
||||
--- a/gcc/config/aarch64/aarch64.md
|
||||
+++ b/gcc/config/aarch64/aarch64.md
|
||||
@@ -7068,11 +7068,22 @@
|
||||
(define_insn "aarch64_load_tp_hard"
|
||||
[(set (match_operand:DI 0 "register_operand" "=r")
|
||||
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
||||
@@ -90,10 +121,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.md gcc-12.1.0-RC-2
|
||||
;; 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 -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64.opt 2022-05-02 21:50:30.090088643 +0100
|
||||
@@ -122,6 +122,21 @@
|
||||
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
||||
index 1d7967db9c0..17870f18b8b 100644
|
||||
--- a/gcc/config/aarch64/aarch64.opt
|
||||
+++ b/gcc/config/aarch64/aarch64.opt
|
||||
@@ -128,6 +128,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
|
||||
EnumValue
|
||||
Enum(aarch64_tls_size) String(48) Value(48)
|
||||
|
||||
@@ -115,7 +147,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-
|
||||
march=
|
||||
Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
|
||||
Use features of architecture ARCH.
|
||||
@@ -260,7 +275,7 @@
|
||||
@@ -266,7 +281,7 @@ TargetVariable
|
||||
long aarch64_stack_protector_guard_offset = 0
|
||||
|
||||
moutline-atomics
|
||||
@@ -124,26 +156,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64.opt gcc-12.1.0-RC-
|
||||
Generate local calls to out-of-line atomic operations.
|
||||
|
||||
-param=aarch64-sve-compare-costs=
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/aarch64-opts.h 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/aarch64-opts.h 2022-05-02 21:50:30.086094234 +0100
|
||||
@@ -48,6 +48,12 @@
|
||||
TLS_DESCRIPTORS
|
||||
};
|
||||
|
||||
+/* Which thread pointer access sequence to use. */
|
||||
+enum aarch64_tp_type {
|
||||
+ TP_HARD,
|
||||
+ TP_SOFT
|
||||
+};
|
||||
+
|
||||
/* The code model defines the address generation strategy.
|
||||
Most have a PIC and non-PIC variant. */
|
||||
enum aarch64_code_model {
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/aarch64/t-aarch64 2022-05-02 21:50:30.090088643 +0100
|
||||
@@ -177,8 +177,10 @@
|
||||
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
||||
index a9a244ab6d6..a29f2772d63 100644
|
||||
--- a/gcc/config/aarch64/t-aarch64
|
||||
+++ b/gcc/config/aarch64/t-aarch64
|
||||
@@ -177,8 +177,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
|
||||
$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
|
||||
|
||||
comma=,
|
||||
@@ -156,10 +173,12 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/aarch64/t-aarch64 gcc-12.1.0-RC-20
|
||||
|
||||
insn-conditions.md: s-check-sve-md
|
||||
s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.h 2022-05-02 22:04:49.962851033 +0100
|
||||
@@ -0,0 +1,29 @@
|
||||
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.
|
||||
+
|
||||
@@ -188,10 +207,15 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.h gcc-12.1.0-RC-20220429
|
||||
+#define TARGET_OS_CPP_BUILTINS() \
|
||||
+ do { \
|
||||
+ builtin_define ("__DEVKITA64__"); \
|
||||
+ builtin_define ("__DEVKITPRO__"); \
|
||||
+ } while (0)
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/devkitpro.opt 2022-05-02 21:50:30.090088643 +0100
|
||||
+
|
||||
+
|
||||
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.
|
||||
+
|
||||
@@ -222,43 +246,27 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/devkitpro.opt gcc-12.1.0-RC-202204
|
||||
+Driver
|
||||
+
|
||||
+; This comment is to ensure we retain the blank line above.
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config/i386/host-mingw32.cc 2022-05-02 21:50:30.090088643 +0100
|
||||
@@ -45,7 +45,11 @@
|
||||
static inline void w32_error(const char*, const char*, int, const char*);
|
||||
|
||||
/* FIXME: Is this big enough? */
|
||||
diff --git a/gcc/config/i386/host-mingw32.cc b/gcc/config/i386/host-mingw32.cc
|
||||
index acff6138d63..8dc91b75f93 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__
|
||||
+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;
|
||||
+ size = UINT64_C(64 * 1024 * 1024 * 1024);
|
||||
+#endif
|
||||
|
||||
/* Granularity for reserving address space. */
|
||||
static size_t va_granularity = 0x10000;
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config.gcc gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config.gcc 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/config.gcc 2022-05-02 21:50:30.086094234 +0100
|
||||
@@ -1093,7 +1093,14 @@
|
||||
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 -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc
|
||||
--- gcc-12.1.0-RC-20220429/gcc/gcc.cc 2022-04-29 14:58:23.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/gcc/gcc.cc 2022-05-02 21:50:30.090088643 +0100
|
||||
@@ -860,6 +860,11 @@
|
||||
res = VirtualAlloc (NULL, size,
|
||||
MEM_RESERVE | MEM_TOP_DOWN,
|
||||
PAGE_NOACCESS);
|
||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
||||
index 16bb07f2cdc..22a181a3a1c 100644
|
||||
--- a/gcc/gcc.cc
|
||||
+++ b/gcc/gcc.cc
|
||||
@@ -868,6 +868,11 @@ proper position among the other output files. */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -270,7 +278,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/g
|
||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||
#ifndef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC \
|
||||
@@ -1204,6 +1209,7 @@
|
||||
@@ -1191,6 +1196,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;
|
||||
@@ -278,7 +286,7 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/g
|
||||
static const char *endfile_spec = ENDFILE_SPEC;
|
||||
static const char *startfile_spec = STARTFILE_SPEC;
|
||||
static const char *linker_name_spec = LINKER_NAME;
|
||||
@@ -1709,6 +1715,7 @@
|
||||
@@ -1701,6 +1707,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),
|
||||
@@ -286,10 +294,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dka64/gcc/g
|
||||
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c
|
||||
--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c 2022-04-29 14:58:25.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/libgcc/crtstuff.c 2022-05-02 21:50:30.094083051 +0100
|
||||
@@ -325,7 +325,7 @@
|
||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||
index 93ff5b81dc5..20c0fe89a28 100644
|
||||
--- a/libgcc/crtstuff.c
|
||||
+++ b/libgcc/crtstuff.c
|
||||
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
||||
|
||||
#ifdef OBJECT_FORMAT_ELF
|
||||
|
||||
@@ -298,10 +307,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dka6
|
||||
/* 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 -NBaur gcc-12.1.0-RC-20220429/libgcc/gthr.h gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h
|
||||
--- gcc-12.1.0-RC-20220429/libgcc/gthr.h 2022-04-29 14:58:25.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/libgcc/gthr.h 2022-05-02 21:50:30.094083051 +0100
|
||||
@@ -136,7 +136,7 @@
|
||||
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
||||
index 1989c0c86ed..f1c49b2d4b1 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. */
|
||||
@@ -310,10 +320,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/libgcc/gthr.h gcc-12.1.0-RC-20220429-dka64/li
|
||||
#undef GTHREAD_USE_WEAK
|
||||
#define GTHREAD_USE_WEAK 0
|
||||
#endif
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am
|
||||
--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am 2022-04-29 14:58:26.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.am 2022-05-02 21:50:30.094083051 +0100
|
||||
@@ -1366,6 +1366,7 @@
|
||||
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
||||
index a880e8ee227..c58249f986c 100644
|
||||
--- a/libstdc++-v3/include/Makefile.am
|
||||
+++ b/libstdc++-v3/include/Makefile.am
|
||||
@@ -1417,6 +1417,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||
@@ -321,10 +332,11 @@ diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.am gcc-12.1.0-R
|
||||
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
||||
< $< > $@
|
||||
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in
|
||||
--- gcc-12.1.0-RC-20220429/libstdc++-v3/include/Makefile.in 2022-04-29 14:58:26.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dka64/libstdc++-v3/include/Makefile.in 2022-05-02 21:50:30.094083051 +0100
|
||||
@@ -1857,6 +1857,7 @@
|
||||
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
||||
index 0ff875b280b..37820c57a0a 100644
|
||||
--- a/libstdc++-v3/include/Makefile.in
|
||||
+++ b/libstdc++-v3/include/Makefile.in
|
||||
@@ -1891,6 +1891,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||
15629
dka64/patches/newlib-4.3.0.20230120.patch
Normal file
15629
dka64/patches/newlib-4.3.0.20230120.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -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 19" \
|
||||
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 24" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
$EXTRA_GCC_PARAMS \
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c
|
||||
index df09b7b8fddb82b21f97afee8821166d92220094..ac1eb8eb02c6d42533c0faa7aebdce432ac947e9 100644 (file)
|
||||
--- a/libiberty/rust-demangle.c
|
||||
+++ b/libiberty/rust-demangle.c
|
||||
@@ -75,10 +75,10 @@ struct rust_demangler
|
||||
int version;
|
||||
|
||||
/* Recursion depth. */
|
||||
- uint recursion;
|
||||
+ unsigned recursion;
|
||||
/* Maximum number of times demangle_path may be called recursively. */
|
||||
#define RUST_MAX_RECURSION_COUNT 1024
|
||||
-#define RUST_NO_RECURSION_LIMIT ((uint) -1)
|
||||
+#define RUST_NO_RECURSION_LIMIT ((unsigned) -1)
|
||||
|
||||
uint64_t bound_lifetime_depth;
|
||||
};
|
||||
@@ -1,233 +0,0 @@
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/arm/arm-cpus.in 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/arm-cpus.in 2022-04-30 13:31:09.120134164 +0100
|
||||
@@ -412,7 +412,7 @@
|
||||
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 -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/arm/t-arm-elf 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/t-arm-elf 2022-04-30 13:31:39.759455398 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Copyright (C) 1998-2022 Free Software Foundation, Inc.
|
||||
+# Copyright (C) 1998-2021 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is part of GCC.
|
||||
#
|
||||
@@ -16,120 +16,14 @@
|
||||
# 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 mfloat-abi=hard
|
||||
+MULTILIB_DIRNAMES = thumb be armv6k fpu
|
||||
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_MATCHES += $(foreach ARCH, $(all_v9_archs), \
|
||||
- march?armv7+fp=march?$(ARCH) \
|
||||
- $(foreach FPARCH, $(v9_fps), \
|
||||
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
|
||||
+MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard
|
||||
|
||||
-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \
|
||||
- march?armv7+fp=march?$(ARCH)+fp.dp)
|
||||
|
||||
-# PART 4 - Reuse rules
|
||||
+MULTILIB_MATCHES += march?armv6k=mtune?mpcore
|
||||
+MULTILIB_MATCHES += march?armv6k=mcpu?mpcore
|
||||
|
||||
-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
|
||||
diff -NBaur gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/arm/unknown-elf.h 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/arm/unknown-elf.h 2022-04-30 13:31:09.120134164 +0100
|
||||
@@ -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 -NBaur gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc
|
||||
--- gcc-12.1.0-RC-20220429/gcc/config/i386/host-mingw32.cc 2022-04-29 14:58:22.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/config/i386/host-mingw32.cc 2022-04-30 13:31:09.120134164 +0100
|
||||
@@ -45,7 +45,11 @@
|
||||
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 -NBaur gcc-12.1.0-RC-20220429/gcc/gcc.cc gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc
|
||||
--- gcc-12.1.0-RC-20220429/gcc/gcc.cc 2022-04-29 14:58:23.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dkarm/gcc/gcc.cc 2022-04-30 13:31:09.120134164 +0100
|
||||
@@ -860,6 +860,11 @@
|
||||
#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 \
|
||||
@@ -1204,6 +1209,7 @@
|
||||
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;
|
||||
@@ -1709,6 +1715,7 @@
|
||||
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 -NBaur gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi
|
||||
--- gcc-12.1.0-RC-20220429/libgcc/config/arm/t-bpabi 2022-04-29 14:58:25.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dkarm/libgcc/config/arm/t-bpabi 2022-04-30 13:31:09.120134164 +0100
|
||||
@@ -17,4 +17,4 @@
|
||||
# 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 -NBaur gcc-12.1.0-RC-20220429/libgcc/crtstuff.c gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c
|
||||
--- gcc-12.1.0-RC-20220429/libgcc/crtstuff.c 2022-04-29 14:58:25.000000000 +0100
|
||||
+++ gcc-12.1.0-RC-20220429-dkarm/libgcc/crtstuff.c 2022-04-30 13:31:09.120134164 +0100
|
||||
@@ -325,7 +325,7 @@
|
||||
|
||||
#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
|
||||
354
dkarm-eabi/patches/gcc-13.2.0.patch
Normal file
354
dkarm-eabi/patches/gcc-13.2.0.patch
Normal file
@@ -0,0 +1,354 @@
|
||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index 6fd1594480a..92b82426f50 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -1412,6 +1412,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 f1fa3fa174c..2bb894b5b2d 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 f7fc1460d1c..055f9d62385 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 397ac3f68b9..b9a388f19be 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/gcc.cc b/gcc/gcc.cc
|
||||
index 16bb07f2cdc..22a181a3a1c 100644
|
||||
--- a/gcc/gcc.cc
|
||||
+++ b/gcc/gcc.cc
|
||||
@@ -868,6 +868,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 \
|
||||
@@ -1191,6 +1196,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;
|
||||
@@ -1701,6 +1707,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/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 93ff5b81dc5..20c0fe89a28 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 1989c0c86ed..dc3220cdf3c 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/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
||||
index a880e8ee227..2050e2e4ccf 100644
|
||||
--- a/libstdc++-v3/include/Makefile.am
|
||||
+++ b/libstdc++-v3/include/Makefile.am
|
||||
@@ -1417,6 +1417,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||
-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 0ff875b280b..7d270fc3a83 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@
|
||||
@@ -1891,6 +1892,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' \
|
||||
< $< > $@
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -66,7 +66,7 @@ then
|
||||
--with-system-zlib \
|
||||
--disable-tm-clone-registry \
|
||||
--disable-__cxa_atexit \
|
||||
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 58" \
|
||||
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 62" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
$EXTRA_GCC_PARAMS \
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -NBaur binutils-2.36.1/opcodes/ppc-opc.c binutils-2.36.1-ppc/opcodes/ppc-opc.c
|
||||
--- binutils-2.36.1/opcodes/ppc-opc.c 2021-01-09 10:47:34.000000000 +0000
|
||||
+++ binutils-2.36.1-ppc/opcodes/ppc-opc.c 2021-02-14 19:41:09.350749949 +0000
|
||||
@@ -4225,7 +4225,7 @@
|
||||
#define MFDEC2 (PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
|
||||
| PPC_OPCODE_TITAN)
|
||||
#define BOOKE PPC_OPCODE_BOOKE
|
||||
-#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
|
||||
+#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
|
||||
#define PPCE300 PPC_OPCODE_E300
|
||||
#define PPCSPE PPC_OPCODE_SPE
|
||||
#define PPCSPE2 PPC_OPCODE_SPE2
|
||||
@@ -1,28 +0,0 @@
|
||||
diff -NBaur binutils-2.37/libiberty/rust-demangle.c binutils-2.37-new/libiberty/rust-demangle.c
|
||||
--- binutils-2.37/libiberty/rust-demangle.c 2021-07-15 15:19:46.000000000 +0100
|
||||
+++ binutils-2.37-new/libiberty/rust-demangle.c 2022-01-01 22:02:21.860422023 +0000
|
||||
@@ -75,10 +75,10 @@
|
||||
int version;
|
||||
|
||||
/* Recursion depth. */
|
||||
- uint recursion;
|
||||
+ unsigned recursion;
|
||||
/* Maximum number of times demangle_path may be called recursively. */
|
||||
#define RUST_MAX_RECURSION_COUNT 1024
|
||||
-#define RUST_NO_RECURSION_LIMIT ((uint) -1)
|
||||
+#define RUST_NO_RECURSION_LIMIT ((unsigned) -1)
|
||||
|
||||
uint64_t bound_lifetime_depth;
|
||||
};
|
||||
diff -NBaur binutils-2.37/opcodes/ppc-opc.c binutils-2.37-new/opcodes/ppc-opc.c
|
||||
--- binutils-2.37/opcodes/ppc-opc.c 2021-07-08 12:37:21.000000000 +0100
|
||||
+++ binutils-2.37-new/opcodes/ppc-opc.c 2022-01-01 22:02:04.409141184 +0000
|
||||
@@ -4302,7 +4302,7 @@
|
||||
#define MFDEC2 (PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
|
||||
| PPC_OPCODE_TITAN)
|
||||
#define BOOKE PPC_OPCODE_BOOKE
|
||||
-#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
|
||||
+#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
|
||||
#define PPCE300 PPC_OPCODE_E300
|
||||
#define PPCSPE PPC_OPCODE_SPE
|
||||
#define PPCSPE2 PPC_OPCODE_SPE2
|
||||
26
dkppc/patches/binutils-2.41.patch
Normal file
26
dkppc/patches/binutils-2.41.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
|
||||
index da892988f5d..6b8efb9bbdb 100644
|
||||
--- a/ld/emulparams/elf32ppccommon.sh
|
||||
+++ b/ld/emulparams/elf32ppccommon.sh
|
||||
@@ -23,7 +23,7 @@ else
|
||||
unset SBSS_START_SYMBOLS
|
||||
unset SBSS_END_SYMBOLS
|
||||
fi
|
||||
-OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};"
|
||||
+OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};${CREATE_SHLIB+PROVIDE (}__end__ = .${CREATE_SHLIB+)};"
|
||||
OTHER_RELRO_SECTIONS="
|
||||
.fixup ${RELOCATING-0} : { *(.fixup) }
|
||||
.got1 ${RELOCATING-0} : { *(.got1) }
|
||||
diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
|
||||
index 37f1aeb780c..f8de8aacc44 100644
|
||||
--- a/opcodes/ppc-opc.c
|
||||
+++ b/opcodes/ppc-opc.c
|
||||
@@ -4988,7 +4988,7 @@ const unsigned int num_powerpc_operands = ARRAY_SIZE (powerpc_operands);
|
||||
#define MFDEC2 (PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
|
||||
| PPC_OPCODE_TITAN)
|
||||
#define BOOKE PPC_OPCODE_BOOKE
|
||||
-#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
|
||||
+#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
|
||||
#define PPCE300 PPC_OPCODE_E300
|
||||
#define PPCSPE PPC_OPCODE_SPE
|
||||
#define PPCSPE2 PPC_OPCODE_SPE2
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/config/gthr.m4 b/config/gthr.m4
|
||||
index 4b937306ad0..bfd0375bd60 100644
|
||||
index 11996247f15..f21b315ce8a 100644
|
||||
--- a/config/gthr.m4
|
||||
+++ b/config/gthr.m4
|
||||
@@ -13,6 +13,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
|
||||
@@ -10,86 +10,8 @@ index 4b937306ad0..bfd0375bd60 100644
|
||||
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.host b/gcc/config.host
|
||||
index 0a02c33cc80..38f7adc655e 100644
|
||||
--- a/gcc/config.host
|
||||
+++ b/gcc/config.host
|
||||
@@ -251,6 +251,10 @@ case ${host} in
|
||||
host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o"
|
||||
host_lto_plugin_soname=liblto_plugin.dll
|
||||
;;
|
||||
+ aarch64-*-darwin*)
|
||||
+ out_host_hook_obj="${out_host_hook_obj} host-aarch64-darwin.o"
|
||||
+ host_xmake_file="${host_xmake_file} aarch64/x-darwin"
|
||||
+ ;;
|
||||
i[34567]86-*-darwin* | x86_64-*-darwin*)
|
||||
out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
|
||||
host_xmake_file="${host_xmake_file} i386/x-darwin"
|
||||
diff --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c
|
||||
new file mode 100644
|
||||
index 00000000000..92c38b0b9db
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/aarch64/host-aarch64-darwin.c
|
||||
@@ -0,0 +1,32 @@
|
||||
+/* i386-darwin host-specific hook definitions.
|
||||
+ Copyright (C) 2003-2021 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/>. */
|
||||
+
|
||||
+#define IN_TARGET_CODE 1
|
||||
+
|
||||
+#include "config.h"
|
||||
+#include "system.h"
|
||||
+#include "coretypes.h"
|
||||
+#include "hosthooks.h"
|
||||
+#include "hosthooks-def.h"
|
||||
+#include "config/host-darwin.h"
|
||||
+
|
||||
+/* Darwin doesn't do anything special for aarch64 hosts; this file exists just
|
||||
+ to include config/host-darwin.h. */
|
||||
+
|
||||
+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
|
||||
diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin
|
||||
new file mode 100644
|
||||
index 00000000000..6d788d5e89c
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/aarch64/x-darwin
|
||||
@@ -0,0 +1,3 @@
|
||||
+host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c
|
||||
+ $(COMPILE) $<
|
||||
+ $(POSTCOMPILE)
|
||||
diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
|
||||
index 360a280b23a..2c03947999a 100644
|
||||
--- a/gcc/config/i386/host-mingw32.c
|
||||
+++ b/gcc/config/i386/host-mingw32.c
|
||||
@@ -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 65d1fa2cd1f..51991aab75c 100644
|
||||
index 98bc77b46b8..4f1690d4f4d 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
|
||||
@@ -101,19 +23,32 @@ index 65d1fa2cd1f..51991aab75c 100644
|
||||
#endif
|
||||
|
||||
#define SIG_ATOMIC_TYPE "int"
|
||||
diff --git a/gcc/config/rs6000/eabi.h b/gcc/config/rs6000/eabi.h
|
||||
index 5bfc377e0de..342ed1932b9 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 a7953fad965..04abd41239b 100644
|
||||
index 3503614efbd..b0a1b8e4ad7 100644
|
||||
--- a/gcc/config/rs6000/rs6000.h
|
||||
+++ b/gcc/config/rs6000/rs6000.h
|
||||
@@ -196,6 +196,7 @@ ASM_OPT_ANY
|
||||
@@ -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.c. */
|
||||
the condition in driver-rs6000.cc. */
|
||||
+#if 0
|
||||
#if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
|
||||
/* In driver-rs6000.c. */
|
||||
/* In driver-rs6000.cc. */
|
||||
extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||
@@ -207,6 +208,8 @@ 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
|
||||
@@ -123,10 +58,10 @@ index a7953fad965..04abd41239b 100644
|
||||
#ifndef CC1_CPU_SPEC
|
||||
#ifdef HAVE_LOCAL_CPU_DETECT
|
||||
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
||||
index 510abe169c5..988e82007b0 100644
|
||||
index ae932fc22f0..527b48878b8 100644
|
||||
--- a/gcc/config/rs6000/sysv4.h
|
||||
+++ b/gcc/config/rs6000/sysv4.h
|
||||
@@ -590,7 +590,11 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
@@ -581,7 +581,11 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
/* Default starting address if specified. */
|
||||
#define LINK_START_SPEC "\
|
||||
@@ -139,7 +74,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
myellowknife : %(link_start_yellowknife) ; \
|
||||
mmvme : %(link_start_mvme) ; \
|
||||
msim : %(link_start_sim) ; \
|
||||
@@ -621,7 +625,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
@@ -612,7 +616,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
/* Any specific OS flags. */
|
||||
#define LINK_OS_SPEC "\
|
||||
@@ -149,7 +84,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
myellowknife : %(link_os_yellowknife) ; \
|
||||
mmvme : %(link_os_mvme) ; \
|
||||
msim : %(link_os_sim) ; \
|
||||
@@ -636,7 +641,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
@@ -627,7 +632,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
/* Override rs6000.h definition. */
|
||||
#undef CPP_SPEC
|
||||
#define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
|
||||
@@ -161,7 +96,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
myellowknife : %(cpp_os_yellowknife) ; \
|
||||
mmvme : %(cpp_os_mvme) ; \
|
||||
msim : %(cpp_os_sim) ; \
|
||||
@@ -650,7 +658,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
@@ -641,7 +649,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
#undef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC "\
|
||||
@@ -173,7 +108,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
myellowknife : %(startfile_yellowknife) ; \
|
||||
mmvme : %(startfile_mvme) ; \
|
||||
msim : %(startfile_sim) ; \
|
||||
@@ -664,7 +675,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
@@ -655,7 +666,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
#undef LIB_SPEC
|
||||
#define LIB_SPEC "\
|
||||
@@ -183,7 +118,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
myellowknife : %(lib_yellowknife) ; \
|
||||
mmvme : %(lib_mvme) ; \
|
||||
msim : %(lib_sim) ; \
|
||||
@@ -674,11 +686,12 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
@@ -665,11 +677,12 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
mcall-openbsd: %(lib_openbsd) ; \
|
||||
: %(lib_default) }"
|
||||
|
||||
@@ -198,7 +133,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
myellowknife : %(endfile_yellowknife) ; \
|
||||
mmvme : %(endfile_mvme) ; \
|
||||
msim : %(endfile_sim) ; \
|
||||
@@ -694,16 +707,27 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
@@ -685,16 +698,27 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
/* Motorola ADS support. */
|
||||
#define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
|
||||
@@ -226,7 +161,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
|
||||
/* Motorola Yellowknife support. */
|
||||
#define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
|
||||
@@ -851,6 +875,7 @@ ncrtn.o%s"
|
||||
@@ -842,6 +866,7 @@ ncrtn.o%s"
|
||||
#undef SUBTARGET_EXTRA_SPECS
|
||||
#define SUBTARGET_EXTRA_SPECS \
|
||||
{ "crtsavres_default", CRTSAVRES_DEFAULT_SPEC }, \
|
||||
@@ -234,7 +169,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
{ "lib_ads", LIB_ADS_SPEC }, \
|
||||
{ "lib_yellowknife", LIB_YELLOWKNIFE_SPEC }, \
|
||||
{ "lib_mvme", LIB_MVME_SPEC }, \
|
||||
@@ -860,6 +885,7 @@ ncrtn.o%s"
|
||||
@@ -851,6 +876,7 @@ ncrtn.o%s"
|
||||
{ "lib_netbsd", LIB_NETBSD_SPEC }, \
|
||||
{ "lib_openbsd", LIB_OPENBSD_SPEC }, \
|
||||
{ "lib_default", LIB_DEFAULT_SPEC }, \
|
||||
@@ -242,7 +177,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
{ "startfile_ads", STARTFILE_ADS_SPEC }, \
|
||||
{ "startfile_yellowknife", STARTFILE_YELLOWKNIFE_SPEC }, \
|
||||
{ "startfile_mvme", STARTFILE_MVME_SPEC }, \
|
||||
@@ -869,6 +895,7 @@ ncrtn.o%s"
|
||||
@@ -860,6 +886,7 @@ ncrtn.o%s"
|
||||
{ "startfile_netbsd", STARTFILE_NETBSD_SPEC }, \
|
||||
{ "startfile_openbsd", STARTFILE_OPENBSD_SPEC }, \
|
||||
{ "startfile_default", STARTFILE_DEFAULT_SPEC }, \
|
||||
@@ -250,7 +185,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
{ "endfile_ads", ENDFILE_ADS_SPEC }, \
|
||||
{ "endfile_yellowknife", ENDFILE_YELLOWKNIFE_SPEC }, \
|
||||
{ "endfile_mvme", ENDFILE_MVME_SPEC }, \
|
||||
@@ -880,7 +907,11 @@ ncrtn.o%s"
|
||||
@@ -871,7 +898,11 @@ ncrtn.o%s"
|
||||
{ "endfile_default", ENDFILE_DEFAULT_SPEC }, \
|
||||
{ "link_shlib", LINK_SHLIB_SPEC }, \
|
||||
{ "link_start", LINK_START_SPEC }, \
|
||||
@@ -262,7 +197,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
{ "link_start_yellowknife", LINK_START_YELLOWKNIFE_SPEC }, \
|
||||
{ "link_start_mvme", LINK_START_MVME_SPEC }, \
|
||||
{ "link_start_sim", LINK_START_SIM_SPEC }, \
|
||||
@@ -890,6 +921,7 @@ ncrtn.o%s"
|
||||
@@ -881,6 +912,7 @@ ncrtn.o%s"
|
||||
{ "link_start_openbsd", LINK_START_OPENBSD_SPEC }, \
|
||||
{ "link_start_default", LINK_START_DEFAULT_SPEC }, \
|
||||
{ "link_os", LINK_OS_SPEC }, \
|
||||
@@ -270,7 +205,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
{ "link_os_ads", LINK_OS_ADS_SPEC }, \
|
||||
{ "link_os_yellowknife", LINK_OS_YELLOWKNIFE_SPEC }, \
|
||||
{ "link_os_mvme", LINK_OS_MVME_SPEC }, \
|
||||
@@ -901,6 +933,9 @@ ncrtn.o%s"
|
||||
@@ -892,6 +924,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 }, \
|
||||
@@ -281,7 +216,7 @@ index 510abe169c5..988e82007b0 100644
|
||||
{ "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 7ab55c49940..763709e907e 100644
|
||||
index 691e0d3d2e8..2eb60bc56b6 100644
|
||||
--- a/gcc/config/rs6000/sysv4.opt
|
||||
+++ b/gcc/config/rs6000/sysv4.opt
|
||||
@@ -124,6 +124,26 @@ mads
|
||||
@@ -312,33 +247,33 @@ index 7ab55c49940..763709e907e 100644
|
||||
Target RejectNegative
|
||||
Link with libyk.a, libc.a and crt0.o.
|
||||
diff --git a/gcc/configure b/gcc/configure
|
||||
index 9b28369e3bf..79b95018a89 100755
|
||||
index c7b26d1927d..d1e32ef9ec5 100755
|
||||
--- a/gcc/configure
|
||||
+++ b/gcc/configure
|
||||
@@ -12593,7 +12593,7 @@ case ${enable_threads} in
|
||||
@@ -13011,7 +13011,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)
|
||||
single | tpf | vxworks | win32 | mcf)
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||||
index 162e08cbc02..34d35d0de8d 100644
|
||||
index 09082e8ccae..f5700df9455 100644
|
||||
--- a/gcc/configure.ac
|
||||
+++ b/gcc/configure.ac
|
||||
@@ -1925,7 +1925,7 @@ case ${enable_threads} in
|
||||
@@ -2020,7 +2020,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)
|
||||
single | tpf | vxworks | win32 | mcf)
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
|
||||
index b372409dd42..708ba039963 100644
|
||||
index cf7f71ae123..7e0892a845f 100644
|
||||
--- a/libgcc/config/rs6000/crtrestvr.S
|
||||
+++ b/libgcc/config/rs6000/crtrestvr.S
|
||||
@@ -24,7 +24,7 @@
|
||||
@@ -356,7 +291,7 @@ index b372409dd42..708ba039963 100644
|
||||
#endif
|
||||
+#endif
|
||||
diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
|
||||
index 48a4d65eed4..6835ea69279 100644
|
||||
index 19de2128714..d116593062d 100644
|
||||
--- a/libgcc/config/rs6000/crtsavevr.S
|
||||
+++ b/libgcc/config/rs6000/crtsavevr.S
|
||||
@@ -24,7 +24,7 @@
|
||||
@@ -902,10 +837,10 @@ index fb812d3801f..7f6669d530f 100644
|
||||
|
||||
# This can't end up in shared libgcc
|
||||
diff --git a/libgcc/configure b/libgcc/configure
|
||||
index 4919a56f518..546b3413deb 100755
|
||||
index be5d45f1755..5c5aa253655 100755
|
||||
--- a/libgcc/configure
|
||||
+++ b/libgcc/configure
|
||||
@@ -5679,6 +5679,7 @@ tm_file="${tm_file_}"
|
||||
@@ -5690,6 +5690,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 ;;
|
||||
@@ -914,10 +849,10 @@ index 4919a56f518..546b3413deb 100755
|
||||
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 675930db043..bdfd6f6b0bb 100644
|
||||
index 93ff5b81dc5..20c0fe89a28 100644
|
||||
--- a/libgcc/crtstuff.c
|
||||
+++ b/libgcc/crtstuff.c
|
||||
@@ -325,7 +325,7 @@ register_tm_clones (void)
|
||||
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
||||
|
||||
#ifdef OBJECT_FORMAT_ELF
|
||||
|
||||
@@ -927,10 +862,10 @@ index 675930db043..bdfd6f6b0bb 100644
|
||||
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 326a279c54f..d2cb9d18294 100755
|
||||
index 68ee94c9e28..1e17f789b89 100755
|
||||
--- a/libstdc++-v3/configure
|
||||
+++ b/libstdc++-v3/configure
|
||||
@@ -15698,6 +15698,7 @@ $as_echo "$target_thread_file" >&6; }
|
||||
@@ -15800,6 +15800,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 ;;
|
||||
@@ -938,43 +873,104 @@ index 326a279c54f..d2cb9d18294 100755
|
||||
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/c_compatibility/fenv.h b/libstdc++-v3/include/c_compatibility/fenv.h
|
||||
index 0413e3b7c25..ff5f8bbe1a1 100644
|
||||
--- a/libstdc++-v3/include/c_compatibility/fenv.h
|
||||
+++ b/libstdc++-v3/include/c_compatibility/fenv.h
|
||||
@@ -26,6 +26,10 @@
|
||||
* This is a Standard C++ Library header.
|
||||
*/
|
||||
diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream
|
||||
index 3dff4e5e74e..7835a727321 100644
|
||||
--- a/libstdc++-v3/include/std/fstream
|
||||
+++ b/libstdc++-v3/include/std/fstream
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
||||
+# include_next <fenv.h>
|
||||
+#else
|
||||
// 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 8380052c9f3..100de070f20 100644
|
||||
--- a/libstdc++-v3/libsupc++/eh_alloc.cc
|
||||
+++ b/libstdc++-v3/libsupc++/eh_alloc.cc
|
||||
@@ -143,6 +143,7 @@ namespace
|
||||
{
|
||||
public:
|
||||
pool() noexcept;
|
||||
+ ~pool();
|
||||
|
||||
_GLIBCXX_NODISCARD void *allocate (std::size_t) noexcept;
|
||||
void free (void *) noexcept;
|
||||
@@ -248,6 +249,15 @@ namespace
|
||||
first_free_entry->next = NULL;
|
||||
}
|
||||
|
||||
+ pool::~pool()
|
||||
+ {
|
||||
+ if (arena)
|
||||
+ {
|
||||
+ ::free(arena);
|
||||
+ arena = 0;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
#ifndef _GLIBCXX_FENV_H
|
||||
#define _GLIBCXX_FENV_H 1
|
||||
void *pool::allocate (std::size_t size) noexcept
|
||||
{
|
||||
__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 c94d260632f..74c7a06a90d 100644
|
||||
--- a/libstdc++-v3/src/c++17/fs_ops.cc
|
||||
+++ b/libstdc++-v3/src/c++17/fs_ops.cc
|
||||
@@ -1124,6 +1124,7 @@ fs::permissions(const path& p, perms prms, perm_options opts,
|
||||
}
|
||||
|
||||
@@ -79,3 +83,5 @@ namespace std
|
||||
#endif // C++11
|
||||
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))
|
||||
@@ -1133,6 +1134,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
|
||||
|
||||
#endif // _GLIBCXX_FENV_H
|
||||
+
|
||||
+#endif // __cplusplus
|
||||
diff --git a/libstdc++-v3/include/c_global/cfenv b/libstdc++-v3/include/c_global/cfenv
|
||||
index 0b0ec35a837..d24cb1a3c81 100644
|
||||
--- a/libstdc++-v3/include/c_global/cfenv
|
||||
+++ b/libstdc++-v3/include/c_global/cfenv
|
||||
@@ -37,9 +37,11 @@
|
||||
if (err)
|
||||
diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h
|
||||
index c95511b5c95..f9be4529bb2 100644
|
||||
--- a/libstdc++-v3/src/filesystem/ops-common.h
|
||||
+++ b/libstdc++-v3/src/filesystem/ops-common.h
|
||||
@@ -486,6 +486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
|
||||
return false;
|
||||
}
|
||||
|
||||
#include <bits/c++config.h>
|
||||
+#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
|
||||
@@ -497,6 +498,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
|
||||
ec.assign(errno, std::generic_category());
|
||||
return false;
|
||||
}
|
||||
+#endif
|
||||
|
||||
-#if _GLIBCXX_HAVE_FENV_H
|
||||
-# include <fenv.h>
|
||||
-#endif
|
||||
+// Need to ensure this finds the C library's <fenv.h> not a libstdc++
|
||||
+// wrapper that might already be installed later in the include search path.
|
||||
+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
||||
+#include_next <fenv.h>
|
||||
+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
|
||||
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 d33c13d7f15..7c343cdc30e 100644
|
||||
--- a/libstdc++-v3/src/filesystem/ops.cc
|
||||
+++ b/libstdc++-v3/src/filesystem/ops.cc
|
||||
@@ -972,6 +972,7 @@ fs::permissions(const path& p, perms prms, error_code& ec) noexcept
|
||||
}
|
||||
|
||||
#ifdef _GLIBCXX_USE_C99_FENV_TR1
|
||||
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))
|
||||
@@ -981,6 +982,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)
|
||||
File diff suppressed because it is too large
Load Diff
10282
dkppc/patches/newlib-4.3.0.20230120.patch
Normal file
10282
dkppc/patches/newlib-4.3.0.20230120.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -12,7 +12,7 @@ cd $target/binutils
|
||||
|
||||
if [ ! -f configured-binutils ]
|
||||
then
|
||||
CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
|
||||
../../binutils-$BINUTILS_VER/configure \
|
||||
--prefix=$prefix --target=$target --disable-nls --disable-shared --disable-debug \
|
||||
--disable-werror \
|
||||
--enable-poison-system-directories \
|
||||
@@ -48,7 +48,7 @@ cd mn10200/binutils
|
||||
|
||||
if [ ! -f configured-binutils ]
|
||||
then
|
||||
CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$MN_BINUTILS_VER/configure \
|
||||
../../binutils-$MN_BINUTILS_VER/configure \
|
||||
--prefix=$prefix --target=mn10200 --disable-nls --disable-debug \
|
||||
--disable-multilib \
|
||||
--disable-werror $CROSS_PARAMS \
|
||||
@@ -76,11 +76,10 @@ cd $BUILDDIR
|
||||
mkdir -p $target/gcc
|
||||
cd $target/gcc
|
||||
|
||||
export gcc_cv_libc_provides_ssp=yes
|
||||
|
||||
if [ ! -f configured-gcc ]
|
||||
then
|
||||
CFLAGS="$cflags" \
|
||||
CXXFLAGS="$cflags" \
|
||||
LDFLAGS="$ldflags" \
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
LDFLAGS_FOR_TARGET="" \
|
||||
@@ -96,12 +95,13 @@ then
|
||||
--enable-libstdcxx-filesystem-ts \
|
||||
--disable-tm-clone-registry \
|
||||
--disable-__cxa_atexit \
|
||||
--disable-libssp \
|
||||
--enable-cxx-flags='-ffunction-sections -fdata-sections' \
|
||||
--target=$target \
|
||||
--with-newlib \
|
||||
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||
--prefix=$prefix \
|
||||
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 40" \
|
||||
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 44.2" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
$EXTRA_GCC_PARAMS \
|
||||
@@ -139,11 +139,12 @@ unset CXX
|
||||
|
||||
if [ ! -f configured-newlib ]
|
||||
then
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections -DCUSTOM_MALLOC_LOCK" \
|
||||
../../newlib-$NEWLIB_VER/configure \
|
||||
--target=$target \
|
||||
--prefix=$prefix \
|
||||
--enable-newlib-mb \
|
||||
--enable-newlib-register-fini \
|
||||
|| { echo "Error configuring newlib"; exit 1; }
|
||||
touch configured-newlib
|
||||
fi
|
||||
|
||||
@@ -30,28 +30,28 @@ done
|
||||
|
||||
case "$VERSION" in
|
||||
"1" )
|
||||
GCC_VER=12.1.0
|
||||
BINUTILS_VER=2.38
|
||||
NEWLIB_VER=4.2.0.20211231
|
||||
GCC_VER=13.2.0
|
||||
BINUTILS_VER=2.41
|
||||
NEWLIB_VER=4.3.0.20230120
|
||||
basedir='dkarm-eabi'
|
||||
package=devkitARM
|
||||
target=arm-none-eabi
|
||||
toolchain=DEVKITARM
|
||||
;;
|
||||
"2" )
|
||||
GCC_VER=11.2.0
|
||||
BINUTILS_VER=2.37
|
||||
GCC_VER=13.2.0
|
||||
BINUTILS_VER=2.41
|
||||
MN_BINUTILS_VER=2.24
|
||||
NEWLIB_VER=4.2.0.20211231
|
||||
NEWLIB_VER=4.3.0.20230120
|
||||
basedir='dkppc'
|
||||
package=devkitPPC
|
||||
target=powerpc-eabi
|
||||
toolchain=DEVKITPPC
|
||||
;;
|
||||
"3" )
|
||||
GCC_VER=12.1.0-RC-20220429
|
||||
BINUTILS_VER=2.32
|
||||
NEWLIB_VER=4.2.0.20211231
|
||||
GCC_VER=13.2.0
|
||||
BINUTILS_VER=2.41
|
||||
NEWLIB_VER=4.3.0.20230120
|
||||
basedir='dka64'
|
||||
package=devkitA64
|
||||
target=aarch64-none-elf
|
||||
|
||||
Reference in New Issue
Block a user