mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-08-21 01:44:16 -05:00
Compare commits
48 Commits
devkitARM_
...
v20180219
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7109bbbc81 | ||
|
|
d94a7ead0b | ||
|
|
46d25cdbb9 | ||
|
|
ce64db576f | ||
|
|
573afd62d1 | ||
|
|
6ae9523383 | ||
|
|
c7876a99f7 | ||
|
|
afcea227f7 | ||
|
|
0c9c332716 | ||
|
|
c81687461c | ||
|
|
ee36d8e96c | ||
|
|
1342f07504 | ||
|
|
4b90e50fef | ||
|
|
c3109cce09 | ||
|
|
3c06e8d9dd | ||
|
|
38be3b48ba | ||
|
|
96af86ec08 | ||
|
|
bcf9ffbea0 | ||
|
|
df4d5d3faa | ||
|
|
6fe79e337e | ||
|
|
971fed0fec | ||
|
|
a26aa62b17 | ||
|
|
b4c89fa4b3 | ||
|
|
5a25d72841 | ||
|
|
4148ab6c73 | ||
|
|
c11289c218 | ||
|
|
de76c68af9 | ||
|
|
5e5c9fea87 | ||
|
|
23404816cd | ||
|
|
2502104350 | ||
|
|
609cfef3f5 | ||
|
|
95e681ef9b | ||
|
|
4811245c09 | ||
|
|
d140c0833e | ||
|
|
11ae52d861 | ||
|
|
447c310f7c | ||
|
|
1c69d9b824 | ||
|
|
0613159be4 | ||
|
|
018f1fb028 | ||
|
|
55e002c9dc | ||
|
|
d30d2fa318 | ||
|
|
03b624ffbb | ||
|
|
a60b475388 | ||
|
|
9f8c88ff88 | ||
|
|
993c6681cb | ||
|
|
abacc13bf7 | ||
|
|
b509e0fbd4 | ||
|
|
dca15fb6d7 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,7 +1,7 @@
|
|||||||
config.sh
|
config.sh
|
||||||
.devkitARM*
|
.devkitARM*
|
||||||
.devkitPPC*
|
.devkitPPC*
|
||||||
.devkitPSP*
|
.devkitA64*
|
||||||
*.gz
|
*.gz
|
||||||
*.bz2
|
*.bz2
|
||||||
*~
|
*~
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
devkitPro build scripts
|
devkitPro build scripts
|
||||||
--------------------------
|
--------------------------
|
||||||
|
|
||||||
This readme will guide you through building devkitARM, devkitPPC or devkitPSP
|
This readme will guide you through building devkitARM, devkitPPC or devkitA64
|
||||||
from source using a set of scripts.
|
from source using a set of scripts.
|
||||||
|
|
||||||
The windows versions of the toolchains are now cross compiled on linux using
|
The windows versions of the toolchains are now cross compiled on linux using
|
||||||
@@ -41,6 +41,13 @@ Building gxtexconv for cube/wii needs GL/gl.h which can be obtained with
|
|||||||
|
|
||||||
sudo apt-get install mesa-common-dev
|
sudo apt-get install mesa-common-dev
|
||||||
|
|
||||||
|
Tools for devkitA64 require liblz4.
|
||||||
|
|
||||||
|
http://lz4.github.io/lz4/
|
||||||
|
|
||||||
|
sudo apt-get install liblz4-dev
|
||||||
|
|
||||||
|
|
||||||
For building the OSX versions we install the Xcode commandline tools and build
|
For building the OSX versions we install the Xcode commandline tools and build
|
||||||
pkg-config from source as well as static versions of the libraries listed above.
|
pkg-config from source as well as static versions of the libraries listed above.
|
||||||
This helps keep the dependencies to a minimum so end users can use the tools
|
This helps keep the dependencies to a minimum so end users can use the tools
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# devkitARM release 47
|
# devkitARM release 47
|
||||||
# devkitPPC release 29-1
|
# devkitPPC release 29-1
|
||||||
|
# devkitA64 alpha 7
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
if [ 0 -eq 1 ] ; then
|
if [ 0 -eq 1 ] ; then
|
||||||
@@ -23,7 +24,7 @@ echo "https://sourceforge.net/tracker/?group_id=114505&atid=668553"
|
|||||||
echo
|
echo
|
||||||
|
|
||||||
|
|
||||||
GENERAL_TOOLS_VER=1.0.0
|
GENERAL_TOOLS_VER=1.0.1
|
||||||
|
|
||||||
LIBGBA_VER=0.5.0
|
LIBGBA_VER=0.5.0
|
||||||
GBATOOLS_VER=1.0.0
|
GBATOOLS_VER=1.0.0
|
||||||
@@ -41,7 +42,7 @@ DLDITOOL_VER=1.24.0
|
|||||||
MMUTIL_VER=1.8.6
|
MMUTIL_VER=1.8.6
|
||||||
|
|
||||||
DFU_UTIL_VER=0.9.1
|
DFU_UTIL_VER=0.9.1
|
||||||
STLINK_VER=1.2.2
|
STLINK_VER=1.2.3
|
||||||
|
|
||||||
GAMECUBE_TOOLS_VER=1.0.1
|
GAMECUBE_TOOLS_VER=1.0.1
|
||||||
LIBOGC_VER=1.8.16
|
LIBOGC_VER=1.8.16
|
||||||
@@ -56,6 +57,9 @@ PICASSO_VER=2.6.2
|
|||||||
GP32_TOOLS_VER=1.0.3
|
GP32_TOOLS_VER=1.0.3
|
||||||
LIBMIRKO_VER=0.9.7
|
LIBMIRKO_VER=0.9.7
|
||||||
|
|
||||||
|
SWITCH_TOOLS_VER=1.1.1
|
||||||
|
LIBNX_VER=1.0.0
|
||||||
|
|
||||||
OSXMIN=${OSXMIN:-10.9}
|
OSXMIN=${OSXMIN:-10.9}
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
@@ -196,7 +200,7 @@ fi
|
|||||||
patchdir=$(pwd)/$basedir/patches
|
patchdir=$(pwd)/$basedir/patches
|
||||||
scriptdir=$(pwd)/$basedir/scripts
|
scriptdir=$(pwd)/$basedir/scripts
|
||||||
|
|
||||||
archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.bz2 newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.bz2"
|
archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.bz2 newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.xz"
|
||||||
|
|
||||||
if [ $VERSION -eq 1 ]; then
|
if [ $VERSION -eq 1 ]; then
|
||||||
|
|
||||||
@@ -221,6 +225,12 @@ if [ $VERSION -eq 2 ]; then
|
|||||||
archives="binutils-${MN_BINUTILS_VER}.tar.bz2 $archives"
|
archives="binutils-${MN_BINUTILS_VER}.tar.bz2 $archives"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ $VERSION -eq 3 ]; then
|
||||||
|
|
||||||
|
hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
|
if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
|
||||||
SRCDIR="$BUILD_DKPRO_SRCDIR"
|
SRCDIR="$BUILD_DKPRO_SRCDIR"
|
||||||
@@ -244,7 +254,7 @@ cd $BUILDDIR
|
|||||||
extract_and_patch binutils $BINUTILS_VER bz2
|
extract_and_patch binutils $BINUTILS_VER bz2
|
||||||
extract_and_patch gcc $GCC_VER bz2
|
extract_and_patch gcc $GCC_VER bz2
|
||||||
extract_and_patch newlib $NEWLIB_VER gz
|
extract_and_patch newlib $NEWLIB_VER gz
|
||||||
extract_and_patch gdb $GDB_VER bz2
|
extract_and_patch gdb $GDB_VER xz
|
||||||
|
|
||||||
if [ $VERSION -eq 2 ]; then
|
if [ $VERSION -eq 2 ]; then
|
||||||
extract_and_patch binutils $MN_BINUTILS_VER bz2
|
extract_and_patch binutils $MN_BINUTILS_VER bz2
|
||||||
@@ -276,13 +286,7 @@ if [ -f $scriptdir/build-tools.sh ]; then . $scriptdir/build-tools.sh || { echo
|
|||||||
if [ -f $scriptdir/build-crtls.sh ]; then . $scriptdir/build-crtls.sh || { echo "Error building crtls"; exit 1; }; cd $BUILDSCRIPTDIR; fi
|
if [ -f $scriptdir/build-crtls.sh ]; then . $scriptdir/build-crtls.sh || { echo "Error building crtls"; exit 1; }; cd $BUILDSCRIPTDIR; fi
|
||||||
|
|
||||||
if [ ! -z $CROSSBUILD ]; then
|
if [ ! -z $CROSSBUILD ]; then
|
||||||
if [ $VERSION -ne 3 ]; then
|
cp -v $CROSSBINPATH/*.dll $CROSSLIBPATH/*.dll $prefix/bin
|
||||||
cp -v $CROSSBINPATH/FreeImage.dll $prefix/bin
|
|
||||||
fi
|
|
||||||
if [ $VERSION -eq 1 ]; then
|
|
||||||
cp -v $CROSSBINPATH/libusb-1.0.dll $prefix/bin
|
|
||||||
fi
|
|
||||||
cp -v $CROSSLIBPATH/*.dll $prefix/bin
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "stripping installed binaries"
|
echo "stripping installed binaries"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
# 0: User selects manually
|
# 0: User selects manually
|
||||||
# 1: devkitARM
|
# 1: devkitARM
|
||||||
# 2: devkitPPC
|
# 2: devkitPPC
|
||||||
# 3: devkitPSP
|
# 3: devkitA64
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
BUILD_DKPRO_PACKAGE=0
|
BUILD_DKPRO_PACKAGE=0
|
||||||
|
|
||||||
|
|||||||
342
dka64/patches/binutils-2.29.1.patch
Normal file
342
dka64/patches/binutils-2.29.1.patch
Normal file
@@ -0,0 +1,342 @@
|
|||||||
|
diff -Nbaur binutils-2.29.1-orig/bfd/elfnn-aarch64.c binutils-2.29.1-dka64/bfd/elfnn-aarch64.c
|
||||||
|
--- binutils-2.29.1-orig/bfd/elfnn-aarch64.c 2017-09-05 14:12:46.000000000 +0100
|
||||||
|
+++ binutils-2.29.1-dka64/bfd/elfnn-aarch64.c 2017-10-22 06:58:57.711591457 +0100
|
||||||
|
@@ -2097,6 +2097,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. */
|
||||||
|
@@ -6081,11 +6087,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);
|
||||||
|
@@ -6225,6 +6233,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 (r_type))
|
||||||
|
{
|
||||||
|
case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
|
||||||
|
@@ -6248,7 +6260,7 @@
|
||||||
|
need_relocs =
|
||||||
|
(bfd_link_pic (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);
|
||||||
|
@@ -6343,7 +6355,7 @@
|
||||||
|
need_relocs =
|
||||||
|
(bfd_link_pic (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);
|
||||||
|
@@ -6392,7 +6404,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);
|
||||||
|
@@ -6891,6 +6903,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
|
||||||
|
@@ -8068,6 +8100,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)
|
||||||
|
@@ -8087,6 +8120,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
|
||||||
|
@@ -8096,7 +8133,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))
|
||||||
|
@@ -8130,6 +8167,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;
|
||||||
|
@@ -8152,6 +8194,7 @@
|
||||||
|
|
||||||
|
htab->root.srelplt->reloc_count++;
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
else
|
||||||
|
{
|
||||||
|
h->plt.offset = (bfd_vma) - 1;
|
||||||
|
@@ -8164,9 +8207,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;
|
||||||
|
@@ -8178,7 +8218,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))
|
||||||
|
@@ -8192,7 +8232,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)))
|
||||||
|
@@ -8225,7 +8265,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_pic (info)
|
||||||
|
|| indx != 0
|
||||||
|
@@ -8291,7 +8331,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)
|
||||||
|
eh->dyn_relocs = NULL;
|
||||||
|
|
||||||
|
/* Make sure undefined weak symbols are output as a dynamic
|
||||||
|
@@ -8310,7 +8350,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
|
||||||
|
@@ -8321,6 +8363,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;
|
||||||
|
@@ -8940,8 +8983,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;
|
||||||
|
@@ -8976,7 +9028,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. */
|
||||||
|
@@ -8995,7 +9047,8 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
+ && !local_undefweak)
|
||||||
|
{
|
||||||
|
Elf_Internal_Rela rela;
|
||||||
|
bfd_byte *loc;
|
||||||
|
@@ -9489,6 +9542,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.29.1-orig/ld/emulparams/aarch64elf32.sh binutils-2.29.1-dka64/ld/emulparams/aarch64elf32.sh
|
||||||
|
--- binutils-2.29.1-orig/ld/emulparams/aarch64elf32.sh 2017-07-10 10:54:42.000000000 +0100
|
||||||
|
+++ binutils-2.29.1-dka64/ld/emulparams/aarch64elf32.sh 2017-10-22 06:58:57.719591510 +0100
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||||
|
+
|
||||||
|
ARCH="aarch64:ilp32"
|
||||||
|
MACHINE=
|
||||||
|
NOP=0
|
||||||
|
diff -Nbaur binutils-2.29.1-orig/ld/emulparams/aarch64elf.sh binutils-2.29.1-dka64/ld/emulparams/aarch64elf.sh
|
||||||
|
--- binutils-2.29.1-orig/ld/emulparams/aarch64elf.sh 2017-07-10 10:54:42.000000000 +0100
|
||||||
|
+++ binutils-2.29.1-dka64/ld/emulparams/aarch64elf.sh 2017-10-22 06:58:57.719591510 +0100
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||||
|
+
|
||||||
|
ARCH=aarch64
|
||||||
|
MACHINE=
|
||||||
|
NOP=0
|
||||||
|
diff -Nbaur binutils-2.29.1-orig/ld/emultempl/aarch64elf.em binutils-2.29.1-dka64/ld/emultempl/aarch64elf.em
|
||||||
|
--- binutils-2.29.1-orig/ld/emultempl/aarch64elf.em 2017-07-10 10:54:42.000000000 +0100
|
||||||
|
+++ binutils-2.29.1-dka64/ld/emultempl/aarch64elf.em 2017-10-22 06:58:57.719591510 +0100
|
||||||
|
@@ -375,7 +375,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"
|
||||||
|
diff -Nbaur binutils-2.29.1-orig/ld/Makefile.am binutils-2.29.1-dka64/ld/Makefile.am
|
||||||
|
--- binutils-2.29.1-orig/ld/Makefile.am 2017-07-10 10:54:42.000000000 +0100
|
||||||
|
+++ binutils-2.29.1-dka64/ld/Makefile.am 2017-10-22 06:58:57.719591510 +0100
|
||||||
|
@@ -1654,19 +1654,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.29.1-orig/ld/Makefile.in binutils-2.29.1-dka64/ld/Makefile.in
|
||||||
|
--- binutils-2.29.1-orig/ld/Makefile.in 2017-09-15 12:38:08.000000000 +0100
|
||||||
|
+++ binutils-2.29.1-dka64/ld/Makefile.in 2017-10-22 06:58:57.719591510 +0100
|
||||||
|
@@ -3219,18 +3219,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 \
|
||||||
346
dka64/patches/binutils-2.30.patch
Normal file
346
dka64/patches/binutils-2.30.patch
Normal file
@@ -0,0 +1,346 @@
|
|||||||
|
diff -NBaur binutils-2.30/bfd/elfnn-aarch64.c binutils-2.30-dka64/bfd/elfnn-aarch64.c
|
||||||
|
--- binutils-2.30/bfd/elfnn-aarch64.c 2018-01-17 11:29:21.000000000 +0000
|
||||||
|
+++ binutils-2.30-dka64/bfd/elfnn-aarch64.c 2018-02-11 19:54:08.141257544 +0000
|
||||||
|
@@ -2097,6 +2097,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. */
|
||||||
|
@@ -6088,11 +6094,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);
|
||||||
|
@@ -6226,6 +6234,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 (r_type))
|
||||||
|
{
|
||||||
|
case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
|
||||||
|
@@ -6249,7 +6261,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);
|
||||||
|
@@ -6344,7 +6356,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);
|
||||||
|
@@ -6393,7 +6405,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);
|
||||||
|
@@ -6735,6 +6747,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
|
||||||
|
@@ -7928,6 +7960,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)
|
||||||
|
@@ -7947,6 +7980,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
|
||||||
|
@@ -7956,7 +7993,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))
|
||||||
|
@@ -7990,6 +8027,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;
|
||||||
|
@@ -8012,6 +8054,7 @@
|
||||||
|
|
||||||
|
htab->root.srelplt->reloc_count++;
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
else
|
||||||
|
{
|
||||||
|
h->plt.offset = (bfd_vma) - 1;
|
||||||
|
@@ -8024,9 +8067,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;
|
||||||
|
@@ -8038,7 +8078,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))
|
||||||
|
@@ -8052,7 +8092,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))
|
||||||
|
@@ -8088,7 +8128,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
|
||||||
|
@@ -8154,7 +8194,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;
|
||||||
|
|
||||||
|
@@ -8174,7 +8214,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
|
||||||
|
@@ -8185,6 +8227,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;
|
||||||
|
@@ -8805,8 +8848,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;
|
||||||
|
@@ -8841,7 +8893,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. */
|
||||||
|
@@ -8860,10 +8912,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;
|
||||||
|
@@ -9357,6 +9410,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.30/ld/emulparams/aarch64elf32.sh binutils-2.30-dka64/ld/emulparams/aarch64elf32.sh
|
||||||
|
--- binutils-2.30/ld/emulparams/aarch64elf32.sh 2018-01-13 13:31:16.000000000 +0000
|
||||||
|
+++ binutils-2.30-dka64/ld/emulparams/aarch64elf32.sh 2018-02-11 19:48:08.997273556 +0000
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||||
|
+
|
||||||
|
ARCH="aarch64:ilp32"
|
||||||
|
MACHINE=
|
||||||
|
NOP=0
|
||||||
|
diff -NBaur binutils-2.30/ld/emulparams/aarch64elf.sh binutils-2.30-dka64/ld/emulparams/aarch64elf.sh
|
||||||
|
--- binutils-2.30/ld/emulparams/aarch64elf.sh 2018-01-13 13:31:16.000000000 +0000
|
||||||
|
+++ binutils-2.30-dka64/ld/emulparams/aarch64elf.sh 2018-02-11 19:48:09.009273555 +0000
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+. ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||||
|
+
|
||||||
|
ARCH=aarch64
|
||||||
|
MACHINE=
|
||||||
|
NOP=0
|
||||||
|
diff -NBaur binutils-2.30/ld/emultempl/aarch64elf.em binutils-2.30-dka64/ld/emultempl/aarch64elf.em
|
||||||
|
--- binutils-2.30/ld/emultempl/aarch64elf.em 2018-01-13 13:31:16.000000000 +0000
|
||||||
|
+++ binutils-2.30-dka64/ld/emultempl/aarch64elf.em 2018-02-11 19:48:09.009273555 +0000
|
||||||
|
@@ -378,7 +378,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"
|
||||||
|
diff -NBaur binutils-2.30/ld/Makefile.am binutils-2.30-dka64/ld/Makefile.am
|
||||||
|
--- binutils-2.30/ld/Makefile.am 2018-01-13 13:31:16.000000000 +0000
|
||||||
|
+++ binutils-2.30-dka64/ld/Makefile.am 2018-02-11 19:48:09.021273555 +0000
|
||||||
|
@@ -1654,19 +1654,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.30/ld/Makefile.in binutils-2.30-dka64/ld/Makefile.in
|
||||||
|
--- binutils-2.30/ld/Makefile.in 2018-01-27 15:03:10.000000000 +0000
|
||||||
|
+++ binutils-2.30-dka64/ld/Makefile.in 2018-02-11 19:48:09.037273554 +0000
|
||||||
|
@@ -3219,18 +3219,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 \
|
||||||
190
dka64/patches/gcc-7.3.0.patch
Normal file
190
dka64/patches/gcc-7.3.0.patch
Normal file
@@ -0,0 +1,190 @@
|
|||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.c gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.c
|
||||||
|
--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.c 2017-11-03 15:01:10.970890000 +0000
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.c 2018-01-22 20:15:07.232099998 +0000
|
||||||
|
@@ -10009,8 +10009,24 @@
|
||||||
|
|| !register_operand (target, Pmode))
|
||||||
|
target = gen_reg_rtx (Pmode);
|
||||||
|
|
||||||
|
- /* Can return in any reg. */
|
||||||
|
- emit_insn (gen_aarch64_load_tp_hard (target));
|
||||||
|
+ if (TARGET_HARD_TP)
|
||||||
|
+ {
|
||||||
|
+ /* Can return in any reg. */
|
||||||
|
+ emit_insn (gen_aarch64_load_tp_hard (target));
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ /* Always returned in r0. Immediately copy the result into a pseudo,
|
||||||
|
+ otherwise other uses of r0 (e.g. setting up function arguments) may
|
||||||
|
+ clobber the value. */
|
||||||
|
+
|
||||||
|
+ rtx tmp;
|
||||||
|
+
|
||||||
|
+ emit_insn (gen_aarch64_load_tp_soft ());
|
||||||
|
+
|
||||||
|
+ tmp = gen_rtx_REG (DImode, R0_REGNUM);
|
||||||
|
+ emit_move_insn (target, tmp);
|
||||||
|
+ }
|
||||||
|
return target;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64-elf-raw.h gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
|
--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64-elf-raw.h 2017-01-01 12:07:43.905435000 +0000
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64-elf-raw.h 2018-01-22 20:15:07.232099998 +0000
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
#ifndef GCC_AARCH64_ELF_RAW_H
|
||||||
|
#define GCC_AARCH64_ELF_RAW_H
|
||||||
|
|
||||||
|
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
||||||
|
#define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
|
||||||
|
#define ENDFILE_SPEC \
|
||||||
|
" crtend%O%s crtn%O%s " \
|
||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.h gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.h
|
||||||
|
--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.h 2017-09-21 13:16:31.171118000 +0100
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.h 2018-01-22 20:15:07.232099998 +0000
|
||||||
|
@@ -887,6 +887,10 @@
|
||||||
|
/* Check TLS Descriptors mechanism is selected. */
|
||||||
|
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
||||||
|
|
||||||
|
+/* Check selected thread pointer access sequence to use. */
|
||||||
|
+#define TARGET_HARD_TP (target_thread_pointer == TP_HARD)
|
||||||
|
+#define TARGET_SOFT_TP (target_thread_pointer == TP_SOFT)
|
||||||
|
+
|
||||||
|
extern enum aarch64_code_model aarch64_cmodel;
|
||||||
|
|
||||||
|
/* When using the tiny addressing model conditional and unconditional branches
|
||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.md gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.md
|
||||||
|
--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.md 2017-04-05 12:48:02.927619000 +0100
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.md 2018-01-22 20:15:07.236099934 +0000
|
||||||
|
@@ -5230,11 +5230,22 @@
|
||||||
|
(define_insn "aarch64_load_tp_hard"
|
||||||
|
[(set (match_operand:DI 0 "register_operand" "=r")
|
||||||
|
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
||||||
|
- ""
|
||||||
|
- "mrs\\t%0, tpidr_el0"
|
||||||
|
+ "TARGET_HARD_TP"
|
||||||
|
+ "mrs\\t%0, tpidr_el0\\t// aarch64_load_tp_hard"
|
||||||
|
[(set_attr "type" "mrs")]
|
||||||
|
)
|
||||||
|
|
||||||
|
+(define_insn "aarch64_load_tp_soft"
|
||||||
|
+ [(set (reg:DI 0) (unspec:DI [(const_int 0)] UNSPEC_TLS))
|
||||||
|
+ (clobber (reg:DI IP0_REGNUM))
|
||||||
|
+ (clobber (reg:DI IP1_REGNUM))
|
||||||
|
+ (clobber (reg:DI LR_REGNUM))
|
||||||
|
+ (clobber (reg:CC CC_REGNUM))]
|
||||||
|
+ "TARGET_SOFT_TP"
|
||||||
|
+ "bl\\t__aarch64_read_tp\\t// aarch64_load_tp_soft"
|
||||||
|
+ [(set_attr "type" "branch")]
|
||||||
|
+)
|
||||||
|
+
|
||||||
|
;; The TLS ABI specifically requires that the compiler does not schedule
|
||||||
|
;; instructions in the TLS stubs, in order to enable linker relaxation.
|
||||||
|
;; Therefore we treat the stubs as an atomic sequence.
|
||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.opt gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.opt
|
||||||
|
--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64.opt 2017-03-17 17:05:23.131899000 +0000
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64.opt 2018-01-22 20:15:07.236099934 +0000
|
||||||
|
@@ -115,6 +115,20 @@
|
||||||
|
EnumValue
|
||||||
|
Enum(aarch64_tls_size) String(48) Value(48)
|
||||||
|
|
||||||
|
+mtp=
|
||||||
|
+Target RejectNegative Joined Enum(aarch64_tp_type) Var(target_thread_pointer) Init(TP_HARD)
|
||||||
|
+Specify how to access the thread pointer.
|
||||||
|
+
|
||||||
|
+Enum
|
||||||
|
+Name(aarch64_tp_type) Type(enum aarch64_tp_type)
|
||||||
|
+Valid arguments to -mtp=:
|
||||||
|
+
|
||||||
|
+EnumValue
|
||||||
|
+Enum(aarch64_tp_type) String(hard) Value(TP_HARD)
|
||||||
|
+
|
||||||
|
+EnumValue
|
||||||
|
+Enum(aarch64_tp_type) String(soft) Value(TP_SOFT)
|
||||||
|
+
|
||||||
|
march=
|
||||||
|
Target RejectNegative ToLower Joined Var(aarch64_arch_string)
|
||||||
|
-march=ARCH Use features of architecture ARCH.
|
||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64-opts.h gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64-opts.h
|
||||||
|
--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/aarch64-opts.h 2017-01-20 00:03:20.347898000 +0000
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/aarch64-opts.h 2018-01-22 20:15:07.232099998 +0000
|
||||||
|
@@ -48,6 +48,12 @@
|
||||||
|
TLS_DESCRIPTORS
|
||||||
|
};
|
||||||
|
|
||||||
|
+/* Which thread pointer access sequence to use. */
|
||||||
|
+enum aarch64_tp_type {
|
||||||
|
+ TP_HARD,
|
||||||
|
+ TP_SOFT
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
/* The code model defines the address generation strategy.
|
||||||
|
Most have a PIC and non-PIC variant. */
|
||||||
|
enum aarch64_code_model {
|
||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/gcc/config/aarch64/t-aarch64 gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/t-aarch64
|
||||||
|
--- gcc-7.3.0-RC-20180122/gcc/config/aarch64/t-aarch64 2017-01-01 12:07:43.905435000 +0000
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/gcc/config/aarch64/t-aarch64 2018-01-22 20:15:07.236099934 +0000
|
||||||
|
@@ -68,5 +68,7 @@
|
||||||
|
$(srcdir)/config/aarch64/cortex-a57-fma-steering.c
|
||||||
|
|
||||||
|
comma=,
|
||||||
|
-MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
|
||||||
|
-MULTILIB_DIRNAMES = $(subst $(comma), ,$(TM_MULTILIB_CONFIG))
|
||||||
|
+MULTILIB_OPTIONS = mcmodel=large fPIC
|
||||||
|
+MULTILIB_DIRNAMES = large pic
|
||||||
|
+MULTILIB_REQUIRED = mcmodel=large fPIC
|
||||||
|
+MULTILIB_MATCHES = fPIC=fpic fPIC=fpie fPIC=fPIE
|
||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/gcc/gcc.c gcc-7.3.0-RC-20180122-aarch64/gcc/gcc.c
|
||||||
|
--- gcc-7.3.0-RC-20180122/gcc/gcc.c 2017-09-15 09:18:34.015147000 +0100
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/gcc/gcc.c 2018-01-22 20:15:07.236099934 +0000
|
||||||
|
@@ -779,6 +779,11 @@
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifndef LIBGLOSS_SPEC
|
||||||
|
+# define LIBGLOSS_SPEC "-lsysbase"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||||
|
#ifndef STARTFILE_SPEC
|
||||||
|
#define STARTFILE_SPEC \
|
||||||
|
@@ -1074,6 +1079,7 @@
|
||||||
|
static const char *lib_spec = LIB_SPEC;
|
||||||
|
static const char *link_gomp_spec = "";
|
||||||
|
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||||
|
+static const char *libgloss_spec = LIBGLOSS_SPEC;
|
||||||
|
static const char *endfile_spec = ENDFILE_SPEC;
|
||||||
|
static const char *startfile_spec = STARTFILE_SPEC;
|
||||||
|
static const char *linker_name_spec = LINKER_NAME;
|
||||||
|
@@ -1579,6 +1585,7 @@
|
||||||
|
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||||
|
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||||
|
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||||
|
+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec),
|
||||||
|
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
||||||
|
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||||
|
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/libgcc/crtstuff.c gcc-7.3.0-RC-20180122-aarch64/libgcc/crtstuff.c
|
||||||
|
--- gcc-7.3.0-RC-20180122/libgcc/crtstuff.c 2017-01-01 12:07:43.905435000 +0000
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/libgcc/crtstuff.c 2018-01-22 20:15:07.236099934 +0000
|
||||||
|
@@ -47,6 +47,7 @@
|
||||||
|
|
||||||
|
/* Target machine header files require this define. */
|
||||||
|
#define IN_LIBGCC2
|
||||||
|
+#define USED_FOR_TARGET
|
||||||
|
|
||||||
|
/* FIXME: Including auto-host is incorrect, but until we have
|
||||||
|
identified the set of defines that need to go into auto-target.h,
|
||||||
|
diff -NBaur gcc-7.3.0-RC-20180122/libgcc/Makefile.in gcc-7.3.0-RC-20180122-aarch64/libgcc/Makefile.in
|
||||||
|
--- gcc-7.3.0-RC-20180122/libgcc/Makefile.in 2017-04-19 09:08:44.446150000 +0100
|
||||||
|
+++ gcc-7.3.0-RC-20180122-aarch64/libgcc/Makefile.in 2018-01-22 20:15:07.236099934 +0000
|
||||||
|
@@ -844,7 +844,7 @@
|
||||||
|
# libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and
|
||||||
|
# LIB2ADDEHSHARED matter. (Usually all three are identical.)
|
||||||
|
|
||||||
|
-c_flags := -fexceptions
|
||||||
|
+c_flags := -fno-exceptions
|
||||||
|
|
||||||
|
ifeq ($(enable_shared),yes)
|
||||||
|
|
||||||
8084
dka64/patches/newlib-3.0.0.patch
Normal file
8084
dka64/patches/newlib-3.0.0.patch
Normal file
File diff suppressed because it is too large
Load Diff
40
dka64/rules/base_rules
Normal file
40
dka64/rules/base_rules
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
include $(DEVKITPRO)/devkitA64/base_tools
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
%.a:
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
@echo $(notdir $@)
|
||||||
|
@rm -f $@
|
||||||
|
$(AR) -rc $@ $^
|
||||||
|
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
%.o: %.cpp
|
||||||
|
@echo $(notdir $<)
|
||||||
|
$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.d $(CXXFLAGS) -c $< -o $@ $(ERROR_FILTER)
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
%.o: %.c
|
||||||
|
@echo $(notdir $<)
|
||||||
|
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d $(CFLAGS) -c $< -o $@ $(ERROR_FILTER)
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
%.o: %.s
|
||||||
|
@echo $(notdir $<)
|
||||||
|
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ $(ERROR_FILTER)
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
%.o: %.S
|
||||||
|
@echo $(notdir $<)
|
||||||
|
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ $(ERROR_FILTER)
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# canned command sequence for binary data
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
define bin2o
|
||||||
|
bin2s $< | $(AS) -o $(@)
|
||||||
|
echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
|
||||||
|
echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
|
||||||
|
echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
|
||||||
|
endef
|
||||||
|
|
||||||
38
dka64/rules/base_tools
Normal file
38
dka64/rules/base_tools
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# make sure we have bash on OSX
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
UNAME_S := $(shell uname -s)
|
||||||
|
UNAME_R := $(shell uname -r)
|
||||||
|
|
||||||
|
ifneq (,$(findstring Darwin,$(UNAME_S)))
|
||||||
|
export SHELL=/bin/bash
|
||||||
|
endif
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# path to tools
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
export PATH := $(DEVKITPRO)/devkitA64/bin:$(PATH)
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# add portlibs path
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
export PORTLIBS_PATH := $(DEVKITPRO)/portlibs
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# the prefix on the compiler executables
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
PREFIX := aarch64-none-elf-
|
||||||
|
|
||||||
|
export CC := $(PREFIX)gcc
|
||||||
|
export CXX := $(PREFIX)g++
|
||||||
|
export AS := $(PREFIX)as
|
||||||
|
export AR := $(PREFIX)gcc-ar
|
||||||
|
export OBJCOPY := $(PREFIX)objcopy
|
||||||
|
export STRIP := $(PREFIX)strip
|
||||||
|
export NM := $(PREFIX)gcc-nm
|
||||||
|
export RANLIB := $(PREFIX)gcc-ranlib
|
||||||
|
|
||||||
|
ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
|
||||||
|
|
||||||
|
ifneq (,$(ISVC))
|
||||||
|
ERROR_FILTER := 2>&1 | sed -e 's/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/g'
|
||||||
|
endif
|
||||||
178
dka64/scripts/build-gcc.sh
Executable file
178
dka64/scripts/build-gcc.sh
Executable file
@@ -0,0 +1,178 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# build and install binutils
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
mkdir -p $target/binutils
|
||||||
|
cd $target/binutils
|
||||||
|
|
||||||
|
if [ ! -f configured-binutils ]
|
||||||
|
then
|
||||||
|
CFLAGS=$cflags LDFLAGS=$ldflags ../../binutils-$BINUTILS_VER/configure \
|
||||||
|
--prefix=$prefix --target=$target --disable-nls --disable-werror \
|
||||||
|
--enable-lto --enable-plugins --enable-poison-system-directories \
|
||||||
|
$CROSS_PARAMS \
|
||||||
|
|| { echo "Error configuring binutils"; exit 1; }
|
||||||
|
touch configured-binutils
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f built-binutils ]
|
||||||
|
then
|
||||||
|
$MAKE || { echo "Error building binutils"; exit 1; }
|
||||||
|
touch built-binutils
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f installed-binutils ]
|
||||||
|
then
|
||||||
|
$MAKE install || { echo "Error installing binutils"; exit 1; }
|
||||||
|
touch installed-binutils
|
||||||
|
fi
|
||||||
|
cd $BUILDDIR
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# build and install just the c compiler
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
mkdir -p $target/gcc
|
||||||
|
cd $target/gcc
|
||||||
|
|
||||||
|
if [ ! -f configured-gcc ]
|
||||||
|
then
|
||||||
|
CFLAGS="$cflags" \
|
||||||
|
CXXFLAGS="$cflags" \
|
||||||
|
LDFLAGS="$ldflags" \
|
||||||
|
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||||
|
CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||||
|
LDFLAGS_FOR_TARGET="" \
|
||||||
|
../../gcc-$GCC_VER/configure \
|
||||||
|
--enable-languages=c,c++ \
|
||||||
|
--with-gnu-as --with-gnu-ld --with-gcc \
|
||||||
|
--with-march=armv8\
|
||||||
|
--enable-cxx-flags='-ffunction-sections' \
|
||||||
|
--disable-libstdcxx-verbose \
|
||||||
|
--enable-poison-system-directories \
|
||||||
|
--enable-interwork --enable-multilib \
|
||||||
|
--enable-threads --disable-win32-registry --disable-nls --disable-debug\
|
||||||
|
--disable-libmudflap --disable-libssp --disable-libgomp \
|
||||||
|
--disable-libstdcxx-pch \
|
||||||
|
--target=$target \
|
||||||
|
--with-newlib \
|
||||||
|
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||||
|
--prefix=$prefix \
|
||||||
|
--enable-lto $plugin_ld\
|
||||||
|
--with-system-zlib \
|
||||||
|
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 alpha 7" \
|
||||||
|
$CROSS_PARAMS \
|
||||||
|
|| { echo "Error configuring gcc"; exit 1; }
|
||||||
|
touch configured-gcc
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f built-gcc ]
|
||||||
|
then
|
||||||
|
$MAKE all-gcc || { echo "Error building gcc stage1"; exit 1; }
|
||||||
|
touch built-gcc
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f installed-gcc ]
|
||||||
|
then
|
||||||
|
$MAKE install-gcc || { echo "Error installing gcc"; exit 1; }
|
||||||
|
touch installed-gcc
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
unset CFLAGS
|
||||||
|
cd $BUILDDIR
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# build and install newlib
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
mkdir -p $target/newlib
|
||||||
|
cd $target/newlib
|
||||||
|
|
||||||
|
if [ ! -f configured-newlib ]
|
||||||
|
then
|
||||||
|
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||||
|
../../newlib-$NEWLIB_VER/configure \
|
||||||
|
--disable-newlib-supplied-syscalls \
|
||||||
|
--enable-newlib-mb \
|
||||||
|
--disable-newlib-wide-orient \
|
||||||
|
--target=$target \
|
||||||
|
--prefix=$prefix \
|
||||||
|
|| { echo "Error configuring newlib"; exit 1; }
|
||||||
|
touch configured-newlib
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f built-newlib ]
|
||||||
|
then
|
||||||
|
$MAKE || { echo "Error building newlib"; exit 1; }
|
||||||
|
touch built-newlib
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if [ ! -f installed-newlib ]
|
||||||
|
then
|
||||||
|
$MAKE install -j1 || { echo "Error installing newlib"; exit 1; }
|
||||||
|
touch installed-newlib
|
||||||
|
fi
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# build and install the final compiler
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
cd $BUILDDIR
|
||||||
|
|
||||||
|
cd $target/gcc
|
||||||
|
|
||||||
|
if [ ! -f built-stage2 ]
|
||||||
|
then
|
||||||
|
$MAKE all || { echo "Error building gcc stage2"; exit 1; }
|
||||||
|
touch built-stage2
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f installed-stage2 ]
|
||||||
|
then
|
||||||
|
$MAKE install || { echo "Error installing gcc stage2"; exit 1; }
|
||||||
|
touch installed-stage2
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -fr $prefix/$target/sys-include
|
||||||
|
|
||||||
|
cd $BUILDDIR
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# build and install the debugger
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
mkdir -p $target/gdb
|
||||||
|
cd $target/gdb
|
||||||
|
|
||||||
|
PLATFORM=`uname -s`
|
||||||
|
|
||||||
|
if [ ! -f configured-gdb ]
|
||||||
|
then
|
||||||
|
CFLAGS="$cflags" \
|
||||||
|
CXXFLAGS="$cflags" \
|
||||||
|
LDFLAGS="$ldflags" \
|
||||||
|
../../gdb-$GDB_VER/configure \
|
||||||
|
--disable-nls --prefix=$prefix --target=$target --disable-werror \
|
||||||
|
$CROSS_PARAMS \
|
||||||
|
|| { echo "Error configuring gdb"; exit 1; }
|
||||||
|
touch configured-gdb
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f built-gdb ]
|
||||||
|
then
|
||||||
|
$MAKE || { echo "Error building gdb"; exit 1; }
|
||||||
|
touch built-gdb
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f installed-gdb ]
|
||||||
|
then
|
||||||
|
$MAKE install || { echo "Error installing gdb"; exit 1; }
|
||||||
|
touch installed-gdb
|
||||||
|
fi
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# copy base rulesets
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
cp -v $BUILDSCRIPTDIR/dka64/rules/* $prefix
|
||||||
20
dka64/scripts/build-tools.sh
Executable file
20
dka64/scripts/build-tools.sh
Executable file
@@ -0,0 +1,20 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
cd $BUILDDIR
|
||||||
|
|
||||||
|
for archive in $hostarchives
|
||||||
|
do
|
||||||
|
dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
|
||||||
|
cd $BUILDDIR/$dir
|
||||||
|
if [ ! -f configured ]; then
|
||||||
|
CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$prefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
|
||||||
|
touch configured
|
||||||
|
fi
|
||||||
|
if [ ! -f built ]; then
|
||||||
|
$MAKE || { echo "error building $dir"; exit 1; }
|
||||||
|
touch built
|
||||||
|
fi
|
||||||
|
if [ ! -f installed ]; then
|
||||||
|
$MAKE install || { echo "error installing $dir"; exit 1; }
|
||||||
|
touch installed
|
||||||
|
fi
|
||||||
|
done
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
DATESTRING=$(date +%Y)$(date +%m)$(date +%d)
|
DATESTRING=$(date +%Y)$(date +%m)$(date +%d)
|
||||||
cd .. && tar --exclude=*CVS* --exclude=.svn --exclude=.git --exclude=*.log --exclude=*.bz2 \
|
cd .. && tar --exclude=*CVS* --exclude=.svn --exclude=.git --exclude=*.log --exclude=*.bz2 \
|
||||||
--exclude=*.gz --exclude=config.sh --exclude=.devkitARM --exclude=.devkitPPC \
|
--exclude=*.gz --exclude=config.sh --exclude=.devkitARM* --exclude=.devkitPPC* \
|
||||||
--exclude=.devkitPSP --exclude=.gitignore \
|
--exclude=.devkitA64* --exclude=.gitignore \
|
||||||
-cvjf buildscripts-$DATESTRING.tar.bz2 buildscripts
|
-cvjf buildscripts-$DATESTRING.tar.bz2 buildscripts
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ do
|
|||||||
echo
|
echo
|
||||||
echo "1: devkitARM (gba gp32 ds)"
|
echo "1: devkitARM (gba gp32 ds)"
|
||||||
echo "2: devkitPPC (gamecube wii)"
|
echo "2: devkitPPC (gamecube wii)"
|
||||||
|
echo "3: devkitA64 (switch)"
|
||||||
read VERSION
|
read VERSION
|
||||||
|
|
||||||
if [ "$VERSION" -ne 1 -a "$VERSION" -ne 2 -a "$VERSION" -ne 3 ]
|
if [ "$VERSION" -ne 1 -a "$VERSION" -ne 2 -a "$VERSION" -ne 3 ]
|
||||||
@@ -49,4 +50,14 @@ case "$VERSION" in
|
|||||||
target=powerpc-eabi
|
target=powerpc-eabi
|
||||||
toolchain=DEVKITPPC
|
toolchain=DEVKITPPC
|
||||||
;;
|
;;
|
||||||
|
"3" )
|
||||||
|
GCC_VER=7.3.0
|
||||||
|
BINUTILS_VER=2.30
|
||||||
|
NEWLIB_VER=3.0.0
|
||||||
|
GDB_VER=8.0
|
||||||
|
basedir='dka64'
|
||||||
|
package=devkitA64
|
||||||
|
target=aarch64-none-elf
|
||||||
|
toolchain=DEVKITA64
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
Reference in New Issue
Block a user