mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-08-21 09:54:03 -05:00
Compare commits
15 Commits
devkitPPC_
...
devkitA64_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0add4d1b5c | ||
|
|
736db33e06 | ||
|
|
96f7acc919 | ||
|
|
c2aae79d59 | ||
|
|
fe202a6f50 | ||
|
|
aeb6482da9 | ||
|
|
b1d5f5c7a6 | ||
|
|
1974c8ae38 | ||
|
|
65c1a1256a | ||
|
|
ade65bab03 | ||
|
|
bcb3bff114 | ||
|
|
a48e515bd6 | ||
|
|
fec37937b7 | ||
|
|
2c8ae62e8e | ||
|
|
383ebe76c8 |
@@ -1,8 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# devkitARM release 52
|
# devkitARM release 53-1
|
||||||
# devkitPPC release 35
|
# devkitPPC release 35
|
||||||
# devkitA64 release 12
|
# devkitA64 release 14
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
if [ 0 -eq 1 ] ; then
|
if [ 0 -eq 1 ] ; then
|
||||||
@@ -28,17 +28,10 @@ echo
|
|||||||
|
|
||||||
GENERAL_TOOLS_VER=1.0.2
|
GENERAL_TOOLS_VER=1.0.2
|
||||||
|
|
||||||
LIBGBA_VER=0.5.2
|
|
||||||
GBATOOLS_VER=1.1.0
|
GBATOOLS_VER=1.1.0
|
||||||
DKARM_RULES_VER=1.0.0
|
DKARM_RULES_VER=1.0.0
|
||||||
DKARM_CRTLS_VER=1.0.0
|
DKARM_CRTLS_VER=1.0.0
|
||||||
|
|
||||||
LIBNDS_VER=1.7.2
|
|
||||||
DEFAULT_ARM7_VER=0.7.4
|
|
||||||
DSWIFI_VER=0.4.2
|
|
||||||
MAXMOD_VER=1.0.11
|
|
||||||
FILESYSTEM_VER=0.9.14
|
|
||||||
LIBFAT_VER=1.1.3
|
|
||||||
DSTOOLS_VER=1.2.1
|
DSTOOLS_VER=1.2.1
|
||||||
GRIT_VER=0.8.15
|
GRIT_VER=0.8.15
|
||||||
NDSTOOL_VER=2.1.1
|
NDSTOOL_VER=2.1.1
|
||||||
@@ -48,13 +41,9 @@ DFU_UTIL_VER=0.9.1
|
|||||||
STLINK_VER=1.2.3
|
STLINK_VER=1.2.3
|
||||||
|
|
||||||
GAMECUBE_TOOLS_VER=1.0.2
|
GAMECUBE_TOOLS_VER=1.0.2
|
||||||
LIBOGC_VER=1.8.21
|
|
||||||
WIILOAD_VER=0.5.1
|
WIILOAD_VER=0.5.1
|
||||||
DKPPC_RULES_VER=1.0.0
|
DKPPC_RULES_VER=1.0.0
|
||||||
|
|
||||||
LIBCTRU_VER=1.5.1
|
|
||||||
CITRO3D_VER=1.5.0
|
|
||||||
CITRO2D_VER=1.1.0
|
|
||||||
TOOLS3DS_VER=1.1.4
|
TOOLS3DS_VER=1.1.4
|
||||||
LINK3DS_VER=0.5.2
|
LINK3DS_VER=0.5.2
|
||||||
PICASSO_VER=2.7.0
|
PICASSO_VER=2.7.0
|
||||||
@@ -64,7 +53,6 @@ GP32_TOOLS_VER=1.0.3
|
|||||||
LIBMIRKO_VER=0.9.8
|
LIBMIRKO_VER=0.9.8
|
||||||
|
|
||||||
SWITCH_TOOLS_VER=1.4.1
|
SWITCH_TOOLS_VER=1.4.1
|
||||||
LIBNX_VER=1.3.0
|
|
||||||
|
|
||||||
OSXMIN=${OSXMIN:-10.9}
|
OSXMIN=${OSXMIN:-10.9}
|
||||||
|
|
||||||
@@ -218,12 +206,6 @@ archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_
|
|||||||
|
|
||||||
if [ $VERSION -eq 1 ]; then
|
if [ $VERSION -eq 1 ]; then
|
||||||
|
|
||||||
targetarchives="libnds-src-${LIBNDS_VER}.tar.bz2 libgba-src-${LIBGBA_VER}.tar.bz2
|
|
||||||
libmirko-src-${LIBMIRKO_VER}.tar.bz2 dswifi-src-${DSWIFI_VER}.tar.bz2 maxmod-src-${MAXMOD_VER}.tar.bz2
|
|
||||||
default-arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
|
|
||||||
libfat-src-${LIBFAT_VER}.tar.bz2 libctru-src-${LIBCTRU_VER}.tar.bz2 citro3d-src-${CITRO3D_VER}.tar.bz2
|
|
||||||
citro2d-src-${CITRO2D_VER}.tar.bz2"
|
|
||||||
|
|
||||||
hostarchives="gba-tools-$GBATOOLS_VER.tar.bz2 gp32-tools-$GP32_TOOLS_VER.tar.bz2
|
hostarchives="gba-tools-$GBATOOLS_VER.tar.bz2 gp32-tools-$GP32_TOOLS_VER.tar.bz2
|
||||||
dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
|
dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
|
||||||
general-tools-$GENERAL_TOOLS_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2
|
general-tools-$GENERAL_TOOLS_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2
|
||||||
@@ -235,8 +217,6 @@ fi
|
|||||||
|
|
||||||
if [ $VERSION -eq 2 ]; then
|
if [ $VERSION -eq 2 ]; then
|
||||||
|
|
||||||
targetarchives="libogc-src-${LIBOGC_VER}.tar.bz2 libfat-src-${LIBFAT_VER}.tar.bz2"
|
|
||||||
|
|
||||||
hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
|
hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
|
||||||
|
|
||||||
archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
|
archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
|
||||||
@@ -244,8 +224,6 @@ fi
|
|||||||
|
|
||||||
if [ $VERSION -eq 3 ]; then
|
if [ $VERSION -eq 3 ]; then
|
||||||
|
|
||||||
targetarchives=" libnx-src-${LIBNX_VER}.tar.bz2"
|
|
||||||
|
|
||||||
hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
|
hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
|
||||||
|
|
||||||
fi
|
fi
|
||||||
@@ -258,7 +236,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cd "$SRCDIR"
|
cd "$SRCDIR"
|
||||||
for archive in $archives $targetarchives $hostarchives
|
for archive in $archives $hostarchives
|
||||||
do
|
do
|
||||||
echo $archive
|
echo $archive
|
||||||
if [ ! -f $archive ]; then
|
if [ ! -f $archive ]; then
|
||||||
@@ -279,16 +257,6 @@ if [ $VERSION -eq 2 ]; then
|
|||||||
extract_and_patch binutils $MN_BINUTILS_VER bz2
|
extract_and_patch binutils $MN_BINUTILS_VER bz2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for archive in $targetarchives
|
|
||||||
do
|
|
||||||
destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
|
|
||||||
echo $destdir
|
|
||||||
if [ ! -d $destdir ]; then
|
|
||||||
mkdir -p $destdir
|
|
||||||
bzip2 -cd "$SRCDIR/$archive" | tar -xf - -C $destdir || { echo "Error extracting "$archive; exit 1; }
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
for archive in $hostarchives
|
for archive in $hostarchives
|
||||||
do
|
do
|
||||||
destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
|
destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
|
||||||
@@ -306,10 +274,6 @@ if [ "$BUILD_DKPRO_SKIP_TOOLS" != "1" ] && [ -f $scriptdir/build-tools.sh ]; the
|
|||||||
. $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR;
|
. $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$BUILD_DKPRO_SKIP_LIBRARIES" != "1" ] && [ -f $scriptdir/build-libs.sh ]; then
|
|
||||||
. $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR;
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd $BUILDSCRIPTDIR
|
cd $BUILDSCRIPTDIR
|
||||||
|
|
||||||
if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
|
if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
|
||||||
|
|||||||
@@ -35,12 +35,6 @@ BUILD_DKPRO_PACKAGE=0
|
|||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
#BUILD_DKPRO_SKIP_TOOLS=1
|
#BUILD_DKPRO_SKIP_TOOLS=1
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# Uncomment to skip building of libraries
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
#BUILD_DKPRO_SKIP_LIBRARIES=1
|
|
||||||
|
|
||||||
|
|
||||||
# Automated script execution
|
# Automated script execution
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# 0: Ask to delete build folders & patched sources
|
# 0: Ask to delete build folders & patched sources
|
||||||
|
|||||||
@@ -1,346 +0,0 @@
|
|||||||
diff -NBaur binutils-2.31.1/bfd/elfnn-aarch64.c binutils-2.31.1-dka64/bfd/elfnn-aarch64.c
|
|
||||||
--- binutils-2.31.1/bfd/elfnn-aarch64.c 2018-06-25 12:44:16.000000000 +0100
|
|
||||||
+++ binutils-2.31.1-dka64/bfd/elfnn-aarch64.c 2018-07-27 18:11:15.757082269 +0100
|
|
||||||
@@ -2342,6 +2342,12 @@
|
|
||||||
aarch64_stub_erratum_843419_veneer,
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* Is an undefined weak symbol resolved to 0 ? */
|
|
||||||
+#define UNDEFINED_WEAK_RESOLVED_TO_ZERO(INFO, EH) \
|
|
||||||
+ ((EH)->root.root.type == bfd_link_hash_undefweak \
|
|
||||||
+ && bfd_link_executable (INFO) \
|
|
||||||
+ && !(INFO)->dynamic_undefined_weak)
|
|
||||||
+
|
|
||||||
struct elf_aarch64_stub_hash_entry
|
|
||||||
{
|
|
||||||
/* Base hash table entry structure. */
|
|
||||||
@@ -6370,11 +6376,13 @@
|
|
||||||
Elf_Internal_Sym *sym;
|
|
||||||
asection *sec;
|
|
||||||
struct elf_link_hash_entry *h;
|
|
||||||
+ struct elf_aarch64_link_hash_entry *eh;
|
|
||||||
bfd_vma relocation;
|
|
||||||
bfd_reloc_status_type r;
|
|
||||||
arelent bfd_reloc;
|
|
||||||
char sym_type;
|
|
||||||
bfd_boolean unresolved_reloc = FALSE;
|
|
||||||
+ bfd_boolean resolved_to_zero = FALSE;
|
|
||||||
char *error_message = NULL;
|
|
||||||
|
|
||||||
r_symndx = ELFNN_R_SYM (rel->r_info);
|
|
||||||
@@ -6509,6 +6517,10 @@
|
|
||||||
h, &unresolved_reloc,
|
|
||||||
save_addend, &addend, sym);
|
|
||||||
|
|
||||||
+ eh = (struct elf_aarch64_link_hash_entry *) h;
|
|
||||||
+ resolved_to_zero = (eh != NULL
|
|
||||||
+ && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
|
|
||||||
+
|
|
||||||
switch (elfNN_aarch64_bfd_reloc_from_type (input_bfd, r_type))
|
|
||||||
{
|
|
||||||
case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
|
|
||||||
@@ -6532,7 +6544,7 @@
|
|
||||||
need_relocs =
|
|
||||||
(!bfd_link_executable (info) || indx != 0) &&
|
|
||||||
(h == NULL
|
|
||||||
- || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
||||||
+ || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
|
||||||
|| h->root.type != bfd_link_hash_undefweak);
|
|
||||||
|
|
||||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
|
||||||
@@ -6627,7 +6639,7 @@
|
|
||||||
need_relocs =
|
|
||||||
(!bfd_link_executable (info) || indx != 0) &&
|
|
||||||
(h == NULL
|
|
||||||
- || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
||||||
+ || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
|
||||||
|| h->root.type != bfd_link_hash_undefweak);
|
|
||||||
|
|
||||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
|
||||||
@@ -6676,7 +6688,7 @@
|
|
||||||
bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
|
|
||||||
|
|
||||||
need_relocs = (h == NULL
|
|
||||||
- || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
||||||
+ || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
|
||||||
|| h->root.type != bfd_link_hash_undefweak);
|
|
||||||
|
|
||||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
|
||||||
@@ -7019,6 +7031,26 @@
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Remove undefined weak symbol from the dynamic symbol table if it
|
|
||||||
+ is resolved to 0. */
|
|
||||||
+
|
|
||||||
+extern bfd_boolean
|
|
||||||
+elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *, struct elf_link_hash_entry *);
|
|
||||||
+
|
|
||||||
+bfd_boolean
|
|
||||||
+elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *info,
|
|
||||||
+ struct elf_link_hash_entry *h)
|
|
||||||
+{
|
|
||||||
+ if (h->dynindx != -1
|
|
||||||
+ && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, elf_aarch64_hash_entry (h)))
|
|
||||||
+ {
|
|
||||||
+ h->dynindx = -1;
|
|
||||||
+ _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
|
|
||||||
+ h->dynstr_index);
|
|
||||||
+ }
|
|
||||||
+ return TRUE;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* Adjust a symbol defined by a dynamic object and referenced by a
|
|
||||||
regular object. The current definition is in some section of the
|
|
||||||
dynamic object, but we're not including those sections. We have to
|
|
||||||
@@ -8221,6 +8253,7 @@
|
|
||||||
struct elf_aarch64_link_hash_table *htab;
|
|
||||||
struct elf_aarch64_link_hash_entry *eh;
|
|
||||||
struct elf_dyn_relocs *p;
|
|
||||||
+ bfd_boolean resolved_to_zero;
|
|
||||||
|
|
||||||
/* An example of a bfd_link_hash_indirect symbol is versioned
|
|
||||||
symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
|
|
||||||
@@ -8240,6 +8273,10 @@
|
|
||||||
info = (struct bfd_link_info *) inf;
|
|
||||||
htab = elf_aarch64_hash_table (info);
|
|
||||||
|
|
||||||
+ eh = (struct elf_aarch64_link_hash_entry *) h;
|
|
||||||
+ eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
|
|
||||||
+ resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
|
|
||||||
+
|
|
||||||
/* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
|
|
||||||
here if it is defined and referenced in a non-shared object. */
|
|
||||||
if (h->type == STT_GNU_IFUNC
|
|
||||||
@@ -8249,7 +8286,7 @@
|
|
||||||
{
|
|
||||||
/* Make sure this symbol is output as a dynamic symbol.
|
|
||||||
Undefined weak syms won't yet be marked as dynamic. */
|
|
||||||
- if (h->dynindx == -1 && !h->forced_local
|
|
||||||
+ if (h->dynindx == -1 && !h->forced_local && !resolved_to_zero
|
|
||||||
&& h->root.type == bfd_link_hash_undefweak)
|
|
||||||
{
|
|
||||||
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
|
||||||
@@ -8283,6 +8320,11 @@
|
|
||||||
of relaxing into these from the large model PLT entries. */
|
|
||||||
s->size += PLT_SMALL_ENTRY_SIZE;
|
|
||||||
|
|
||||||
+ /* There should be no PLT relocations against resolved undefined
|
|
||||||
+ weak symbols in the executable. */
|
|
||||||
+ if (!resolved_to_zero)
|
|
||||||
+ {
|
|
||||||
+
|
|
||||||
/* We also need to make an entry in the .got.plt section, which
|
|
||||||
will be placed in the .got section by the linker script. */
|
|
||||||
htab->root.sgotplt->size += GOT_ENTRY_SIZE;
|
|
||||||
@@ -8305,6 +8347,7 @@
|
|
||||||
|
|
||||||
htab->root.srelplt->reloc_count++;
|
|
||||||
}
|
|
||||||
+ }
|
|
||||||
else
|
|
||||||
{
|
|
||||||
h->plt.offset = (bfd_vma) - 1;
|
|
||||||
@@ -8317,9 +8360,6 @@
|
|
||||||
h->needs_plt = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
- eh = (struct elf_aarch64_link_hash_entry *) h;
|
|
||||||
- eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
|
|
||||||
-
|
|
||||||
if (h->got.refcount > 0)
|
|
||||||
{
|
|
||||||
bfd_boolean dyn;
|
|
||||||
@@ -8331,7 +8371,7 @@
|
|
||||||
|
|
||||||
/* Make sure this symbol is output as a dynamic symbol.
|
|
||||||
Undefined weak syms won't yet be marked as dynamic. */
|
|
||||||
- if (dyn && h->dynindx == -1 && !h->forced_local
|
|
||||||
+ if (dyn && h->dynindx == -1 && !h->forced_local && !resolved_to_zero
|
|
||||||
&& h->root.type == bfd_link_hash_undefweak)
|
|
||||||
{
|
|
||||||
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
|
||||||
@@ -8345,7 +8385,7 @@
|
|
||||||
{
|
|
||||||
h->got.offset = htab->root.sgot->size;
|
|
||||||
htab->root.sgot->size += GOT_ENTRY_SIZE;
|
|
||||||
- if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
||||||
+ if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
|
||||||
|| h->root.type != bfd_link_hash_undefweak)
|
|
||||||
&& (bfd_link_pic (info)
|
|
||||||
|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
|
|
||||||
@@ -8381,7 +8421,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
indx = h && h->dynindx != -1 ? h->dynindx : 0;
|
|
||||||
- if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
|
||||||
+ if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
|
||||||
|| h->root.type != bfd_link_hash_undefweak)
|
|
||||||
&& (!bfd_link_executable (info)
|
|
||||||
|| indx != 0
|
|
||||||
@@ -8447,7 +8487,7 @@
|
|
||||||
visibility. */
|
|
||||||
if (eh->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak)
|
|
||||||
{
|
|
||||||
- if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
|
||||||
+ if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT || resolved_to_zero
|
|
||||||
|| UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
|
||||||
eh->dyn_relocs = NULL;
|
|
||||||
|
|
||||||
@@ -8467,7 +8507,9 @@
|
|
||||||
symbols which turn out to need copy relocs or are not
|
|
||||||
dynamic. */
|
|
||||||
|
|
||||||
- if (!h->non_got_ref
|
|
||||||
+ if (!(h->non_got_ref
|
|
||||||
+ || (h->root.type == bfd_link_hash_undefweak
|
|
||||||
+ && !resolved_to_zero))
|
|
||||||
&& ((h->def_dynamic
|
|
||||||
&& !h->def_regular)
|
|
||||||
|| (htab->root.dynamic_sections_created
|
|
||||||
@@ -8478,6 +8520,7 @@
|
|
||||||
Undefined weak syms won't yet be marked as dynamic. */
|
|
||||||
if (h->dynindx == -1
|
|
||||||
&& !h->forced_local
|
|
||||||
+ && !resolved_to_zero
|
|
||||||
&& h->root.type == bfd_link_hash_undefweak
|
|
||||||
&& !bfd_elf_link_record_dynamic_symbol (info, h))
|
|
||||||
return FALSE;
|
|
||||||
@@ -9098,8 +9141,17 @@
|
|
||||||
Elf_Internal_Sym *sym)
|
|
||||||
{
|
|
||||||
struct elf_aarch64_link_hash_table *htab;
|
|
||||||
+ struct elf_aarch64_link_hash_entry *eh;
|
|
||||||
+ bfd_boolean local_undefweak;
|
|
||||||
htab = elf_aarch64_hash_table (info);
|
|
||||||
|
|
||||||
+ eh = (struct elf_aarch64_link_hash_entry *) h;
|
|
||||||
+
|
|
||||||
+ /* We keep PLT/GOT entries without dynamic PLT/GOT relocations for
|
|
||||||
+ resolved undefined weak symbols in executable so that their
|
|
||||||
+ references have value 0 at run-time. */
|
|
||||||
+ local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
|
|
||||||
+
|
|
||||||
if (h->plt.offset != (bfd_vma) - 1)
|
|
||||||
{
|
|
||||||
asection *plt, *gotplt, *relplt;
|
|
||||||
@@ -9134,7 +9186,7 @@
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
|
|
||||||
- if (!h->def_regular)
|
|
||||||
+ if (!local_undefweak && !h->def_regular)
|
|
||||||
{
|
|
||||||
/* Mark the symbol as undefined, rather than as defined in
|
|
||||||
the .plt section. */
|
|
||||||
@@ -9153,10 +9205,11 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
if (h->got.offset != (bfd_vma) - 1
|
|
||||||
- && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
|
|
||||||
+ && elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
|
|
||||||
/* Undefined weak symbol in static PIE resolves to 0 without
|
|
||||||
any dynamic relocations. */
|
|
||||||
- && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
|
||||||
+ && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)
|
|
||||||
+ && !local_undefweak)
|
|
||||||
{
|
|
||||||
Elf_Internal_Rela rela;
|
|
||||||
bfd_byte *loc;
|
|
||||||
@@ -9650,6 +9703,9 @@
|
|
||||||
#define elf_backend_init_index_section \
|
|
||||||
_bfd_elf_init_2_index_sections
|
|
||||||
|
|
||||||
+#define elf_backend_fixup_symbol \
|
|
||||||
+ elfNN_aarch64_elf_fixup_symbol
|
|
||||||
+
|
|
||||||
#define elf_backend_finish_dynamic_sections \
|
|
||||||
elfNN_aarch64_finish_dynamic_sections
|
|
||||||
|
|
||||||
diff -NBaur binutils-2.31.1/ld/emulparams/aarch64elf32.sh binutils-2.31.1-dka64/ld/emulparams/aarch64elf32.sh
|
|
||||||
--- binutils-2.31.1/ld/emulparams/aarch64elf32.sh 2018-06-24 19:38:57.000000000 +0100
|
|
||||||
+++ binutils-2.31.1-dka64/ld/emulparams/aarch64elf32.sh 2018-07-27 18:04:52.585317513 +0100
|
|
||||||
@@ -1,3 +1,5 @@
|
|
||||||
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
|
||||||
+
|
|
||||||
ARCH="aarch64:ilp32"
|
|
||||||
MACHINE=
|
|
||||||
NOP=0x1f2003d5
|
|
||||||
diff -NBaur binutils-2.31.1/ld/emulparams/aarch64elf.sh binutils-2.31.1-dka64/ld/emulparams/aarch64elf.sh
|
|
||||||
--- binutils-2.31.1/ld/emulparams/aarch64elf.sh 2018-06-24 19:38:57.000000000 +0100
|
|
||||||
+++ binutils-2.31.1-dka64/ld/emulparams/aarch64elf.sh 2018-07-27 18:04:52.585317513 +0100
|
|
||||||
@@ -1,3 +1,5 @@
|
|
||||||
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
|
||||||
+
|
|
||||||
ARCH=aarch64
|
|
||||||
MACHINE=
|
|
||||||
NOP=0x1f2003d5
|
|
||||||
diff -NBaur binutils-2.31.1/ld/emultempl/aarch64elf.em binutils-2.31.1-dka64/ld/emultempl/aarch64elf.em
|
|
||||||
--- binutils-2.31.1/ld/emultempl/aarch64elf.em 2018-06-26 12:27:20.000000000 +0100
|
|
||||||
+++ binutils-2.31.1-dka64/ld/emultempl/aarch64elf.em 2018-07-27 18:04:52.585317513 +0100
|
|
||||||
@@ -380,7 +380,7 @@
|
|
||||||
{ "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
|
|
||||||
'
|
|
||||||
|
|
||||||
-PARSE_AND_LIST_OPTIONS='
|
|
||||||
+PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}'
|
|
||||||
fprintf (file, _(" --no-enum-size-warning Don'\''t warn about objects with incompatible\n"
|
|
||||||
" enum sizes\n"));
|
|
||||||
fprintf (file, _(" --no-wchar-size-warning Don'\''t warn about objects with incompatible\n"
|
|
||||||
diff -NBaur binutils-2.31.1/ld/Makefile.am binutils-2.31.1-dka64/ld/Makefile.am
|
|
||||||
--- binutils-2.31.1/ld/Makefile.am 2018-06-24 19:38:57.000000000 +0100
|
|
||||||
+++ binutils-2.31.1-dka64/ld/Makefile.am 2018-07-27 18:04:52.585317513 +0100
|
|
||||||
@@ -1495,19 +1495,23 @@
|
|
||||||
$(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
|
|
||||||
|
|
||||||
eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
|
|
||||||
- $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
|
||||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
|
||||||
+ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
|
|
||||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
|
||||||
|
|
||||||
eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
|
|
||||||
- $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
|
||||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
|
||||||
+ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
|
|
||||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
|
||||||
|
|
||||||
eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
|
|
||||||
- $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
|
||||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
|
||||||
+ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
|
|
||||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
|
||||||
|
|
||||||
eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
|
|
||||||
- $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
|
||||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
|
||||||
+ $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em ldemul-list.h \
|
|
||||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
|
||||||
|
|
||||||
eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \
|
|
||||||
diff -NBaur binutils-2.31.1/ld/Makefile.in binutils-2.31.1-dka64/ld/Makefile.in
|
|
||||||
--- binutils-2.31.1/ld/Makefile.in 2018-07-18 08:46:21.000000000 +0100
|
|
||||||
+++ binutils-2.31.1-dka64/ld/Makefile.in 2018-07-27 18:04:52.585317513 +0100
|
|
||||||
@@ -3097,18 +3097,22 @@
|
|
||||||
|
|
||||||
eaarch64elf.c: $(srcdir)/emulparams/aarch64elf.sh \
|
|
||||||
$(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
|
||||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
|
||||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
|
||||||
|
|
||||||
eaarch64elf32.c: $(srcdir)/emulparams/aarch64elf32.sh \
|
|
||||||
$(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
|
||||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
|
||||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
|
||||||
|
|
||||||
eaarch64elfb.c: $(srcdir)/emulparams/aarch64elfb.sh $(srcdir)/emulparams/aarch64elf.sh \
|
|
||||||
$(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
|
||||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
|
||||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
|
||||||
|
|
||||||
eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aarch64elf32.sh \
|
|
||||||
$(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
|
|
||||||
+ $(srcdir)/emulparams/dynamic_undefined_weak.sh \
|
|
||||||
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
|
|
||||||
|
|
||||||
eaarch64cloudabi.c: $(srcdir)/emulparams/aarch64cloudabi.sh \
|
|
||||||
604
dka64/patches/binutils-2.32.patch
Normal file
604
dka64/patches/binutils-2.32.patch
Normal file
@@ -0,0 +1,604 @@
|
|||||||
|
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
|
||||||
|
index 5741c60264..fb5d9d069c 100644
|
||||||
|
--- a/bfd/elf-bfd.h
|
||||||
|
+++ b/bfd/elf-bfd.h
|
||||||
|
@@ -1789,6 +1789,14 @@ struct output_elf_obj_tdata
|
||||||
|
asection *sec;
|
||||||
|
} build_id;
|
||||||
|
|
||||||
|
+ /* Data for .nx-module-name. */
|
||||||
|
+ struct
|
||||||
|
+ {
|
||||||
|
+ bfd_boolean (*after_write_object_contents) (bfd *);
|
||||||
|
+ const char *name;
|
||||||
|
+ asection *sec;
|
||||||
|
+ } nx_module_name;
|
||||||
|
+
|
||||||
|
/* Records the result of `get_program_header_size'. */
|
||||||
|
bfd_size_type program_header_size;
|
||||||
|
|
||||||
|
diff --git a/bfd/elf.c b/bfd/elf.c
|
||||||
|
index eb3e1828e9..bc6bb48804 100644
|
||||||
|
--- a/bfd/elf.c
|
||||||
|
+++ b/bfd/elf.c
|
||||||
|
@@ -6514,6 +6514,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
|
||||||
|
if (!bed->s->write_shdrs_and_ehdr (abfd))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
+ /* Write out the NX module name. */
|
||||||
|
+ if (t->o->nx_module_name.after_write_object_contents != NULL)
|
||||||
|
+ {
|
||||||
|
+ failed = !(*t->o->nx_module_name.after_write_object_contents) (abfd);
|
||||||
|
+ if (failed)
|
||||||
|
+ return FALSE;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* This is last since write_shdrs_and_ehdr can touch i_shdrp[0]. */
|
||||||
|
if (t->o->build_id.after_write_object_contents != NULL)
|
||||||
|
return (*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
|
||||||
|
--- a/bfd/elfnn-aarch64.c
|
||||||
|
+++ b/bfd/elfnn-aarch64.c
|
||||||
|
@@ -2341,6 +2341,12 @@ enum elf_aarch64_stub_type
|
||||||
|
aarch64_stub_erratum_843419_veneer,
|
||||||
|
};
|
||||||
|
|
||||||
|
+/* Is an undefined weak symbol resolved to 0 ? */
|
||||||
|
+#define UNDEFINED_WEAK_RESOLVED_TO_ZERO(INFO, EH) \
|
||||||
|
+ ((EH)->root.root.type == bfd_link_hash_undefweak \
|
||||||
|
+ && bfd_link_executable (INFO) \
|
||||||
|
+ && !(INFO)->dynamic_undefined_weak)
|
||||||
|
+
|
||||||
|
struct elf_aarch64_stub_hash_entry
|
||||||
|
{
|
||||||
|
/* Base hash table entry structure. */
|
||||||
|
@@ -6436,11 +6442,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
|
Elf_Internal_Sym *sym;
|
||||||
|
asection *sec;
|
||||||
|
struct elf_link_hash_entry *h;
|
||||||
|
+ struct elf_aarch64_link_hash_entry *eh;
|
||||||
|
bfd_vma relocation;
|
||||||
|
bfd_reloc_status_type r;
|
||||||
|
arelent bfd_reloc;
|
||||||
|
char sym_type;
|
||||||
|
bfd_boolean unresolved_reloc = FALSE;
|
||||||
|
+ bfd_boolean 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,
|
||||||
|
h, &unresolved_reloc,
|
||||||
|
save_addend, &addend, sym);
|
||||||
|
|
||||||
|
+ eh = (struct elf_aarch64_link_hash_entry *) h;
|
||||||
|
+ resolved_to_zero = (eh != NULL
|
||||||
|
+ && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
|
||||||
|
+
|
||||||
|
switch (elfNN_aarch64_bfd_reloc_from_type (input_bfd, r_type))
|
||||||
|
{
|
||||||
|
case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
|
||||||
|
@@ -6599,7 +6611,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
|
need_relocs =
|
||||||
|
(!bfd_link_executable (info) || indx != 0) &&
|
||||||
|
(h == NULL
|
||||||
|
- || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
||||||
|
+ || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
||||||
|
|| h->root.type != bfd_link_hash_undefweak);
|
||||||
|
|
||||||
|
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||||
|
@@ -6694,7 +6706,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
|
need_relocs =
|
||||||
|
(!bfd_link_executable (info) || indx != 0) &&
|
||||||
|
(h == NULL
|
||||||
|
- || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
||||||
|
+ || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
||||||
|
|| h->root.type != bfd_link_hash_undefweak);
|
||||||
|
|
||||||
|
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||||
|
@@ -6743,7 +6755,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||||
|
bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
|
||||||
|
|
||||||
|
need_relocs = (h == NULL
|
||||||
|
- || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
||||||
|
+ || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
||||||
|
|| h->root.type != bfd_link_hash_undefweak);
|
||||||
|
|
||||||
|
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||||
|
@@ -7086,6 +7098,26 @@ 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
|
||||||
|
+elfNN_aarch64_elf_fixup_symbol (struct bfd_link_info *info,
|
||||||
|
+ struct elf_link_hash_entry *h)
|
||||||
|
+{
|
||||||
|
+ if (h->dynindx != -1
|
||||||
|
+ && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, elf_aarch64_hash_entry (h)))
|
||||||
|
+ {
|
||||||
|
+ h->dynindx = -1;
|
||||||
|
+ _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
|
||||||
|
+ h->dynstr_index);
|
||||||
|
+ }
|
||||||
|
+ return TRUE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/* Adjust a symbol defined by a dynamic object and referenced by a
|
||||||
|
regular object. The current definition is in some section of the
|
||||||
|
dynamic object, but we're not including those sections. We have to
|
||||||
|
@@ -8286,6 +8318,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;
|
||||||
|
|
||||||
|
/* 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)
|
||||||
|
info = (struct bfd_link_info *) inf;
|
||||||
|
htab = elf_aarch64_hash_table (info);
|
||||||
|
|
||||||
|
+ eh = (struct elf_aarch64_link_hash_entry *) h;
|
||||||
|
+ eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
|
||||||
|
+ resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
|
||||||
|
+
|
||||||
|
/* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
|
||||||
|
here if it is defined and referenced in a non-shared object. */
|
||||||
|
if (h->type == STT_GNU_IFUNC
|
||||||
|
@@ -8314,7 +8351,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
{
|
||||||
|
/* Make sure this symbol is output as a dynamic symbol.
|
||||||
|
Undefined weak syms won't yet be marked as dynamic. */
|
||||||
|
- if (h->dynindx == -1 && !h->forced_local
|
||||||
|
+ if (h->dynindx == -1 && !h->forced_local && !resolved_to_zero
|
||||||
|
&& h->root.type == bfd_link_hash_undefweak)
|
||||||
|
{
|
||||||
|
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
||||||
|
@@ -8348,6 +8385,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;
|
||||||
|
|
||||||
|
+ /* There should be no PLT relocations against resolved undefined
|
||||||
|
+ weak symbols in the executable. */
|
||||||
|
+ if (!resolved_to_zero)
|
||||||
|
+ {
|
||||||
|
+
|
||||||
|
/* We also need to make an entry in the .got.plt section, which
|
||||||
|
will be placed in the .got section by the linker script. */
|
||||||
|
htab->root.sgotplt->size += GOT_ENTRY_SIZE;
|
||||||
|
@@ -8370,6 +8412,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
|
||||||
|
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)
|
||||||
|
h->needs_plt = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- eh = (struct elf_aarch64_link_hash_entry *) h;
|
||||||
|
- eh->tlsdesc_got_jump_table_offset = (bfd_vma) - 1;
|
||||||
|
-
|
||||||
|
if (h->got.refcount > 0)
|
||||||
|
{
|
||||||
|
bfd_boolean dyn;
|
||||||
|
@@ -8396,7 +8436,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
|
||||||
|
/* Make sure this symbol is output as a dynamic symbol.
|
||||||
|
Undefined weak syms won't yet be marked as dynamic. */
|
||||||
|
- if (dyn && h->dynindx == -1 && !h->forced_local
|
||||||
|
+ if (dyn && h->dynindx == -1 && !h->forced_local && !resolved_to_zero
|
||||||
|
&& h->root.type == bfd_link_hash_undefweak)
|
||||||
|
{
|
||||||
|
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
||||||
|
@@ -8410,7 +8450,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
{
|
||||||
|
h->got.offset = htab->root.sgot->size;
|
||||||
|
htab->root.sgot->size += GOT_ENTRY_SIZE;
|
||||||
|
- if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
||||||
|
+ if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
||||||
|
|| h->root.type != bfd_link_hash_undefweak)
|
||||||
|
&& (bfd_link_pic (info)
|
||||||
|
|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
|
||||||
|
@@ -8446,7 +8486,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
}
|
||||||
|
|
||||||
|
indx = h && h->dynindx != -1 ? h->dynindx : 0;
|
||||||
|
- if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|
||||||
|
+ if (((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT && !resolved_to_zero)
|
||||||
|
|| h->root.type != bfd_link_hash_undefweak)
|
||||||
|
&& (!bfd_link_executable (info)
|
||||||
|
|| indx != 0
|
||||||
|
@@ -8512,7 +8552,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 (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;
|
||||||
|
|
||||||
|
@@ -8532,7 +8572,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||||
|
symbols which turn out to need copy relocs or are not
|
||||||
|
dynamic. */
|
||||||
|
|
||||||
|
- if (!h->non_got_ref
|
||||||
|
+ if (!(h->non_got_ref
|
||||||
|
+ || (h->root.type == bfd_link_hash_undefweak
|
||||||
|
+ && !resolved_to_zero))
|
||||||
|
&& ((h->def_dynamic
|
||||||
|
&& !h->def_regular)
|
||||||
|
|| (htab->root.dynamic_sections_created
|
||||||
|
@@ -8543,6 +8585,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,
|
||||||
|
Elf_Internal_Sym *sym)
|
||||||
|
{
|
||||||
|
struct elf_aarch64_link_hash_table *htab;
|
||||||
|
+ struct elf_aarch64_link_hash_entry *eh;
|
||||||
|
+ bfd_boolean local_undefweak;
|
||||||
|
htab = elf_aarch64_hash_table (info);
|
||||||
|
|
||||||
|
+ eh = (struct elf_aarch64_link_hash_entry *) h;
|
||||||
|
+
|
||||||
|
+ /* We keep PLT/GOT entries without dynamic PLT/GOT relocations for
|
||||||
|
+ resolved undefined weak symbols in executable so that their
|
||||||
|
+ references have value 0 at run-time. */
|
||||||
|
+ local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
|
||||||
|
+
|
||||||
|
if (h->plt.offset != (bfd_vma) - 1)
|
||||||
|
{
|
||||||
|
asection *plt, *gotplt, *relplt;
|
||||||
|
@@ -9199,7 +9251,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
|
||||||
|
- if (!h->def_regular)
|
||||||
|
+ if (!local_undefweak && !h->def_regular)
|
||||||
|
{
|
||||||
|
/* Mark the symbol as undefined, rather than as defined in
|
||||||
|
the .plt section. */
|
||||||
|
@@ -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
|
||||||
|
/* Undefined weak symbol in static PIE resolves to 0 without
|
||||||
|
any dynamic relocations. */
|
||||||
|
- && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
||||||
|
+ && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)
|
||||||
|
+ && !local_undefweak)
|
||||||
|
{
|
||||||
|
Elf_Internal_Rela rela;
|
||||||
|
bfd_byte *loc;
|
||||||
|
@@ -9715,6 +9768,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
|
||||||
|
#define elf_backend_init_index_section \
|
||||||
|
_bfd_elf_init_2_index_sections
|
||||||
|
|
||||||
|
+#define elf_backend_fixup_symbol \
|
||||||
|
+ elfNN_aarch64_elf_fixup_symbol
|
||||||
|
+
|
||||||
|
#define elf_backend_finish_dynamic_sections \
|
||||||
|
elfNN_aarch64_finish_dynamic_sections
|
||||||
|
|
||||||
|
diff --git a/ld/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
|
||||||
|
--- a/ld/emulparams/aarch64elf.sh
|
||||||
|
+++ b/ld/emulparams/aarch64elf.sh
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+. ${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
|
||||||
|
--- a/ld/emulparams/aarch64elf32.sh
|
||||||
|
+++ b/ld/emulparams/aarch64elf32.sh
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+. ${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
|
||||||
|
--- a/ld/emultempl/aarch64elf.em
|
||||||
|
+++ b/ld/emultempl/aarch64elf.em
|
||||||
|
@@ -380,7 +380,7 @@ PARSE_AND_LIST_LONGOPTS='
|
||||||
|
{ "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
|
||||||
|
'
|
||||||
|
|
||||||
|
-PARSE_AND_LIST_OPTIONS='
|
||||||
|
+PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}'
|
||||||
|
fprintf (file, _(" --no-enum-size-warning Don'\''t warn about objects with incompatible\n"
|
||||||
|
" enum sizes\n"));
|
||||||
|
fprintf (file, _(" --no-wchar-size-warning Don'\''t warn about objects with incompatible\n"
|
||||||
|
diff --git a/ld/emultempl/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;
|
||||||
|
|
||||||
|
+/* NX module name. */
|
||||||
|
+static const char *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;
|
||||||
|
}
|
||||||
|
|
||||||
|
+static bfd_boolean
|
||||||
|
+write_nx_module_name (bfd *abfd)
|
||||||
|
+{
|
||||||
|
+ struct elf_obj_tdata *t = elf_tdata (abfd);
|
||||||
|
+ const char *name;
|
||||||
|
+ asection *asec;
|
||||||
|
+ Elf_Internal_Shdr *i_shdr;
|
||||||
|
+ unsigned char *contents;
|
||||||
|
+ bfd_size_type size;
|
||||||
|
+ file_ptr position;
|
||||||
|
+
|
||||||
|
+ name = t->o->nx_module_name.name;
|
||||||
|
+ asec = t->o->nx_module_name.sec;
|
||||||
|
+ if (bfd_is_abs_section (asec->output_section))
|
||||||
|
+ {
|
||||||
|
+ einfo (_("%P: warning: .nx-module-name section discarded,"
|
||||||
|
+ " --build-id ignored\n"));
|
||||||
|
+ return TRUE;
|
||||||
|
+ }
|
||||||
|
+ i_shdr = &elf_section_data (asec->output_section)->this_hdr;
|
||||||
|
+
|
||||||
|
+ if (i_shdr->contents == NULL)
|
||||||
|
+ {
|
||||||
|
+ if (asec->contents == NULL)
|
||||||
|
+ asec->contents = (unsigned char *) xmalloc (asec->size);
|
||||||
|
+ contents = asec->contents;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ contents = i_shdr->contents + asec->output_offset;
|
||||||
|
+
|
||||||
|
+ size = asec->size;
|
||||||
|
+ bfd_h_put_32 (abfd, 0, &contents[0]);
|
||||||
|
+ bfd_h_put_32 (abfd, size - 9, &contents[4]);
|
||||||
|
+ memcpy (&contents[8], name, size - 9);
|
||||||
|
+ contents[size - 1] = 0; /* ensure null termination for AMS */
|
||||||
|
+
|
||||||
|
+ position = i_shdr->sh_offset + asec->output_offset;
|
||||||
|
+
|
||||||
|
+ return (bfd_seek (abfd, position, SEEK_SET) == 0
|
||||||
|
+ && bfd_bwrite (contents, size, abfd) == size);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* Make .nx-module-name section, and set up elf_tdata->nx_module_name. */
|
||||||
|
+
|
||||||
|
+static bfd_boolean
|
||||||
|
+setup_nx_module_name (bfd *ibfd, bfd *obfd)
|
||||||
|
+{
|
||||||
|
+ asection *s;
|
||||||
|
+ bfd_size_type size;
|
||||||
|
+ flagword flags;
|
||||||
|
+
|
||||||
|
+ if (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, '.');
|
||||||
|
+ if (dot_pos != NULL)
|
||||||
|
+ {
|
||||||
|
+ /* Remove extension. */
|
||||||
|
+ *dot_pos = 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ size = 8 + strlen(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))
|
||||||
|
+ {
|
||||||
|
+ 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.sec = s;
|
||||||
|
+ elf_section_type (s) = SHT_PROGBITS;
|
||||||
|
+ s->size = size;
|
||||||
|
+ return TRUE;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ einfo (_("%P: warning: cannot create .nx-module-name section,"
|
||||||
|
+ " --nx-module-name ignored\n"));
|
||||||
|
+ return FALSE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/* This is called after all the input files have been opened. */
|
||||||
|
|
||||||
|
static void
|
||||||
|
@@ -1267,6 +1356,24 @@ gld${EMULATION_NAME}_after_open (void)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (emit_nx_module_name != NULL)
|
||||||
|
+ {
|
||||||
|
+ /* Find an ELF input. */
|
||||||
|
+ for (abfd = link_info.input_bfds;
|
||||||
|
+ abfd != (bfd *) NULL; abfd = abfd->link.next)
|
||||||
|
+ if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
|
||||||
|
+ && bfd_count_sections (abfd) != 0
|
||||||
|
+ && !((lang_input_statement_type *) abfd->usrdata)->flags.just_syms)
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ /* If there are no ELF input files do not try to create a .nx-module-name section. */
|
||||||
|
+ if (abfd == NULL || !setup_nx_module_name (abfd, link_info.output_bfd))
|
||||||
|
+ {
|
||||||
|
+ free ((char *) emit_nx_module_name);
|
||||||
|
+ 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
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
;
|
||||||
|
|
||||||
|
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 ();
|
||||||
@@ -1,17 +1,22 @@
|
|||||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||||
index 532c33f4c2b..c8a8bc698a7 100644
|
index ddd3b8f4d9d..014df2e5a59 100644
|
||||||
--- a/gcc/config.gcc
|
--- a/gcc/config.gcc
|
||||||
+++ b/gcc/config.gcc
|
+++ b/gcc/config.gcc
|
||||||
@@ -945,6 +945,7 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
@@ -985,6 +985,12 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
||||||
case $target in
|
case $target in
|
||||||
aarch64-*-elf*)
|
aarch64-*-elf*)
|
||||||
use_gcc_stdint=wrap
|
use_gcc_stdint=wrap
|
||||||
|
+ tm_file="${tm_file} devkitpro.h"
|
||||||
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
|
+ 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*)
|
aarch64-*-fuchsia*)
|
||||||
tm_file="${tm_file} fuchsia.h"
|
tm_file="${tm_file} fuchsia.h"
|
||||||
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
index c074238df06..ef503ddd5a6 100644
|
index bbebd0ef029..8f38510402f 100644
|
||||||
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
@@ -22,6 +22,7 @@
|
@@ -22,6 +22,7 @@
|
||||||
@@ -23,7 +28,7 @@ index c074238df06..ef503ddd5a6 100644
|
|||||||
#define ENDFILE_SPEC \
|
#define ENDFILE_SPEC \
|
||||||
" crtend%O%s crtn%O%s " \
|
" crtend%O%s crtn%O%s " \
|
||||||
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
||||||
index 7a5c6d7664f..687793841de 100644
|
index 4b07d296a11..037985f1d86 100644
|
||||||
--- a/gcc/config/aarch64/aarch64-opts.h
|
--- a/gcc/config/aarch64/aarch64-opts.h
|
||||||
+++ b/gcc/config/aarch64/aarch64-opts.h
|
+++ b/gcc/config/aarch64/aarch64-opts.h
|
||||||
@@ -48,6 +48,12 @@ enum aarch64_tls_type {
|
@@ -48,6 +48,12 @@ enum aarch64_tls_type {
|
||||||
@@ -40,10 +45,10 @@ index 7a5c6d7664f..687793841de 100644
|
|||||||
Most have a PIC and non-PIC variant. */
|
Most have a PIC and non-PIC variant. */
|
||||||
enum aarch64_code_model {
|
enum aarch64_code_model {
|
||||||
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
||||||
index 175f13dc264..733ab473cbd 100644
|
index 6b25d9cbfae..39c7026a90c 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.c
|
--- a/gcc/config/aarch64/aarch64.c
|
||||||
+++ b/gcc/config/aarch64/aarch64.c
|
+++ b/gcc/config/aarch64/aarch64.c
|
||||||
@@ -11979,8 +11979,24 @@ aarch64_load_tp (rtx target)
|
@@ -13186,8 +13186,24 @@ aarch64_load_tp (rtx target)
|
||||||
|| !register_operand (target, Pmode))
|
|| !register_operand (target, Pmode))
|
||||||
target = gen_reg_rtx (Pmode);
|
target = gen_reg_rtx (Pmode);
|
||||||
|
|
||||||
@@ -71,10 +76,10 @@ index 175f13dc264..733ab473cbd 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
||||||
index 976f9afae54..73263bcb5e7 100644
|
index fc6df970c2e..705c6de868f 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.h
|
--- a/gcc/config/aarch64/aarch64.h
|
||||||
+++ b/gcc/config/aarch64/aarch64.h
|
+++ b/gcc/config/aarch64/aarch64.h
|
||||||
@@ -957,6 +957,10 @@ typedef struct
|
@@ -1006,6 +1006,10 @@ typedef struct
|
||||||
/* Check TLS Descriptors mechanism is selected. */
|
/* Check TLS Descriptors mechanism is selected. */
|
||||||
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
||||||
|
|
||||||
@@ -86,10 +91,10 @@ index 976f9afae54..73263bcb5e7 100644
|
|||||||
|
|
||||||
/* When using the tiny addressing model conditional and unconditional branches
|
/* When using the tiny addressing model conditional and unconditional branches
|
||||||
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
||||||
index 32a0e1f3685..783c655acf0 100644
|
index 5a1894063a1..7c9d9452659 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.md
|
--- a/gcc/config/aarch64/aarch64.md
|
||||||
+++ b/gcc/config/aarch64/aarch64.md
|
+++ b/gcc/config/aarch64/aarch64.md
|
||||||
@@ -5693,11 +5693,22 @@
|
@@ -6583,11 +6583,22 @@
|
||||||
(define_insn "aarch64_load_tp_hard"
|
(define_insn "aarch64_load_tp_hard"
|
||||||
[(set (match_operand:DI 0 "register_operand" "=r")
|
[(set (match_operand:DI 0 "register_operand" "=r")
|
||||||
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
||||||
@@ -115,10 +120,10 @@ index 32a0e1f3685..783c655acf0 100644
|
|||||||
;; instructions in the TLS stubs, in order to enable linker relaxation.
|
;; instructions in the TLS stubs, in order to enable linker relaxation.
|
||||||
;; Therefore we treat the stubs as an atomic sequence.
|
;; Therefore we treat the stubs as an atomic sequence.
|
||||||
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
||||||
index 52eaf8c6f40..52bccddc6e3 100644
|
index 7719c3b6352..cd32a639b16 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.opt
|
--- a/gcc/config/aarch64/aarch64.opt
|
||||||
+++ b/gcc/config/aarch64/aarch64.opt
|
+++ b/gcc/config/aarch64/aarch64.opt
|
||||||
@@ -115,6 +115,20 @@ Enum(aarch64_tls_size) String(32) Value(32)
|
@@ -118,6 +118,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
|
||||||
EnumValue
|
EnumValue
|
||||||
Enum(aarch64_tls_size) String(48) Value(48)
|
Enum(aarch64_tls_size) String(48) Value(48)
|
||||||
|
|
||||||
@@ -135,29 +140,104 @@ index 52eaf8c6f40..52bccddc6e3 100644
|
|||||||
+
|
+
|
||||||
+EnumValue
|
+EnumValue
|
||||||
+Enum(aarch64_tp_type) String(soft) Value(TP_SOFT)
|
+Enum(aarch64_tp_type) String(soft) Value(TP_SOFT)
|
||||||
|
+
|
||||||
+
|
+
|
||||||
march=
|
march=
|
||||||
Target RejectNegative ToLower Joined Var(aarch64_arch_string)
|
Target RejectNegative ToLower Joined Var(aarch64_arch_string)
|
||||||
-march=ARCH Use features of architecture ARCH.
|
Use features of architecture ARCH.
|
||||||
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
||||||
index 0be1f0d63aa..a54068bfd96 100644
|
index ee471f8983f..aedaefdd62d 100644
|
||||||
--- a/gcc/config/aarch64/t-aarch64
|
--- a/gcc/config/aarch64/t-aarch64
|
||||||
+++ b/gcc/config/aarch64/t-aarch64
|
+++ b/gcc/config/aarch64/t-aarch64
|
||||||
@@ -68,5 +68,7 @@ cortex-a57-fma-steering.o: $(srcdir)/config/aarch64/cortex-a57-fma-steering.c \
|
@@ -100,6 +100,8 @@ aarch64-bti-insert.o: $(srcdir)/config/aarch64/aarch64-bti-insert.c \
|
||||||
$(srcdir)/config/aarch64/cortex-a57-fma-steering.c
|
$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
|
||||||
|
$(srcdir)/config/aarch64/aarch64-bti-insert.c
|
||||||
|
|
||||||
comma=,
|
-comma=,
|
||||||
-MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
|
-MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
|
||||||
-MULTILIB_DIRNAMES = $(subst $(comma), ,$(TM_MULTILIB_CONFIG))
|
-MULTILIB_DIRNAMES = $(subst $(comma), ,$(TM_MULTILIB_CONFIG))
|
||||||
|
+ comma=,
|
||||||
+MULTILIB_OPTIONS = mcmodel=large fPIC
|
+MULTILIB_OPTIONS = mcmodel=large fPIC
|
||||||
+MULTILIB_DIRNAMES = large pic
|
+MULTILIB_DIRNAMES = large pic
|
||||||
+MULTILIB_REQUIRED = mcmodel=large fPIC
|
+MULTILIB_REQUIRED = mcmodel=large fPIC
|
||||||
+MULTILIB_MATCHES = fPIC=fpic fPIC=fpie fPIC=fPIE
|
+MULTILIB_MATCHES = fPIC=fpic fPIC=fpie fPIC=fPIE
|
||||||
|
diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..11ba0f5ab1c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/gcc/config/devkitpro.h
|
||||||
|
@@ -0,0 +1,31 @@
|
||||||
|
+/* Definitions for devkitPro toolchains.
|
||||||
|
+ Copyright (C) 2016-2018 Free Software Foundation, Inc.
|
||||||
|
+
|
||||||
|
+ This file is part of GCC.
|
||||||
|
+
|
||||||
|
+ GCC is free software; you can redistribute it and/or modify it
|
||||||
|
+ under the terms of the GNU General Public License as published
|
||||||
|
+ by the Free Software Foundation; either version 3, or (at your
|
||||||
|
+ option) any later version.
|
||||||
|
+
|
||||||
|
+ GCC is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||||
|
+ License for more details.
|
||||||
|
+
|
||||||
|
+ Under Section 7 of GPL version 3, you are granted additional
|
||||||
|
+ permissions described in the GCC Runtime Library Exception, version
|
||||||
|
+ 3.1, as published by the Free Software Foundation.
|
||||||
|
+
|
||||||
|
+ You should have received a copy of the GNU General Public License and
|
||||||
|
+ a copy of the GCC Runtime Library Exception along with this program;
|
||||||
|
+ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
+ <http://www.gnu.org/licenses/>. */
|
||||||
|
+
|
||||||
|
+#undef TARGET_OS_CPP_BUILTINS
|
||||||
|
+#define TARGET_OS_CPP_BUILTINS() \
|
||||||
|
+ do { \
|
||||||
|
+ builtin_define ("__DEVKITA64__"); \
|
||||||
|
+ } 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.c b/gcc/gcc.c
|
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
||||||
index a716f708259..6a11011dba7 100644
|
index 4f57765b012..2899202cc05 100644
|
||||||
--- a/gcc/gcc.c
|
--- a/gcc/gcc.c
|
||||||
+++ b/gcc/gcc.c
|
+++ b/gcc/gcc.c
|
||||||
@@ -786,6 +786,11 @@ proper position among the other output files. */
|
@@ -794,6 +794,11 @@ proper position among the other output files. */
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -169,7 +249,7 @@ index a716f708259..6a11011dba7 100644
|
|||||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||||
#ifndef STARTFILE_SPEC
|
#ifndef STARTFILE_SPEC
|
||||||
#define STARTFILE_SPEC \
|
#define STARTFILE_SPEC \
|
||||||
@@ -1081,6 +1086,7 @@ static const char *link_spec = LINK_SPEC;
|
@@ -1086,6 +1091,7 @@ static const char *link_spec = LINK_SPEC;
|
||||||
static const char *lib_spec = LIB_SPEC;
|
static const char *lib_spec = LIB_SPEC;
|
||||||
static const char *link_gomp_spec = "";
|
static const char *link_gomp_spec = "";
|
||||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||||
@@ -177,7 +257,7 @@ index a716f708259..6a11011dba7 100644
|
|||||||
static const char *endfile_spec = ENDFILE_SPEC;
|
static const char *endfile_spec = ENDFILE_SPEC;
|
||||||
static const char *startfile_spec = STARTFILE_SPEC;
|
static const char *startfile_spec = STARTFILE_SPEC;
|
||||||
static const char *linker_name_spec = LINKER_NAME;
|
static const char *linker_name_spec = LINKER_NAME;
|
||||||
@@ -1577,6 +1583,7 @@ static struct spec_list static_specs[] =
|
@@ -1583,6 +1589,7 @@ static struct spec_list static_specs[] =
|
||||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||||
@@ -186,7 +266,7 @@ index a716f708259..6a11011dba7 100644
|
|||||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||||
INIT_STATIC_SPEC ("version", &compiler_version),
|
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||||
index 5e894455e16..f2347455de0 100644
|
index 4927a9f8977..8311b6a7f5e 100644
|
||||||
--- a/libgcc/crtstuff.c
|
--- a/libgcc/crtstuff.c
|
||||||
+++ b/libgcc/crtstuff.c
|
+++ b/libgcc/crtstuff.c
|
||||||
@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
@@ -197,3 +277,40 @@ index 5e894455e16..f2347455de0 100644
|
|||||||
|
|
||||||
/* FIXME: Including auto-host is incorrect, but until we have
|
/* FIXME: Including auto-host is incorrect, but until we have
|
||||||
identified the set of defines that need to go into auto-target.h,
|
identified the set of defines that need to go into auto-target.h,
|
||||||
|
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
||||||
|
index 67826419882..d9f01c6c371 100644
|
||||||
|
--- a/libgcc/gthr.h
|
||||||
|
+++ b/libgcc/gthr.h
|
||||||
|
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
/* The pe-coff weak support isn't fully compatible to ELF's weak.
|
||||||
|
For static libraries it might would work, but as we need to deal
|
||||||
|
with shared versions too, we disable it for mingw-targets. */
|
||||||
|
-#ifdef __MINGW32__
|
||||||
|
+#if defined(__MINGW32__) || defined(__DEVKITA64__)
|
||||||
|
#undef GTHREAD_USE_WEAK
|
||||||
|
#define GTHREAD_USE_WEAK 0
|
||||||
|
#endif
|
||||||
|
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
||||||
|
index 1deacb80ca2..0de11c15a3a 100644
|
||||||
|
--- a/libstdc++-v3/include/Makefile.am
|
||||||
|
+++ b/libstdc++-v3/include/Makefile.am
|
||||||
|
@@ -1338,6 +1338,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||||
|
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||||
|
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||||
|
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||||
|
+ -e 's/_GLIBCXX___DEVKITA64_GLIBCXX___/__DEVKITA64__/g' \
|
||||||
|
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
||||||
|
< $< > $@
|
||||||
|
|
||||||
|
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
||||||
|
index bc475c6dd90..bfa3e71898a 100644
|
||||||
|
--- a/libstdc++-v3/include/Makefile.in
|
||||||
|
+++ b/libstdc++-v3/include/Makefile.in
|
||||||
|
@@ -1817,6 +1817,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||||
|
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||||
|
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||||
|
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||||
|
+ -e 's/_GLIBCXX___DEVKITA64_GLIBCXX___/__DEVKITA64__/g' \
|
||||||
|
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
||||||
|
< $< > $@
|
||||||
|
|
||||||
60
dka64/patches/gdb-8.2.1.patch
Normal file
60
dka64/patches/gdb-8.2.1.patch
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
|
||||||
|
--- gdb-8.2.1/gdb/dtrace-probe.c 2018-12-23 05:51:54.000000000 +0000
|
||||||
|
+++ gdb-8.2.1-apple/gdb/dtrace-probe.c 2019-03-23 19:45:04.743529457 +0000
|
||||||
|
@@ -100,7 +100,7 @@
|
||||||
|
|
||||||
|
/* DTrace static_probe_ops. */
|
||||||
|
|
||||||
|
-const dtrace_static_probe_ops dtrace_static_probe_ops;
|
||||||
|
+const dtrace_static_probe_ops dtrace_static_probe_ops = {};
|
||||||
|
|
||||||
|
/* The following structure represents a dtrace probe. */
|
||||||
|
|
||||||
|
diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
|
||||||
|
--- gdb-8.2.1/gdb/probe.c 2018-12-23 05:51:54.000000000 +0000
|
||||||
|
+++ gdb-8.2.1-apple/gdb/probe.c 2019-03-23 19:35:59.701401090 +0000
|
||||||
|
@@ -60,7 +60,7 @@
|
||||||
|
|
||||||
|
/* Static operations associated with a generic probe. */
|
||||||
|
|
||||||
|
-const any_static_probe_ops any_static_probe_ops;
|
||||||
|
+const any_static_probe_ops any_static_probe_ops = {};
|
||||||
|
|
||||||
|
/* A helper for parse_probes that decodes a probe specification in
|
||||||
|
SEARCH_PSPACE. It appends matching SALs to RESULT. */
|
||||||
|
diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
|
||||||
|
--- gdb-8.2.1/gdb/record-btrace.c 2018-12-23 05:51:54.000000000 +0000
|
||||||
|
+++ gdb-8.2.1-apple/gdb/record-btrace.c 2019-03-23 19:35:59.705388987 +0000
|
||||||
|
@@ -144,7 +144,7 @@
|
||||||
|
|
||||||
|
/* Token associated with a new-thread observer enabling branch tracing
|
||||||
|
for the new thread. */
|
||||||
|
-static const gdb::observers::token record_btrace_thread_observer_token;
|
||||||
|
+static const gdb::observers::token record_btrace_thread_observer_token = {};
|
||||||
|
|
||||||
|
/* Memory access types used in set/show record btrace replay-memory-access. */
|
||||||
|
static const char replay_memory_access_read_only[] = "read-only";
|
||||||
|
diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
|
||||||
|
--- gdb-8.2.1/gdb/stap-probe.c 2018-12-23 05:51:54.000000000 +0000
|
||||||
|
+++ gdb-8.2.1-apple/gdb/stap-probe.c 2019-03-23 19:35:59.705388987 +0000
|
||||||
|
@@ -119,7 +119,7 @@
|
||||||
|
|
||||||
|
/* SystemTap static_probe_ops. */
|
||||||
|
|
||||||
|
-const stap_static_probe_ops stap_static_probe_ops;
|
||||||
|
+const stap_static_probe_ops stap_static_probe_ops = {};
|
||||||
|
|
||||||
|
class stap_probe : public probe
|
||||||
|
{
|
||||||
|
diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
|
||||||
|
--- gdb-8.2.1/gdb/tui/tui-hooks.c 2018-12-23 05:51:54.000000000 +0000
|
||||||
|
+++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c 2019-03-23 19:35:59.705388987 +0000
|
||||||
|
@@ -205,7 +205,7 @@
|
||||||
|
|
||||||
|
/* Token associated with observers registered while TUI hooks are
|
||||||
|
installed. */
|
||||||
|
-static const gdb::observers::token tui_observers_token;
|
||||||
|
+static const gdb::observers::token tui_observers_token = {};
|
||||||
|
|
||||||
|
/* Attach or detach a single observer, according to ATTACH. */
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -64,7 +64,7 @@ then
|
|||||||
--prefix=$prefix \
|
--prefix=$prefix \
|
||||||
--enable-lto $plugin_ld\
|
--enable-lto $plugin_ld\
|
||||||
--with-system-zlib \
|
--with-system-zlib \
|
||||||
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 12" \
|
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 14" \
|
||||||
$CROSS_PARAMS \
|
$CROSS_PARAMS \
|
||||||
$CROSS_GCC_PARAMS \
|
$CROSS_GCC_PARAMS \
|
||||||
|| { echo "Error configuring gcc"; exit 1; }
|
|| { echo "Error configuring gcc"; exit 1; }
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
export DEVKITPRO=$TOOLPATH
|
|
||||||
|
|
||||||
cd $BUILDDIR/libnx-$LIBNX_VER
|
|
||||||
$MAKE || { echo "error building libnx"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libnx"; exit 1; }
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
|
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
|
||||||
index ba194a80229..12e023c3728 100644
|
index 3a55f6ac6d2..1a16dcc1c74 100644
|
||||||
--- a/gcc/config/arm/arm-cpus.in
|
--- a/gcc/config/arm/arm-cpus.in
|
||||||
+++ b/gcc/config/arm/arm-cpus.in
|
+++ b/gcc/config/arm/arm-cpus.in
|
||||||
@@ -401,7 +401,7 @@ begin arch armv6k
|
@@ -352,7 +352,7 @@ begin arch armv6k
|
||||||
tune for mpcore
|
tune for mpcore
|
||||||
tune flags CO_PROC
|
tune flags CO_PROC
|
||||||
base 6K
|
base 6K
|
||||||
@@ -12,16 +12,16 @@ index ba194a80229..12e023c3728 100644
|
|||||||
optalias vfpv2 fp
|
optalias vfpv2 fp
|
||||||
option nofp remove ALL_FP
|
option nofp remove ALL_FP
|
||||||
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
|
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
|
||||||
index 9ec5bf065ac..9ab3ffb109d 100644
|
index 8911d489f14..b1976386bab 100644
|
||||||
--- a/gcc/config/arm/t-arm-elf
|
--- a/gcc/config/arm/t-arm-elf
|
||||||
+++ b/gcc/config/arm/t-arm-elf
|
+++ b/gcc/config/arm/t-arm-elf
|
||||||
@@ -1,4 +1,4 @@
|
@@ -1,4 +1,4 @@
|
||||||
-# Copyright (C) 1998-2018 Free Software Foundation, Inc.
|
-# Copyright (C) 1998-2019 Free Software Foundation, Inc.
|
||||||
+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
|
+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This file is part of GCC.
|
# This file is part of GCC.
|
||||||
#
|
#
|
||||||
@@ -16,110 +16,83 @@
|
@@ -16,111 +16,14 @@
|
||||||
# along with GCC; see the file COPYING3. If not see
|
# along with GCC; see the file COPYING3. If not see
|
||||||
# <http://www.gnu.org/licenses/>.
|
# <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
@@ -48,14 +48,15 @@ index 9ec5bf065ac..9ab3ffb109d 100644
|
|||||||
-v8_fps := simd fp16 crypto fp16+crypto dotprod fp16fml
|
-v8_fps := simd fp16 crypto fp16+crypto dotprod fp16fml
|
||||||
-
|
-
|
||||||
-# We don't do anything special with these. Pre-v4t probably doesn't work.
|
-# We don't do anything special with these. Pre-v4t probably doesn't work.
|
||||||
-all_early_nofp := armv2 armv2a armv3 armv3m armv4 armv4t armv5 armv5t
|
-all_early_nofp := armv4 armv4t armv5t
|
||||||
-
|
-
|
||||||
-all_early_arch := armv5e armv5tej armv6 armv6j armv6k armv6z armv6kz \
|
-all_early_arch := armv5tej armv6 armv6j armv6k armv6z armv6kz \
|
||||||
- armv6zk armv6t2 iwmmxt iwmmxt2
|
- armv6zk armv6t2 iwmmxt iwmmxt2
|
||||||
-
|
-
|
||||||
-all_v7_a_r := armv7-a armv7ve armv7-r
|
-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
|
-all_v8_archs := armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a \
|
||||||
|
- armv8.5-a
|
||||||
-
|
-
|
||||||
-# No floating point variants, require thumb1 softfp
|
-# No floating point variants, require thumb1 softfp
|
||||||
-all_nofp_t := armv6-m armv6s-m armv8-m.base
|
-all_nofp_t := armv6-m armv6s-m armv8-m.base
|
||||||
@@ -114,16 +115,19 @@ index 9ec5bf065ac..9ab3ffb109d 100644
|
|||||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v7_a_r), \
|
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v7_a_r), \
|
||||||
- march?armv7+fp=march?$(ARCH) \
|
- march?armv7+fp=march?$(ARCH) \
|
||||||
- march?armv7+fp=march?$(ARCH)+fp)
|
- march?armv7+fp=march?$(ARCH)+fp)
|
||||||
-
|
|
||||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v8_archs), \
|
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v8_archs), \
|
||||||
- march?armv7+fp=march?$(ARCH) \
|
- march?armv7+fp=march?$(ARCH) \
|
||||||
- $(foreach FPARCH, $(v8_fps), \
|
- $(foreach FPARCH, $(v8_fps), \
|
||||||
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
|
- 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, \
|
-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \
|
||||||
- march?armv7+fp=march?$(ARCH)+fp.dp)
|
- march?armv7+fp=march?$(ARCH)+fp.dp)
|
||||||
-
|
|
||||||
-# PART 4 - Reuse rules
|
-# 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
|
||||||
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp
|
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp
|
||||||
@@ -134,83 +138,8 @@ index 9ec5bf065ac..9ab3ffb109d 100644
|
|||||||
-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=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=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/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
|
||||||
+MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+MULTILIB_MATCHES += march?armv6k=mtune?mpcore
|
|
||||||
+MULTILIB_MATCHES += march?armv6k=mcpu?mpcore
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#MULTILIB_OPTIONS += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te
|
|
||||||
+#MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te
|
|
||||||
+#MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626
|
|
||||||
+
|
|
||||||
+#MULTILIB_OPTIONS += march=armv7
|
|
||||||
+#MULTILIB_DIRNAMES += thumb2
|
|
||||||
+#MULTILIB_EXCEPTIONS += march=armv7* marm/*march=armv7*
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=march?armv7-a
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=march?armv7-r
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=march?armv7-m
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=mcpu?cortex-a8
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=mcpu?cortex-m3
|
|
||||||
+
|
|
||||||
+# Not quite true. We can support hard-vfp calling in Thumb2, but how do we
|
|
||||||
+# express that here? Also, we really need architecture v5e or later
|
|
||||||
+# (mcrr etc).
|
|
||||||
+#MULTILIB_OPTIONS += mfloat-abi=hard
|
|
||||||
+#MULTILIB_DIRNAMES += fpu
|
|
||||||
+#MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
|
|
||||||
+#MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard*
|
|
||||||
+#MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard*
|
|
||||||
+
|
|
||||||
+# MULTILIB_OPTIONS += mcpu=ep9312
|
|
||||||
+# MULTILIB_DIRNAMES += ep9312
|
|
||||||
+# MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312*
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += mlittle-endian/mbig-endian
|
|
||||||
+# MULTILIB_DIRNAMES += le be
|
|
||||||
+# MULTILIB_MATCHES += mbig-endian=mbe mlittle-endian=mle
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += mfloat-abi=hard/mfloat-abi=soft
|
|
||||||
+# MULTILIB_DIRNAMES += fpu soft
|
|
||||||
+# MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork
|
|
||||||
+# MULTILIB_DIRNAMES += normal interwork
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += fno-leading-underscore/fleading-underscore
|
|
||||||
+# MULTILIB_DIRNAMES += elf under
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += mcpu=arm7
|
|
||||||
+# MULTILIB_DIRNAMES += nofmult
|
|
||||||
+# MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=arm7*
|
|
||||||
+# # Note: the multilib_exceptions matches both -mthumb and
|
|
||||||
+# # -mthumb-interwork
|
|
||||||
+# #
|
|
||||||
+# # We have to match all the arm cpu variants which do not have the
|
|
||||||
+# # multiply instruction and treat them as if the user had specified
|
|
||||||
+# # -mcpu=arm7. Note that in the following the ? is interpreted as
|
|
||||||
+# # an = for the purposes of matching command line options.
|
|
||||||
+# # FIXME: There ought to be a better way to do this.
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7d
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7di
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm70
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700i
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710c
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7100
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500fe
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm6
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm60
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm600
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm610
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm620
|
|
||||||
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
|
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
|
||||||
index 12dd0931b08..59584fe64bc 100644
|
index cf9ba6b4dc0..008d7555ecb 100644
|
||||||
--- a/gcc/config/arm/unknown-elf.h
|
--- a/gcc/config/arm/unknown-elf.h
|
||||||
+++ b/gcc/config/arm/unknown-elf.h
|
+++ b/gcc/config/arm/unknown-elf.h
|
||||||
@@ -29,7 +29,7 @@
|
@@ -29,7 +29,7 @@
|
||||||
@@ -222,22 +151,18 @@ index 12dd0931b08..59584fe64bc 100644
|
|||||||
|
|
||||||
#undef STARTFILE_SPEC
|
#undef STARTFILE_SPEC
|
||||||
#define STARTFILE_SPEC \
|
#define STARTFILE_SPEC \
|
||||||
@@ -93,4 +93,9 @@
|
@@ -93,4 +93,5 @@
|
||||||
udivmoddi4, which will depend on the exception unwind routines,
|
udivmoddi4, which will depend on the exception unwind routines,
|
||||||
which will depend on abort, which is defined in libc. */
|
which will depend on abort, which is defined in libc. */
|
||||||
#undef LINK_GCC_C_SEQUENCE_SPEC
|
#undef LINK_GCC_C_SEQUENCE_SPEC
|
||||||
-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L --end-group"
|
-#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"
|
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
||||||
+
|
+
|
||||||
+/* The system headers under devkitARM are C++-aware. */
|
|
||||||
+#undef NO_IMPLICIT_EXTERN_C
|
|
||||||
+#define NO_IMPLICIT_EXTERN_C
|
|
||||||
+
|
|
||||||
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
||||||
index a716f708259..6a11011dba7 100644
|
index 4f57765b012..2899202cc05 100644
|
||||||
--- a/gcc/gcc.c
|
--- a/gcc/gcc.c
|
||||||
+++ b/gcc/gcc.c
|
+++ b/gcc/gcc.c
|
||||||
@@ -786,6 +786,11 @@ proper position among the other output files. */
|
@@ -794,6 +794,11 @@ proper position among the other output files. */
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -249,7 +174,7 @@ index a716f708259..6a11011dba7 100644
|
|||||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||||
#ifndef STARTFILE_SPEC
|
#ifndef STARTFILE_SPEC
|
||||||
#define STARTFILE_SPEC \
|
#define STARTFILE_SPEC \
|
||||||
@@ -1081,6 +1086,7 @@ static const char *link_spec = LINK_SPEC;
|
@@ -1086,6 +1091,7 @@ static const char *link_spec = LINK_SPEC;
|
||||||
static const char *lib_spec = LIB_SPEC;
|
static const char *lib_spec = LIB_SPEC;
|
||||||
static const char *link_gomp_spec = "";
|
static const char *link_gomp_spec = "";
|
||||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||||
@@ -257,7 +182,7 @@ index a716f708259..6a11011dba7 100644
|
|||||||
static const char *endfile_spec = ENDFILE_SPEC;
|
static const char *endfile_spec = ENDFILE_SPEC;
|
||||||
static const char *startfile_spec = STARTFILE_SPEC;
|
static const char *startfile_spec = STARTFILE_SPEC;
|
||||||
static const char *linker_name_spec = LINKER_NAME;
|
static const char *linker_name_spec = LINKER_NAME;
|
||||||
@@ -1577,6 +1583,7 @@ static struct spec_list static_specs[] =
|
@@ -1583,6 +1589,7 @@ static struct spec_list static_specs[] =
|
||||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||||
@@ -276,7 +201,7 @@ index dddddc7c444..c2502597953 100644
|
|||||||
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
|
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
|
||||||
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
|
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
|
||||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||||
index 5e894455e16..f81c9c6a64c 100644
|
index 4927a9f8977..2a79e3e137d 100644
|
||||||
--- a/libgcc/crtstuff.c
|
--- a/libgcc/crtstuff.c
|
||||||
+++ b/libgcc/crtstuff.c
|
+++ b/libgcc/crtstuff.c
|
||||||
@@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
@@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
@@ -1,7 +1,29 @@
|
|||||||
diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
|
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
|
||||||
--- gdb-8.2.1/gdb/arm-3ds-tdep.c 1970-01-01 01:00:00.000000000 +0100
|
index 9799a7a65d..ccd3f8a626 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/arm-3ds-tdep.c 2019-02-19 17:15:22.100604954 +0000
|
--- a/gdb/Makefile.in
|
||||||
@@ -0,0 +1,157 @@
|
+++ b/gdb/Makefile.in
|
||||||
|
@@ -684,6 +684,7 @@ ALL_TARGET_OBS = \
|
||||||
|
arch/arm-linux.o \
|
||||||
|
arch/i386.o \
|
||||||
|
arch/ppc-linux-common.o \
|
||||||
|
+ arm-3ds-tdep.o \
|
||||||
|
arm-bsd-tdep.o \
|
||||||
|
arm-fbsd-tdep.o \
|
||||||
|
arm-linux-tdep.o \
|
||||||
|
@@ -2213,6 +2214,7 @@ ALLDEPFILES = \
|
||||||
|
amd64-tdep.c \
|
||||||
|
arc-tdep.c \
|
||||||
|
arm.c \
|
||||||
|
+ arm-3ds-tdep.c \
|
||||||
|
arm-bsd-tdep.c \
|
||||||
|
arm-fbsd-nat.c \
|
||||||
|
arm-fbsd-tdep.c \
|
||||||
|
diff --git a/gdb/arm-3ds-tdep.c b/gdb/arm-3ds-tdep.c
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..c41336982b
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/gdb/arm-3ds-tdep.c
|
||||||
|
@@ -0,0 +1,291 @@
|
||||||
+/* Target-dependent code for 3DS. */
|
+/* Target-dependent code for 3DS. */
|
||||||
+
|
+
|
||||||
+/* This uses code from GDB, which license is: */
|
+/* This uses code from GDB, which license is: */
|
||||||
@@ -49,6 +71,32 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
|
|||||||
+ NULL,
|
+ NULL,
|
||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
|
+/* single_step() is called just before we want to resume the inferior,
|
||||||
|
+ if we want to single-step it but there is no hardware or kernel
|
||||||
|
+ single-step support. We find the target of the coming instructions
|
||||||
|
+ and breakpoint them. */
|
||||||
|
+
|
||||||
|
+std::vector<CORE_ADDR>
|
||||||
|
+arm_3ds_software_single_step (struct regcache *regcache)
|
||||||
|
+{
|
||||||
|
+ struct gdbarch *gdbarch = regcache->arch ();
|
||||||
|
+ struct arm_get_next_pcs next_pcs_ctx;
|
||||||
|
+
|
||||||
|
+ arm_get_next_pcs_ctor (&next_pcs_ctx,
|
||||||
|
+ &arm_3ds_get_next_pcs_ops,
|
||||||
|
+ gdbarch_byte_order (gdbarch),
|
||||||
|
+ gdbarch_byte_order_for_code (gdbarch),
|
||||||
|
+ 0,
|
||||||
|
+ regcache);
|
||||||
|
+
|
||||||
|
+ std::vector<CORE_ADDR> next_pcs = arm_get_next_pcs (&next_pcs_ctx);
|
||||||
|
+
|
||||||
|
+ for (CORE_ADDR &pc_ref : next_pcs)
|
||||||
|
+ pc_ref = gdbarch_addr_bits_remove (gdbarch, pc_ref);
|
||||||
|
+
|
||||||
|
+ return next_pcs;
|
||||||
|
+}
|
||||||
|
+
|
||||||
+static CORE_ADDR
|
+static CORE_ADDR
|
||||||
+arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self)
|
+arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self)
|
||||||
+{
|
+{
|
||||||
@@ -124,6 +172,108 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
|
|||||||
+ return svc_number;
|
+ return svc_number;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
|
+/* Implement the breakpoint_kind_from_pc gdbarch method. */
|
||||||
|
+
|
||||||
|
+static int
|
||||||
|
+arm_3ds_breakpoint_kind_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr)
|
||||||
|
+{
|
||||||
|
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
||||||
|
+ enum bfd_endian byte_order_for_code = gdbarch_byte_order_for_code (gdbarch);
|
||||||
|
+
|
||||||
|
+ if (arm_pc_is_thumb (gdbarch, *pcptr))
|
||||||
|
+ {
|
||||||
|
+ *pcptr = UNMAKE_THUMB_ADDR (*pcptr);
|
||||||
|
+
|
||||||
|
+ /* If we have a separate 32-bit breakpoint instruction for Thumb-2,
|
||||||
|
+ check whether we are replacing a 32-bit instruction. */
|
||||||
|
+ if (tdep->thumb2_breakpoint != NULL)
|
||||||
|
+ {
|
||||||
|
+ gdb_byte buf[2];
|
||||||
|
+
|
||||||
|
+ if (target_read_memory (*pcptr, buf, 2) == 0)
|
||||||
|
+ {
|
||||||
|
+ unsigned short inst1;
|
||||||
|
+
|
||||||
|
+ inst1 = extract_unsigned_integer (buf, 2, byte_order_for_code);
|
||||||
|
+ if (thumb_insn_size (inst1) == 4)
|
||||||
|
+ return ARM_BP_KIND_THUMB2;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return ARM_BP_KIND_THUMB;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ return ARM_BP_KIND_ARM;
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* Implement the sw_breakpoint_from_kind gdbarch method. */
|
||||||
|
+
|
||||||
|
+static const gdb_byte *
|
||||||
|
+arm_3ds_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size)
|
||||||
|
+{
|
||||||
|
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
||||||
|
+
|
||||||
|
+ switch (kind)
|
||||||
|
+ {
|
||||||
|
+ case ARM_BP_KIND_ARM:
|
||||||
|
+ *size = tdep->arm_breakpoint_size;
|
||||||
|
+ return tdep->arm_breakpoint;
|
||||||
|
+ case ARM_BP_KIND_THUMB:
|
||||||
|
+ *size = tdep->thumb_breakpoint_size;
|
||||||
|
+ return tdep->thumb_breakpoint;
|
||||||
|
+ case ARM_BP_KIND_THUMB2:
|
||||||
|
+ *size = tdep->thumb2_breakpoint_size;
|
||||||
|
+ return tdep->thumb2_breakpoint;
|
||||||
|
+ default:
|
||||||
|
+ gdb_assert_not_reached ("unexpected arm breakpoint kind");
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* Implement the breakpoint_kind_from_current_state gdbarch method. */
|
||||||
|
+
|
||||||
|
+static int
|
||||||
|
+arm_3ds_breakpoint_kind_from_current_state (struct gdbarch *gdbarch,
|
||||||
|
+ struct regcache *regcache,
|
||||||
|
+ CORE_ADDR *pcptr)
|
||||||
|
+{
|
||||||
|
+ gdb_byte buf[4];
|
||||||
|
+
|
||||||
|
+ /* Check the memory pointed by PC is readable. */
|
||||||
|
+ if (target_read_memory (regcache_read_pc (regcache), buf, 4) == 0)
|
||||||
|
+ {
|
||||||
|
+ struct arm_get_next_pcs next_pcs_ctx;
|
||||||
|
+
|
||||||
|
+ arm_get_next_pcs_ctor (&next_pcs_ctx,
|
||||||
|
+ &arm_3ds_get_next_pcs_ops,
|
||||||
|
+ gdbarch_byte_order (gdbarch),
|
||||||
|
+ gdbarch_byte_order_for_code (gdbarch),
|
||||||
|
+ 0,
|
||||||
|
+ regcache);
|
||||||
|
+
|
||||||
|
+ std::vector<CORE_ADDR> next_pcs = arm_get_next_pcs (&next_pcs_ctx);
|
||||||
|
+
|
||||||
|
+ /* If MEMADDR is the next instruction of current pc, do the
|
||||||
|
+ software single step computation, and get the thumb mode by
|
||||||
|
+ the destination address. */
|
||||||
|
+ for (CORE_ADDR pc : next_pcs)
|
||||||
|
+ {
|
||||||
|
+ if (UNMAKE_THUMB_ADDR (pc) == *pcptr)
|
||||||
|
+ {
|
||||||
|
+ if (IS_THUMB_ADDR (pc))
|
||||||
|
+ {
|
||||||
|
+ *pcptr = MAKE_THUMB_ADDR (*pcptr);
|
||||||
|
+ return arm_3ds_breakpoint_kind_from_pc (gdbarch, pcptr);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ return ARM_BP_KIND_ARM;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return arm_3ds_breakpoint_kind_from_pc (gdbarch, pcptr);
|
||||||
|
+}
|
||||||
|
+
|
||||||
+static void
|
+static void
|
||||||
+arm_3ds_init_abi (struct gdbarch_info info,
|
+arm_3ds_init_abi (struct gdbarch_info info,
|
||||||
+ struct gdbarch *gdbarch)
|
+ struct gdbarch *gdbarch)
|
||||||
@@ -146,7 +296,13 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
|
|||||||
+ tdep->fp_model = ARM_FLOAT_VFP;
|
+ tdep->fp_model = ARM_FLOAT_VFP;
|
||||||
+
|
+
|
||||||
+ /* Single stepping. */
|
+ /* Single stepping. */
|
||||||
+ set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
|
+ set_gdbarch_software_single_step (gdbarch, arm_3ds_software_single_step);
|
||||||
|
+
|
||||||
|
+ /* Breakpoint manipulation. */
|
||||||
|
+ set_gdbarch_breakpoint_kind_from_pc (gdbarch, arm_3ds_breakpoint_kind_from_pc);
|
||||||
|
+ set_gdbarch_sw_breakpoint_from_kind (gdbarch, arm_3ds_sw_breakpoint_from_kind);
|
||||||
|
+ set_gdbarch_breakpoint_kind_from_current_state (gdbarch,
|
||||||
|
+ arm_3ds_breakpoint_kind_from_current_state);
|
||||||
+
|
+
|
||||||
+ /* `catch syscall' */
|
+ /* `catch syscall' */
|
||||||
+ set_xml_syscall_file_name (gdbarch, "syscalls/arm-3ds.xml");
|
+ set_xml_syscall_file_name (gdbarch, "syscalls/arm-3ds.xml");
|
||||||
@@ -159,10 +315,11 @@ diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
|
|||||||
+ gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_3DS,
|
+ gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_3DS,
|
||||||
+ arm_3ds_init_abi);
|
+ arm_3ds_init_abi);
|
||||||
+}
|
+}
|
||||||
diff -NBaur gdb-8.2.1/gdb/configure.tgt gdb-8.2.1-apple/gdb/configure.tgt
|
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
|
||||||
--- gdb-8.2.1/gdb/configure.tgt 2018-12-23 05:51:54.000000000 +0000
|
index f197160896..e2835ddef5 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/configure.tgt 2019-02-19 17:15:22.104618045 +0000
|
--- a/gdb/configure.tgt
|
||||||
@@ -61,7 +61,7 @@
|
+++ b/gdb/configure.tgt
|
||||||
|
@@ -61,7 +61,7 @@ arc*-*-*)
|
||||||
;;
|
;;
|
||||||
|
|
||||||
arm*-*-*)
|
arm*-*-*)
|
||||||
@@ -171,10 +328,11 @@ diff -NBaur gdb-8.2.1/gdb/configure.tgt gdb-8.2.1-apple/gdb/configure.tgt
|
|||||||
|
|
||||||
hppa*-*-*)
|
hppa*-*-*)
|
||||||
# Target: HP PA-RISC
|
# Target: HP PA-RISC
|
||||||
diff -NBaur gdb-8.2.1/gdb/data-directory/Makefile.in gdb-8.2.1-apple/gdb/data-directory/Makefile.in
|
diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
|
||||||
--- gdb-8.2.1/gdb/data-directory/Makefile.in 2018-01-05 04:07:23.000000000 +0000
|
index 753e0b69a3..645eb043b9 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/data-directory/Makefile.in 2019-02-19 17:15:22.104618045 +0000
|
--- a/gdb/data-directory/Makefile.in
|
||||||
@@ -63,7 +63,7 @@
|
+++ b/gdb/data-directory/Makefile.in
|
||||||
|
@@ -63,7 +63,7 @@ GEN_SYSCALLS_FILES = \
|
||||||
sparc-linux.xml \
|
sparc-linux.xml \
|
||||||
sparc64-linux.xml
|
sparc64-linux.xml
|
||||||
|
|
||||||
@@ -183,10 +341,11 @@ diff -NBaur gdb-8.2.1/gdb/data-directory/Makefile.in gdb-8.2.1-apple/gdb/data-di
|
|||||||
|
|
||||||
PYTHON_DIR = python
|
PYTHON_DIR = python
|
||||||
PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
|
PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
|
||||||
diff -NBaur gdb-8.2.1/gdb/defs.h gdb-8.2.1-apple/gdb/defs.h
|
diff --git a/gdb/defs.h b/gdb/defs.h
|
||||||
--- gdb-8.2.1/gdb/defs.h 2018-12-23 05:51:54.000000000 +0000
|
index fc4217005a..a179a6d820 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/defs.h 2019-02-19 17:15:22.104618045 +0000
|
--- a/gdb/defs.h
|
||||||
@@ -495,6 +495,7 @@
|
+++ b/gdb/defs.h
|
||||||
|
@@ -495,6 +495,7 @@ enum gdb_osabi
|
||||||
GDB_OSABI_LYNXOS178,
|
GDB_OSABI_LYNXOS178,
|
||||||
GDB_OSABI_NEWLIB,
|
GDB_OSABI_NEWLIB,
|
||||||
GDB_OSABI_SDE,
|
GDB_OSABI_SDE,
|
||||||
@@ -194,10 +353,11 @@ diff -NBaur gdb-8.2.1/gdb/defs.h gdb-8.2.1-apple/gdb/defs.h
|
|||||||
|
|
||||||
GDB_OSABI_INVALID /* keep this last */
|
GDB_OSABI_INVALID /* keep this last */
|
||||||
};
|
};
|
||||||
diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
|
diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
|
||||||
--- gdb-8.2.1/gdb/dtrace-probe.c 2018-12-23 05:51:54.000000000 +0000
|
index fa4e06e794..b6afc4cc7c 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/dtrace-probe.c 2019-02-19 17:30:16.449175937 +0000
|
--- a/gdb/dtrace-probe.c
|
||||||
@@ -100,7 +100,7 @@
|
+++ b/gdb/dtrace-probe.c
|
||||||
|
@@ -100,7 +100,7 @@ public:
|
||||||
|
|
||||||
/* DTrace static_probe_ops. */
|
/* DTrace static_probe_ops. */
|
||||||
|
|
||||||
@@ -206,29 +366,11 @@ diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
|
|||||||
|
|
||||||
/* The following structure represents a dtrace probe. */
|
/* The following structure represents a dtrace probe. */
|
||||||
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/Makefile.in gdb-8.2.1-apple/gdb/Makefile.in
|
diff --git a/gdb/osabi.c b/gdb/osabi.c
|
||||||
--- gdb-8.2.1/gdb/Makefile.in 2018-12-23 05:51:54.000000000 +0000
|
index 7d0540b181..49d3f78331 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/Makefile.in 2019-02-19 17:15:22.104618045 +0000
|
--- a/gdb/osabi.c
|
||||||
@@ -684,6 +684,7 @@
|
+++ b/gdb/osabi.c
|
||||||
arch/arm-linux.o \
|
@@ -80,6 +80,7 @@ static const struct osabi_names gdb_osabi_names[] =
|
||||||
arch/i386.o \
|
|
||||||
arch/ppc-linux-common.o \
|
|
||||||
+ arm-3ds-tdep.o \
|
|
||||||
arm-bsd-tdep.o \
|
|
||||||
arm-fbsd-tdep.o \
|
|
||||||
arm-linux-tdep.o \
|
|
||||||
@@ -2213,6 +2214,7 @@
|
|
||||||
amd64-tdep.c \
|
|
||||||
arc-tdep.c \
|
|
||||||
arm.c \
|
|
||||||
+ arm-3ds-tdep.c \
|
|
||||||
arm-bsd-tdep.c \
|
|
||||||
arm-fbsd-nat.c \
|
|
||||||
arm-fbsd-tdep.c \
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/osabi.c gdb-8.2.1-apple/gdb/osabi.c
|
|
||||||
--- gdb-8.2.1/gdb/osabi.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/osabi.c 2019-02-19 17:15:22.104618045 +0000
|
|
||||||
@@ -80,6 +80,7 @@
|
|
||||||
{ "LynxOS178", NULL },
|
{ "LynxOS178", NULL },
|
||||||
{ "Newlib", NULL },
|
{ "Newlib", NULL },
|
||||||
{ "SDE", NULL },
|
{ "SDE", NULL },
|
||||||
@@ -236,10 +378,11 @@ diff -NBaur gdb-8.2.1/gdb/osabi.c gdb-8.2.1-apple/gdb/osabi.c
|
|||||||
|
|
||||||
{ "<invalid>", NULL }
|
{ "<invalid>", NULL }
|
||||||
};
|
};
|
||||||
diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
|
diff --git a/gdb/probe.c b/gdb/probe.c
|
||||||
--- gdb-8.2.1/gdb/probe.c 2018-12-23 05:51:54.000000000 +0000
|
index 1f3da213ef..4acbeb8704 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/probe.c 2019-02-19 17:31:05.266578008 +0000
|
--- a/gdb/probe.c
|
||||||
@@ -60,7 +60,7 @@
|
+++ b/gdb/probe.c
|
||||||
|
@@ -60,7 +60,7 @@ public:
|
||||||
|
|
||||||
/* Static operations associated with a generic probe. */
|
/* Static operations associated with a generic probe. */
|
||||||
|
|
||||||
@@ -248,10 +391,11 @@ diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
|
|||||||
|
|
||||||
/* A helper for parse_probes that decodes a probe specification in
|
/* A helper for parse_probes that decodes a probe specification in
|
||||||
SEARCH_PSPACE. It appends matching SALs to RESULT. */
|
SEARCH_PSPACE. It appends matching SALs to RESULT. */
|
||||||
diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
|
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
|
||||||
--- gdb-8.2.1/gdb/record-btrace.c 2018-12-23 05:51:54.000000000 +0000
|
index 09a3f6cc5c..9f90a6b436 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/record-btrace.c 2019-02-19 17:31:33.301731324 +0000
|
--- a/gdb/record-btrace.c
|
||||||
@@ -144,7 +144,7 @@
|
+++ b/gdb/record-btrace.c
|
||||||
|
@@ -144,7 +144,7 @@ static record_btrace_target record_btrace_ops;
|
||||||
|
|
||||||
/* Token associated with a new-thread observer enabling branch tracing
|
/* Token associated with a new-thread observer enabling branch tracing
|
||||||
for the new thread. */
|
for the new thread. */
|
||||||
@@ -260,10 +404,11 @@ diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
|
|||||||
|
|
||||||
/* Memory access types used in set/show record btrace replay-memory-access. */
|
/* Memory access types used in set/show record btrace replay-memory-access. */
|
||||||
static const char replay_memory_access_read_only[] = "read-only";
|
static const char replay_memory_access_read_only[] = "read-only";
|
||||||
diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
|
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
|
||||||
--- gdb-8.2.1/gdb/stap-probe.c 2018-12-23 05:51:54.000000000 +0000
|
index ed7e1a0d3f..42fad3835f 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/stap-probe.c 2019-02-19 17:29:35.744567941 +0000
|
--- a/gdb/stap-probe.c
|
||||||
@@ -119,7 +119,7 @@
|
+++ b/gdb/stap-probe.c
|
||||||
|
@@ -119,7 +119,7 @@ public:
|
||||||
|
|
||||||
/* SystemTap static_probe_ops. */
|
/* SystemTap static_probe_ops. */
|
||||||
|
|
||||||
@@ -272,9 +417,11 @@ diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
|
|||||||
|
|
||||||
class stap_probe : public probe
|
class stap_probe : public probe
|
||||||
{
|
{
|
||||||
diff -NBaur gdb-8.2.1/gdb/syscalls/arm-3ds.xml gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml
|
diff --git a/gdb/syscalls/arm-3ds.xml b/gdb/syscalls/arm-3ds.xml
|
||||||
--- gdb-8.2.1/gdb/syscalls/arm-3ds.xml 1970-01-01 01:00:00.000000000 +0100
|
new file mode 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml 2019-02-19 17:15:22.104618045 +0000
|
index 0000000000..48780b7bd5
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/gdb/syscalls/arm-3ds.xml
|
||||||
@@ -0,0 +1,159 @@
|
@@ -0,0 +1,159 @@
|
||||||
+<?xml version="1.0"?>
|
+<?xml version="1.0"?>
|
||||||
+<!DOCTYPE syscalls_info SYSTEM "gdb-syscalls.dtd">
|
+<!DOCTYPE syscalls_info SYSTEM "gdb-syscalls.dtd">
|
||||||
@@ -435,10 +582,11 @@ diff -NBaur gdb-8.2.1/gdb/syscalls/arm-3ds.xml gdb-8.2.1-apple/gdb/syscalls/arm-
|
|||||||
+ <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
|
+ <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
|
||||||
+
|
+
|
||||||
+</syscalls_info>
|
+</syscalls_info>
|
||||||
diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
|
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
|
||||||
--- gdb-8.2.1/gdb/tui/tui-hooks.c 2018-12-23 05:51:54.000000000 +0000
|
index efa02e2f08..1c341dcf47 100644
|
||||||
+++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c 2019-02-19 17:28:53.178460364 +0000
|
--- a/gdb/tui/tui-hooks.c
|
||||||
@@ -205,7 +205,7 @@
|
+++ b/gdb/tui/tui-hooks.c
|
||||||
|
@@ -205,7 +205,7 @@ tui_normal_stop (struct bpstats *bs, int print_frame)
|
||||||
|
|
||||||
/* Token associated with observers registered while TUI hooks are
|
/* Token associated with observers registered while TUI hooks are
|
||||||
installed. */
|
installed. */
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ index 41843eed1..dc0e2a5fd 100644
|
|||||||
AS=${AS-as}
|
AS=${AS-as}
|
||||||
diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
|
diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..0d2be31c6
|
index 000000000..7ee40deec
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/Makefile.in
|
+++ b/libgloss/libsysbase/Makefile.in
|
||||||
@@ -0,0 +1,148 @@
|
@@ -0,0 +1,148 @@
|
||||||
@@ -104,7 +104,7 @@ index 000000000..0d2be31c6
|
|||||||
+ else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
|
+ else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
|
||||||
+
|
+
|
||||||
+# object files needed
|
+# object files needed
|
||||||
+OBJS = abort.o iosupport.o clocks.o close.o environ.o execve.o fork.o fstat.o getpid.o gettod.o \
|
+OBJS = abort.o iosupport.o clocks.o environ.o execve.o fork.o fstat.o getpid.o gettod.o \
|
||||||
+ isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
|
+ isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
|
||||||
+ unlink.o wait.o write.o _exit.o malloc_vars.o \
|
+ unlink.o wait.o write.o _exit.o malloc_vars.o \
|
||||||
+ chdir.o mkdir.o rename.o build_argv.o statvfs.o \
|
+ chdir.o mkdir.o rename.o build_argv.o statvfs.o \
|
||||||
@@ -927,58 +927,6 @@ index 000000000..01cfee469
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff --git a/libgloss/libsysbase/close.c b/libgloss/libsysbase/close.c
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000..931ad07b1
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/libgloss/libsysbase/close.c
|
|
||||||
@@ -0,0 +1,46 @@
|
|
||||||
+#include "config.h"
|
|
||||||
+#include <_ansi.h>
|
|
||||||
+#include <_syslist.h>
|
|
||||||
+#include <stdio.h>
|
|
||||||
+#include <errno.h>
|
|
||||||
+
|
|
||||||
+#include <sys/iosupport.h>
|
|
||||||
+
|
|
||||||
+#ifdef REENTRANT_SYSCALLS_PROVIDED
|
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+int _close_r(struct _reent *ptr, int fileDesc) {
|
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+#else
|
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+int _close(int fileDesc) {
|
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+ struct _reent *ptr = _REENT;
|
|
||||||
+#endif
|
|
||||||
+ int ret = -1;
|
|
||||||
+ unsigned int dev = 0;
|
|
||||||
+
|
|
||||||
+ if(fileDesc!=-1) {
|
|
||||||
+
|
|
||||||
+ __handle *handle = __get_handle(fileDesc);
|
|
||||||
+
|
|
||||||
+ if ( handle != NULL) {
|
|
||||||
+ dev = handle->device;
|
|
||||||
+ handle->refcount--;
|
|
||||||
+ if (handle->refcount == 0 ) {
|
|
||||||
+
|
|
||||||
+ if(devoptab_list[dev]->close_r) {
|
|
||||||
+ ptr->deviceData = devoptab_list[dev]->deviceData;
|
|
||||||
+ ret = devoptab_list[dev]->close_r(ptr,handle->fileStruct);
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ ret = 0;
|
|
||||||
+
|
|
||||||
+ __release_handle(fileDesc);
|
|
||||||
+ } else {
|
|
||||||
+ ret = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
diff --git a/libgloss/libsysbase/config.h.in b/libgloss/libsysbase/config.h.in
|
diff --git a/libgloss/libsysbase/config.h.in b/libgloss/libsysbase/config.h.in
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..48ce950b4
|
index 000000000..48ce950b4
|
||||||
@@ -1012,7 +960,7 @@ index 000000000..48ce950b4
|
|||||||
+#undef __SYMBOL_PREFIX
|
+#undef __SYMBOL_PREFIX
|
||||||
diff --git a/libgloss/libsysbase/configure b/libgloss/libsysbase/configure
|
diff --git a/libgloss/libsysbase/configure b/libgloss/libsysbase/configure
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..c4b5a79b6
|
index 000000000..7fe331552
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/configure
|
+++ b/libgloss/libsysbase/configure
|
||||||
@@ -0,0 +1,4158 @@
|
@@ -0,0 +1,4158 @@
|
||||||
@@ -1599,7 +1547,7 @@ index 000000000..c4b5a79b6
|
|||||||
+PACKAGE_BUGREPORT=
|
+PACKAGE_BUGREPORT=
|
||||||
+PACKAGE_URL=
|
+PACKAGE_URL=
|
||||||
+
|
+
|
||||||
+ac_unique_file="close.c"
|
+ac_unique_file="abort.c"
|
||||||
+ac_subst_vars='LTLIBOBJS
|
+ac_subst_vars='LTLIBOBJS
|
||||||
+LIBOBJS
|
+LIBOBJS
|
||||||
+host_makefile_frag_path
|
+host_makefile_frag_path
|
||||||
@@ -5176,7 +5124,7 @@ index 000000000..c4b5a79b6
|
|||||||
+
|
+
|
||||||
diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
|
diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..bf276a413
|
index 000000000..3da91ed98
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/configure.in
|
+++ b/libgloss/libsysbase/configure.in
|
||||||
@@ -0,0 +1,199 @@
|
@@ -0,0 +1,199 @@
|
||||||
@@ -5195,7 +5143,7 @@ index 000000000..bf276a413
|
|||||||
+# Process this file with autoconf to produce a configure script.
|
+# Process this file with autoconf to produce a configure script.
|
||||||
+#
|
+#
|
||||||
+AC_PREREQ(2.59)
|
+AC_PREREQ(2.59)
|
||||||
+AC_INIT(close.c)
|
+AC_INIT(abort.c)
|
||||||
+AC_CONFIG_HEADER(config.h)
|
+AC_CONFIG_HEADER(config.h)
|
||||||
+
|
+
|
||||||
+if test "${enable_shared}" = "yes" ; then
|
+if test "${enable_shared}" = "yes" ; then
|
||||||
@@ -6001,10 +5949,13 @@ index 000000000..9d5b74724
|
|||||||
+
|
+
|
||||||
diff --git a/libgloss/libsysbase/handle_manager.c b/libgloss/libsysbase/handle_manager.c
|
diff --git a/libgloss/libsysbase/handle_manager.c b/libgloss/libsysbase/handle_manager.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..f3fcc88f7
|
index 000000000..6bf9ab89e
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/handle_manager.c
|
+++ b/libgloss/libsysbase/handle_manager.c
|
||||||
@@ -0,0 +1,173 @@
|
@@ -0,0 +1,229 @@
|
||||||
|
+#include "config.h"
|
||||||
|
+#include <_ansi.h>
|
||||||
|
+#include <_syslist.h>
|
||||||
+#include <stdlib.h>
|
+#include <stdlib.h>
|
||||||
+#include <stdio.h>
|
+#include <stdio.h>
|
||||||
+#include <errno.h>
|
+#include <errno.h>
|
||||||
@@ -6025,7 +5976,7 @@ index 000000000..f3fcc88f7
|
|||||||
+
|
+
|
||||||
+__LOCK_INIT(static, __hndl_lock);
|
+__LOCK_INIT(static, __hndl_lock);
|
||||||
+
|
+
|
||||||
+void __free_handle(__handle *handle) {
|
+static void __free_handle(__handle *handle) {
|
||||||
+
|
+
|
||||||
+ if ( NULL != handle
|
+ if ( NULL != handle
|
||||||
+ && handle != &__stdin_handle
|
+ && handle != &__stdin_handle
|
||||||
@@ -6093,8 +6044,11 @@ index 000000000..f3fcc88f7
|
|||||||
+
|
+
|
||||||
+ if ( fd < 0 || fd >= MAX_HANDLES ) return NULL;
|
+ if ( fd < 0 || fd >= MAX_HANDLES ) return NULL;
|
||||||
+
|
+
|
||||||
+ return handles[fd];
|
+ __lock_acquire (__hndl_lock);
|
||||||
|
+ __handle *handle = handles[fd];
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
+
|
+
|
||||||
|
+ return handle;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int dup(int oldfd) {
|
+int dup(int oldfd) {
|
||||||
@@ -6126,57 +6080,107 @@ index 000000000..f3fcc88f7
|
|||||||
+
|
+
|
||||||
+int dup2(int oldfd, int newfd) {
|
+int dup2(int oldfd, int newfd) {
|
||||||
+
|
+
|
||||||
+
|
|
||||||
+ __lock_acquire (__hndl_lock);
|
|
||||||
+
|
|
||||||
+ if ( newfd < 0 || newfd >= MAX_HANDLES ||
|
+ if ( newfd < 0 || newfd >= MAX_HANDLES ||
|
||||||
|
+ oldfd < 0 || oldfd >= MAX_HANDLES) {
|
||||||
+
|
+
|
||||||
+ oldfd < 0 || oldfd >= MAX_HANDLES ||
|
|
||||||
+ handles[oldfd] == NULL ) {
|
|
||||||
+
|
|
||||||
+ __lock_release (__hndl_lock);
|
|
||||||
+ errno = EBADF;
|
+ errno = EBADF;
|
||||||
+
|
+
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ if ( newfd == oldfd ) {
|
+ if ( newfd == oldfd ) {
|
||||||
+ __lock_release (__hndl_lock);
|
|
||||||
+ return newfd;
|
+ return newfd;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
+ __lock_acquire (__hndl_lock);
|
||||||
|
+
|
||||||
|
+ if ( handles[oldfd] == NULL ) {
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
|
+ errno = EBADF;
|
||||||
|
+
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ __handle *handle = handles[newfd];
|
+ __handle *handle = handles[newfd];
|
||||||
+
|
+
|
||||||
+ if ( NULL != handle ) {
|
|
||||||
+
|
|
||||||
+ handle->refcount--;
|
|
||||||
+
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ handles[newfd] = handles[oldfd];
|
+ handles[newfd] = handles[oldfd];
|
||||||
+ handles[newfd]->refcount++;
|
+ handles[newfd]->refcount++;
|
||||||
+
|
+
|
||||||
|
+ if ( handle ) {
|
||||||
|
+
|
||||||
|
+ int ref = --handle->refcount;
|
||||||
+ __lock_release (__hndl_lock);
|
+ __lock_release (__hndl_lock);
|
||||||
+
|
+
|
||||||
+ if ( NULL != handle ) {
|
+ if ( ref == 0 ) {
|
||||||
+
|
+
|
||||||
+ if (handle->refcount == 0 ) {
|
+ if ( devoptab_list[handle->device]->close_r ) {
|
||||||
+
|
|
||||||
+ if( devoptab_list[handle->device]->close_r != NULL) {
|
|
||||||
+
|
+
|
||||||
|
+ _REENT->deviceData = devoptab_list[handle->device]->deviceData;
|
||||||
+ devoptab_list[handle->device]->close_r(_REENT,handle->fileStruct);
|
+ devoptab_list[handle->device]->close_r(_REENT,handle->fileStruct);
|
||||||
+
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ __free_handle(handle);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
+ } else {
|
+ } else {
|
||||||
+
|
+
|
||||||
+ __free_handle(handle);
|
+ __lock_release (__hndl_lock);
|
||||||
+
|
+
|
||||||
+ }
|
+ }
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
+
|
||||||
+ return newfd;
|
+ return newfd;
|
||||||
|
+}
|
||||||
+
|
+
|
||||||
|
+#ifdef REENTRANT_SYSCALLS_PROVIDED
|
||||||
|
+//---------------------------------------------------------------------------------
|
||||||
|
+int _close_r(struct _reent *ptr, int fd) {
|
||||||
|
+//---------------------------------------------------------------------------------
|
||||||
|
+#else
|
||||||
|
+//---------------------------------------------------------------------------------
|
||||||
|
+int _close(int fd) {
|
||||||
|
+//---------------------------------------------------------------------------------
|
||||||
|
+ struct _reent *ptr = _REENT;
|
||||||
|
+#endif
|
||||||
|
+ int ret = 0;
|
||||||
|
+
|
||||||
|
+ if (fd < 0 || fd >= MAX_HANDLES) {
|
||||||
|
+
|
||||||
|
+ ptr->_errno = EBADF;
|
||||||
|
+ return -1;
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ __lock_acquire (__hndl_lock);
|
||||||
|
+
|
||||||
|
+ __handle *handle = handles[fd];
|
||||||
|
+
|
||||||
|
+ if ( !handle ) {
|
||||||
|
+
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
|
+ ptr->_errno = EBADF;
|
||||||
|
+ return -1;
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ int ref = --handle->refcount;
|
||||||
|
+ handles[fd] = NULL;
|
||||||
|
+
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
|
+
|
||||||
|
+ if ( ref == 0 ) {
|
||||||
|
+
|
||||||
|
+ if ( devoptab_list[handle->device]->close_r ) {
|
||||||
|
+
|
||||||
|
+ ptr->deviceData = devoptab_list[handle->device]->deviceData;
|
||||||
|
+ ret = devoptab_list[handle->device]->close_r(ptr,handle->fileStruct);
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ __free_handle(handle);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/iosupport.c b/libgloss/libsysbase/iosupport.c
|
diff --git a/libgloss/libsysbase/iosupport.c b/libgloss/libsysbase/iosupport.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ then
|
|||||||
--prefix=$prefix \
|
--prefix=$prefix \
|
||||||
--enable-lto\
|
--enable-lto\
|
||||||
--with-system-zlib \
|
--with-system-zlib \
|
||||||
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 52" \
|
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 53" \
|
||||||
$CROSS_PARAMS \
|
$CROSS_PARAMS \
|
||||||
$CROSS_GCC_PARAMS \
|
$CROSS_GCC_PARAMS \
|
||||||
|| { echo "Error configuring gcc"; exit 1; }
|
|| { echo "Error configuring gcc"; exit 1; }
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# set env variables
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
export DEVKITPRO=$TOOLPATH
|
|
||||||
export DEVKITARM=$DEVKITPRO/devkitARM
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# Install the rules files
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
cd $BUILDDIR
|
|
||||||
|
|
||||||
mkdir -p rules
|
|
||||||
cd rules
|
|
||||||
tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
|
|
||||||
make install
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# Install and build the crt0 files
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
cd $BUILDDIR
|
|
||||||
|
|
||||||
mkdir -p crtls
|
|
||||||
cd crtls
|
|
||||||
tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
|
|
||||||
make install
|
|
||||||
|
|
||||||
cd $BUILDDIR/libgba-$LIBGBA_VER
|
|
||||||
$MAKE || { echo "error building libgba"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libgba"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/libnds-$LIBNDS_VER
|
|
||||||
$MAKE || { echo "error building libnds"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libnds"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/dswifi-$DSWIFI_VER
|
|
||||||
$MAKE || { echo "error building dswifi"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing dswifi"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/maxmod-$MAXMOD_VER
|
|
||||||
$MAKE || { echo "error building maxmod"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing maxmod"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/default_arm7-$DEFAULT_ARM7_VER
|
|
||||||
$MAKE || { echo "error building default arm7"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing default arm7"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/libfat-$LIBFAT_VER
|
|
||||||
$MAKE nds-install || { echo "error building nds libfat"; exit 1; }
|
|
||||||
$MAKE gba-install || { echo "error installing gba libfat"; exit 1; }
|
|
||||||
|
|
||||||
#cd $BUILDDIR/libmirko-$LIBMIRKO_VER
|
|
||||||
#$MAKE || { echo "error building libmirko"; exit 1; }
|
|
||||||
#$MAKE install || { echo "error installing libmirko"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/libfilesystem-$FILESYSTEM_VER
|
|
||||||
$MAKE || { echo "error building libfilesystem"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libfilesystem"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/libctru-$LIBCTRU_VER
|
|
||||||
$MAKE || { echo "error building libctru"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libctru"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/citro3d-$CITRO3D_VER
|
|
||||||
$MAKE || { echo "error building citro3d"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing citro3d"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/citro2d-$CITRO2D_VER
|
|
||||||
$MAKE || { echo "error building citro2d"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing citro2d"; exit 1; }
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
export DEVKITPPC=$TOOLPATH/devkitPPC
|
|
||||||
export DEVKITPRO=$TOOLPATH
|
|
||||||
|
|
||||||
cd $BUILDDIR
|
|
||||||
mkdir -p rules
|
|
||||||
cd rules
|
|
||||||
tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
|
|
||||||
make install
|
|
||||||
|
|
||||||
cd $BUILDDIR/libogc-$LIBOGC_VER
|
|
||||||
|
|
||||||
if [ ! -f installed ]; then
|
|
||||||
echo "Building & installing libogc"
|
|
||||||
$MAKE install || { echo "libogc install failed"; exit 1; }
|
|
||||||
touch installed
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd $BUILDDIR/libfat-$LIBFAT_VER
|
|
||||||
|
|
||||||
if [ ! -f installed ]; then
|
|
||||||
echo "Building & installing libfat"
|
|
||||||
$MAKE ogc-install || { echo "libfat install failed"; exit 1; }
|
|
||||||
touch installed
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@ done
|
|||||||
|
|
||||||
case "$VERSION" in
|
case "$VERSION" in
|
||||||
"1" )
|
"1" )
|
||||||
GCC_VER=8.3.0
|
GCC_VER=9.1.0
|
||||||
BINUTILS_VER=2.32
|
BINUTILS_VER=2.32
|
||||||
NEWLIB_VER=3.1.0
|
NEWLIB_VER=3.1.0
|
||||||
GDB_VER=8.2.1
|
GDB_VER=8.2.1
|
||||||
@@ -51,10 +51,10 @@ case "$VERSION" in
|
|||||||
toolchain=DEVKITPPC
|
toolchain=DEVKITPPC
|
||||||
;;
|
;;
|
||||||
"3" )
|
"3" )
|
||||||
GCC_VER=8.2.0
|
GCC_VER=9.2.0
|
||||||
BINUTILS_VER=2.31.1
|
BINUTILS_VER=2.32
|
||||||
NEWLIB_VER=3.0.0
|
NEWLIB_VER=3.1.0
|
||||||
GDB_VER=8.0
|
GDB_VER=8.2.1
|
||||||
basedir='dka64'
|
basedir='dka64'
|
||||||
package=devkitA64
|
package=devkitA64
|
||||||
target=aarch64-none-elf
|
target=aarch64-none-elf
|
||||||
|
|||||||
Reference in New Issue
Block a user