mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-08-21 01:44:16 -05:00
Compare commits
77 Commits
devkitPPC_
...
devkitARM_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef789eddb7 | ||
|
|
502f832a5b | ||
|
|
848924d332 | ||
|
|
1f5f5eedf5 | ||
|
|
5664d84c44 | ||
|
|
6e8de1b1d2 | ||
|
|
b16276e9da | ||
|
|
7f142c7583 | ||
|
|
1a1b35aa3b | ||
|
|
70c8df8709 | ||
|
|
bc52f6ac2b | ||
|
|
81719c49e3 | ||
|
|
d4a84c9884 | ||
|
|
25f22b6c93 | ||
|
|
a0fe0c5297 | ||
|
|
77ad8b785c | ||
|
|
e4b1370595 | ||
|
|
dcfd0e271e | ||
|
|
9bf0973c2a | ||
|
|
0b31c7ab1c | ||
|
|
90e2936222 | ||
|
|
556a2a2e02 | ||
|
|
6da9ea33f7 | ||
|
|
433a4bdd80 | ||
|
|
20bf4948a1 | ||
|
|
5e720e01c1 | ||
|
|
183ab79cfc | ||
|
|
ad4246dfc4 | ||
|
|
9165c280f3 | ||
|
|
116613adc8 | ||
|
|
fbc790a8dd | ||
|
|
91789e0ca8 | ||
|
|
fddf563787 | ||
|
|
45bf89586f | ||
|
|
ddaf472951 | ||
|
|
0adc00806f | ||
|
|
fa1972f5e9 | ||
|
|
2a306b5e49 | ||
|
|
1857d52ede | ||
|
|
57ec7b67ac | ||
|
|
d9392f8f56 | ||
|
|
e0c908dfc2 | ||
|
|
2ddef0ade4 | ||
|
|
e68aaf8cdd | ||
|
|
0add4d1b5c | ||
|
|
736db33e06 | ||
|
|
96f7acc919 | ||
|
|
c2aae79d59 | ||
|
|
fe202a6f50 | ||
|
|
aeb6482da9 | ||
|
|
b1d5f5c7a6 | ||
|
|
1974c8ae38 | ||
|
|
65c1a1256a | ||
|
|
ade65bab03 | ||
|
|
bcb3bff114 | ||
|
|
a48e515bd6 | ||
|
|
fec37937b7 | ||
|
|
2c8ae62e8e | ||
|
|
383ebe76c8 | ||
|
|
d604cafce3 | ||
|
|
d0d158bd80 | ||
|
|
fe39e87d88 | ||
|
|
5ddee95920 | ||
|
|
58b9db7650 | ||
|
|
43415d430a | ||
|
|
223bc0823d | ||
|
|
c6675ab007 | ||
|
|
af02813a13 | ||
|
|
21d8bd0e46 | ||
|
|
b10d1e133f | ||
|
|
c38b9e9425 | ||
|
|
d643106bf8 | ||
|
|
dd40237a2a | ||
|
|
6530f0a3c3 | ||
|
|
0bd88d5ac8 | ||
|
|
ec6543e3c0 | ||
|
|
11d640cd77 |
@@ -39,7 +39,7 @@ http://www.zlib.net
|
||||
http://www.libusb.org
|
||||
http://expat.sourceforge.net/
|
||||
|
||||
sudo apt-get install libfreeimage-dev zlib1g-dev libusb-dev libudev-dev libexpat1-dev
|
||||
sudo apt-get install libfreeimage-dev zlib1g-dev libusb-dev libudev-dev libexpat1-dev
|
||||
|
||||
|
||||
Building gxtexconv for cube/wii needs GL/gl.h which can be obtained with
|
||||
|
||||
143
build-devkit.sh
143
build-devkit.sh
@@ -1,8 +1,9 @@
|
||||
|
||||
#!/bin/bash
|
||||
#---------------------------------------------------------------------------------
|
||||
# devkitARM release 50
|
||||
# devkitPPC release 33
|
||||
# devkitA64 release 12
|
||||
# devkitARM release 55
|
||||
# devkitPPC release 37
|
||||
# devkitA64 release 16
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
if [ 0 -eq 1 ] ; then
|
||||
@@ -26,43 +27,13 @@ echo "https://github.com/devkitPro/buildscripts/pulls"
|
||||
echo
|
||||
|
||||
|
||||
GENERAL_TOOLS_VER=1.0.2
|
||||
|
||||
LIBGBA_VER=0.5.1
|
||||
GBATOOLS_VER=1.1.0
|
||||
DKARM_RULES_VER=1.2.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
|
||||
GRIT_VER=0.8.15
|
||||
NDSTOOL_VER=2.1.1
|
||||
MMUTIL_VER=1.8.7
|
||||
|
||||
DFU_UTIL_VER=0.9.1
|
||||
STLINK_VER=1.2.3
|
||||
|
||||
GAMECUBE_TOOLS_VER=1.0.2
|
||||
LIBOGC_VER=1.8.21
|
||||
WIILOAD_VER=0.5.1
|
||||
DKPPC_RULES_VER=1.0.0
|
||||
|
||||
LIBCTRU_VER=1.5.0
|
||||
CITRO3D_VER=1.4.0
|
||||
CITRO2D_VER=1.0.0
|
||||
TOOLS3DS_VER=1.1.4
|
||||
LINK3DS_VER=0.5.2
|
||||
PICASSO_VER=2.7.0
|
||||
TEX3DS_VER=1.0.0
|
||||
|
||||
GP32_TOOLS_VER=1.0.3
|
||||
LIBMIRKO_VER=0.9.8
|
||||
|
||||
SWITCH_TOOLS_VER=1.4.1
|
||||
LIBNX_VER=1.3.0
|
||||
DKA64_RULES_VER=1.0.0
|
||||
|
||||
OSXMIN=${OSXMIN:-10.9}
|
||||
|
||||
@@ -149,24 +120,22 @@ fi
|
||||
echo use $MAKE as make
|
||||
export MAKE
|
||||
|
||||
CROSS_PARAMS="--build=`./config.guess`"
|
||||
|
||||
if [ ! -z $CROSSBUILD ]; then
|
||||
export PATH=/opt/devkitpro/$package/bin:$PATH
|
||||
prefix=$INSTALLDIR/$CROSSBUILD/$package
|
||||
CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
|
||||
CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
|
||||
else
|
||||
prefix=$INSTALLDIR/$package
|
||||
fi
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Add installed devkit to the path, adjusting path on minsys
|
||||
#---------------------------------------------------------------------------------
|
||||
TOOLPATH=$(echo $INSTALLDIR | sed -e 's/^\([a-zA-Z]\):/\/\1/')
|
||||
export PATH=$PATH:$TOOLPATH/$package/bin
|
||||
|
||||
CROSS_PARAMS="--build=`./config.guess`"
|
||||
|
||||
if [ ! -z $CROSSBUILD ]; then
|
||||
toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
|
||||
prefix=$INSTALLDIR/$CROSSBUILD/$package
|
||||
toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
|
||||
CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
|
||||
CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
|
||||
else
|
||||
toolsprefix=$INSTALLDIR/tools
|
||||
prefix=$INSTALLDIR/$package
|
||||
fi
|
||||
export PATH=$TOOLPATH/$package/bin:$PATH
|
||||
|
||||
if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then
|
||||
|
||||
@@ -212,41 +181,26 @@ fi
|
||||
patchdir=$(pwd)/$basedir/patches
|
||||
scriptdir=$(pwd)/$basedir/scripts
|
||||
|
||||
archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.xz"
|
||||
|
||||
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
|
||||
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
|
||||
dfu-util-$DFU_UTIL_VER.tar.bz2 stlink-$STLINK_VER.tar.bz2 3dstools-$TOOLS3DS_VER.tar.bz2
|
||||
picasso-$PICASSO_VER.tar.bz2 tex3ds-$TEX3DS_VER.tar.bz2 3dslink-$LINK3DS_VER.tar.bz2"
|
||||
fi
|
||||
archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz"
|
||||
|
||||
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"
|
||||
|
||||
archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
|
||||
archives="binutils-${MN_BINUTILS_VER}.tar.bz2 $archives"
|
||||
fi
|
||||
|
||||
if [ $VERSION -eq 3 ]; then
|
||||
if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ]; then
|
||||
if [ $VERSION -eq 1 ]; then
|
||||
archives="devkitarm-rules-$DKARM_RULES_VER.tar.xz devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz $archives"
|
||||
fi
|
||||
|
||||
targetarchives=" libnx-src-${LIBNX_VER}.tar.bz2"
|
||||
|
||||
hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
|
||||
if [ $VERSION -eq 2 ]; then
|
||||
archives="devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
|
||||
fi
|
||||
|
||||
if [ $VERSION -eq 3 ]; then
|
||||
archives="devkita64-rules-$DKA64_RULES_VER.tar.xz $archives"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
|
||||
SRCDIR="$BUILD_DKPRO_SRCDIR"
|
||||
else
|
||||
@@ -254,7 +208,7 @@ else
|
||||
fi
|
||||
|
||||
cd "$SRCDIR"
|
||||
for archive in $archives $targetarchives $hostarchives
|
||||
for archive in $archives
|
||||
do
|
||||
echo $archive
|
||||
if [ ! -f $archive ]; then
|
||||
@@ -269,47 +223,24 @@ cd $BUILDDIR
|
||||
extract_and_patch binutils $BINUTILS_VER xz
|
||||
extract_and_patch gcc $GCC_VER xz
|
||||
extract_and_patch newlib $NEWLIB_VER gz
|
||||
extract_and_patch gdb $GDB_VER xz
|
||||
|
||||
if [ $VERSION -eq 2 ]; then
|
||||
extract_and_patch binutils $MN_BINUTILS_VER bz2
|
||||
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
|
||||
do
|
||||
destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
|
||||
if [ ! -d $destdir ]; then
|
||||
tar -xjf "$SRCDIR/$archive"
|
||||
fi
|
||||
done
|
||||
if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2; fi
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Build and install devkit components
|
||||
#---------------------------------------------------------------------------------
|
||||
if [ -f $scriptdir/build-gcc.sh ]; then . $scriptdir/build-gcc.sh || { echo "Error building toolchain"; exit 1; }; cd $BUILDSCRIPTDIR; fi
|
||||
|
||||
if [ "$BUILD_DKPRO_SKIP_TOOLS" != "1" ] && [ -f $scriptdir/build-tools.sh ]; then
|
||||
. $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR;
|
||||
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;
|
||||
if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ] && [ -f $scriptdir/build-crtls.sh ]; then
|
||||
. $scriptdir/build-crtls.sh || { echo "Error building crtls & rules"; exit 1; }; cd $BUILDSCRIPTDIR;
|
||||
fi
|
||||
|
||||
cd $BUILDSCRIPTDIR
|
||||
|
||||
if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
|
||||
cp -v $CROSSBINPATH//libwinpthread-1.dll $prefix/bin
|
||||
cp -v $CROSSBINPATH/libwinpthread-1.dll $prefix/bin/
|
||||
cp -v $CROSSBINPATH/libwinpthread-1.dll $prefix/libexec/gcc/$target/$GCC_VER/
|
||||
fi
|
||||
|
||||
echo "stripping installed binaries"
|
||||
|
||||
@@ -31,15 +31,9 @@ BUILD_DKPRO_PACKAGE=0
|
||||
#export MAKEFLAGS="$MAKEFLAGS -j${numcores}"
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Uncomment to skip building of tools
|
||||
# Uncomment to skip building of crtls and rules files
|
||||
#---------------------------------------------------------------------------------
|
||||
#BUILD_DKPRO_SKIP_TOOLS=1
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Uncomment to skip building of libraries
|
||||
#---------------------------------------------------------------------------------
|
||||
#BUILD_DKPRO_SKIP_LIBRARIES=1
|
||||
|
||||
#BUILD_DKPRO_SKIP_CRTLS=1
|
||||
|
||||
# Automated script execution
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
6
cross-build-aarch64-linux-gnu.sh
Executable file
6
cross-build-aarch64-linux-gnu.sh
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
export CROSSBUILD=aarch64-linux-gnu
|
||||
export CROSSPATH=/opt/aarch64-linux-gnu
|
||||
export CROSSLIBPATH=$CROSSPATH/lib
|
||||
export CROSSBINPATH=$CROSSPATH/bin
|
||||
|
||||
0
cross-build-x86_64-linux-gnu.sh
Executable file
0
cross-build-x86_64-linux-gnu.sh
Executable file
@@ -1,346 +0,0 @@
|
||||
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 \
|
||||
@@ -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 ();
|
||||
371
dka64/patches/gcc-10.2.0.patch
Normal file
371
dka64/patches/gcc-10.2.0.patch
Normal file
@@ -0,0 +1,371 @@
|
||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index 6a349965c0a..2206091e057 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -1039,7 +1039,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
||||
tmake_file="${tmake_file} aarch64/t-aarch64"
|
||||
case $target in
|
||||
aarch64-*-elf*)
|
||||
+ default_use_cxa_atexit=yes
|
||||
use_gcc_stdint=wrap
|
||||
+ tm_file="${tm_file} devkitpro.h"
|
||||
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
|
||||
+ extra_options="${extra_options} devkitpro.opt"
|
||||
+ case ${enable_threads} in
|
||||
+ "" | yes | posix) thread_file='posix' ;;
|
||||
+ esac
|
||||
;;
|
||||
aarch64-*-fuchsia*)
|
||||
tm_file="${tm_file} fuchsia.h"
|
||||
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
index da5872cf4d8..ca840ab29cb 100644
|
||||
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
@@ -22,6 +22,7 @@
|
||||
#ifndef GCC_AARCH64_ELF_RAW_H
|
||||
#define GCC_AARCH64_ELF_RAW_H
|
||||
|
||||
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
||||
#define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
|
||||
#define ENDFILE_SPEC \
|
||||
" crtend%O%s crtn%O%s " \
|
||||
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
||||
index ee7bed34924..d1e2742d750 100644
|
||||
--- a/gcc/config/aarch64/aarch64-opts.h
|
||||
+++ b/gcc/config/aarch64/aarch64-opts.h
|
||||
@@ -48,6 +48,12 @@ enum aarch64_tls_type {
|
||||
TLS_DESCRIPTORS
|
||||
};
|
||||
|
||||
+/* Which thread pointer access sequence to use. */
|
||||
+enum aarch64_tp_type {
|
||||
+ TP_HARD,
|
||||
+ TP_SOFT
|
||||
+};
|
||||
+
|
||||
/* The code model defines the address generation strategy.
|
||||
Most have a PIC and non-PIC variant. */
|
||||
enum aarch64_code_model {
|
||||
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
||||
index b86434a6acf..389e3fe3910 100644
|
||||
--- a/gcc/config/aarch64/aarch64.c
|
||||
+++ b/gcc/config/aarch64/aarch64.c
|
||||
@@ -15983,8 +15983,24 @@ aarch64_load_tp (rtx target)
|
||||
|| !register_operand (target, Pmode))
|
||||
target = gen_reg_rtx (Pmode);
|
||||
|
||||
- /* Can return in any reg. */
|
||||
- emit_insn (gen_aarch64_load_tp_hard (target));
|
||||
+ if (TARGET_HARD_TP)
|
||||
+ {
|
||||
+ /* Can return in any reg. */
|
||||
+ emit_insn (gen_aarch64_load_tp_hard (target));
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ /* Always returned in r0. Immediately copy the result into a pseudo,
|
||||
+ otherwise other uses of r0 (e.g. setting up function arguments) may
|
||||
+ clobber the value. */
|
||||
+
|
||||
+ rtx tmp;
|
||||
+
|
||||
+ emit_insn (gen_aarch64_load_tp_soft ());
|
||||
+
|
||||
+ tmp = gen_rtx_REG (DImode, R0_REGNUM);
|
||||
+ emit_move_insn (target, tmp);
|
||||
+ }
|
||||
return target;
|
||||
}
|
||||
|
||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
||||
index 1ce23c68781..57216651648 100644
|
||||
--- a/gcc/config/aarch64/aarch64.h
|
||||
+++ b/gcc/config/aarch64/aarch64.h
|
||||
@@ -1134,6 +1134,10 @@ typedef struct
|
||||
/* Check TLS Descriptors mechanism is selected. */
|
||||
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
||||
|
||||
+/* Check selected thread pointer access sequence to use. */
|
||||
+#define TARGET_HARD_TP (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 --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
||||
index 8c8be3c2740..1257616a659 100644
|
||||
--- a/gcc/config/aarch64/aarch64.md
|
||||
+++ b/gcc/config/aarch64/aarch64.md
|
||||
@@ -6789,11 +6789,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 --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
||||
index d99d14c137d..08e52537dc6 100644
|
||||
--- a/gcc/config/aarch64/aarch64.opt
|
||||
+++ b/gcc/config/aarch64/aarch64.opt
|
||||
@@ -118,6 +118,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
|
||||
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 Negative(march=) ToLower Joined Var(aarch64_arch_string)
|
||||
Use features of architecture ARCH.
|
||||
@@ -256,7 +271,7 @@ TargetVariable
|
||||
long aarch64_stack_protector_guard_offset = 0
|
||||
|
||||
moutline-atomics
|
||||
-Target Report Var(aarch64_flag_outline_atomics) Init(2) Save
|
||||
+Target Report Var(aarch64_flag_outline_atomics) Save
|
||||
Generate local calls to out-of-line atomic operations.
|
||||
|
||||
-param=aarch64-sve-compare-costs=
|
||||
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
||||
index 11d20b7be14..02ca761d3bf 100644
|
||||
--- a/gcc/config/aarch64/t-aarch64
|
||||
+++ b/gcc/config/aarch64/t-aarch64
|
||||
@@ -159,8 +159,10 @@ aarch64-bti-insert.o: $(srcdir)/config/aarch64/aarch64-bti-insert.c \
|
||||
$(srcdir)/config/aarch64/aarch64-bti-insert.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
|
||||
|
||||
insn-conditions.md: s-check-sve-md
|
||||
s-check-sve-md: $(srcdir)/config/aarch64/check-sve-md.awk \
|
||||
diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
|
||||
new file mode 100644
|
||||
index 00000000000..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/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
|
||||
index 250fef59b55..36b2239aa5d 100644
|
||||
--- a/gcc/config/i386/host-mingw32.c
|
||||
+++ b/gcc/config/i386/host-mingw32.c
|
||||
@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
|
||||
|
||||
static inline void w32_error(const char*, const char*, int, const char*);
|
||||
|
||||
-/* FIXME: Is this big enough? */
|
||||
-static const size_t pch_VA_max_size = 128 * 1024 * 1024;
|
||||
-
|
||||
/* Granularity for reserving address space. */
|
||||
static size_t va_granularity = 0x10000;
|
||||
|
||||
@@ -88,9 +85,6 @@ static void *
|
||||
mingw32_gt_pch_get_address (size_t size, int)
|
||||
{
|
||||
void* res;
|
||||
- size = (size + va_granularity - 1) & ~(va_granularity - 1);
|
||||
- if (size > pch_VA_max_size)
|
||||
- return NULL;
|
||||
|
||||
/* FIXME: We let system determine base by setting first arg to NULL.
|
||||
Allocating at top of available address space avoids unnecessary
|
||||
@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
|
||||
If we allocate at bottom we need to reserve the address as early
|
||||
as possible and at the same point in each invocation. */
|
||||
|
||||
- res = VirtualAlloc (NULL, pch_VA_max_size,
|
||||
+ res = VirtualAlloc (NULL, size,
|
||||
MEM_RESERVE | MEM_TOP_DOWN,
|
||||
PAGE_NOACCESS);
|
||||
if (!res)
|
||||
@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
|
||||
|
||||
/* Offset must be also be a multiple of allocation granularity for
|
||||
this to work. We can't change the offset. */
|
||||
- if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
|
||||
+ if ((offset & (va_granularity - 1)) != 0)
|
||||
return -1;
|
||||
|
||||
|
||||
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
||||
index 9f790db0daf..97f52d0b893 100644
|
||||
--- a/gcc/gcc.c
|
||||
+++ b/gcc/gcc.c
|
||||
@@ -793,6 +793,11 @@ proper position among the other output files. */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#ifndef LIBGLOSS_SPEC
|
||||
+# define LIBGLOSS_SPEC "-lsysbase"
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||
#ifndef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC \
|
||||
@@ -1085,6 +1090,7 @@ static const char *link_spec = LINK_SPEC;
|
||||
static const char *lib_spec = LIB_SPEC;
|
||||
static const char *link_gomp_spec = "";
|
||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||
+static const char *libgloss_spec = LIBGLOSS_SPEC;
|
||||
static const char *endfile_spec = ENDFILE_SPEC;
|
||||
static const char *startfile_spec = STARTFILE_SPEC;
|
||||
static const char *linker_name_spec = LINKER_NAME;
|
||||
@@ -1582,6 +1588,7 @@ static struct spec_list static_specs[] =
|
||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||
+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec),
|
||||
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||
index 3f769a1c660..e005d8304b7 100644
|
||||
--- a/libgcc/crtstuff.c
|
||||
+++ b/libgcc/crtstuff.c
|
||||
@@ -325,7 +325,7 @@ register_tm_clones (void)
|
||||
|
||||
#ifdef OBJECT_FORMAT_ELF
|
||||
|
||||
-#if DEFAULT_USE_CXA_ATEXIT
|
||||
+#if 1 /* DEFAULT_USE_CXA_ATEXIT */
|
||||
/* Declare the __dso_handle variable. It should have a unique value
|
||||
in every shared-object; in a main program its value is zero. The
|
||||
object should in any case be protected. This means the instance
|
||||
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
||||
index f31cf083cbe..649f900aac3 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 80aeb3f8959..308ceedc673 100644
|
||||
--- a/libstdc++-v3/include/Makefile.am
|
||||
+++ b/libstdc++-v3/include/Makefile.am
|
||||
@@ -1315,6 +1315,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 eb437ad8d8d..6e076fc63bd 100644
|
||||
--- a/libstdc++-v3/include/Makefile.in
|
||||
+++ b/libstdc++-v3/include/Makefile.in
|
||||
@@ -1793,6 +1793,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' \
|
||||
< $< > $@
|
||||
|
||||
@@ -1,190 +0,0 @@
|
||||
diff -NBaur gcc-8.1.0/gcc/config/aarch64/aarch64.c gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64.c
|
||||
--- gcc-8.1.0/gcc/config/aarch64/aarch64.c 2018-03-15 08:55:04.000000000 +0000
|
||||
+++ gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64.c 2018-05-08 11:09:01.247467815 +0100
|
||||
@@ -11963,8 +11963,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-8.1.0/gcc/config/aarch64/aarch64-elf-raw.h gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
--- gcc-8.1.0/gcc/config/aarch64/aarch64-elf-raw.h 2018-01-03 10:03:58.000000000 +0000
|
||||
+++ gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64-elf-raw.h 2018-05-08 11:09:01.247467815 +0100
|
||||
@@ -22,6 +22,7 @@
|
||||
#ifndef GCC_AARCH64_ELF_RAW_H
|
||||
#define GCC_AARCH64_ELF_RAW_H
|
||||
|
||||
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
||||
#define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
|
||||
#define ENDFILE_SPEC \
|
||||
" crtend%O%s crtn%O%s " \
|
||||
diff -NBaur gcc-8.1.0/gcc/config/aarch64/aarch64.h gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64.h
|
||||
--- gcc-8.1.0/gcc/config/aarch64/aarch64.h 2018-02-21 14:05:45.000000000 +0000
|
||||
+++ gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64.h 2018-05-08 11:09:01.255467862 +0100
|
||||
@@ -957,6 +957,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-8.1.0/gcc/config/aarch64/aarch64.md gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64.md
|
||||
--- gcc-8.1.0/gcc/config/aarch64/aarch64.md 2018-04-24 17:58:49.000000000 +0100
|
||||
+++ gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64.md 2018-05-08 11:09:01.255467862 +0100
|
||||
@@ -5693,11 +5693,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-8.1.0/gcc/config/aarch64/aarch64.opt gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64.opt
|
||||
--- gcc-8.1.0/gcc/config/aarch64/aarch64.opt 2018-01-13 17:50:35.000000000 +0000
|
||||
+++ gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64.opt 2018-05-08 11:09:01.255467862 +0100
|
||||
@@ -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-8.1.0/gcc/config/aarch64/aarch64-opts.h gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64-opts.h
|
||||
--- gcc-8.1.0/gcc/config/aarch64/aarch64-opts.h 2018-01-13 17:50:35.000000000 +0000
|
||||
+++ gcc-8.1.0-aarch64/gcc/config/aarch64/aarch64-opts.h 2018-05-08 11:09:01.255467862 +0100
|
||||
@@ -48,6 +48,12 @@
|
||||
TLS_DESCRIPTORS
|
||||
};
|
||||
|
||||
+/* Which thread pointer access sequence to use. */
|
||||
+enum aarch64_tp_type {
|
||||
+ TP_HARD,
|
||||
+ TP_SOFT
|
||||
+};
|
||||
+
|
||||
/* The code model defines the address generation strategy.
|
||||
Most have a PIC and non-PIC variant. */
|
||||
enum aarch64_code_model {
|
||||
diff -NBaur gcc-8.1.0/gcc/config/aarch64/t-aarch64 gcc-8.1.0-aarch64/gcc/config/aarch64/t-aarch64
|
||||
--- gcc-8.1.0/gcc/config/aarch64/t-aarch64 2018-01-03 10:03:58.000000000 +0000
|
||||
+++ gcc-8.1.0-aarch64/gcc/config/aarch64/t-aarch64 2018-05-08 11:09:01.255467862 +0100
|
||||
@@ -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-8.1.0/gcc/gcc.c gcc-8.1.0-aarch64/gcc/gcc.c
|
||||
--- gcc-8.1.0/gcc/gcc.c 2018-02-09 06:44:06.000000000 +0000
|
||||
+++ gcc-8.1.0-aarch64/gcc/gcc.c 2018-05-08 11:09:01.259467885 +0100
|
||||
@@ -786,6 +786,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 \
|
||||
@@ -1081,6 +1086,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;
|
||||
@@ -1577,6 +1583,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-8.1.0/libgcc/crtstuff.c gcc-8.1.0-aarch64/libgcc/crtstuff.c
|
||||
--- gcc-8.1.0/libgcc/crtstuff.c 2018-01-03 10:03:58.000000000 +0000
|
||||
+++ gcc-8.1.0-aarch64/libgcc/crtstuff.c 2018-05-08 11:09:01.259467885 +0100
|
||||
@@ -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-8.1.0/libgcc/Makefile.in gcc-8.1.0-aarch64/libgcc/Makefile.in
|
||||
--- gcc-8.1.0/libgcc/Makefile.in 2018-01-03 10:03:58.000000000 +0000
|
||||
+++ gcc-8.1.0-aarch64/libgcc/Makefile.in 2018-05-08 11:09:01.259467885 +0100
|
||||
@@ -847,7 +847,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)
|
||||
|
||||
@@ -1,199 +0,0 @@
|
||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index 532c33f4c2b..c8a8bc698a7 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -945,6 +945,7 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
||||
case $target in
|
||||
aarch64-*-elf*)
|
||||
use_gcc_stdint=wrap
|
||||
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
|
||||
;;
|
||||
aarch64-*-fuchsia*)
|
||||
tm_file="${tm_file} fuchsia.h"
|
||||
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
index c074238df06..ef503ddd5a6 100644
|
||||
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
@@ -22,6 +22,7 @@
|
||||
#ifndef GCC_AARCH64_ELF_RAW_H
|
||||
#define GCC_AARCH64_ELF_RAW_H
|
||||
|
||||
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
||||
#define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
|
||||
#define ENDFILE_SPEC \
|
||||
" crtend%O%s crtn%O%s " \
|
||||
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
||||
index 7a5c6d7664f..687793841de 100644
|
||||
--- a/gcc/config/aarch64/aarch64-opts.h
|
||||
+++ b/gcc/config/aarch64/aarch64-opts.h
|
||||
@@ -48,6 +48,12 @@ enum aarch64_tls_type {
|
||||
TLS_DESCRIPTORS
|
||||
};
|
||||
|
||||
+/* Which thread pointer access sequence to use. */
|
||||
+enum aarch64_tp_type {
|
||||
+ TP_HARD,
|
||||
+ TP_SOFT
|
||||
+};
|
||||
+
|
||||
/* The code model defines the address generation strategy.
|
||||
Most have a PIC and non-PIC variant. */
|
||||
enum aarch64_code_model {
|
||||
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
||||
index 175f13dc264..733ab473cbd 100644
|
||||
--- a/gcc/config/aarch64/aarch64.c
|
||||
+++ b/gcc/config/aarch64/aarch64.c
|
||||
@@ -11979,8 +11979,24 @@ aarch64_load_tp (rtx target)
|
||||
|| !register_operand (target, Pmode))
|
||||
target = gen_reg_rtx (Pmode);
|
||||
|
||||
- /* Can return in any reg. */
|
||||
- emit_insn (gen_aarch64_load_tp_hard (target));
|
||||
+ if (TARGET_HARD_TP)
|
||||
+ {
|
||||
+ /* Can return in any reg. */
|
||||
+ emit_insn (gen_aarch64_load_tp_hard (target));
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ /* Always returned in r0. Immediately copy the result into a pseudo,
|
||||
+ otherwise other uses of r0 (e.g. setting up function arguments) may
|
||||
+ clobber the value. */
|
||||
+
|
||||
+ rtx tmp;
|
||||
+
|
||||
+ emit_insn (gen_aarch64_load_tp_soft ());
|
||||
+
|
||||
+ tmp = gen_rtx_REG (DImode, R0_REGNUM);
|
||||
+ emit_move_insn (target, tmp);
|
||||
+ }
|
||||
return target;
|
||||
}
|
||||
|
||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
||||
index 976f9afae54..73263bcb5e7 100644
|
||||
--- a/gcc/config/aarch64/aarch64.h
|
||||
+++ b/gcc/config/aarch64/aarch64.h
|
||||
@@ -957,6 +957,10 @@ typedef struct
|
||||
/* Check TLS Descriptors mechanism is selected. */
|
||||
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
||||
|
||||
+/* Check selected thread pointer access sequence to use. */
|
||||
+#define TARGET_HARD_TP (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 --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
||||
index 32a0e1f3685..783c655acf0 100644
|
||||
--- a/gcc/config/aarch64/aarch64.md
|
||||
+++ b/gcc/config/aarch64/aarch64.md
|
||||
@@ -5693,11 +5693,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 --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
||||
index 52eaf8c6f40..52bccddc6e3 100644
|
||||
--- a/gcc/config/aarch64/aarch64.opt
|
||||
+++ b/gcc/config/aarch64/aarch64.opt
|
||||
@@ -115,6 +115,20 @@ Enum(aarch64_tls_size) String(32) Value(32)
|
||||
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 --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
||||
index 0be1f0d63aa..a54068bfd96 100644
|
||||
--- a/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 \
|
||||
$(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 --git a/gcc/gcc.c b/gcc/gcc.c
|
||||
index a716f708259..6a11011dba7 100644
|
||||
--- a/gcc/gcc.c
|
||||
+++ b/gcc/gcc.c
|
||||
@@ -786,6 +786,11 @@ proper position among the other output files. */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#ifndef LIBGLOSS_SPEC
|
||||
+# define LIBGLOSS_SPEC "-lsysbase"
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||
#ifndef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC \
|
||||
@@ -1081,6 +1086,7 @@ static const char *link_spec = LINK_SPEC;
|
||||
static const char *lib_spec = LIB_SPEC;
|
||||
static const char *link_gomp_spec = "";
|
||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||
+static const char *libgloss_spec = LIBGLOSS_SPEC;
|
||||
static const char *endfile_spec = ENDFILE_SPEC;
|
||||
static const char *startfile_spec = STARTFILE_SPEC;
|
||||
static const char *linker_name_spec = LINKER_NAME;
|
||||
@@ -1577,6 +1583,7 @@ static struct spec_list static_specs[] =
|
||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||
+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec),
|
||||
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||
index 5e894455e16..f2347455de0 100644
|
||||
--- a/libgcc/crtstuff.c
|
||||
+++ b/libgcc/crtstuff.c
|
||||
@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
|
||||
/* 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,
|
||||
File diff suppressed because it is too large
Load Diff
16
dka64/scripts/build-crtls.sh
Normal file
16
dka64/scripts/build-crtls.sh
Normal file
@@ -0,0 +1,16 @@
|
||||
#!/bin/sh
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# set env variables
|
||||
#---------------------------------------------------------------------------------
|
||||
export DEVKITPRO=$TOOLPATH
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install the rules files
|
||||
#---------------------------------------------------------------------------------
|
||||
cd $BUILDDIR
|
||||
|
||||
mkdir -p rules
|
||||
cd rules
|
||||
tar -xvf $SRCDIR/devkita64-rules-$DKA64_RULES_VER.tar.xz
|
||||
make install
|
||||
@@ -59,12 +59,14 @@ then
|
||||
--enable-libstdcxx-time \
|
||||
--enable-libstdcxx-filesystem-ts \
|
||||
--target=$target \
|
||||
--with-newlib \
|
||||
--with-newlib=yes \
|
||||
--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 release 12" \
|
||||
--disable-tm-clone-registry \
|
||||
--disable-__cxa_atexit \
|
||||
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 16" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
|| { echo "Error configuring gcc"; exit 1; }
|
||||
@@ -148,42 +150,3 @@ then
|
||||
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
|
||||
|
||||
@@ -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,20 +0,0 @@
|
||||
#!/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=$toolsprefix $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,195 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
|
||||
PHDRS
|
||||
{
|
||||
code PT_LOAD FLAGS(5) /* Read | Execute */;
|
||||
rodata PT_LOAD FLAGS(4) /* Read */;
|
||||
data PT_LOAD FLAGS(6) /* Read | Write */;
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
/* =========== CODE section =========== */
|
||||
|
||||
PROVIDE(__start__ = 0x100000);
|
||||
. = __start__;
|
||||
|
||||
.text ALIGN(0x1000) :
|
||||
{
|
||||
/* .init */
|
||||
KEEP( *(.crt0) )
|
||||
KEEP( *(.init) )
|
||||
. = ALIGN(4);
|
||||
|
||||
/* .text */
|
||||
*(.text)
|
||||
*(.text.*)
|
||||
*(.glue_7)
|
||||
*(.glue_7t)
|
||||
*(.stub)
|
||||
*(.gnu.warning)
|
||||
*(.gnu.linkonce.t*)
|
||||
. = ALIGN(4);
|
||||
|
||||
/* .fini */
|
||||
KEEP( *(.fini) )
|
||||
. = ALIGN(4);
|
||||
} : code
|
||||
|
||||
/* =========== RODATA section =========== */
|
||||
|
||||
. = ALIGN(0x1000);
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*all.rodata*(*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4);
|
||||
} : rodata
|
||||
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } : rodata
|
||||
__exidx_start = .;
|
||||
ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } : rodata
|
||||
__exidx_end = .;
|
||||
|
||||
/* =========== DATA section =========== */
|
||||
|
||||
. = ALIGN(0x1000);
|
||||
|
||||
.data :
|
||||
{
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4);
|
||||
} : data
|
||||
|
||||
.tdata ALIGN(4) :
|
||||
{
|
||||
__tdata_lma = .;
|
||||
*(.tdata)
|
||||
*(.tdata.*)
|
||||
*(.gnu.linkonce.td.*)
|
||||
. = ALIGN(4);
|
||||
__tdata_lma_end = .;
|
||||
} : data
|
||||
|
||||
.tbss ALIGN(4) :
|
||||
{
|
||||
*(.tbss)
|
||||
*(.tbss.*)
|
||||
*(.gnu.linkonce.tb.*)
|
||||
*(.tcommon)
|
||||
. = ALIGN(4);
|
||||
} : data
|
||||
|
||||
.preinit_array ALIGN(4) :
|
||||
{
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
KEEP (*(.preinit_array))
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
} : data
|
||||
|
||||
.init_array ALIGN(4) :
|
||||
{
|
||||
PROVIDE (__init_array_start = .);
|
||||
KEEP (*(SORT(.init_array.*)))
|
||||
KEEP (*(.init_array))
|
||||
PROVIDE (__init_array_end = .);
|
||||
} : data
|
||||
|
||||
.fini_array ALIGN(4) :
|
||||
{
|
||||
PROVIDE (__fini_array_start = .);
|
||||
KEEP (*(.fini_array))
|
||||
KEEP (*(SORT(.fini_array.*)))
|
||||
PROVIDE (__fini_array_end = .);
|
||||
} : data
|
||||
|
||||
.ctors ALIGN(4) :
|
||||
{
|
||||
KEEP (*crtbegin.o(.ctors)) /* MUST be first -- GCC requires it */
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
} : data
|
||||
|
||||
.dtors ALIGN(4) :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
} : data
|
||||
|
||||
__bss_start__ = .;
|
||||
.bss ALIGN(4) :
|
||||
{
|
||||
*(.dynbss)
|
||||
*(.bss)
|
||||
*(.bss.*)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(COMMON)
|
||||
. = ALIGN(4);
|
||||
|
||||
/* Reserve space for the TLS segment of the main thread */
|
||||
__tls_start = .;
|
||||
. += + SIZEOF(.tdata) + SIZEOF(.tbss);
|
||||
__tls_end = .;
|
||||
} : data
|
||||
__bss_end__ = .;
|
||||
|
||||
__end__ = ABSOLUTE(.) ;
|
||||
|
||||
/* ==================
|
||||
==== Metadata ====
|
||||
================== */
|
||||
|
||||
/* Discard sections that difficult post-processing */
|
||||
/DISCARD/ : { *(.group .comment .note) }
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T 3dsx.ld%s -d --emit-relocs --use-blx --gc-sections
|
||||
|
||||
*startfile:
|
||||
3dsx_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ 3DS processor selection
|
||||
@---------------------------------------------------------------------------------
|
||||
.cpu mpcore
|
||||
@---------------------------------------------------------------------------------
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
.section ".crt0","ax"
|
||||
.global _start, __service_ptr, __apt_appid, __heap_size, __linear_heap_size, __system_arglist, __system_runflags
|
||||
@---------------------------------------------------------------------------------
|
||||
.align 2
|
||||
.arm
|
||||
@---------------------------------------------------------------------------------
|
||||
_start:
|
||||
@---------------------------------------------------------------------------------
|
||||
b startup
|
||||
.ascii "_prm"
|
||||
__service_ptr:
|
||||
.word 0 @ Pointer to service handle override list -- if non-NULL it is assumed that we have been launched from a homebrew launcher
|
||||
__apt_appid:
|
||||
.word 0x300 @ Program APPID
|
||||
__heap_size:
|
||||
.word 24*1024*1024 @ Default heap size (24 MiB)
|
||||
__linear_heap_size:
|
||||
.word 32*1024*1024 @ Default linear heap size (32 MiB)
|
||||
__system_arglist:
|
||||
.word 0 @ Pointer to argument list (argc (u32) followed by that many NULL terminated strings)
|
||||
__system_runflags:
|
||||
.word 0 @ Flags to signal runtime restrictions to ctrulib
|
||||
startup:
|
||||
@ Save return address
|
||||
mov r4, lr
|
||||
|
||||
@ Clear the BSS section
|
||||
ldr r0, =__bss_start__
|
||||
ldr r1, =__bss_end__
|
||||
sub r1, r1, r0
|
||||
bl ClearMem
|
||||
|
||||
@ System initialization
|
||||
mov r0, r4
|
||||
bl initSystem
|
||||
|
||||
@ Set up argc/argv arguments for main()
|
||||
ldr r0, =__system_argc
|
||||
ldr r1, =__system_argv
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r1]
|
||||
|
||||
@ Jump to user code
|
||||
ldr r3, =main
|
||||
ldr lr, =__ctru_exit
|
||||
bx r3
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Clear memory to 0x00 if length != 0
|
||||
@ r0 = Start Address
|
||||
@ r1 = Length
|
||||
@---------------------------------------------------------------------------------
|
||||
ClearMem:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r2, #3 @ Round down to nearest word boundary
|
||||
add r1, r1, r2 @ Shouldn't be needed
|
||||
bics r1, r1, r2 @ Clear 2 LSB (and set Z)
|
||||
bxeq lr @ Quit if copy size is 0
|
||||
|
||||
mov r2, #0
|
||||
ClrLoop:
|
||||
stmia r0!, {r2}
|
||||
subs r1, r1, #4
|
||||
bne ClrLoop
|
||||
|
||||
bx lr
|
||||
@@ -1,13 +0,0 @@
|
||||
include $(DEVKITARM)/base_rules
|
||||
|
||||
all:
|
||||
$(CC) -x assembler-with-cpp -marm -c $(CRT)_crt0.s -o$(CRT)_crt0.o
|
||||
$(CC) -x assembler-with-cpp -mthumb -c $(CRT)_crt0.s -o thumb/$(CRT)_crt0.o
|
||||
|
||||
ds_arm7_vram_crt0:
|
||||
$(CC) -x assembler-with-cpp -marm -c -DVRAM ds_arm7_crt0.s -ods_arm7_vram_crt0.o
|
||||
$(CC) -x assembler-with-cpp -mthumb -c -DVRAM ds_arm7_crt0.s -othumb/ds_arm7_vram_crt0.o
|
||||
|
||||
3dsx_crt0:
|
||||
$(CC) -march=armv6k -mfloat-abi=hard -c 3dsx_crt0.s -o armv6k/fpu/3dsx_crt0.o
|
||||
|
||||
@@ -1,195 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
|
||||
MEMORY {
|
||||
/* This base address is chosen to be a reserved instruction in THUMB mode,
|
||||
and SWILT in ARM mode, with an impossible SWI value. This should allow
|
||||
the patcher / linker to find all shifted addresses within each section.
|
||||
Changed sections are: glue_7, got
|
||||
*/
|
||||
ddmem : ORIGIN = 0xBF800000, LENGTH = 16K
|
||||
}
|
||||
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
.crt0 :
|
||||
{
|
||||
__text_start = . ;
|
||||
KEEP (*(.crt0))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ddmem = 0xff
|
||||
|
||||
.text : /* ALIGN (4): */
|
||||
{
|
||||
*(.text.*)
|
||||
*(.stub)
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.gnu.linkonce.t*)
|
||||
__glue_start = ABSOLUTE(.);
|
||||
*(.glue_7)
|
||||
*(.glue_7t)
|
||||
__glue_end = ABSOLUTE(.);
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ddmem = 0xff
|
||||
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ddmem =0xff
|
||||
|
||||
__text_end = . ;
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*all.rodata*(*)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ddmem = 0xff
|
||||
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >ddmem
|
||||
__exidx_start = .;
|
||||
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } >ddmem
|
||||
__exidx_end = .;
|
||||
|
||||
/* Ensure the __preinit_array_start label is properly aligned. We
|
||||
could instead move the label definition inside the section, but
|
||||
the linker would then create the section even if it turns out to
|
||||
be empty, which isn't pretty. */
|
||||
. = ALIGN(32 / 8);
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
.preinit_array : { KEEP (*(.preinit_array)) } >ddmem = 0xff
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { KEEP (*(.init_array)) } >ddmem = 0xff
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { KEEP (*(.fini_array)) } >ddmem = 0xff
|
||||
PROVIDE (__fini_array_end = .);
|
||||
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ddmem = 0xff
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ddmem = 0xff
|
||||
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ddmem = 0xff
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ddmem = 0xff
|
||||
.jcr : { KEEP (*(.jcr)) } >ddmem = 0
|
||||
|
||||
|
||||
__got_start = . ;
|
||||
.got :
|
||||
{
|
||||
*(.got.plt)
|
||||
*(.got)
|
||||
*(.rel.got)
|
||||
} >ddmem = 0
|
||||
__got_end = . ;
|
||||
|
||||
|
||||
.data ALIGN(4) : {
|
||||
__data_start = ABSOLUTE(.);
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4);
|
||||
__data_end = ABSOLUTE(.) ;
|
||||
} >ddmem = 0xff
|
||||
|
||||
__data_end = . ;
|
||||
|
||||
.bss ALIGN(4) :
|
||||
{
|
||||
__bss_start = ABSOLUTE(.);
|
||||
__bss_start__ = ABSOLUTE(.);
|
||||
*(.dynbss)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(.bss*)
|
||||
*(COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ddmem
|
||||
|
||||
__bss_end = . ;
|
||||
__bss_end__ = . ;
|
||||
|
||||
_end = . ;
|
||||
__end__ = . ;
|
||||
PROVIDE (end = _end);
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
.stack 0x80000 : { _stack = .; *(.stack) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
@@ -1,232 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
|
||||
|
||||
PHDRS {
|
||||
crt0 PT_LOAD FLAGS(7);
|
||||
arm7 PT_LOAD FLAGS(7);
|
||||
arm7i PT_LOAD FLAGS(0x100007);
|
||||
}
|
||||
|
||||
|
||||
MEMORY {
|
||||
ewram : ORIGIN = 0x02380000, LENGTH = 12M - 512K
|
||||
rom : ORIGIN = 0x08000000, LENGTH = 32M
|
||||
iwram : ORIGIN = 0x037f8000, LENGTH = 96K
|
||||
|
||||
twl_ewram : ORIGIN = 0x02e80000, LENGTH = 512K - 64K
|
||||
twl_iwram : ORIGIN = 0x03000000, LENGTH = 256K
|
||||
}
|
||||
|
||||
__iwram_start = ORIGIN(iwram);
|
||||
__iwram_top = ORIGIN(iwram)+ LENGTH(iwram);
|
||||
|
||||
__sp_irq = __iwram_top - 0x100;
|
||||
__sp_svc = __sp_irq - 0x100;
|
||||
__sp_usr = __sp_svc - 0x100;
|
||||
|
||||
__irq_flags = 0x04000000 - 8;
|
||||
__irq_flagsaux = 0x04000000 - 0x40;
|
||||
__irq_vector = 0x04000000 - 4;
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
|
||||
.twl :
|
||||
{
|
||||
__arm7i_lma__ = LOADADDR(.twl);
|
||||
__arm7i_start__ = .;
|
||||
*(.twl)
|
||||
*.twl*(.text .stub .text.* .gnu.linkonce.t.*)
|
||||
*.twl*(.rodata)
|
||||
*.twl*(.roda)
|
||||
*.twl*(.rodata.*)
|
||||
*.twl*(.data)
|
||||
*.twl*(.data.*)
|
||||
*.twl*(.gnu.linkonce.d*)
|
||||
. = ALIGN(4);
|
||||
__arm7i_end__ = .;
|
||||
} >twl_iwram AT>twl_ewram :arm7i
|
||||
|
||||
.twl_bss ALIGN(4) (NOLOAD) :
|
||||
{
|
||||
__twl_bss_start__ = .;
|
||||
*(.twl_bss)
|
||||
*.twl.*(.dynbss)
|
||||
*.twl.*(.gnu.linkonce.b*)
|
||||
*.twl.*(.bss*)
|
||||
*.twl.*(COMMON)
|
||||
. = ALIGN(4);
|
||||
__twl_bss_end__ = .;
|
||||
} >twl_iwram :NONE
|
||||
|
||||
.crt0 :
|
||||
{
|
||||
KEEP (*(.crt0))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram :crt0
|
||||
|
||||
.text :
|
||||
{
|
||||
__arm7_lma__ = LOADADDR(.text);
|
||||
__arm7_start__ = .;
|
||||
KEEP (*(SORT_NONE(.init)))
|
||||
*(.plt)
|
||||
*(.text .stub .text.* .gnu.linkonce.t.*)
|
||||
KEEP (*(.text.*personality*))
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.glue_7t) *(.glue_7) *(.vfp11_veneer)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram AT>ewram :arm7
|
||||
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
} >iwram AT>ewram
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*all.rodata*(*)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram AT>ewram
|
||||
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >iwram AT>ewram
|
||||
|
||||
.ARM.exidx : {
|
||||
__exidx_start = .;
|
||||
*(.ARM.exidx* .gnu.linkonce.armexidx.*)
|
||||
__exidx_end = .;
|
||||
} >iwram AT>ewram
|
||||
|
||||
/* Ensure the __preinit_array_start label is properly aligned. We
|
||||
could instead move the label definition inside the section, but
|
||||
the linker would then create the section even if it turns out to
|
||||
be empty, which isn't pretty. */
|
||||
.preinit_array : {
|
||||
. = ALIGN(32 / 8);
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
KEEP (*(.preinit_array))
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
} >iwram AT>ewram
|
||||
|
||||
.init_array : {
|
||||
PROVIDE (__init_array_start = .);
|
||||
KEEP (*(.init_array))
|
||||
PROVIDE (__init_array_end = .);
|
||||
} >iwram AT>ewram
|
||||
|
||||
.fini_array : {
|
||||
PROVIDE (__fini_array_start = .);
|
||||
KEEP (*(.fini_array))
|
||||
PROVIDE (__fini_array_end = .);
|
||||
} >iwram AT>ewram
|
||||
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram AT>ewram
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram AT>ewram
|
||||
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram AT>ewram
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram AT>ewram
|
||||
.jcr : { KEEP (*(.jcr)) } >iwram AT>ewram
|
||||
.got : { *(.got.plt) *(.got) } >iwram AT>ewram
|
||||
|
||||
.data ALIGN(4) : {
|
||||
__data_start = ABSOLUTE(.);
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4);
|
||||
__data_end = ABSOLUTE(.) ;
|
||||
} >iwram AT>ewram
|
||||
|
||||
.bss ALIGN(4) (NOLOAD) :
|
||||
{
|
||||
__arm7_end__ = .;
|
||||
__bss_start = ABSOLUTE(.);
|
||||
__bss_start__ = ABSOLUTE(.);
|
||||
*(.dynbss)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(.bss*)
|
||||
*(COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__bss_end__ = ABSOLUTE(.);
|
||||
__end__ = ABSOLUTE(.);
|
||||
} >iwram
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T ds_arm7.ld%s --gc-sections
|
||||
|
||||
*startfile:
|
||||
ds_arm7_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,185 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
.section ".crt0","ax"
|
||||
.global _start
|
||||
@---------------------------------------------------------------------------------
|
||||
.align 4
|
||||
.arm
|
||||
@---------------------------------------------------------------------------------
|
||||
_start:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r0, #0x04000000 @ IME = 0;
|
||||
mov r1, #0
|
||||
str r1, [r0, #0x208]
|
||||
|
||||
mov r0, #0x12 @ Switch to IRQ Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_irq @ Set IRQ stack
|
||||
|
||||
mov r0, #0x13 @ Switch to SVC Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_svc @ Set SVC stack
|
||||
|
||||
mov r0, #0x1F @ Switch to System Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_usr @ Set user stack
|
||||
|
||||
#ifndef VRAM
|
||||
adr r1, __sync_start @ Perform ARM7<->ARM9 sync code
|
||||
ldr r2, =__arm7_start__
|
||||
mov r3, #(__sync_end-__sync_start)
|
||||
mov r8, r2
|
||||
bl CopyMem
|
||||
mov r3, r8
|
||||
bl _blx_r3_stub
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy arm7 binary from LMA to VMA (EWRAM to IWRAM)
|
||||
@---------------------------------------------------------------------------------
|
||||
adr r0, arm7lma @ Calculate ARM7 LMA
|
||||
ldr r1, [r0]
|
||||
add r1, r1, r0
|
||||
ldr r2, =__arm7_start__
|
||||
ldr r4, =__arm7_end__
|
||||
bl CopyMemCheck
|
||||
|
||||
#else
|
||||
bl __sync_start
|
||||
#endif
|
||||
|
||||
ldr r0, =__bss_start__ @ Clear BSS section to 0x00
|
||||
ldr r1, =__bss_end__
|
||||
sub r1, r1, r0
|
||||
bl ClearMem
|
||||
|
||||
cmp r10, #1
|
||||
bne NotTWL
|
||||
ldr r1, =__dsimode @ set DSi mode flag
|
||||
strb r10, [r1]
|
||||
|
||||
#ifndef VRAM
|
||||
ldr r1, =0x02ffe1d8 @ Get ARM7i LMA from header
|
||||
ldr r1, [r1]
|
||||
ldr r2, =__arm7i_start__
|
||||
ldr r4, =__arm7i_end__
|
||||
bl CopyMemCheck
|
||||
|
||||
ldr r0, =__twl_bss_start__ @ Clear TWL BSS section to 0x00
|
||||
ldr r1, =__twl_bss_end__
|
||||
sub r1, r1, r0
|
||||
bl ClearMem
|
||||
#endif
|
||||
|
||||
NotTWL:
|
||||
ldr r3, =__libc_init_array @ global constructors
|
||||
bl _blx_r3_stub
|
||||
|
||||
mov r0, #0 @ int argc
|
||||
mov r1, #0 @ char *argv[]
|
||||
ldr r3, =main
|
||||
ldr lr,=__libnds_exit
|
||||
mov r12, #0x4000000 @ tell arm9 we are ready
|
||||
mov r9, #0
|
||||
str r9, [r12, #0x180]
|
||||
_blx_r3_stub:
|
||||
bx r3
|
||||
|
||||
#ifndef VRAM
|
||||
arm7lma:
|
||||
.word __arm7_lma__ - .
|
||||
#endif
|
||||
.pool
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ ARM7<->ARM9 synchronization code
|
||||
@---------------------------------------------------------------------------------
|
||||
|
||||
__sync_start:
|
||||
push {lr}
|
||||
mov r12, #0x4000000
|
||||
mov r9, #0x0
|
||||
bl IPCSync
|
||||
mov r9, #(0x9<<8)
|
||||
str r9, [r12, #0x180]
|
||||
mov r9, #0xA
|
||||
bl IPCSync
|
||||
mov r9, #(0xB<<8)
|
||||
str r9, [r12, #0x180]
|
||||
mov r9, #0xC
|
||||
bl IPCSync
|
||||
mov r9, #(0xD<<8)
|
||||
str r9, [r12, #0x180]
|
||||
IPCRecvFlag:
|
||||
ldr r10, [r12, #0x180]
|
||||
and r10, r10, #0xF
|
||||
cmp r10, #0xC
|
||||
beq IPCRecvFlag
|
||||
pop {pc}
|
||||
IPCSync:
|
||||
ldr r10, [r12, #0x180]
|
||||
and r10, r10, #0xF
|
||||
cmp r10, r9
|
||||
bne IPCSync
|
||||
bx lr
|
||||
__sync_end:
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Clear memory to 0x00 if length != 0
|
||||
@ r0 = Start Address
|
||||
@ r1 = Length
|
||||
@---------------------------------------------------------------------------------
|
||||
ClearMem:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r2, #3 @ Round down to nearest word boundary
|
||||
add r1, r1, r2 @ Shouldn't be needed
|
||||
bics r1, r1, r2 @ Clear 2 LSB (and set Z)
|
||||
bxeq lr @ Quit if copy size is 0
|
||||
|
||||
mov r2, #0
|
||||
ClrLoop:
|
||||
stmia r0!, {r2}
|
||||
subs r1, r1, #4
|
||||
bne ClrLoop
|
||||
bx lr
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy memory if length != 0
|
||||
@ r1 = Source Address
|
||||
@ r2 = Dest Address
|
||||
@ r4 = Dest Address + Length
|
||||
@---------------------------------------------------------------------------------
|
||||
CopyMemCheck:
|
||||
@---------------------------------------------------------------------------------
|
||||
cmp r1, r2
|
||||
bxeq lr
|
||||
|
||||
sub r3, r4, r2 @ Is there any data to copy?
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy memory
|
||||
@ r1 = Source Address
|
||||
@ r2 = Dest Address
|
||||
@ r3 = Length
|
||||
@---------------------------------------------------------------------------------
|
||||
CopyMem:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r0, #3 @ These commands are used in cases where
|
||||
add r3, r3, r0 @ the length is not a multiple of 4,
|
||||
bics r3, r3, r0 @ even though it should be.
|
||||
bxeq lr @ Length is zero, so exit
|
||||
CIDLoop:
|
||||
ldmia r1!, {r0}
|
||||
stmia r2!, {r0}
|
||||
subs r3, r3, #4
|
||||
bne CIDLoop
|
||||
bx lr
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
.align
|
||||
.pool
|
||||
.end
|
||||
@---------------------------------------------------------------------------------
|
||||
@@ -1,192 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
|
||||
MEMORY {
|
||||
|
||||
rom : ORIGIN = 0x08000000, LENGTH = 32M
|
||||
iwram : ORIGIN = 0x037f8000, LENGTH = 96K
|
||||
}
|
||||
|
||||
__iwram_start = ORIGIN(iwram);
|
||||
__iwram_top = ORIGIN(iwram)+ LENGTH(iwram);
|
||||
|
||||
__sp_irq = __iwram_top - 0x100;
|
||||
__sp_svc = __sp_irq - 0x100;
|
||||
__sp_usr = __sp_svc - 0x100;
|
||||
|
||||
__irq_flags = 0x04000000 - 8;
|
||||
__irq_flagsaux = 0x04000000 - 0x40;
|
||||
__irq_vector = 0x04000000 - 4;
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
.crt0 :
|
||||
{
|
||||
__text_start = . ;
|
||||
KEEP (*(.crt0))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram = 0xff
|
||||
|
||||
.init :
|
||||
{
|
||||
KEEP (*(SORT_NONE(.init)))
|
||||
} >iwram = 0xff
|
||||
|
||||
.plt : { *(.plt) } >iwram = 0xff
|
||||
|
||||
.text : /* ALIGN (4): */
|
||||
{
|
||||
*(.text .stub .text.* .gnu.linkonce.t.*)
|
||||
KEEP (*(.text.*personality*))
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.glue_7t) *(.glue_7) *(.vfp11_veneer)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram = 0xff
|
||||
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
} >iwram =0xff
|
||||
|
||||
__text_end = . ;
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*all.rodata*(*)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram = 0xff
|
||||
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >iwram
|
||||
__exidx_start = .;
|
||||
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } >iwram
|
||||
__exidx_end = .;
|
||||
|
||||
/* Ensure the __preinit_array_start label is properly aligned. We
|
||||
could instead move the label definition inside the section, but
|
||||
the linker would then create the section even if it turns out to
|
||||
be empty, which isn't pretty. */
|
||||
. = ALIGN(32 / 8);
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
.preinit_array : { KEEP (*(.preinit_array)) } >iwram = 0xff
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { KEEP (*(.init_array)) } >iwram = 0xff
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { KEEP (*(.fini_array)) } >iwram = 0xff
|
||||
PROVIDE (__fini_array_end = .);
|
||||
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram = 0xff
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram = 0xff
|
||||
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram = 0xff
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram = 0xff
|
||||
.jcr : { KEEP (*(.jcr)) } >iwram = 0
|
||||
.got : { *(.got.plt) *(.got) } >iwram = 0
|
||||
|
||||
|
||||
.data ALIGN(4) : {
|
||||
__data_start = ABSOLUTE(.);
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4);
|
||||
__data_end = ABSOLUTE(.) ;
|
||||
} >iwram = 0xff
|
||||
|
||||
|
||||
__arm7_end__ = .;
|
||||
|
||||
|
||||
.bss ALIGN(4) :
|
||||
{
|
||||
__bss_start = ABSOLUTE(.);
|
||||
__bss_start__ = ABSOLUTE(.);
|
||||
*(.dynbss)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(.bss*)
|
||||
*(COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__bss_end__ = ABSOLUTE(.);
|
||||
__end__ = ABSOLUTE(.);
|
||||
} >iwram
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
.stack 0x80000 : { _stack = .; *(.stack) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T ds_arm7_iwram.ld%s
|
||||
|
||||
*startfile:
|
||||
ds_arm7_vram_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,196 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
|
||||
MEMORY {
|
||||
|
||||
rom : ORIGIN = 0x08000000, LENGTH = 32M
|
||||
iwram : ORIGIN = 0x037f8000, LENGTH = 96K
|
||||
vram : ORIGIN = 0x06000000, LENGTH = 256K
|
||||
}
|
||||
|
||||
__iwram_start = ORIGIN(iwram);
|
||||
__iwram_top = ORIGIN(iwram)+ LENGTH(iwram);
|
||||
|
||||
__sp_irq = __iwram_top - 0x100;
|
||||
__sp_svc = __sp_irq - 0x100;
|
||||
__sp_usr = __sp_svc - 0x100;
|
||||
|
||||
__irq_flags = 0x04000000 - 8;
|
||||
__irq_flagsaux = 0x04000000 - 0x40;
|
||||
__irq_vector = 0x04000000 - 4;
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
.crt0 :
|
||||
{
|
||||
__text_start = . ;
|
||||
KEEP (*(.crt0))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >vram = 0xff
|
||||
|
||||
__arm7_lma__ = .;
|
||||
__arm7_start__ = .;
|
||||
.init :
|
||||
{
|
||||
KEEP (*(SORT_NONE(.init)))
|
||||
} >vram = 0xff
|
||||
|
||||
.plt : { *(.plt) } >vram = 0xff
|
||||
|
||||
.text : /* ALIGN (4): */
|
||||
{
|
||||
*(.text .stub .text.* .twl .gnu.linkonce.t.*)
|
||||
KEEP (*(.text.*personality*))
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.glue_7t) *(.glue_7) *(.vfp11_veneer)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >vram = 0xff
|
||||
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
} >vram =0xff
|
||||
|
||||
__text_end = . ;
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*all.rodata*(*)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >vram = 0xff
|
||||
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >vram
|
||||
__exidx_start = .;
|
||||
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } >vram
|
||||
__exidx_end = .;
|
||||
|
||||
/* Ensure the __preinit_array_start label is properly aligned. We
|
||||
could instead move the label definition inside the section, but
|
||||
the linker would then create the section even if it turns out to
|
||||
be empty, which isn't pretty. */
|
||||
. = ALIGN(32 / 8);
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
.preinit_array : { KEEP (*(.preinit_array)) } >vram = 0xff
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { KEEP (*(.init_array)) } >vram = 0xff
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { KEEP (*(.fini_array)) } >vram = 0xff
|
||||
PROVIDE (__fini_array_end = .);
|
||||
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >vram = 0xff
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >vram = 0xff
|
||||
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >vram = 0xff
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >vram = 0xff
|
||||
.jcr : { KEEP (*(.jcr)) } >vram = 0
|
||||
.got : { *(.got.plt) *(.got) } >vram = 0
|
||||
|
||||
|
||||
.data ALIGN(4) : {
|
||||
__data_start = ABSOLUTE(.);
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4);
|
||||
__data_end = ABSOLUTE(.) ;
|
||||
} >vram = 0xff
|
||||
|
||||
|
||||
__arm7_end__ = .;
|
||||
|
||||
|
||||
.bss ALIGN(4) (NOLOAD) :
|
||||
{
|
||||
__bss_start = ABSOLUTE(.);
|
||||
__bss_start__ = ABSOLUTE(.);
|
||||
*(.dynbss)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(.bss*)
|
||||
*(.twl_bss)
|
||||
*(COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__bss_end__ = ABSOLUTE(.);
|
||||
__end__ = ABSOLUTE(.);
|
||||
} >vram
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
.stack 0x80000 : { _stack = .; *(.stack) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T ds_arm7_vram.ld%s
|
||||
|
||||
*startfile:
|
||||
ds_arm7_vram_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,284 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
|
||||
__ewram_end = ORIGIN(ewram) + LENGTH(ewram);
|
||||
__eheap_end = ORIGIN(ewram) + LENGTH(ewram);
|
||||
|
||||
__dtcm_top = ORIGIN(dtcm) + LENGTH(dtcm);
|
||||
__irq_flags = __dtcm_top - 0x08;
|
||||
__irq_vector = __dtcm_top - 0x04;
|
||||
|
||||
__sp_svc = __dtcm_top - 0x100;
|
||||
__sp_irq = __sp_svc - 0x100;
|
||||
__sp_usr = __sp_irq - 0x100;
|
||||
|
||||
PHDRS {
|
||||
main PT_LOAD FLAGS(7);
|
||||
dtcm PT_LOAD FLAGS(7);
|
||||
itcm PT_LOAD FLAGS(7);
|
||||
vectors PT_LOAD FLAGS(7);
|
||||
twl PT_LOAD FLAGS(0x100007);
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
/* Secure area crap */
|
||||
.secure : { *(.secure) } >ewram :main = 0
|
||||
|
||||
.crt0 :
|
||||
{
|
||||
__text_start = . ;
|
||||
KEEP (*(.crt0))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram :main = 0x00
|
||||
|
||||
.plt : { *(.plt) } >ewram :main = 0xff
|
||||
|
||||
.init :
|
||||
{
|
||||
KEEP (*(SORT_NONE(.init)))
|
||||
} >ewram :main
|
||||
|
||||
.text : /* ALIGN (4): */
|
||||
{
|
||||
*(EXCLUDE_FILE(*.itcm* *.vectors* *.twl*) .text)
|
||||
*(EXCLUDE_FILE(*.itcm* *.vectors* *.twl*) .stub)
|
||||
*(EXCLUDE_FILE(*.itcm* *.vectors* *.twl*) .text.*)
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(EXCLUDE_FILE(*.twl*) .gnu.warning)
|
||||
*(EXCLUDE_FILE(*.twl*) .gnu.linkonce.t*)
|
||||
*(.glue_7)
|
||||
*(.glue_7t)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram :main = 0xff
|
||||
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
} >ewram :main =0xff
|
||||
|
||||
__text_end = . ;
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(EXCLUDE_FILE(*.twl*) .rodata)
|
||||
*all.rodata*(*)
|
||||
*(EXCLUDE_FILE(*.twl*) .roda)
|
||||
*(EXCLUDE_FILE(*.twl*) .rodata.*)
|
||||
*(EXCLUDE_FILE(*.twl*) .gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram :main = 0xff
|
||||
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >ewram :main
|
||||
__exidx_start = .;
|
||||
ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } >ewram :main
|
||||
__exidx_end = .;
|
||||
|
||||
/* Ensure the __preinit_array_start label is properly aligned. We
|
||||
could instead move the label definition inside the section, but
|
||||
the linker would then create the section even if it turns out to
|
||||
be empty, which isn't pretty. */
|
||||
|
||||
. = ALIGN(32 / 8);
|
||||
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
.preinit_array : { KEEP (*(.preinit_array)) } >ewram :main = 0xff
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array :
|
||||
{
|
||||
KEEP (*(SORT(.init_array.*)))
|
||||
KEEP (*(.init_array))
|
||||
} >ewram :main = 0xff
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array :
|
||||
{
|
||||
KEEP (*(.fini_array))
|
||||
KEEP (*(SORT(.fini_array.*)))
|
||||
} >ewram :main = 0xff
|
||||
|
||||
PROVIDE (__fini_array_end = .);
|
||||
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram :main = 0xff
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram :main = 0xff
|
||||
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram :main = 0xff
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram :main = 0xff
|
||||
.jcr : { KEEP (*(.jcr)) } >ewram :main = 0
|
||||
.got : { *(.got.plt) *(.got) *(.rel.got) } >ewram :main = 0
|
||||
|
||||
.ewram ALIGN(4) :
|
||||
{
|
||||
__ewram_start = ABSOLUTE(.) ;
|
||||
*(.ewram)
|
||||
*ewram.*(.text)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram :main = 0xff
|
||||
|
||||
|
||||
.data ALIGN(4) :
|
||||
{
|
||||
__data_start = ABSOLUTE(.);
|
||||
*(EXCLUDE_FILE(*.twl*) .data)
|
||||
*(EXCLUDE_FILE(*.twl*) .data.*)
|
||||
*(EXCLUDE_FILE(*.twl*) .gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4);
|
||||
__data_end = ABSOLUTE(.) ;
|
||||
} >ewram :main = 0xff
|
||||
|
||||
__bss_vma = . ;
|
||||
|
||||
.dtcm :
|
||||
{
|
||||
__dtcm_lma = LOADADDR(.dtcm);
|
||||
__dtcm_start = ABSOLUTE(.);
|
||||
*(.dtcm)
|
||||
*(.dtcm.*)
|
||||
. = ALIGN(4);
|
||||
__dtcm_end = ABSOLUTE(.);
|
||||
} >dtcm AT>ewram :dtcm = 0xff
|
||||
|
||||
.itcm :
|
||||
{
|
||||
__itcm_lma = LOADADDR(.itcm);
|
||||
__itcm_start = ABSOLUTE(.);
|
||||
*(.itcm)
|
||||
*.itcm*(.text .stub .text.*)
|
||||
. = ALIGN(4);
|
||||
__itcm_end = ABSOLUTE(.);
|
||||
} >itcm AT>ewram :itcm = 0xff
|
||||
|
||||
.vectors :
|
||||
{
|
||||
__vectors_lma = LOADADDR(.vectors);
|
||||
__vectors_start = ABSOLUTE(.);
|
||||
KEEP(*(.vectors .vectors.*))
|
||||
. = ALIGN(4);
|
||||
__vectors_end = ABSOLUTE(.);
|
||||
} >vectors AT>ewram :vectors = 0xff
|
||||
|
||||
.sbss __dtcm_end (NOLOAD):
|
||||
{
|
||||
__sbss_start = ABSOLUTE(.);
|
||||
__sbss_start__ = ABSOLUTE(.);
|
||||
*(.sbss)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__sbss_end = ABSOLUTE(.);
|
||||
} >dtcm :NONE
|
||||
|
||||
.bss __bss_vma (NOLOAD):
|
||||
{
|
||||
__bss_start = ABSOLUTE(.);
|
||||
__bss_start__ = ABSOLUTE(.);
|
||||
*(EXCLUDE_FILE(*.twl*) .dynbss)
|
||||
*(EXCLUDE_FILE(*.twl*) .gnu.linkonce.b*)
|
||||
*(EXCLUDE_FILE(*.twl*) .bss*)
|
||||
*(EXCLUDE_FILE(*.twl*) COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__bss_end__ = ABSOLUTE(.) ;
|
||||
__end__ = ABSOLUTE(.) ;
|
||||
} >ewram :NONE
|
||||
|
||||
.twl __end__ : AT(MAX(0x2400000,MAX(__end__,LOADADDR(.vectors)+SIZEOF(.vectors))))
|
||||
{
|
||||
__arm9i_lma__ = LOADADDR(.twl);
|
||||
__arm9i_start__ = ABSOLUTE(.);
|
||||
*(.twl)
|
||||
*.twl*(.text .stub .text.* .gnu.linkonce.t.*)
|
||||
*.twl*(.rodata)
|
||||
*.twl*(.roda)
|
||||
*.twl*(.rodata.*)
|
||||
*.twl*(.data)
|
||||
*.twl*(.data.*)
|
||||
*.twl*(.gnu.linkonce.d*)
|
||||
__arm9i_end__ = ABSOLUTE(.);
|
||||
} :twl
|
||||
|
||||
.twl_bss __arm9i_end__ (NOLOAD):
|
||||
{
|
||||
__twl_bss_start__ = ABSOLUTE(.);
|
||||
*(.twl_bss)
|
||||
*.twl*(.dynbss)
|
||||
*.twl*(.gnu.linkonce.b*)
|
||||
*.twl*(.bss*)
|
||||
*.twl*(COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__twl_bss_end__ = ABSOLUTE(.);
|
||||
__twl_end__ = ABSOLUTE(.);
|
||||
} :NONE
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
.stack 0x80000 : { _stack = .; *(.stack) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
MEMORY {
|
||||
ewram : ORIGIN = 0x02000000, LENGTH = 4M - 512k
|
||||
dtcm : ORIGIN = 0x0b000000, LENGTH = 16K
|
||||
vectors : ORIGIN = 0x01000000, LENGTH = 256
|
||||
itcm : ORIGIN = 0x01000100, LENGTH = 32K - 256
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T ds_arm9.mem%s -T ds_arm9.ld%s --gc-sections
|
||||
|
||||
*startfile:
|
||||
ds_arm9_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,272 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ DS processor selection
|
||||
@---------------------------------------------------------------------------------
|
||||
.arch armv5te
|
||||
.cpu arm946e-s
|
||||
@---------------------------------------------------------------------------------
|
||||
|
||||
.equ _libnds_argv,0x02FFFE70
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
.section ".crt0","ax"
|
||||
.global _start
|
||||
@---------------------------------------------------------------------------------
|
||||
.align 4
|
||||
.arm
|
||||
@---------------------------------------------------------------------------------
|
||||
_start:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r0, #0x04000000 @ IME = 0;
|
||||
str r0, [r0, #0x208]
|
||||
|
||||
@ set sensible stacks to allow bios call
|
||||
|
||||
mov r0, #0x13 @ Switch to SVC Mode
|
||||
msr cpsr, r0
|
||||
mov r1,#0x03000000
|
||||
sub r1,r1,#0x1000
|
||||
mov sp,r1
|
||||
mov r0, #0x1F @ Switch to System Mode
|
||||
msr cpsr, r0
|
||||
sub r1,r1,#0x100
|
||||
mov sp,r1
|
||||
|
||||
ldr r3, =__libnds_mpu_setup
|
||||
blx r3
|
||||
|
||||
mov r0, #0x12 @ Switch to IRQ Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_irq @ Set IRQ stack
|
||||
|
||||
mov r0, #0x13 @ Switch to SVC Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_svc @ Set SVC stack
|
||||
|
||||
mov r0, #0x1F @ Switch to System Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_usr @ Set user stack
|
||||
|
||||
mov r12, #0x4000000 @ Read system ROM status (NTR/TWL)
|
||||
ldrb r11, [r12,r12,lsr #12]
|
||||
and r11, r11, #0x3
|
||||
|
||||
mov r9, #(0x0<<8) @ Synchronize with ARM7
|
||||
str r9, [r12, #0x180]
|
||||
mov r9, #0x9
|
||||
bl IPCSync
|
||||
mov r9, #(0xA<<8)
|
||||
str r9, [r12, #0x180]
|
||||
mov r9, #0xB
|
||||
bl IPCSync
|
||||
mov r9, #(0xC<<8)
|
||||
str r9, [r12, #0x180]
|
||||
mov r9, #0xD
|
||||
bl IPCSync
|
||||
mov r9, r11, lsl #8
|
||||
str r9, [r12, #0x180]
|
||||
mov r9, #0
|
||||
bl IPCSync
|
||||
str r9, [r12, #0x180]
|
||||
|
||||
ldr r1, =__itcm_lma @ Copy instruction tightly coupled memory (itcm section) from LMA to VMA
|
||||
ldr r2, =__itcm_start
|
||||
ldr r4, =__itcm_end
|
||||
bl CopyMemCheck
|
||||
|
||||
ldr r1, =__vectors_lma @ Copy reserved vectors area (itcm section) from LMA to VMA
|
||||
ldr r2, =__vectors_start
|
||||
ldr r4, =__vectors_end
|
||||
bl CopyMemCheck
|
||||
|
||||
ldr r1, =__dtcm_lma @ Copy data tightly coupled memory (dtcm section) from LMA to VMA
|
||||
ldr r2, =__dtcm_start
|
||||
ldr r4, =__dtcm_end
|
||||
bl CopyMemCheck
|
||||
|
||||
cmp r11, #1
|
||||
ldrne r10, =__end__ @ (DS mode) heap start
|
||||
ldreq r10, =__twl_end__ @ (DSi mode) heap start
|
||||
bl checkARGV @ check and process argv trickery
|
||||
|
||||
ldr r0, =__bss_start__ @ Clear BSS section
|
||||
ldr r1, =__bss_end__
|
||||
sub r1, r1, r0
|
||||
bl ClearMem
|
||||
|
||||
ldr r0, =__sbss_start @ Clear SBSS section
|
||||
ldr r1, =__sbss_end
|
||||
sub r1, r1, r0
|
||||
bl ClearMem
|
||||
|
||||
cmp r11, #1
|
||||
bne NotTWL
|
||||
ldr r9, =__dsimode @ set DSi mode flag
|
||||
strb r11, [r9]
|
||||
|
||||
@ Copy TWL area (arm9i section) from LMA to VMA
|
||||
ldr r1, =0x02ffe1c8 @ Get ARM9i LMA from header
|
||||
ldr r1, [r1]
|
||||
|
||||
ldr r2, =__arm9i_start__
|
||||
cmp r1, r2 @ skip copy if LMA=VMA
|
||||
ldrne r4, =__arm9i_end__
|
||||
blne CopyMemCheck
|
||||
|
||||
ldr r0, =__twl_bss_start__ @ Clear TWL BSS section
|
||||
ldr r1, =__twl_bss_end__
|
||||
sub r1, r1, r0
|
||||
bl ClearMem
|
||||
|
||||
NotTWL:
|
||||
ldr r0, =_libnds_argv
|
||||
|
||||
@ reset heap base
|
||||
ldr r2, [r0,#20] @ newheap base
|
||||
cmp r2, #0
|
||||
moveq r2, r10
|
||||
ldr r1, =fake_heap_start @ set heap start
|
||||
str r2, [r1]
|
||||
|
||||
ldr r1, =fake_heap_end @ set heap end
|
||||
sub r8, r8,#0xc000
|
||||
str r8, [r1]
|
||||
|
||||
push {r0}
|
||||
ldr r0, =__secure_area__
|
||||
ldr r3, =initSystem
|
||||
blx r3 @ system initialisation
|
||||
|
||||
ldr r3, =__libc_init_array @ global constructors
|
||||
blx r3
|
||||
|
||||
pop {r0}
|
||||
|
||||
ldr r1, [r0,#16] @ argv
|
||||
ldr r0, [r0,#12] @ argc
|
||||
|
||||
ldr r3, =main
|
||||
ldr lr, =__libnds_exit
|
||||
bx r3 @ jump to user code
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ check for a commandline
|
||||
@---------------------------------------------------------------------------------
|
||||
checkARGV:
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r0, =_libnds_argv @ argv structure
|
||||
mov r1, #0
|
||||
str r1, [r0,#12] @ clear argc
|
||||
str r1, [r0,#16] @ clear argv
|
||||
|
||||
ldr r3, [r0] @ argv magic number
|
||||
ldr r2, =0x5f617267 @ '_arg'
|
||||
cmp r3, r2
|
||||
strne r1, [r0,#20]
|
||||
bxne lr @ bail out if no magic
|
||||
|
||||
ldr r1, [r0, #4] @ command line address
|
||||
ldr r2, [r0, #8] @ length of command line
|
||||
|
||||
@ copy to heap
|
||||
mov r3, r10 @ initial heap base
|
||||
str r3, [r0, #4] @ set command line address
|
||||
|
||||
cmp r2, #0
|
||||
subnes r4, r3, r1 @ dst-src
|
||||
bxeq lr @ dst == src || len==0 : nothing to do.
|
||||
|
||||
cmphi r2, r4 @ len > (dst-src)
|
||||
bhi .copybackward
|
||||
|
||||
.copyforward:
|
||||
ldrb r4, [r1], #1
|
||||
strb r4, [r3], #1
|
||||
subs r2, r2, #1
|
||||
bne .copyforward
|
||||
b .copydone
|
||||
|
||||
.copybackward:
|
||||
subs r2, r2, #1
|
||||
ldrb r4, [r1, r2]
|
||||
strb r4, [r3, r2]
|
||||
bne .copybackward
|
||||
|
||||
.copydone:
|
||||
push {lr}
|
||||
ldr r3, =build_argv
|
||||
blx r3
|
||||
pop {lr}
|
||||
bx lr
|
||||
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Clear memory to 0x00 if length != 0
|
||||
@ r0 = Start Address
|
||||
@ r1 = Length
|
||||
@---------------------------------------------------------------------------------
|
||||
ClearMem:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r2, #3 @ Round down to nearest word boundary
|
||||
add r1, r1, r2 @ Shouldn't be needed
|
||||
bics r1, r1, r2 @ Clear 2 LSB (and set Z)
|
||||
bxeq lr @ Quit if copy size is 0
|
||||
|
||||
mov r2, #0
|
||||
ClrLoop:
|
||||
stmia r0!, {r2}
|
||||
subs r1, r1, #4
|
||||
bne ClrLoop
|
||||
|
||||
bx lr
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy memory if length != 0
|
||||
@ r1 = Source Address
|
||||
@ r2 = Dest Address
|
||||
@ r4 = Dest Address + Length
|
||||
@---------------------------------------------------------------------------------
|
||||
CopyMemCheck:
|
||||
@---------------------------------------------------------------------------------
|
||||
sub r3, r4, r2 @ Is there any data to copy?
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy memory
|
||||
@ r1 = Source Address
|
||||
@ r2 = Dest Address
|
||||
@ r3 = Length
|
||||
@---------------------------------------------------------------------------------
|
||||
CopyMem:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r0, #3 @ These commands are used in cases where
|
||||
add r3, r3, r0 @ the length is not a multiple of 4,
|
||||
bics r3, r3, r0 @ even though it should be.
|
||||
bxeq lr @ Length is zero, so exit
|
||||
CIDLoop:
|
||||
ldmia r1!, {r0}
|
||||
stmia r2!, {r0}
|
||||
subs r3, r3, #4
|
||||
bne CIDLoop
|
||||
|
||||
bx lr
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Synchronize with ARM7
|
||||
@---------------------------------------------------------------------------------
|
||||
IPCSync:
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r10, [r12, #0x180]
|
||||
and r10, r10, #0xF
|
||||
cmp r10, r9
|
||||
bne IPCSync
|
||||
bx lr
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
.align
|
||||
.pool
|
||||
.end
|
||||
@---------------------------------------------------------------------------------
|
||||
@@ -1,229 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
|
||||
MEMORY {
|
||||
|
||||
rom : ORIGIN = 0x08000000, LENGTH = 32M
|
||||
iwram : ORIGIN = 0x03800000, LENGTH = 64K
|
||||
ewram : ORIGIN = 0x02000000, LENGTH = 4M
|
||||
}
|
||||
|
||||
__ewram_start = ORIGIN(ewram);
|
||||
__eheap_end = ORIGIN(ewram)+ LENGTH(ewram);
|
||||
__iwram_start = ORIGIN(iwram);
|
||||
__iwram_top = ORIGIN(iwram)+ LENGTH(iwram);
|
||||
__sp_irq = __iwram_top - 0x60;
|
||||
__sp_svc = __sp_irq - 0x100;
|
||||
__sp_usr = __sp_svc - 0x100;
|
||||
|
||||
__irq_flags = __iwram_top - 8;
|
||||
__irq_vector = __iwram_top - 4;
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
.crt0 :
|
||||
{
|
||||
__text_start = . ;
|
||||
KEEP (*(.crt0))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0xff
|
||||
|
||||
.init :
|
||||
{
|
||||
KEEP (*(SORT_NONE(.init)))
|
||||
} >rom = 0xff
|
||||
|
||||
.plt : { *(.plt) } >rom = 0xff
|
||||
|
||||
.init :
|
||||
{
|
||||
KEEP (*(SORT_NONE(.init)))
|
||||
} >ewram
|
||||
|
||||
.text : /* ALIGN (4): */
|
||||
{
|
||||
*(EXCLUDE_FILE (*.iwram*) .text)
|
||||
*(.text .stub .text.* .gnu.linkonce.t.*)
|
||||
KEEP (*(.text.*personality*))
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.glue_7t) *(.glue_7) *(.vfp11_veneer)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0xff
|
||||
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
} >rom =0xff
|
||||
|
||||
__text_end = . ;
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*all.rodata*(*)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0xff
|
||||
|
||||
/* Ensure the __preinit_array_start label is properly aligned. We
|
||||
could instead move the label definition inside the section, but
|
||||
the linker would then create the section even if it turns out to
|
||||
be empty, which isn't pretty. */
|
||||
. = ALIGN(32 / 8);
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
.preinit_array : { KEEP (*(.preinit_array)) } >rom = 0xff
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { KEEP (*(.init_array)) } >rom = 0xff
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { KEEP (*(.fini_array)) } >rom = 0xff
|
||||
PROVIDE (__fini_array_end = .);
|
||||
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0xff
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0xff
|
||||
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0xff
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0xff
|
||||
.jcr : { KEEP (*(.jcr)) } >rom = 0
|
||||
.got : { *(.got.plt) *(.got) } >rom = 0
|
||||
|
||||
__ewram_lma = . ;
|
||||
|
||||
.ewram __ewram_start : AT (__ewram_lma)
|
||||
{
|
||||
__ewram_start = ABSOLUTE(.) ;
|
||||
*(.ewram)
|
||||
*ewram.*(.text)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram = 0xff
|
||||
|
||||
.sbss ALIGN(4):
|
||||
{
|
||||
__sbss_start = ABSOLUTE(.);
|
||||
*(.sbss)
|
||||
. = ALIGN(4);
|
||||
} >ewram
|
||||
__sbss_end = . ;
|
||||
|
||||
_end = . ;
|
||||
__end__ = . ;
|
||||
PROVIDE (end = _end);
|
||||
|
||||
__iwram_lma = __ewram_lma + SIZEOF(.ewram) + SIZEOF(.sbss);
|
||||
|
||||
.iwram __iwram_start : AT (__iwram_lma)
|
||||
{
|
||||
__iwram_start = ABSOLUTE(.) ;
|
||||
*(.iwram)
|
||||
*iwram.*(.text)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >iwram = 0xff
|
||||
|
||||
__iwram_end = . ;
|
||||
__data_lma = __iwram_lma + SIZEOF(.iwram) ;
|
||||
|
||||
|
||||
.data ALIGN(4) : AT (__data_lma)
|
||||
{
|
||||
__data_start = ABSOLUTE(.);
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4);
|
||||
} >iwram = 0xff
|
||||
|
||||
__data_end = . ;
|
||||
__appended_data = __data_lma + SIZEOF(.data) ;
|
||||
|
||||
|
||||
.bss ALIGN(4) :
|
||||
{
|
||||
__bss_start = ABSOLUTE(.);
|
||||
__bss_start__ = ABSOLUTE(.);
|
||||
*(.dynbss)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(.bss*)
|
||||
*(COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__bss_end__ = ABSOLUTE(.);
|
||||
__end__ = ABSOLUTE(.);
|
||||
} >iwram
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
.stack 0x80000 : { _stack = .; *(.stack) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T ds_cart.ld%s --gc-sections
|
||||
|
||||
*startfile:
|
||||
ds_cart_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,166 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
.section ".crt0","ax"
|
||||
.global _start
|
||||
.arm
|
||||
@---------------------------------------------------------------------------------
|
||||
_start:
|
||||
@---------------------------------------------------------------------------------
|
||||
b rom_header_end
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
.fill 156,1,0 @ Nintendo Logo Character Data (8000004h)
|
||||
.fill 16,1,0 @ Game Title
|
||||
.byte 0x30,0x31 @ Maker Code (80000B0h)
|
||||
.byte 0x96 @ Fixed Value (80000B2h)
|
||||
.byte 0x00 @ Main Unit Code (80000B3h)
|
||||
.byte 0x00 @ Device Type (80000B4h)
|
||||
.fill 7,1,0 @ unused
|
||||
.byte 0x00 @ Software Version No (80000BCh)
|
||||
.byte 0xf0 @ Complement Check (80000BDh)
|
||||
.byte 0x00,0x00 @ Checksum (80000BEh)
|
||||
|
||||
rom_header_end:
|
||||
b start_vector @ This branch must be here for proper
|
||||
@ positioning of the following header.
|
||||
|
||||
.GLOBAL __boot_method, __slave_number
|
||||
__boot_method:
|
||||
.byte 0 @ boot method (0=ROM boot, 3=Multiplay boot)
|
||||
__slave_number:
|
||||
.byte 0 @ slave # (1=slave#1, 2=slave#2, 3=slave#3)
|
||||
|
||||
.byte 0 @ reserved
|
||||
.byte 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
@---------------------------------------------------------------------------------
|
||||
.align 4
|
||||
.arm
|
||||
@---------------------------------------------------------------------------------
|
||||
start_vector:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r0, #0x04000000 @ IME = 0;
|
||||
str r0, [r0, #0x208]
|
||||
|
||||
mov r0, #0x12 @ Switch to IRQ Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_irq @ Set IRQ stack
|
||||
|
||||
mov r0, #0x13 @ Switch to SVC Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_svc @ Set SVC stack
|
||||
|
||||
|
||||
mov r0, #0x1F @ Switch to System Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_usr @ Set user stack
|
||||
|
||||
mov r1, #0x42
|
||||
strb r1, [r7], #1
|
||||
mov r1, #0x35
|
||||
strb r1, [r7], #1
|
||||
mov r1, #0x2B
|
||||
strb r1, [r7], #1
|
||||
mov r1, #0x2B
|
||||
strb r1, [r7], #1
|
||||
|
||||
ldr r1, =__data_lma @ Copy initialized data (data section) from LMA to VMA (ROM to RAM)
|
||||
ldr r2, =__data_start
|
||||
ldr r4, =__data_end
|
||||
bl CopyMemChk
|
||||
|
||||
ldr r1, =__iwram_lma @ Copy internal work ram (iwram section) from LMA to VMA (ROM to RAM)
|
||||
ldr r2, =__iwram_start
|
||||
ldr r4, =__iwram_end
|
||||
bl CopyMemChk
|
||||
|
||||
ldr r0, =__bss_start @ Clear BSS section to 0x00
|
||||
ldr r1, =__bss_end
|
||||
sub r1, r1, r0
|
||||
bl ClearMem
|
||||
|
||||
ldr r0, =__sbss_start @ Clear SBSS section to 0x00
|
||||
ldr r1, =__sbss_end
|
||||
sub r1, r1, r0
|
||||
bl ClearMem
|
||||
|
||||
ldr r1, =fake_heap_end @ set heap end
|
||||
ldr r0, =__eheap_end
|
||||
str r0, [r1]
|
||||
|
||||
ldr r3, =__libc_init_array @ global constructors
|
||||
bl _call_via_r3
|
||||
|
||||
mov r0, #0 @ int argc
|
||||
mov r1, #0 @ char *argv[]
|
||||
ldr r3, =main
|
||||
bl _call_via_r3 @ jump to user code
|
||||
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Clear memory to 0x00 if length != 0
|
||||
@ r0 = Start Address
|
||||
@ r1 = Length
|
||||
@---------------------------------------------------------------------------------
|
||||
ClearMem:
|
||||
mov r2, #3 @ Round down to nearest word boundary
|
||||
add r1, r1, r2 @ Shouldn't be needed
|
||||
bics r1, r1, r2 @ Clear 2 LSB (and set Z)
|
||||
bxeq lr @ Quit if copy size is 0
|
||||
|
||||
mov r2, #0
|
||||
@---------------------------------------------------------------------------------
|
||||
ClrLoop:
|
||||
@---------------------------------------------------------------------------------
|
||||
stmia r0!, {r2}
|
||||
subs r1, r1, #4
|
||||
bne ClrLoop
|
||||
bx lr
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy memory if length != 0
|
||||
@ r1 = Source Address
|
||||
@ r2 = Dest Address
|
||||
@ r4 = Dest Address + Length
|
||||
@---------------------------------------------------------------------------------
|
||||
CopyMemChk:
|
||||
@---------------------------------------------------------------------------------
|
||||
sub r3, r4, r2 @ Is there any data to copy?
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy memory
|
||||
@ r1 = Source Address
|
||||
@ r2 = Dest Address
|
||||
@ r3 = Length
|
||||
@---------------------------------------------------------------------------------
|
||||
CopyMem:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r0, #3 @ These commands are used in cases where
|
||||
add r3, r3, r0 @ the length is not a multiple of 4,
|
||||
bics r3, r3, r0 @ even though it should be.
|
||||
bxeq lr @ Length is zero so exit
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
CIDLoop:
|
||||
@---------------------------------------------------------------------------------
|
||||
ldmia r1!, {r0}
|
||||
stmia r2!, {r0}
|
||||
subs r3, r3, #4
|
||||
bne CIDLoop
|
||||
bx lr
|
||||
@---------------------------------------------------------------------------------
|
||||
.align
|
||||
.pool
|
||||
@---------------------------------------------------------------------------------
|
||||
.end
|
||||
@---------------------------------------------------------------------------------
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
MEMORY {
|
||||
ewram : ORIGIN = 0x02000000, LENGTH = 15M - 512k
|
||||
dtcm : ORIGIN = 0x0b000000, LENGTH = 16K
|
||||
vectors : ORIGIN = 0x01000000, LENGTH = 256
|
||||
itcm : ORIGIN = 0x01000100, LENGTH = 32K - 256
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T dsi_arm9.mem%s -T ds_arm9.ld%s --gc-sections
|
||||
|
||||
*startfile:
|
||||
ds_arm9_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
@---------------------------------------------------------------------------------
|
||||
@ nintendo e-reader startup code
|
||||
@---------------------------------------------------------------------------------
|
||||
@ author : tim schuerewegen
|
||||
@ version : 1.0
|
||||
@---------------------------------------------------------------------------------
|
||||
@ This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
@ v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
@ obtain one at https://mozilla.org/MPL/2.0/.
|
||||
@---------------------------------------------------------------------------------
|
||||
.section ".crt0","ax"
|
||||
.global _start
|
||||
.align
|
||||
.arm
|
||||
@---------------------------------------------------------------------------------
|
||||
_start:
|
||||
@---------------------------------------------------------------------------------
|
||||
b start_vector
|
||||
.long 0
|
||||
.long 0x02000000
|
||||
|
||||
start_vector:
|
||||
@ enter thumb mode
|
||||
adr r0, _start_thumb + 1
|
||||
bx r0
|
||||
|
||||
.thumb
|
||||
|
||||
_start_thumb:
|
||||
|
||||
@ save return address (rom)
|
||||
mov r3, lr
|
||||
|
||||
@ clear bss section
|
||||
ldr r0, =__bss_start
|
||||
ldr r1, =__bss_end
|
||||
mov r2, #0
|
||||
_loop_bss_clear:
|
||||
strb r2, [r0]
|
||||
add r0, #1
|
||||
cmp r0, r1
|
||||
blt _loop_bss_clear
|
||||
|
||||
@ set return address (rom)
|
||||
mov lr, r3
|
||||
|
||||
@ jump to main
|
||||
ldr r3, =main
|
||||
bx r3
|
||||
|
||||
.align
|
||||
|
||||
.pool
|
||||
|
||||
.end
|
||||
|
||||
.align
|
||||
.pool
|
||||
.end
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T gba_cart.ld%s --gc-sections
|
||||
|
||||
*startfile:
|
||||
gba_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,318 +0,0 @@
|
||||
/* Linker Script Original v1.3 by Jeff Frohwein */
|
||||
/* v1.0 - Original release */
|
||||
/* v1.1 - Added proper .data section support */
|
||||
/* v1.2 - Added support for c++ & iwram overlays */
|
||||
/* - Major contributions by Jason Wilkins. */
|
||||
/* v1.3 - .ewram section now can be used when */
|
||||
/* compiling for MULTIBOOT mode. This fixes */
|
||||
/* malloc() in DevKitAdvance which depends */
|
||||
/* on __eheap_start instead of end to define*/
|
||||
/* the starting location of heap space. */
|
||||
/* External global variable __gba_iwram_heap*/
|
||||
/* support added to allow labels end, _end, */
|
||||
/* & __end__ to point to end of iwram or */
|
||||
/* the end of ewram. */
|
||||
/* Additions by WinterMute */
|
||||
/* v1.4 - .sbss section added for unitialised */
|
||||
/* data in ewram */
|
||||
/* v1.5 - padding section added to stop EZF */
|
||||
/* stripping important data */
|
||||
|
||||
/* This file is released into the public domain */
|
||||
/* for commercial or non-commercial use with no */
|
||||
/* restrictions placed upon it. */
|
||||
|
||||
/* NOTE!!!: This linker script defines the RAM & */
|
||||
/* ROM start addresses. In order for it to work */
|
||||
/* properly, remove -Ttext and -Tbss linker */
|
||||
/* options from your makefile if they are */
|
||||
/* present. */
|
||||
|
||||
/* You can use the following to view section */
|
||||
/* addresses in your .elf file: */
|
||||
/* objdump -h file.elf */
|
||||
/* Please note that empty sections may incorrectly*/
|
||||
/* list the lma address as the vma address for */
|
||||
/* some versions of objdump. */
|
||||
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
/* SEARCH_DIR(/bin/arm); */
|
||||
|
||||
/* The linker script function "var1 += var2;" sometimes */
|
||||
/* reports incorrect values in the *.map file but the */
|
||||
/* actual value it calculates is usually, if not always, */
|
||||
/* correct. If you leave out the ". = ALIGN(4);" at the */
|
||||
/* end of each section then the return value of SIZEOF() */
|
||||
/* is sometimes incorrect and "var1 += var2;" appears to */
|
||||
/* not work as well. "var1 += var2" style functions are */
|
||||
/* avoided below as a result. */
|
||||
|
||||
MEMORY {
|
||||
|
||||
rom : ORIGIN = 0x08000000, LENGTH = 32M
|
||||
iwram : ORIGIN = 0x03000000, LENGTH = 32K
|
||||
ewram : ORIGIN = 0x02000000, LENGTH = 256K
|
||||
}
|
||||
|
||||
__text_start = ORIGIN(rom);
|
||||
__eheap_end = ORIGIN(ewram) + LENGTH(ewram);
|
||||
__iwram_start = ORIGIN(iwram);
|
||||
__iwram_top = ORIGIN(iwram) + LENGTH(iwram);;
|
||||
__sp_irq = __iwram_top - 0x060;
|
||||
__sp_usr = __sp_irq - 0x0a0;
|
||||
__irq_flags = 0x03007ff8;
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
. = __text_start;
|
||||
.crt0 :
|
||||
{
|
||||
KEEP (*(.crt0))
|
||||
. = ALIGN(4);
|
||||
} >rom =0xff
|
||||
|
||||
|
||||
.init :
|
||||
{
|
||||
KEEP (*(SORT_NONE(.init)))
|
||||
} >rom
|
||||
|
||||
.plt :
|
||||
{
|
||||
*(.plt)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom
|
||||
|
||||
.text : /* ALIGN (4): */
|
||||
{
|
||||
*(EXCLUDE_FILE (*.iwram*) .text)
|
||||
*(.text .stub .text.* .gnu.linkonce.t.*)
|
||||
KEEP (*(.text.*personality*))
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.glue_7t) *(.glue_7) *(.vfp11_veneer)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0xff
|
||||
|
||||
__text_end = .;
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom =0
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*all.rodata*(*)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0xff
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >rom
|
||||
__exidx_start = .;
|
||||
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } >rom
|
||||
__exidx_end = .;
|
||||
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0
|
||||
|
||||
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >rom = 0
|
||||
|
||||
__iwram_lma = .;
|
||||
|
||||
.iwram __iwram_start : AT (__iwram_lma)
|
||||
{
|
||||
__iwram_start__ = ABSOLUTE(.) ;
|
||||
*(.iwram)
|
||||
*iwram.*(.text)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__iwram_end__ = ABSOLUTE(.) ;
|
||||
} >iwram = 0xff
|
||||
|
||||
__data_lma = __iwram_lma + SIZEOF(.iwram) ;
|
||||
|
||||
.bss ALIGN(4) (NOLOAD) :
|
||||
{
|
||||
__bss_start = ABSOLUTE(.);
|
||||
__bss_start__ = ABSOLUTE(.);
|
||||
*(.dynbss)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(.bss*)
|
||||
*(COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__bss_end__ = ABSOLUTE(.);
|
||||
|
||||
} AT>iwram
|
||||
|
||||
.data ALIGN(4) : AT (__data_lma)
|
||||
{
|
||||
__data_start__ = ABSOLUTE(.);
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4);
|
||||
} >iwram = 0xff
|
||||
|
||||
__preinit_lma = __data_lma + SIZEOF(.data);
|
||||
|
||||
.preinit_array ALIGN(4) : AT (__preinit_lma)
|
||||
{
|
||||
__preinit_array_start = ABSOLUTE(.);
|
||||
KEEP (*(.preinit_array))
|
||||
__preinit_array_end = ABSOLUTE(.);
|
||||
} >iwram
|
||||
|
||||
__init_lma = __preinit_lma + SIZEOF(.preinit_array);
|
||||
|
||||
.init_array ALIGN(4) : AT (__init_lma)
|
||||
{
|
||||
__init_array_start = ABSOLUTE(.);
|
||||
KEEP (*(SORT(.init_array.*)))
|
||||
KEEP (*(.init_array))
|
||||
__init_array_end = ABSOLUTE(.);
|
||||
} >iwram
|
||||
|
||||
__fini_lma = __init_lma + SIZEOF(.init_array);
|
||||
|
||||
.fini_array ALIGN(4) : AT (__fini_lma)
|
||||
{
|
||||
__fini_array_start = ABSOLUTE(.);
|
||||
KEEP (*(SORT(.fini_array.*)))
|
||||
KEEP (*(.fini_array))
|
||||
__fini_array_end = ABSOLUTE(.);
|
||||
} >iwram
|
||||
|
||||
__jcr_lma = __fini_lma + SIZEOF(.fini_array);
|
||||
.jcr ALIGN(4) : AT (__jcr_lma) { KEEP (*(.jcr)) } >iwram
|
||||
|
||||
__data_end__ = ABSOLUTE(.);
|
||||
__iwram_overlay_lma = __jcr_lma + SIZEOF(.jcr);
|
||||
|
||||
__iwram_overlay_start = . ;
|
||||
|
||||
OVERLAY ALIGN(4) : NOCROSSREFS AT (__iwram_overlay_lma)
|
||||
{
|
||||
.iwram0 { *(.iwram0) . = ALIGN(4);}
|
||||
.iwram1 { *(.iwram1) . = ALIGN(4);}
|
||||
.iwram2 { *(.iwram2) . = ALIGN(4);}
|
||||
.iwram3 { *(.iwram3) . = ALIGN(4);}
|
||||
.iwram4 { *(.iwram4) . = ALIGN(4);}
|
||||
.iwram5 { *(.iwram5) . = ALIGN(4);}
|
||||
.iwram6 { *(.iwram6) . = ALIGN(4);}
|
||||
.iwram7 { *(.iwram7) . = ALIGN(4);}
|
||||
.iwram8 { *(.iwram8) . = ALIGN(4);}
|
||||
.iwram9 { *(.iwram9) . = ALIGN(4);}
|
||||
}>iwram = 0xff
|
||||
|
||||
__iwram_overlay_end = . ;
|
||||
__ewram_lma = __iwram_overlay_lma + (__iwram_overlay_end - __iwram_overlay_start) ;
|
||||
|
||||
__iheap_start = . ;
|
||||
|
||||
__ewram_start = ORIGIN(ewram);
|
||||
.ewram __ewram_start : AT (__ewram_lma)
|
||||
{
|
||||
*(.ewram)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__ewram_end = ABSOLUTE(.);
|
||||
}>ewram = 0xff
|
||||
|
||||
__pad_lma = __ewram_lma + SIZEOF(.ewram);
|
||||
|
||||
.sbss ALIGN(4)(NOLOAD):
|
||||
{
|
||||
__sbss_start__ = ABSOLUTE(.);
|
||||
*(.sbss)
|
||||
. = ALIGN(4);
|
||||
__sbss_end__ = ABSOLUTE(.);
|
||||
__end__ = ABSOLUTE(.);
|
||||
__eheap_start = ABSOLUTE(.);
|
||||
} AT>ewram
|
||||
|
||||
/* EZF Advance strips trailing 0xff bytes, add a pad section so nothing important is removed */
|
||||
.pad ALIGN(4) : AT (__pad_lma)
|
||||
{
|
||||
LONG(0x52416b64)
|
||||
LONG(0x4d)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} = 0xff
|
||||
__rom_end__ = __pad_lma + SIZEOF(.pad);
|
||||
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
.stack 0x80000 : { _stack = .; *(.stack) }
|
||||
/* These must appear regardless of . */
|
||||
.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }
|
||||
.ARM.attributes 0 : { KEEP (*(.ARM.attributes)) }
|
||||
/DISCARD/ : { *(.note.GNU-stack) }
|
||||
}
|
||||
@@ -1,255 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
|
||||
.section ".crt0","ax"
|
||||
.global _start
|
||||
.align
|
||||
|
||||
.arm
|
||||
.cpu arm7tdmi
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
_start:
|
||||
@---------------------------------------------------------------------------------
|
||||
b rom_header_end
|
||||
|
||||
.fill 156,1,0 @ Nintendo Logo Character Data (8000004h)
|
||||
.fill 16,1,0 @ Game Title
|
||||
.byte 0x30,0x31 @ Maker Code (80000B0h)
|
||||
.byte 0x96 @ Fixed Value (80000B2h)
|
||||
.byte 0x00 @ Main Unit Code (80000B3h)
|
||||
.byte 0x00 @ Device Type (80000B4h)
|
||||
.fill 7,1,0 @ unused
|
||||
.byte 0x00 @ Software Version No (80000BCh)
|
||||
.byte 0xf0 @ Complement Check (80000BDh)
|
||||
.byte 0x00,0x00 @ Checksum (80000BEh)
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
rom_header_end:
|
||||
@---------------------------------------------------------------------------------
|
||||
b start_vector @ This branch must be here for proper
|
||||
@ positioning of the following header.
|
||||
|
||||
.GLOBAL __boot_method, __slave_number
|
||||
@---------------------------------------------------------------------------------
|
||||
__boot_method:
|
||||
@---------------------------------------------------------------------------------
|
||||
.byte 0 @ boot method (0=ROM boot, 3=Multiplay boot)
|
||||
@---------------------------------------------------------------------------------
|
||||
__slave_number:
|
||||
@---------------------------------------------------------------------------------
|
||||
.byte 0 @ slave # (1=slave#1, 2=slave#2, 3=slave#3)
|
||||
|
||||
.byte 0 @ reserved
|
||||
.byte 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
.word 0 @ reserved
|
||||
|
||||
.global start_vector
|
||||
.align
|
||||
@---------------------------------------------------------------------------------
|
||||
start_vector:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r0, #0x4000000 @ REG_BASE
|
||||
str r0, [r0, #0x208]
|
||||
|
||||
mov r0, #0x12 @ Switch to IRQ Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_irq @ Set IRQ stack
|
||||
mov r0, #0x1f @ Switch to System Mode
|
||||
msr cpsr, r0
|
||||
ldr sp, =__sp_usr @ Set user stack
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Enter Thumb mode
|
||||
@---------------------------------------------------------------------------------
|
||||
add r0, pc, #1
|
||||
bx r0
|
||||
|
||||
.thumb
|
||||
|
||||
ldr r0, =__text_start
|
||||
lsl r0, #5 @ Was code compiled at 0x08000000 or higher?
|
||||
bcs DoEWRAMClear @ yes, you can not run it in external WRAM
|
||||
|
||||
mov r0, pc
|
||||
lsl r0, #5 @ Are we running from ROM (0x8000000 or higher) ?
|
||||
bcc SkipEWRAMClear @ No, so no need to do a copy.
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ We were started in ROM, silly emulators. :P
|
||||
@ So we need to copy to ExWRAM.
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r2, #2
|
||||
lsl r2, r2, #24 @ r2= 0x02000000
|
||||
ldr r3, =__end__ @ last ewram address
|
||||
sub r3, r2 @ r3= actual binary size
|
||||
mov r6, r2 @ r6= 0x02000000
|
||||
lsl r1, r2, #2 @ r1= 0x08000000
|
||||
|
||||
bl CopyMem
|
||||
|
||||
bx r6 @ Jump to the code to execute
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
DoEWRAMClear: @ Clear External WRAM to 0x00
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r1, #0x40
|
||||
lsl r1, #12 @ r1 = 0x40000
|
||||
lsl r0, r1, #7 @ r0 = 0x2000000
|
||||
bl ClearMem
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
SkipEWRAMClear: @ Clear Internal WRAM to 0x00
|
||||
@---------------------------------------------------------------------------------
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Clear BSS section to 0x00
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r0, =__bss_start__
|
||||
ldr r1, =__bss_end__
|
||||
sub r1, r0
|
||||
bl ClearMem
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Clear SBSS section to 0x00
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r0, =__sbss_start__
|
||||
ldr r1, =__sbss_end__
|
||||
sub r1, r0
|
||||
bl ClearMem
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy initialized data (data section) from LMA to VMA (ROM to RAM)
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r1, =__data_lma
|
||||
ldr r2, =__data_start__
|
||||
ldr r4, =__data_end__
|
||||
bl CopyMemChk
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy internal work ram (iwram section) from LMA to VMA (ROM to RAM)
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r1,= __iwram_lma
|
||||
ldr r2,= __iwram_start__
|
||||
ldr r4,= __iwram_end__
|
||||
bl CopyMemChk
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy internal work ram overlay 0 (iwram0 section) from LMA to VMA (ROM to RAM)
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r2,= __load_stop_iwram0
|
||||
ldr r1,= __load_start_iwram0
|
||||
sub r3, r2, r1 @ Is there any data to copy?
|
||||
beq CIW0Skip @ no
|
||||
|
||||
ldr r2,= __iwram_overlay_start
|
||||
bl CopyMem
|
||||
@---------------------------------------------------------------------------------
|
||||
CIW0Skip:
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy external work ram (ewram section) from LMA to VMA (ROM to RAM)
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r1, =__ewram_lma
|
||||
ldr r2, =__ewram_start
|
||||
ldr r4, =__ewram_end
|
||||
bl CopyMemChk
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
CEW0Skip:
|
||||
@---------------------------------------------------------------------------------
|
||||
@ set heap end
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r1, =fake_heap_end
|
||||
ldr r0, =__eheap_end
|
||||
str r0, [r1]
|
||||
@---------------------------------------------------------------------------------
|
||||
@ global constructors
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r3, =__libc_init_array
|
||||
bl _blx_r3_stub
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Jump to user code
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r0, #0 @ int argc
|
||||
mov r1, #0 @ char *argv[]
|
||||
ldr r3, =main
|
||||
bl _blx_r3_stub
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Clear memory to 0x00 if length != 0
|
||||
@---------------------------------------------------------------------------------
|
||||
@ r0 = Start Address
|
||||
@ r1 = Length
|
||||
@---------------------------------------------------------------------------------
|
||||
ClearMem:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r2,#3 @ These commands are used in cases where
|
||||
add r1,r2 @ the length is not a multiple of 4,
|
||||
bic r1,r2 @ even though it should be.
|
||||
|
||||
beq ClearMX @ Length is zero so exit
|
||||
|
||||
mov r2,#0
|
||||
@---------------------------------------------------------------------------------
|
||||
ClrLoop:
|
||||
@---------------------------------------------------------------------------------
|
||||
stmia r0!, {r2}
|
||||
sub r1,#4
|
||||
bne ClrLoop
|
||||
@---------------------------------------------------------------------------------
|
||||
ClearMX:
|
||||
@---------------------------------------------------------------------------------
|
||||
bx lr
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
_blx_r3_stub:
|
||||
@---------------------------------------------------------------------------------
|
||||
bx r3
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy memory if length != 0
|
||||
@---------------------------------------------------------------------------------
|
||||
@ r1 = Source Address
|
||||
@ r2 = Dest Address
|
||||
@ r4 = Dest Address + Length
|
||||
@---------------------------------------------------------------------------------
|
||||
CopyMemChk:
|
||||
@---------------------------------------------------------------------------------
|
||||
sub r3, r4, r2 @ Is there any data to copy?
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Copy memory
|
||||
@---------------------------------------------------------------------------------
|
||||
@ r1 = Source Address
|
||||
@ r2 = Dest Address
|
||||
@ r3 = Length
|
||||
@---------------------------------------------------------------------------------
|
||||
CopyMem:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov r0, #3 @ These commands are used in cases where
|
||||
add r3, r0 @ the length is not a multiple of 4,
|
||||
bic r3, r0 @ even though it should be.
|
||||
beq CIDExit @ Length is zero so exit
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
CIDLoop:
|
||||
@---------------------------------------------------------------------------------
|
||||
ldmia r1!, {r0}
|
||||
stmia r2!, {r0}
|
||||
sub r3, #4
|
||||
bne CIDLoop
|
||||
@---------------------------------------------------------------------------------
|
||||
CIDExit:
|
||||
@---------------------------------------------------------------------------------
|
||||
bx lr
|
||||
|
||||
.align
|
||||
.pool
|
||||
.end
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
/***********************************/
|
||||
/* NINTENDO E-READER LINKER SCRIPT */
|
||||
/***********************************/
|
||||
/* Author : Tim Schuerewegen */
|
||||
/* Version : 1.0 */
|
||||
/***********************************/
|
||||
|
||||
OUTPUT_FORMAT( "elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH( arm)
|
||||
ENTRY( _start)
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
. = 0x02000000;
|
||||
|
||||
.crt0 :
|
||||
{
|
||||
*(.crt0)
|
||||
. = ALIGN(4);
|
||||
} = 0xff
|
||||
|
||||
.text :
|
||||
{
|
||||
*(.text)
|
||||
. = ALIGN(4);
|
||||
} = 0xff
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
. = ALIGN(4);
|
||||
} = 0xff
|
||||
|
||||
.data :
|
||||
{
|
||||
*(.data)
|
||||
. = ALIGN(4);
|
||||
} = 0xff
|
||||
|
||||
.bss :
|
||||
{
|
||||
__bss_start = .;
|
||||
*(.bss)
|
||||
. = ALIGN(4);
|
||||
__bss_end__ = ABSOLUTE(.);
|
||||
__end__ = ABSOLUTE(.);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
%rename endfile old_endfile
|
||||
|
||||
*link:
|
||||
-T gba_er.ld%s %(old_link) --gc-sections
|
||||
|
||||
*startfile:
|
||||
er_crt0%O%s
|
||||
@@ -1,303 +0,0 @@
|
||||
/* Linker Script Original v1.3 by Jeff Frohwein */
|
||||
/* v1.0 - Original release */
|
||||
/* v1.1 - Added proper .data section support */
|
||||
/* v1.2 - Added support for c++ & iwram overlays */
|
||||
/* - Major contributions by Jason Wilkins. */
|
||||
/* v1.3 - .ewram section now can be used when */
|
||||
/* compiling for MULTIBOOT mode. This fixes */
|
||||
/* malloc() in DevKitAdvance which depends */
|
||||
/* on __eheap_start instead of end to define*/
|
||||
/* the starting location of heap space. */
|
||||
/* External global variable __gba_iwram_heap*/
|
||||
/* support added to allow labels end, _end, */
|
||||
/* & __end__ to point to end of iwram or */
|
||||
/* the end of ewram. */
|
||||
/* Additions by WinterMute */
|
||||
/* v1.4 - .sbss section added for unitialised */
|
||||
/* data in ewram */
|
||||
/* v1.5 - padding section added to stop EZF */
|
||||
/* stripping important data */
|
||||
/* v1.6 - added memory sections */
|
||||
|
||||
/* This file is released into the public domain */
|
||||
/* for commercial or non-commercial use with no */
|
||||
/* restrictions placed upon it. */
|
||||
|
||||
/* NOTE!!!: This linker script defines the RAM & */
|
||||
/* ROM start addresses. In order for it to work */
|
||||
/* properly, remove -Ttext and -Tbss linker */
|
||||
/* options from your makefile if they are */
|
||||
/* present. */
|
||||
|
||||
/* You can use the following to view section */
|
||||
/* addresses in your .elf file: */
|
||||
/* objdump -h file.elf */
|
||||
/* Please note that empty sections may incorrectly*/
|
||||
/* list the lma address as the vma address for */
|
||||
/* some versions of objdump. */
|
||||
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
|
||||
MEMORY {
|
||||
|
||||
rom : ORIGIN = 0x08000000, LENGTH = 32M
|
||||
iwram : ORIGIN = 0x03000000, LENGTH = 32K
|
||||
ewram : ORIGIN = 0x02000000, LENGTH = 256K
|
||||
}
|
||||
|
||||
|
||||
|
||||
__text_start = ORIGIN(ewram);
|
||||
__eheap_end = ORIGIN(ewram) + LENGTH(ewram);
|
||||
__iwram_start = ORIGIN(iwram);
|
||||
__iwram_top = ORIGIN(iwram) + LENGTH(iwram);;
|
||||
|
||||
__sp_irq = __iwram_top - 0x060;
|
||||
__sp_usr = __sp_irq - 0x0a0;
|
||||
__irq_flags = 0x03007ff8;
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
. = __text_start;
|
||||
. = __text_start;
|
||||
.crt0 :
|
||||
{
|
||||
KEEP (*(.crt0))
|
||||
. = ALIGN(4);
|
||||
} >ewram =0xff
|
||||
|
||||
.init :
|
||||
{
|
||||
KEEP (*(SORT_NONE(.init)))
|
||||
} >ewram
|
||||
|
||||
.plt :
|
||||
{
|
||||
*(.plt)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram
|
||||
|
||||
|
||||
.text ALIGN (4):
|
||||
{
|
||||
*(EXCLUDE_FILE (*.iwram*) .text)
|
||||
*(.text .stub .text.* .gnu.linkonce.t.*)
|
||||
KEEP (*(.text.*personality*))
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.glue_7t) *(.glue_7) *(.vfp11_veneer)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram = 0xff
|
||||
|
||||
__text_end = .;
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram =0
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*all.rodata*(*)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram = 0xff
|
||||
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >ewram
|
||||
__exidx_start = .;
|
||||
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } >ewram
|
||||
__exidx_end = .;
|
||||
/* Ensure the __preinit_array_start label is properly aligned. We
|
||||
could instead move the label definition inside the section, but
|
||||
the linker would then create the section even if it turns out to
|
||||
be empty, which isn't pretty. */
|
||||
. = ALIGN(32 / 8);
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
.preinit_array : { KEEP (*(.preinit_array)) } >ewram = 0xff
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { KEEP (*(.init_array)) } >ewram = 0xff
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { KEEP (*(.fini_array)) } >ewram = 0xff
|
||||
PROVIDE (__fini_array_end = .);
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram = 0
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram = 0
|
||||
|
||||
.jcr : { KEEP (*(.jcr)) } >ewram
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram = 0
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ewram = 0
|
||||
|
||||
__iwram_lma = .;
|
||||
|
||||
.iwram __iwram_start : AT (__iwram_lma)
|
||||
{
|
||||
__iwram_start__ = ABSOLUTE(.) ;
|
||||
*(.iwram)
|
||||
*iwram.*(.text)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__iwram_end__ = ABSOLUTE(.) ;
|
||||
} >iwram = 0xff
|
||||
|
||||
__data_lma = __iwram_lma + SIZEOF(.iwram) ;
|
||||
|
||||
.bss ALIGN(4) (NOLOAD):
|
||||
{
|
||||
__bss_start__ = ABSOLUTE(.);
|
||||
*(.dynbss)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(.bss*)
|
||||
*(COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__bss_end__ = ABSOLUTE(.) ;
|
||||
}
|
||||
|
||||
.data ALIGN(4) : AT (__data_lma)
|
||||
{
|
||||
__data_start__ = ABSOLUTE(.);
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__data_end__ = ABSOLUTE(.);
|
||||
} >iwram = 0xff
|
||||
|
||||
__iwram_overlay_lma = __data_lma + SIZEOF(.data);
|
||||
|
||||
PROVIDE (edata = .);
|
||||
__iwram_overlay_start = . ;
|
||||
|
||||
OVERLAY ALIGN(4) : NOCROSSREFS AT (__iwram_overlay_lma)
|
||||
{
|
||||
.iwram0 { *(.iwram0) . = ALIGN(4);}
|
||||
.iwram1 { *(.iwram1) . = ALIGN(4);}
|
||||
.iwram2 { *(.iwram2) . = ALIGN(4);}
|
||||
.iwram3 { *(.iwram3) . = ALIGN(4);}
|
||||
.iwram4 { *(.iwram4) . = ALIGN(4);}
|
||||
.iwram5 { *(.iwram5) . = ALIGN(4);}
|
||||
.iwram6 { *(.iwram6) . = ALIGN(4);}
|
||||
.iwram7 { *(.iwram7) . = ALIGN(4);}
|
||||
.iwram8 { *(.iwram8) . = ALIGN(4);}
|
||||
.iwram9 { *(.iwram9) . = ALIGN(4);}
|
||||
} >iwram = 0xff
|
||||
|
||||
__ewram_lma = LOADADDR(.iwram0) + SIZEOF(.iwram0)+SIZEOF(.iwram1)+SIZEOF(.iwram2)+SIZEOF(.iwram3)+SIZEOF(.iwram4)+SIZEOF(.iwram5)+SIZEOF(.iwram6)+SIZEOF(.iwram7)+SIZEOF(.iwram8)+SIZEOF(.iwram9);
|
||||
|
||||
__iwram_overlay_end = __ewram_lma ;
|
||||
|
||||
/* v1.3 */
|
||||
__ewram_start = __ewram_lma ;
|
||||
|
||||
.ewram __ewram_start : AT (__ewram_lma)
|
||||
{
|
||||
*(.ewram)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__ewram_end = ABSOLUTE(.);
|
||||
} >ewram = 0xff
|
||||
|
||||
__ewram_overlay_lma = __ewram_lma + SIZEOF(.ewram);
|
||||
|
||||
.sbss ALIGN(4)(NOLOAD):
|
||||
{
|
||||
__sbss_start__ = ABSOLUTE(.);
|
||||
*(.sbss)
|
||||
. = ALIGN(4);
|
||||
__sbss_end__ = ABSOLUTE(.);
|
||||
__end__ = ABSOLUTE(.);
|
||||
__eheap_start = ABSOLUTE(.);
|
||||
}
|
||||
|
||||
OVERLAY ALIGN(4): NOCROSSREFS AT (__ewram_overlay_lma)
|
||||
{
|
||||
.ewram0 { *(.ewram0) . = ALIGN(4);}
|
||||
.ewram1 { *(.ewram1) . = ALIGN(4);}
|
||||
.ewram2 { *(.ewram2) . = ALIGN(4);}
|
||||
.ewram3 { *(.ewram3) . = ALIGN(4);}
|
||||
.ewram4 { *(.ewram4) . = ALIGN(4);}
|
||||
.ewram5 { *(.ewram5) . = ALIGN(4);}
|
||||
.ewram6 { *(.ewram6) . = ALIGN(4);}
|
||||
.ewram7 { *(.ewram7) . = ALIGN(4);}
|
||||
.ewram8 { *(.ewram8) . = ALIGN(4);}
|
||||
.ewram9 { *(.ewram9) . = ALIGN(4);}
|
||||
} >ewram = 0xff
|
||||
__ewram_overlay_end = ABSOLUTE(.);
|
||||
|
||||
__eheap_start = __ewram_overlay_end ;
|
||||
|
||||
_end = __ewram_overlay_end;
|
||||
__end__ = __ewram_overlay_end;
|
||||
__rom_end__ = __ewram_overlay_end;
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
.stack 0x80000 : { _stack = .; *(.stack) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
-T gba_mb.ld%s %(old_link) --gc-sections
|
||||
|
||||
*startfile:
|
||||
gba_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,171 +0,0 @@
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
|
||||
MEMORY
|
||||
{
|
||||
ram : ORIGIN = 0xc000000, LENGTH = 8M
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
.crt0 :
|
||||
{
|
||||
__text_start = . ;
|
||||
KEEP (*(.crt0))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0xff
|
||||
|
||||
.init :
|
||||
{
|
||||
KEEP (*(SORT_NONE(.init)))
|
||||
} >ram
|
||||
|
||||
.plt : { *(.plt) } >ram = 0xff
|
||||
|
||||
|
||||
.text : /* ALIGN (4): */
|
||||
{
|
||||
*(.text .stub .text.* .gnu.linkonce.t.*)
|
||||
KEEP (*(.text.*personality*))
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.glue_7t) *(.glue_7) *(.vfp11_veneer)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0xff
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
} >ram =0xff
|
||||
|
||||
__text_end = . ;
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*all.rodata*(*)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0xff
|
||||
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >ram
|
||||
__exidx_start = .;
|
||||
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } >ram
|
||||
__exidx_end = .;
|
||||
/* Ensure the __preinit_array_start label is properly aligned. We
|
||||
could instead move the label definition inside the section, but
|
||||
the linker would then create the section even if it turns out to
|
||||
be empty, which isn't pretty. */
|
||||
. = ALIGN(32 / 8);
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
.preinit_array : { KEEP (*(.preinit_array)) } >ram = 0xff
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { KEEP (*(.init_array)) } >ram = 0xff
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { KEEP (*(.fini_array)) } >ram = 0xff
|
||||
PROVIDE (__fini_array_end = .);
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0
|
||||
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0
|
||||
.jcr : { KEEP (*(.jcr)) } >ram = 0
|
||||
.got : { *(.got.plt) *(.got) } >ram = 0
|
||||
__ro_end = . ;
|
||||
|
||||
.data ALIGN(4) :
|
||||
{
|
||||
__data_start = ABSOLUTE(.);
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__data_end = ABSOLUTE(.);
|
||||
} >ram = 0xff
|
||||
|
||||
|
||||
.bss ALIGN(4) :
|
||||
{
|
||||
__bss_start = ABSOLUTE(.);
|
||||
/* __bss_start__ = ABSOLUTE(.); */
|
||||
*(.dynbss)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(.bss*)
|
||||
*(COMMON)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__bss_end = ABSOLUTE(.) ;
|
||||
__end__ = ABSOLUTE(.) ;
|
||||
} > ram
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
.stack 0x80000 : { _stack = .; *(.stack) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T gp32.ld%s --gc-sections
|
||||
|
||||
*startfile:
|
||||
gp32_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
/*--------------------------------------------------------------------------------
|
||||
This Source Code Form is subject to the terms of the Mozilla Public License,
|
||||
v. 2.0. If a copy of the MPL was not distributed with this file, You can
|
||||
obtain one at https://mozilla.org/MPL/2.0/.
|
||||
--------------------------------------------------------------------------------*/
|
||||
|
||||
.section ".crt0","ax"
|
||||
.code 32
|
||||
.align
|
||||
.global _start
|
||||
@---------------------------------------------------------------------------------
|
||||
_start:
|
||||
@---------------------------------------------------------------------------------
|
||||
b _start2
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ AXF addresses
|
||||
@---------------------------------------------------------------------------------
|
||||
_text_start:
|
||||
.word __text_start
|
||||
_ro_end:
|
||||
.word __ro_end
|
||||
_data_start:
|
||||
.word __data_start
|
||||
.word __bss_end
|
||||
_bss_start:
|
||||
.word __bss_start
|
||||
_bss_end:
|
||||
.word __bss_end
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ GamePark magic sequence
|
||||
@---------------------------------------------------------------------------------
|
||||
.word 0x44450011
|
||||
.word 0x44450011
|
||||
.word 0x01234567
|
||||
.word 0x12345678
|
||||
.word 0x23456789
|
||||
.word 0x34567890
|
||||
.word 0x45678901
|
||||
.word 0x56789012
|
||||
.word 0x23456789
|
||||
.word 0x34567890
|
||||
.word 0x45678901
|
||||
.word 0x56789012
|
||||
.word 0x23456789
|
||||
.word 0x34567890
|
||||
.word 0x45678901
|
||||
.word 0x56789012
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
_start2:
|
||||
@---------------------------------------------------------------------------------
|
||||
mrs r0, CPSR
|
||||
orr r0, r0, #0xC0
|
||||
msr CPSR_ctl, r0
|
||||
|
||||
mrs r0, CPSR
|
||||
bic r0, r0, #0xC0
|
||||
orr r0, r0, #0x40
|
||||
msr CPSR_ctl,r0
|
||||
|
||||
@---------------------------------------------------------------------------------
|
||||
@ global constructors
|
||||
@---------------------------------------------------------------------------------
|
||||
ldr r3,=_call_main
|
||||
mov lr,r3
|
||||
ldr r3,=__libc_init_array
|
||||
bx r3
|
||||
@---------------------------------------------------------------------------------
|
||||
@ Jump to user code
|
||||
@---------------------------------------------------------------------------------
|
||||
_call_main:
|
||||
@---------------------------------------------------------------------------------
|
||||
mov lr, #0
|
||||
ldr r3, =main
|
||||
bx r3
|
||||
|
||||
.pool
|
||||
.end
|
||||
@@ -1,213 +0,0 @@
|
||||
/* GP32 Linker Script v1.2 by Jeff F */
|
||||
/* v1.0 - Original release */
|
||||
/* v1.1 - Cleaned up and added MEMORY command */
|
||||
/* v1.2 - DJWillis - Added propper .init and */
|
||||
/* .fini for GCC 3.3.2 and above */
|
||||
/* */
|
||||
/* This file is released into the public domain */
|
||||
/* for commercial or non-commercial use with no */
|
||||
/* restrictions placed upon it. */
|
||||
/* */
|
||||
/* NOTE!!!: This linker script defines the RAM */
|
||||
/* start addresses. In order for it to work */
|
||||
/* properly, remove -Ttext and -Tbss linker */
|
||||
/* options from your makefile if they are */
|
||||
/* present. */
|
||||
/* */
|
||||
/* You can use the following to view section */
|
||||
/* addresses in your .elf file: */
|
||||
/* objdump -h file.elf */
|
||||
/* */
|
||||
/* Please note that empty sections may incorrectly*/
|
||||
/* list the lma address as the vma address for */
|
||||
/* some versions of objdump. */
|
||||
|
||||
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||
OUTPUT_ARCH(arm)
|
||||
ENTRY(_start)
|
||||
/* SEARCH_DIR(/bin/arm); */
|
||||
|
||||
/* Then use it like this: IWRAMHEAP */
|
||||
/* The linker script function "var1 += var2;" sometimes */
|
||||
/* reports incorrect values in the *.map file but the */
|
||||
/* actual value it calculates is usually, if not always, */
|
||||
/* correct. If you leave out the ". = ALIGN(4);" at the */
|
||||
/* end of each section then the return value of SIZEOF() */
|
||||
/* is sometimes incorrect and "var1 += var2;" appears to */
|
||||
/* not work as well. "var1 += var2" style functions are */
|
||||
/* avoided below as a result. */
|
||||
|
||||
/* The linker script MEMORY directive is not used here due */
|
||||
/* to the fact that __text_start is not always a fixed value. */
|
||||
|
||||
MEMORY
|
||||
{
|
||||
ram : ORIGIN = 0xc000000, LENGTH = 8M
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
.text : /* ALIGN (4): */
|
||||
{
|
||||
__text_start = . ;
|
||||
|
||||
*(EXCLUDE_FILE (*text.iwram*) .text)
|
||||
*(.text.*)
|
||||
*(.stub)
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.gnu.linkonce.t*)
|
||||
*(.glue_7)
|
||||
*(.glue_7t)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0xff
|
||||
|
||||
__text_end = . ;
|
||||
|
||||
|
||||
.init :
|
||||
{
|
||||
*(.init)
|
||||
} > ram = 0xff
|
||||
|
||||
.jcr :
|
||||
{
|
||||
*(.jcr)
|
||||
} > ram = 0xff
|
||||
|
||||
.fini :
|
||||
{
|
||||
*(.fini)
|
||||
} > ram = 0xff
|
||||
|
||||
.rodata :
|
||||
{
|
||||
*(.rodata)
|
||||
*all.rodata*(*)
|
||||
*(.roda)
|
||||
*(.rodata.*)
|
||||
*(.gnu.linkonce.r*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0xff
|
||||
|
||||
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >ram
|
||||
__exidx_start = .;
|
||||
.ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } >ram
|
||||
__exidx_end = .;
|
||||
/* Ensure the __preinit_array_start label is properly aligned. We
|
||||
could instead move the label definition inside the section, but
|
||||
the linker would then create the section even if it turns out to
|
||||
be empty, which isn't pretty. */
|
||||
. = ALIGN(32 / 8);
|
||||
PROVIDE (__preinit_array_start = .);
|
||||
.preinit_array : { KEEP (*(.preinit_array)) } >ram = 0xff
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { KEEP (*(.init_array)) } >ram = 0xff
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { KEEP (*(.fini_array)) } >ram = 0xff
|
||||
PROVIDE (__fini_array_end = .);
|
||||
|
||||
.ctors :
|
||||
{
|
||||
/* gcc uses crtbegin.o to find the start of the constructors, so
|
||||
we make sure it is first. Because this is a wildcard, it
|
||||
doesn't matter if the user does not actually link against
|
||||
crtbegin.o; the linker won't look for a file to match a
|
||||
wildcard. The wildcard also means that it doesn't matter which
|
||||
directory crtbegin.o is in. */
|
||||
KEEP (*crtbegin.o(.ctors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0
|
||||
|
||||
.eh_frame :
|
||||
{
|
||||
KEEP (*(.eh_frame))
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0
|
||||
|
||||
.gcc_except_table :
|
||||
{
|
||||
*(.gcc_except_table)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0
|
||||
__ro_end = . ;
|
||||
|
||||
.data ALIGN(4) :
|
||||
{
|
||||
__data_start = ABSOLUTE(.);
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d*)
|
||||
CONSTRUCTORS
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
} >ram = 0xff
|
||||
|
||||
__data_end = . ;
|
||||
|
||||
.bss ALIGN(4) :
|
||||
{
|
||||
__bss_start = ABSOLUTE(.);
|
||||
/* __bss_start__ = ABSOLUTE(.); */
|
||||
*(.dynbss)
|
||||
*(.gnu.linkonce.b*)
|
||||
*(COMMON)
|
||||
*(.bss*)
|
||||
. = ALIGN(4); /* REQUIRED. LD is flaky without it. */
|
||||
__bss_end = ABSOLUTE(.);
|
||||
__end__ = ABSOLUTE(.);
|
||||
} > ram
|
||||
|
||||
|
||||
__eheap_end = . ;
|
||||
|
||||
/* Stabs debugging sections. */
|
||||
.stab 0 : { *(.stab) }
|
||||
.stabstr 0 : { *(.stabstr) }
|
||||
.stab.excl 0 : { *(.stab.excl) }
|
||||
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||
.stab.index 0 : { *(.stab.index) }
|
||||
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||
.comment 0 : { *(.comment) }
|
||||
/* DWARF debug sections.
|
||||
Symbols in the DWARF debugging sections are relative to the beginning
|
||||
of the section so we begin them at 0. */
|
||||
/* DWARF 1 */
|
||||
.debug 0 : { *(.debug) }
|
||||
.line 0 : { *(.line) }
|
||||
/* GNU DWARF 1 extensions */
|
||||
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||
/* DWARF 1.1 and DWARF 2 */
|
||||
.debug_aranges 0 : { *(.debug_aranges) }
|
||||
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||
/* DWARF 2 */
|
||||
.debug_info 0 : { *(.debug_info) }
|
||||
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||
.debug_line 0 : { *(.debug_line) }
|
||||
.debug_frame 0 : { *(.debug_frame) }
|
||||
.debug_str 0 : { *(.debug_str) }
|
||||
.debug_loc 0 : { *(.debug_loc) }
|
||||
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||
/* SGI/MIPS DWARF 2 extensions */
|
||||
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||
.debug_typenames 0 : { *(.debug_typenames) }
|
||||
.debug_varnames 0 : { *(.debug_varnames) }
|
||||
.stack 0x80000 : { _stack = .; *(.stack) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
%rename link old_link
|
||||
|
||||
*link:
|
||||
%(old_link) -T gp32_gpsdk.ld%s --gc-sections
|
||||
|
||||
*startfile:
|
||||
gp32_gpsdk_crt0%O%s crti%O%s crtbegin%O%s
|
||||
|
||||
@@ -1,246 +0,0 @@
|
||||
@****************************************************
|
||||
@* gp32 crt0.S v1.0 by Jeff F *
|
||||
@****************************************************
|
||||
|
||||
@ v1.0 - Original release
|
||||
@
|
||||
@ This file is released into the public domain for commercial
|
||||
@ or non-commercial usage with no restrictions placed upon it.
|
||||
|
||||
.TEXT
|
||||
|
||||
@ Note: Normally it is the job of crt0.S to clear the BSS
|
||||
@ (Zero Initialized) section to 0x00, but in the case of
|
||||
@ the gp32 we do not have to do this because it is done
|
||||
@ by the gp32 bios after it loads the app.
|
||||
|
||||
@ The official sdt dev kit uses 'Main ()' as the entry
|
||||
@ point. If you would rather use 'main ()' instead then
|
||||
@ comment out the next line.
|
||||
@
|
||||
@ You have to use 'main ()' at some point in your program
|
||||
@ if you want to do c++ code. GCC will do a call to constructor
|
||||
@ setup before executing 'main ()'. Using 'main ()' also increases
|
||||
@ your program size by ~5500 bytes.
|
||||
|
||||
@ .equ __OfficialEntry, 1
|
||||
|
||||
@ The official sdt dev kit initializes various things in init.o
|
||||
@ Crt0.S performs similar tasks for compatibility. If you don't
|
||||
@ wish to use the official libs, or those that are compatible,
|
||||
@ then you need to comment out the next line to prevent link errors.
|
||||
|
||||
.equ __OfficialInits, 1
|
||||
|
||||
|
||||
.GLOBAL _start
|
||||
_start:
|
||||
.ALIGN
|
||||
.CODE 32
|
||||
|
||||
@ Start Vector
|
||||
|
||||
b _GpInit
|
||||
|
||||
.word __text_start @ Start of text (Read Only) section
|
||||
_roe: .word __ro_end @ End "
|
||||
_rws: .word __data_start @ Start of data (Read/Write) section
|
||||
.word __bss_end @ End of bss (this is the way sdt does it for some reason)
|
||||
_zis: .word __bss_start @ Start of bss (Zero Initialized) section
|
||||
_zie: .word __bss_end @ End "
|
||||
|
||||
.word 0x44450011
|
||||
.word 0x44450011
|
||||
|
||||
.word 0x01234567
|
||||
.word 0x12345678
|
||||
.word 0x23456789
|
||||
.word 0x34567890
|
||||
.word 0x45678901
|
||||
.word 0x56789012
|
||||
.word 0x23456789
|
||||
.word 0x34567890
|
||||
.word 0x45678901
|
||||
.word 0x56789012
|
||||
.word 0x23456789
|
||||
.word 0x34567890
|
||||
.word 0x45678901
|
||||
.word 0x56789012
|
||||
|
||||
_GpInit:
|
||||
mrs r0,CPSR
|
||||
orr r0,r0,#0xc0
|
||||
msr CPSR_fsxc,r0
|
||||
|
||||
.ifdef __OfficialInits
|
||||
|
||||
@ Call function in user_init.s
|
||||
@ bl asm_user_entry
|
||||
|
||||
@ Get pointer to GpSurfaceSet routine
|
||||
mov r0,#0
|
||||
swi 0xb
|
||||
ldr r1,=GpSurfaceSet
|
||||
ldr r2,=GpSurfaceFlip
|
||||
str r0,[r1]
|
||||
str r0,[r2]
|
||||
|
||||
@ Get time passed
|
||||
mov r0,#6
|
||||
swi 0xb
|
||||
ldr r1,=_timepassed
|
||||
str r0,[r1]
|
||||
|
||||
@ Get button stuff
|
||||
mov r0,#0
|
||||
swi 0x10
|
||||
ldr r2,=_reg_io_key_a
|
||||
ldr r3,=_reg_io_key_b
|
||||
str r0,[r2]
|
||||
str r1,[r3]
|
||||
|
||||
@ Set heap start location
|
||||
ldr r0,_zie
|
||||
ldr r1,=HEAPSTART
|
||||
str r0,[r1]
|
||||
|
||||
@ Set heap end location
|
||||
mov r0,#5
|
||||
swi 0xb
|
||||
ldr r1,=HEAPEND
|
||||
sub r0,r0,#255
|
||||
bic r0,r0,#3
|
||||
str r0,[r1]
|
||||
|
||||
@ Set App Argument
|
||||
swi 0x15
|
||||
|
||||
mov r10,r0
|
||||
mov r11,r1 @ possibly not needed but left in anyway
|
||||
|
||||
mrs r0,CPSR
|
||||
bic r0,r0,#192
|
||||
orr r0,r0,#64
|
||||
msr CPSR_fsxc,r0
|
||||
|
||||
mov r0,r10
|
||||
mov r1,r11 @ possibly not needed but left in anyway
|
||||
.endif
|
||||
|
||||
@ Jump to Main ()
|
||||
|
||||
.ifdef __OfficialEntry
|
||||
ldr r3,=Main
|
||||
.else
|
||||
ldr r3,=main
|
||||
.endif
|
||||
bx r3 @ Init.o uses 'mov pc,r3' but
|
||||
@ 'bx r3' is used here instead. This way
|
||||
@ the main function can be ARM or Thumb.
|
||||
|
||||
.ifdef __OfficialInits
|
||||
|
||||
swi 0x12
|
||||
orr r1,r1,r2
|
||||
and r1,r1,r3
|
||||
eor r1,r1,r4
|
||||
mov r5,r1,lsr #4
|
||||
add r1,r1,r7
|
||||
sub r7,r7,r1
|
||||
mov r8,#0
|
||||
mov pc,r8
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
b .
|
||||
nop
|
||||
nop
|
||||
nop
|
||||
nop
|
||||
nop
|
||||
nop
|
||||
|
||||
.GLOBAL _fw_init_for_dbg
|
||||
_fw_init_for_dbg:
|
||||
stmdb sp!,{r0-r12}
|
||||
|
||||
mov r10,lr
|
||||
mov r11,sp
|
||||
|
||||
bic r0,r0,#31 @ 0x1f
|
||||
orr r1,r0,#17 @ 0x11
|
||||
orr r2,r0,#19 @ 0x13
|
||||
msr cpsr_cxsf,r1
|
||||
mov r12,#4
|
||||
add r12,r12,pc
|
||||
msr cpsr_cxsf,r2
|
||||
swi 0x1ff
|
||||
|
||||
@ bl asm_user_entry_path
|
||||
|
||||
mov r0,r11
|
||||
mov r1,r10
|
||||
add r0,r0,#52
|
||||
ldr r2,[r0]
|
||||
mov lr,r1
|
||||
stmdb sp!,{r2}
|
||||
stmdb sp!,{r0-r12,lr}
|
||||
|
||||
@ Copy RW Base - ZI Base
|
||||
ldr r0,=_roe @ |Image$$RO$$Limit|
|
||||
ldr r3,=_zis @ |Image$$ZI$$Base|
|
||||
ldr r2,=_rws @ |Image$$RW$$Base|
|
||||
sub r3,r3,r2
|
||||
CopyRWData:
|
||||
cmp r3,#36
|
||||
blt CopyRWData2
|
||||
ldmia r0!,{r4-r12}
|
||||
stmia r2!,{r4-r12}
|
||||
sub r3,r3,#36
|
||||
b CopyRWData
|
||||
CopyRWData2:
|
||||
cmp r3,#0
|
||||
ble CopyRWData3
|
||||
ldr r4,[r0],#4
|
||||
str r4,[r2],#4
|
||||
sub r3,r3,#4
|
||||
b CopyRWData2
|
||||
CopyRWData3:
|
||||
|
||||
@ Clear ZI section
|
||||
ldr r1,=_zie @ |Image$$ZI$$Limit|
|
||||
ldr r0,=_zis @ |Image$$ZI$$Base|
|
||||
mov r2,#0
|
||||
mov r3,r2
|
||||
mov r4,r2
|
||||
mov r5,r2
|
||||
mov r6,r2
|
||||
mov r7,r2
|
||||
mov r8,r2
|
||||
mov r9,r2
|
||||
mov r10,r2
|
||||
mov r11,r2
|
||||
mov r12,r2
|
||||
CopyZIData:
|
||||
stmia r0!,{r2-r12}
|
||||
cmp r0,r1
|
||||
blt CopyZIData
|
||||
|
||||
ldmia sp!,{r0-r12,pc}
|
||||
|
||||
.endif
|
||||
|
||||
.ALIGN
|
||||
.POOL
|
||||
|
||||
|
||||
.END
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
|
||||
index 545321b0bbe..63ed77af8fd 100644
|
||||
index 728be500b80..74c1abad635 100644
|
||||
--- a/gcc/config/arm/arm-cpus.in
|
||||
+++ b/gcc/config/arm/arm-cpus.in
|
||||
@@ -395,7 +395,7 @@ begin arch armv6k
|
||||
@@ -392,7 +392,7 @@ begin arch armv6k
|
||||
tune for mpcore
|
||||
tune flags CO_PROC
|
||||
base 6K
|
||||
@@ -12,16 +12,10 @@ index 545321b0bbe..63ed77af8fd 100644
|
||||
optalias vfpv2 fp
|
||||
option nofp remove ALL_FP
|
||||
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
|
||||
index 9ec5bf065ac..9ab3ffb109d 100644
|
||||
index 3d92bd23322..35cefcde676 100644
|
||||
--- a/gcc/config/arm/t-arm-elf
|
||||
+++ b/gcc/config/arm/t-arm-elf
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Copyright (C) 1998-2018 Free Software Foundation, Inc.
|
||||
+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is part of GCC.
|
||||
#
|
||||
@@ -16,110 +16,83 @@
|
||||
@@ -16,111 +16,14 @@
|
||||
# along with GCC; see the file COPYING3. If not see
|
||||
# <http://www.gnu.org/licenses/>.
|
||||
|
||||
@@ -48,14 +42,15 @@ index 9ec5bf065ac..9ab3ffb109d 100644
|
||||
-v8_fps := simd fp16 crypto fp16+crypto dotprod fp16fml
|
||||
-
|
||||
-# We don't do anything special with these. Pre-v4t probably doesn't work.
|
||||
-all_early_nofp := 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
|
||||
-
|
||||
-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 armv8.6-a
|
||||
-
|
||||
-# No floating point variants, require thumb1 softfp
|
||||
-all_nofp_t := armv6-m armv6s-m armv8-m.base
|
||||
@@ -114,16 +109,19 @@ index 9ec5bf065ac..9ab3ffb109d 100644
|
||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v7_a_r), \
|
||||
- march?armv7+fp=march?$(ARCH) \
|
||||
- march?armv7+fp=march?$(ARCH)+fp)
|
||||
-
|
||||
|
||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v8_archs), \
|
||||
- march?armv7+fp=march?$(ARCH) \
|
||||
- $(foreach FPARCH, $(v8_fps), \
|
||||
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
|
||||
-
|
||||
+MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard
|
||||
|
||||
-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \
|
||||
- march?armv7+fp=march?$(ARCH)+fp.dp)
|
||||
-
|
||||
|
||||
-# PART 4 - Reuse rules
|
||||
+MULTILIB_MATCHES += march?armv6k=mtune?mpcore
|
||||
+MULTILIB_MATCHES += march?armv6k=mcpu?mpcore
|
||||
|
||||
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto
|
||||
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp
|
||||
@@ -134,83 +132,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=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_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
|
||||
index 12dd0931b08..59584fe64bc 100644
|
||||
index 9ad2947505f..1790caa8e88 100644
|
||||
--- a/gcc/config/arm/unknown-elf.h
|
||||
+++ b/gcc/config/arm/unknown-elf.h
|
||||
@@ -29,7 +29,7 @@
|
||||
@@ -222,22 +145,60 @@ index 12dd0931b08..59584fe64bc 100644
|
||||
|
||||
#undef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC \
|
||||
@@ -93,4 +93,9 @@
|
||||
@@ -93,4 +93,5 @@
|
||||
udivmoddi4, which will depend on the exception unwind routines,
|
||||
which will depend on abort, which is defined in libc. */
|
||||
#undef LINK_GCC_C_SEQUENCE_SPEC
|
||||
-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %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"
|
||||
+
|
||||
+/* The system headers under devkitARM are C++-aware. */
|
||||
+#undef NO_IMPLICIT_EXTERN_C
|
||||
+#define NO_IMPLICIT_EXTERN_C
|
||||
+
|
||||
diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
|
||||
index 250fef59b55..36b2239aa5d 100644
|
||||
--- a/gcc/config/i386/host-mingw32.c
|
||||
+++ b/gcc/config/i386/host-mingw32.c
|
||||
@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
|
||||
|
||||
static inline void w32_error(const char*, const char*, int, const char*);
|
||||
|
||||
-/* FIXME: Is this big enough? */
|
||||
-static const size_t pch_VA_max_size = 128 * 1024 * 1024;
|
||||
-
|
||||
/* Granularity for reserving address space. */
|
||||
static size_t va_granularity = 0x10000;
|
||||
|
||||
@@ -88,9 +85,6 @@ static void *
|
||||
mingw32_gt_pch_get_address (size_t size, int)
|
||||
{
|
||||
void* res;
|
||||
- size = (size + va_granularity - 1) & ~(va_granularity - 1);
|
||||
- if (size > pch_VA_max_size)
|
||||
- return NULL;
|
||||
|
||||
/* FIXME: We let system determine base by setting first arg to NULL.
|
||||
Allocating at top of available address space avoids unnecessary
|
||||
@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
|
||||
If we allocate at bottom we need to reserve the address as early
|
||||
as possible and at the same point in each invocation. */
|
||||
|
||||
- res = VirtualAlloc (NULL, pch_VA_max_size,
|
||||
+ res = VirtualAlloc (NULL, size,
|
||||
MEM_RESERVE | MEM_TOP_DOWN,
|
||||
PAGE_NOACCESS);
|
||||
if (!res)
|
||||
@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
|
||||
|
||||
/* Offset must be also be a multiple of allocation granularity for
|
||||
this to work. We can't change the offset. */
|
||||
- if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
|
||||
+ if ((offset & (va_granularity - 1)) != 0)
|
||||
return -1;
|
||||
|
||||
|
||||
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
||||
index a716f708259..6a11011dba7 100644
|
||||
index 9f790db0daf..97f52d0b893 100644
|
||||
--- a/gcc/gcc.c
|
||||
+++ b/gcc/gcc.c
|
||||
@@ -786,6 +786,11 @@ proper position among the other output files. */
|
||||
@@ -793,6 +793,11 @@ proper position among the other output files. */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -249,7 +210,7 @@ index a716f708259..6a11011dba7 100644
|
||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||
#ifndef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC \
|
||||
@@ -1081,6 +1086,7 @@ static const char *link_spec = LINK_SPEC;
|
||||
@@ -1085,6 +1090,7 @@ static const char *link_spec = LINK_SPEC;
|
||||
static const char *lib_spec = LIB_SPEC;
|
||||
static const char *link_gomp_spec = "";
|
||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||
@@ -257,7 +218,7 @@ index a716f708259..6a11011dba7 100644
|
||||
static const char *endfile_spec = ENDFILE_SPEC;
|
||||
static const char *startfile_spec = STARTFILE_SPEC;
|
||||
static const char *linker_name_spec = LINKER_NAME;
|
||||
@@ -1577,6 +1583,7 @@ static struct spec_list static_specs[] =
|
||||
@@ -1582,6 +1588,7 @@ static struct spec_list static_specs[] =
|
||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||
@@ -276,15 +237,15 @@ index dddddc7c444..c2502597953 100644
|
||||
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
|
||||
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
|
||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||
index 5e894455e16..f81c9c6a64c 100644
|
||||
index 3f769a1c660..e005d8304b7 100644
|
||||
--- a/libgcc/crtstuff.c
|
||||
+++ b/libgcc/crtstuff.c
|
||||
@@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
@@ -325,7 +325,7 @@ register_tm_clones (void)
|
||||
|
||||
/* 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,
|
||||
this will have to do. */
|
||||
#ifdef OBJECT_FORMAT_ELF
|
||||
|
||||
-#if DEFAULT_USE_CXA_ATEXIT
|
||||
+#if 1 /* DEFAULT_USE_CXA_ATEXIT */
|
||||
/* Declare the __dso_handle variable. It should have a unique value
|
||||
in every shared-object; in a main program its value is zero. The
|
||||
object should in any case be protected. This means the instance
|
||||
@@ -1,389 +0,0 @@
|
||||
diff -NBaur gdb-8.2/gdb/arm-3ds-tdep.c gdb-8.2-3ds/gdb/arm-3ds-tdep.c
|
||||
--- gdb-8.2/gdb/arm-3ds-tdep.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ gdb-8.2-3ds/gdb/arm-3ds-tdep.c 2018-11-15 22:55:21.916968907 +0000
|
||||
@@ -0,0 +1,157 @@
|
||||
+/* Target-dependent code for 3DS. */
|
||||
+
|
||||
+/* This uses code from GDB, which license is: */
|
||||
+
|
||||
+/*
|
||||
+ Copyright (C) 2002-2017 Free Software Foundation, Inc.
|
||||
+
|
||||
+ This file is part of GDB.
|
||||
+
|
||||
+ This program 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 of the License, or
|
||||
+ (at your option) any later version.
|
||||
+
|
||||
+ This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+#include "defs.h"
|
||||
+#include "gdbcore.h"
|
||||
+#include "target.h"
|
||||
+#include "osabi.h"
|
||||
+#include "xml-syscall.h"
|
||||
+
|
||||
+#include "arch/arm.h"
|
||||
+#include "arch/arm-get-next-pcs.h"
|
||||
+#include "arm-tdep.h"
|
||||
+
|
||||
+static const gdb_byte arm_3ds_arm_le_breakpoint[] = {0xff, 0x00, 0x00, 0xef};
|
||||
+static const gdb_byte arm_3ds_thumb_le_breakpoint[] = {0xff, 0xdf};
|
||||
+
|
||||
+static CORE_ADDR
|
||||
+ arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self);
|
||||
+
|
||||
+/* Operation function pointers for get_next_pcs. */
|
||||
+static struct arm_get_next_pcs_ops arm_3ds_get_next_pcs_ops = {
|
||||
+ arm_get_next_pcs_read_memory_unsigned_integer,
|
||||
+ arm_3ds_get_next_pcs_syscall_next_pc,
|
||||
+ arm_get_next_pcs_addr_bits_remove,
|
||||
+ arm_get_next_pcs_is_thumb,
|
||||
+ NULL,
|
||||
+};
|
||||
+
|
||||
+static CORE_ADDR
|
||||
+arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self)
|
||||
+{
|
||||
+ CORE_ADDR next_pc = 0;
|
||||
+ CORE_ADDR pc = regcache_read_pc (self->regcache);
|
||||
+ int is_thumb = arm_is_thumb (self->regcache);
|
||||
+ ULONGEST svc_number = 0;
|
||||
+
|
||||
+ if (is_thumb)
|
||||
+ {
|
||||
+ next_pc = pc + 2;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ next_pc = pc + 4;
|
||||
+ }
|
||||
+
|
||||
+ /* Addresses for calling Thumb functions have the bit 0 set. */
|
||||
+ if (is_thumb)
|
||||
+ next_pc = MAKE_THUMB_ADDR (next_pc);
|
||||
+
|
||||
+ return next_pc;
|
||||
+}
|
||||
+
|
||||
+static LONGEST
|
||||
+arm_3ds_get_syscall_number (struct gdbarch *gdbarch,
|
||||
+ thread_info *thread)
|
||||
+{
|
||||
+ struct regcache *regs = get_thread_regcache (thread);
|
||||
+
|
||||
+ ULONGEST pc;
|
||||
+ ULONGEST cpsr;
|
||||
+ ULONGEST t_bit = arm_psr_thumb_bit (gdbarch);
|
||||
+ int is_thumb;
|
||||
+ ULONGEST svc_number = -1;
|
||||
+
|
||||
+ regcache_cooked_read_unsigned (regs, ARM_PC_REGNUM, &pc);
|
||||
+ regcache_cooked_read_unsigned (regs, ARM_PS_REGNUM, &cpsr);
|
||||
+ is_thumb = (cpsr & t_bit) != 0;
|
||||
+
|
||||
+ if (is_thumb)
|
||||
+ {
|
||||
+ enum bfd_endian byte_order_for_code =
|
||||
+ gdbarch_byte_order_for_code (gdbarch);
|
||||
+
|
||||
+ /* PC gets incremented before the syscall-stop, so read the
|
||||
+ previous instruction. */
|
||||
+ unsigned long this_instr =
|
||||
+ read_memory_unsigned_integer (pc - 2, 2, byte_order_for_code);
|
||||
+
|
||||
+ unsigned long svc_operand = (0x00ff & this_instr);
|
||||
+ svc_number = svc_operand;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ enum bfd_endian byte_order_for_code =
|
||||
+ gdbarch_byte_order_for_code (gdbarch);
|
||||
+
|
||||
+ /* PC gets incremented before the syscall-stop, so read the
|
||||
+ previous instruction. */
|
||||
+ unsigned long this_instr =
|
||||
+ read_memory_unsigned_integer (pc - 4, 4, byte_order_for_code);
|
||||
+
|
||||
+ unsigned long svc_operand = (0x000000ff & this_instr);
|
||||
+ svc_number = svc_operand;
|
||||
+ }
|
||||
+
|
||||
+ if (svc_number == 0xfe)
|
||||
+ {
|
||||
+ regcache_cooked_read_unsigned (regs, 12, &svc_number);
|
||||
+ }
|
||||
+
|
||||
+ return svc_number;
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+arm_3ds_init_abi (struct gdbarch_info info,
|
||||
+ struct gdbarch *gdbarch)
|
||||
+{
|
||||
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
||||
+
|
||||
+ switch (info.byte_order)
|
||||
+ {
|
||||
+ case BFD_ENDIAN_LITTLE:
|
||||
+ tdep->arm_breakpoint = arm_3ds_arm_le_breakpoint;
|
||||
+ tdep->thumb_breakpoint = arm_3ds_thumb_le_breakpoint;
|
||||
+ tdep->arm_breakpoint_size = sizeof (arm_3ds_arm_le_breakpoint);
|
||||
+ tdep->thumb_breakpoint_size = sizeof (arm_3ds_thumb_le_breakpoint);
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ internal_error (__FILE__, __LINE__,
|
||||
+ _("arm_gdbarch_init: bad byte order"));
|
||||
+ }
|
||||
+ tdep->fp_model = ARM_FLOAT_VFP;
|
||||
+
|
||||
+ /* Single stepping. */
|
||||
+ set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
|
||||
+
|
||||
+ /* `catch syscall' */
|
||||
+ set_xml_syscall_file_name (gdbarch, "syscalls/arm-3ds.xml");
|
||||
+ set_gdbarch_get_syscall_number (gdbarch, arm_3ds_get_syscall_number);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+_initialize_arm_3ds_tdep (void)
|
||||
+{
|
||||
+ gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_3DS,
|
||||
+ arm_3ds_init_abi);
|
||||
+}
|
||||
diff -NBaur gdb-8.2/gdb/configure.tgt gdb-8.2-3ds/gdb/configure.tgt
|
||||
--- gdb-8.2/gdb/configure.tgt 2018-09-05 08:44:28.000000000 +0100
|
||||
+++ gdb-8.2-3ds/gdb/configure.tgt 2018-11-15 22:47:17.337689978 +0000
|
||||
@@ -61,7 +61,7 @@
|
||||
;;
|
||||
|
||||
arm*-*-*)
|
||||
- cpu_obs="arch/arm.o arch/arm-get-next-pcs.o arm-tdep.o";;
|
||||
+ cpu_obs="arch/arm.o arch/arm-get-next-pcs.o arm-tdep.o arm-3ds-tdep.o";;
|
||||
|
||||
hppa*-*-*)
|
||||
# Target: HP PA-RISC
|
||||
diff -NBaur gdb-8.2/gdb/data-directory/Makefile.in gdb-8.2-3ds/gdb/data-directory/Makefile.in
|
||||
--- gdb-8.2/gdb/data-directory/Makefile.in 2018-01-05 04:07:23.000000000 +0000
|
||||
+++ gdb-8.2-3ds/gdb/data-directory/Makefile.in 2018-11-15 22:42:36.840956065 +0000
|
||||
@@ -63,7 +63,7 @@
|
||||
sparc-linux.xml \
|
||||
sparc64-linux.xml
|
||||
|
||||
-SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml $(GEN_SYSCALLS_FILES)
|
||||
+SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml arm-3ds.xml $(GEN_SYSCALLS_FILES)
|
||||
|
||||
PYTHON_DIR = python
|
||||
PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
|
||||
diff -NBaur gdb-8.2/gdb/defs.h gdb-8.2-3ds/gdb/defs.h
|
||||
--- gdb-8.2/gdb/defs.h 2018-09-05 08:27:32.000000000 +0100
|
||||
+++ gdb-8.2-3ds/gdb/defs.h 2018-11-15 22:42:36.840956065 +0000
|
||||
@@ -495,6 +495,7 @@
|
||||
GDB_OSABI_LYNXOS178,
|
||||
GDB_OSABI_NEWLIB,
|
||||
GDB_OSABI_SDE,
|
||||
+ GDB_OSABI_3DS,
|
||||
|
||||
GDB_OSABI_INVALID /* keep this last */
|
||||
};
|
||||
diff -NBaur gdb-8.2/gdb/Makefile.in gdb-8.2-3ds/gdb/Makefile.in
|
||||
--- gdb-8.2/gdb/Makefile.in 2018-09-05 08:44:28.000000000 +0100
|
||||
+++ gdb-8.2-3ds/gdb/Makefile.in 2018-11-15 22:45:01.628931262 +0000
|
||||
@@ -684,6 +684,7 @@
|
||||
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 @@
|
||||
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/gdb/osabi.c gdb-8.2-3ds/gdb/osabi.c
|
||||
--- gdb-8.2/gdb/osabi.c 2018-09-05 08:27:13.000000000 +0100
|
||||
+++ gdb-8.2-3ds/gdb/osabi.c 2018-11-15 22:42:36.840956065 +0000
|
||||
@@ -80,6 +80,7 @@
|
||||
{ "LynxOS178", NULL },
|
||||
{ "Newlib", NULL },
|
||||
{ "SDE", NULL },
|
||||
+ { "3DS", NULL },
|
||||
|
||||
{ "<invalid>", NULL }
|
||||
};
|
||||
diff -NBaur gdb-8.2/gdb/syscalls/arm-3ds.xml gdb-8.2-3ds/gdb/syscalls/arm-3ds.xml
|
||||
--- gdb-8.2/gdb/syscalls/arm-3ds.xml 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ gdb-8.2-3ds/gdb/syscalls/arm-3ds.xml 2018-11-15 22:42:36.840956065 +0000
|
||||
@@ -0,0 +1,159 @@
|
||||
+<?xml version="1.0"?>
|
||||
+<!DOCTYPE syscalls_info SYSTEM "gdb-syscalls.dtd">
|
||||
+<!-- This file is located inside GDB and is based on files which license are: -->
|
||||
+<!-- Copyright (C) 2009-2017 Free Software Foundation, Inc.
|
||||
+
|
||||
+ Copying and distribution of this file, with or without modification,
|
||||
+ are permitted in any medium without royalty provided the copyright
|
||||
+ notice and this notice are preserved. This file is offered as-is,
|
||||
+ without any warranty. -->
|
||||
+<syscalls_info>
|
||||
+ <syscall name="ControlMemory" number="1" groups="memory"/>
|
||||
+ <syscall name="QueryMemory" number="2" groups="memory"/>
|
||||
+
|
||||
+ <syscall name="ExitProcess" number="3" groups="process"/>
|
||||
+ <syscall name="GetProcessAffinityMask" number="4" groups="process"/>
|
||||
+ <syscall name="SetProcessAffinityMask" number="5" groups="process"/>
|
||||
+ <syscall name="GetProcessIdealProcessor" number="6" groups="process"/>
|
||||
+ <syscall name="SetProcessIdealProcessor" number="7" groups="process"/>
|
||||
+
|
||||
+ <syscall name="CreateThread" number="8" groups="thread"/>
|
||||
+ <syscall name="ExitThread" number="9" groups="thread"/>
|
||||
+ <syscall name="SleepThread" number="10" groups="thread"/>
|
||||
+ <syscall name="GetThreadPriority" number="11" groups="thread"/>
|
||||
+ <syscall name="SetThreadPriority" number="12" groups="thread"/>
|
||||
+ <syscall name="GetThreadAffinityMask" number="13" groups="thread"/>
|
||||
+ <syscall name="SetThreadAffinityMask" number="14" groups="thread"/> <!-- removed -->
|
||||
+ <syscall name="GetThreadIdealProcessor" number="15" groups="thread"/>
|
||||
+ <syscall name="SetThreadIdealProcessor" number="16" groups="thread"/> <!-- removed -->
|
||||
+ <syscall name="GetCurrentProcessorNumber" number="17" groups="thread"/>
|
||||
+ <syscall name="Run" number="18" groups="thread"/>
|
||||
+
|
||||
+ <syscall name="CreateMutex" number="19" groups="synchronization"/>
|
||||
+ <syscall name="ReleaseMutex" number="20" groups="synchronization"/>
|
||||
+ <syscall name="CreateSemaphore" number="21" groups="synchronization"/>
|
||||
+ <syscall name="ReleaseSemaphore" number="22" groups="synchronization"/>
|
||||
+ <syscall name="CreateEvent" number="23" groups="synchronization"/>
|
||||
+ <syscall name="SignalEvent" number="24" groups="synchronization"/>
|
||||
+ <syscall name="ClearEvent" number="25" groups="synchronization"/>
|
||||
+ <syscall name="CreateTimer" number="26" groups="synchronization"/>
|
||||
+ <syscall name="SetTimer" number="27" groups="synchronization"/>
|
||||
+ <syscall name="CancelTimer" number="28" groups="synchronization"/>
|
||||
+ <syscall name="ClearTimer" number="29" groups="synchronization"/>
|
||||
+
|
||||
+ <syscall name="CreateMemoryBlock" number="30" groups="memory,ipc"/>
|
||||
+ <syscall name="MapMemoryBlock" number="31" groups="memory,ipc"/>
|
||||
+ <syscall name="UnmapMemoryBlock" number="32" groups="memory,ipc"/>
|
||||
+
|
||||
+ <syscall name="CreateAddressArbiter" number="33" groups="memory,synchronization"/>
|
||||
+ <syscall name="ArbitrateAddress" number="34" groups="memory,synchronization"/>
|
||||
+
|
||||
+ <syscall name="CloseHandle" number="35" groups="synchronization,ipc,memory,thread,process,debug"/>
|
||||
+ <syscall name="WaitSynchronization" number="36" groups="synchronization,ipc,thread,process,debug"/>
|
||||
+ <syscall name="WaitSynchronizationN" number="37" groups="synchronization,ipc,thread,process,debug"/>
|
||||
+ <syscall name="SignalAndWait" number="38" groups="synchronization"/> <!-- removed -->
|
||||
+ <syscall name="DuplicateHandle" number="39" groups="synchronization,ipc,memory,thread,process,debug"/>
|
||||
+
|
||||
+ <syscall name="GetSystemTick" number="40" groups="information"/>
|
||||
+ <syscall name="GetHandleInfo" number="41" groups="information,synchronization,ipc,memory,thread,process,debug"/>
|
||||
+ <syscall name="GetSystemInfo" number="42" groups="information"/>
|
||||
+ <syscall name="GetProcessInfo" number="43" groups="information,process"/>
|
||||
+ <syscall name="GetThreadInfo" number="44" groups="information,thread"/>
|
||||
+
|
||||
+ <syscall name="ConnectToPort" number="45" groups="ipc"/>
|
||||
+ <syscall name="GetCFWInfo" number="46" groups="custom,information"/> <!-- deprecated -->
|
||||
+ <syscall name="SendSyncRequest2" number="47" groups="ipc"/> <!-- removed -->
|
||||
+ <syscall name="SendSyncRequest3" number="48" groups="ipc"/> <!-- removed -->
|
||||
+ <syscall name="SendSyncRequest4" number="49" groups="ipc"/> <!-- removed -->
|
||||
+ <syscall name="SendSyncRequest" number="50" groups="ipc"/> <!-- removed -->
|
||||
+
|
||||
+ <syscall name="OpenProcess" number="51" groups="process"/>
|
||||
+ <syscall name="OpenThread" number="52" groups="thread"/>
|
||||
+
|
||||
+ <syscall name="GetProcessId" number="53" groups="process"/>
|
||||
+ <syscall name="GetProcessIdOfThread" number="54" groups="process,thread"/>
|
||||
+ <syscall name="GetThreadId" number="55" groups="thread"/>
|
||||
+
|
||||
+ <syscall name="GetResourceLimit" number="56" groups="process"/>
|
||||
+ <syscall name="GetResourceLimitLimitValues" number="57" groups="process"/>
|
||||
+ <syscall name="GetResourceLimitCurrentValues" number="58" groups="process"/>
|
||||
+
|
||||
+ <syscall name="GetThreadContext" number="59" groups="debug,thread"/> <!-- removed -->
|
||||
+ <syscall name="Break" number="60" groups="debug"/>
|
||||
+ <syscall name="OutputDebugString" number="61" groups="debug"/>
|
||||
+ <syscall name="ControlPerformanceCounter" number="62" groups="debug"/>
|
||||
+
|
||||
+ <syscall name="CreatePort" number="71" groups="ipc"/>
|
||||
+ <syscall name="CreateSessionToPort" number="72" groups="ipc"/>
|
||||
+ <syscall name="CreateSession" number="73" groups="ipc"/>
|
||||
+ <syscall name="AcceptSession" number="74" groups="ipc"/>
|
||||
+ <syscall name="ReplyAndReceive1" number="75" groups="ipc"/>
|
||||
+ <syscall name="ReplyAndReceive2" number="76" groups="ipc"/>
|
||||
+ <syscall name="ReplyAndReceive3" number="77" groups="ipc"/>
|
||||
+ <syscall name="ReplyAndReceive4" number="78" groups="ipc"/>
|
||||
+ <syscall name="ReplyAndReceive" number="79" groups="ipc"/>
|
||||
+
|
||||
+ <syscall name="BindInterrupt" number="80" groups="io,synchronization"/>
|
||||
+ <syscall name="UnbindInterrupt" number="81" groups="io,synchronization"/>
|
||||
+ <syscall name="InvalidateProcessDataCache" number="82" groups="io,memory,process"/>
|
||||
+ <syscall name="StoreProcessDataCache" number="83" groups="io,memory,process"/>
|
||||
+ <syscall name="FlushProcessDataCache" number="84" groups="io,memory,process"/>
|
||||
+
|
||||
+ <syscall name="StartInterprocessDma" number="85" groups="io,memory,ipc"/>
|
||||
+ <syscall name="StopDma" number="86" groups="io,memory,ipc"/>
|
||||
+ <syscall name="GetDmaState" number="87" groups="io,memory,ipc"/>
|
||||
+ <syscall name="RestartDma" number="88" groups="io,memory,ipc"/>
|
||||
+
|
||||
+ <syscall name="SetGpuProt" number="89" groups="io"/>
|
||||
+ <syscall name="SetWifiEnabled" number="90" groups="io"/>
|
||||
+
|
||||
+ <syscall name="DebugActiveProcess" number="96" groups="debug,process"/>
|
||||
+ <syscall name="BreakDebugProcess" number="97" groups="debug,process"/>
|
||||
+ <syscall name="TerminateDebugProcess" number="98" groups="debug,process"/>
|
||||
+ <syscall name="GetProcessDebugEvent" number="99" groups="debug"/>
|
||||
+ <syscall name="ContinueDebugEvent" number="100" groups="debug"/>
|
||||
+ <syscall name="GetProcessList" number="101" groups="information,debug,process"/>
|
||||
+ <syscall name="GetThreadList" number="102" groups="information,debug,thread"/>
|
||||
+ <syscall name="GetDebugThreadContext" number="103" groups="debug,thread"/>
|
||||
+ <syscall name="SetDebugThreadContext" number="104" groups="debug,thread"/>
|
||||
+ <syscall name="QueryDebugProcessMemory" number="105" groups="debug,process,memory"/>
|
||||
+ <syscall name="ReadProcessMemory" number="106" groups="debug,process,memory"/>
|
||||
+ <syscall name="WriteProcessMemory" number="107" groups="debug,process,memory"/>
|
||||
+ <syscall name="SetHardwareBreakPoint" number="108" group="debug"/>
|
||||
+ <syscall name="GetDebugThreadParam" number="109" group="debug,thread"/>
|
||||
+
|
||||
+ <syscall name="ControlProcessMemory" number="112" group="process,memory"/>
|
||||
+ <syscall name="MapProcessMemory" number="113" group="process,memory"/>
|
||||
+ <syscall name="UnmapProcessMemory" number="114" group="process,memory"/>
|
||||
+
|
||||
+ <syscall name="CreateCodeSet" number="115" group="process,memory"/>
|
||||
+ <syscall name="RandomStub" number="116" group="process,memory"/> <!-- removed -->
|
||||
+ <syscall name="CreateProcess" number="117" group="process"/>
|
||||
+ <syscall name="TerminateProcess" number="118" group="process"/>
|
||||
+ <syscall name="SetProcessResourceLimits" number="119" group="process"/>
|
||||
+ <syscall name="CreateResourceLimit" number="120" group="process"/>
|
||||
+ <syscall name="SetResourceLimitValues" number="121" group="process"/>
|
||||
+ <syscall name="AddCodeSegment" number="122" group="process"/> <!-- removed -->
|
||||
+
|
||||
+ <syscall name="Backdoor" number="123" group="kernel"/>
|
||||
+ <syscall name="KernelSetState" number="124" group="kernel"/>
|
||||
+
|
||||
+ <syscall name="QueryProcessMemory" number="125" group="process,memory"/>
|
||||
+
|
||||
+ <syscall name="CustomBackdoor" number="128" group="custom,kernel"/>
|
||||
+
|
||||
+ <syscall name="ConvertVAToPA" number="144" group="custom,io,memory"/>
|
||||
+ <syscall name="FlushDataCacheRange" number="145" group="custom,io,memory"/>
|
||||
+ <syscall name="FlushEntireDataCache" number="146" group="custom,io,memory"/>
|
||||
+ <syscall name="InvalidateInstructionCacheRange" number="147" group="custom,io,memory"/>
|
||||
+ <syscall name="InvalidateEntireInstructionCache" number="148" group="custom,io,memory"/>
|
||||
+
|
||||
+ <syscall name="MapProcessMemoryEx" number="160" group="custom,process,memory"/>
|
||||
+ <syscall name="UnmapProcessMemoryEx" number="161" group="custom,process,memory"/>
|
||||
+ <syscall name="ControlMemoryEx" number="162" group="custom,memory"/>
|
||||
+
|
||||
+ <syscall name="ControlService" number="176" group="custom,ipc"/>
|
||||
+ <syscall name="CopyHandle" number="177" groups="custom,synchronization,ipc,thread,process,debug"/>
|
||||
+ <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
|
||||
+
|
||||
+</syscalls_info>
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/libgloss/configure b/libgloss/configure
|
||||
index aa6f8f834..0e8579890 100755
|
||||
index 0d2918cee..bccfb07b4 100755
|
||||
--- a/libgloss/configure
|
||||
+++ b/libgloss/configure
|
||||
@@ -2594,6 +2594,8 @@ if test "${config_libnosys}" = "true"; then
|
||||
@@ -2604,6 +2604,8 @@ if test "${config_libnosys}" = "true"; then
|
||||
|
||||
fi
|
||||
|
||||
@@ -12,7 +12,7 @@ index aa6f8f834..0e8579890 100755
|
||||
|
||||
ac_config_commands="$ac_config_commands depfiles"
|
||||
diff --git a/libgloss/configure.in b/libgloss/configure.in
|
||||
index 6da164352..f18f17447 100644
|
||||
index f38d5298e..509c31071 100644
|
||||
--- a/libgloss/configure.in
|
||||
+++ b/libgloss/configure.in
|
||||
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
|
||||
@@ -23,7 +23,7 @@ index 6da164352..f18f17447 100644
|
||||
|
||||
if test "${enable_shared}" = "yes" ; then
|
||||
echo "Shared libraries not supported for cross compiling, ignored"
|
||||
@@ -187,6 +188,7 @@ dnl fi
|
||||
@@ -193,6 +194,7 @@ dnl fi
|
||||
if test "${config_libnosys}" = "true"; then
|
||||
AC_CONFIG_SUBDIRS([libnosys])
|
||||
fi
|
||||
@@ -33,7 +33,7 @@ index 6da164352..f18f17447 100644
|
||||
AS=${AS-as}
|
||||
diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
|
||||
new file mode 100644
|
||||
index 000000000..0d2be31c6
|
||||
index 000000000..7ee40deec
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/Makefile.in
|
||||
@@ -0,0 +1,148 @@
|
||||
@@ -104,7 +104,7 @@ index 000000000..0d2be31c6
|
||||
+ else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
|
||||
+
|
||||
+# 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 \
|
||||
+ unlink.o wait.o write.o _exit.o malloc_vars.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
|
||||
new file mode 100644
|
||||
index 000000000..48ce950b4
|
||||
@@ -1012,7 +960,7 @@ index 000000000..48ce950b4
|
||||
+#undef __SYMBOL_PREFIX
|
||||
diff --git a/libgloss/libsysbase/configure b/libgloss/libsysbase/configure
|
||||
new file mode 100644
|
||||
index 000000000..c4b5a79b6
|
||||
index 000000000..7fe331552
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/configure
|
||||
@@ -0,0 +1,4158 @@
|
||||
@@ -1599,7 +1547,7 @@ index 000000000..c4b5a79b6
|
||||
+PACKAGE_BUGREPORT=
|
||||
+PACKAGE_URL=
|
||||
+
|
||||
+ac_unique_file="close.c"
|
||||
+ac_unique_file="abort.c"
|
||||
+ac_subst_vars='LTLIBOBJS
|
||||
+LIBOBJS
|
||||
+host_makefile_frag_path
|
||||
@@ -5176,7 +5124,7 @@ index 000000000..c4b5a79b6
|
||||
+
|
||||
diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
|
||||
new file mode 100644
|
||||
index 000000000..bf276a413
|
||||
index 000000000..3da91ed98
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/configure.in
|
||||
@@ -0,0 +1,199 @@
|
||||
@@ -5195,7 +5143,7 @@ index 000000000..bf276a413
|
||||
+# Process this file with autoconf to produce a configure script.
|
||||
+#
|
||||
+AC_PREREQ(2.59)
|
||||
+AC_INIT(close.c)
|
||||
+AC_INIT(abort.c)
|
||||
+AC_CONFIG_HEADER(config.h)
|
||||
+
|
||||
+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
|
||||
new file mode 100644
|
||||
index 000000000..f3fcc88f7
|
||||
index 000000000..6bf9ab89e
|
||||
--- /dev/null
|
||||
+++ 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 <stdio.h>
|
||||
+#include <errno.h>
|
||||
@@ -6025,7 +5976,7 @@ index 000000000..f3fcc88f7
|
||||
+
|
||||
+__LOCK_INIT(static, __hndl_lock);
|
||||
+
|
||||
+void __free_handle(__handle *handle) {
|
||||
+static void __free_handle(__handle *handle) {
|
||||
+
|
||||
+ if ( NULL != handle
|
||||
+ && handle != &__stdin_handle
|
||||
@@ -6093,8 +6044,11 @@ index 000000000..f3fcc88f7
|
||||
+
|
||||
+ 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) {
|
||||
@@ -6126,57 +6080,107 @@ index 000000000..f3fcc88f7
|
||||
+
|
||||
+int dup2(int oldfd, int newfd) {
|
||||
+
|
||||
+
|
||||
+ __lock_acquire (__hndl_lock);
|
||||
+
|
||||
+ 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;
|
||||
+
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ if ( newfd == oldfd ) {
|
||||
+ __lock_release (__hndl_lock);
|
||||
+ return newfd;
|
||||
+ }
|
||||
+
|
||||
+ __lock_acquire (__hndl_lock);
|
||||
+
|
||||
+ if ( handles[oldfd] == NULL ) {
|
||||
+ __lock_release (__hndl_lock);
|
||||
+ errno = EBADF;
|
||||
+
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ __handle *handle = handles[newfd];
|
||||
+
|
||||
+ if ( NULL != handle ) {
|
||||
+
|
||||
+ handle->refcount--;
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ handles[newfd] = handles[oldfd];
|
||||
+ handles[newfd]->refcount++;
|
||||
+
|
||||
+ __lock_release (__hndl_lock);
|
||||
+ if ( handle ) {
|
||||
+
|
||||
+ if ( NULL != handle ) {
|
||||
+ int ref = --handle->refcount;
|
||||
+ __lock_release (__hndl_lock);
|
||||
+
|
||||
+ if (handle->refcount == 0 ) {
|
||||
+ if ( ref == 0 ) {
|
||||
+
|
||||
+ if( devoptab_list[handle->device]->close_r != NULL) {
|
||||
+ if ( devoptab_list[handle->device]->close_r ) {
|
||||
+
|
||||
+ _REENT->deviceData = devoptab_list[handle->device]->deviceData;
|
||||
+ devoptab_list[handle->device]->close_r(_REENT,handle->fileStruct);
|
||||
+
|
||||
+ } else {
|
||||
+
|
||||
+ __free_handle(handle);
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ __free_handle(handle);
|
||||
+ }
|
||||
+
|
||||
+ } else {
|
||||
+
|
||||
+ __lock_release (__hndl_lock);
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ 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
|
||||
new file mode 100644
|
||||
@@ -7404,10 +7408,10 @@ index 000000000..61de918bc
|
||||
+ return ret;
|
||||
+}
|
||||
diff --git a/newlib/configure.host b/newlib/configure.host
|
||||
index eb645868b..9cb69fde9 100644
|
||||
index a84c0c80a..29fb7ed24 100644
|
||||
--- a/newlib/configure.host
|
||||
+++ b/newlib/configure.host
|
||||
@@ -631,6 +631,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
|
||||
@@ -687,6 +687,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
|
||||
syscall_dir=syscalls
|
||||
default_newlib_io_long_long="yes"
|
||||
;;
|
||||
@@ -7423,7 +7427,7 @@ index eb645868b..9cb69fde9 100644
|
||||
syscall_dir=syscalls
|
||||
;;
|
||||
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
|
||||
index cbc0fa989..10960f912 100644
|
||||
index 164d95bca..083e48758 100644
|
||||
--- a/newlib/libc/include/stdio.h
|
||||
+++ b/newlib/libc/include/stdio.h
|
||||
@@ -233,7 +233,7 @@ int fsetpos (FILE *, const _fpos_t *);
|
||||
@@ -7436,7 +7440,7 @@ index cbc0fa989..10960f912 100644
|
||||
void clearerr (FILE *);
|
||||
int feof (FILE *);
|
||||
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
|
||||
index 2082dfdb1..e535f189b 100644
|
||||
index d746b15fc..80169d9b7 100644
|
||||
--- a/newlib/libc/include/sys/config.h
|
||||
+++ b/newlib/libc/include/sys/config.h
|
||||
@@ -4,6 +4,9 @@
|
||||
@@ -7516,7 +7520,7 @@ index a3fb5c02c..5debd1525 100644
|
||||
+
|
||||
+#endif // _dirent_h_
|
||||
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
|
||||
index 2900b332f..6efb54eb3 100644
|
||||
index 218807178..c9efd7d03 100644
|
||||
--- a/newlib/libc/include/sys/features.h
|
||||
+++ b/newlib/libc/include/sys/features.h
|
||||
@@ -330,6 +330,9 @@ extern "C" {
|
||||
@@ -7531,7 +7535,7 @@ index 2900b332f..6efb54eb3 100644
|
||||
#ifdef __rtems__
|
||||
diff --git a/newlib/libc/include/sys/iosupport.h b/newlib/libc/include/sys/iosupport.h
|
||||
new file mode 100644
|
||||
index 000000000..dfed4107e
|
||||
index 000000000..c190fa37d
|
||||
--- /dev/null
|
||||
+++ b/newlib/libc/include/sys/iosupport.h
|
||||
@@ -0,0 +1,112 @@
|
||||
@@ -7547,7 +7551,7 @@ index 000000000..dfed4107e
|
||||
+#include <reent.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <sys/statvfs.h>
|
||||
+#include <time.h>
|
||||
+#include <sys/time.h>
|
||||
+
|
||||
+enum {
|
||||
+ STD_IN,
|
||||
@@ -7647,11 +7651,25 @@ index 000000000..dfed4107e
|
||||
+//---------------------------------------------------------------------------------
|
||||
+#endif // __iosupp_h__
|
||||
+//---------------------------------------------------------------------------------
|
||||
diff --git a/newlib/libc/include/sys/param.h b/newlib/libc/include/sys/param.h
|
||||
index 9a6f115a6..142e71d35 100644
|
||||
--- a/newlib/libc/include/sys/param.h
|
||||
+++ b/newlib/libc/include/sys/param.h
|
||||
@@ -19,9 +19,6 @@
|
||||
#ifndef NOFILE
|
||||
# define NOFILE (60)
|
||||
#endif
|
||||
-#ifndef PATHSIZE
|
||||
-# define PATHSIZE (1024)
|
||||
-#endif
|
||||
|
||||
#define MAXPATHLEN PATH_MAX
|
||||
|
||||
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
|
||||
index 1ef226194..ce3721a14 100644
|
||||
index 74b70e9c0..d8c5410ec 100644
|
||||
--- a/newlib/libc/include/sys/reent.h
|
||||
+++ b/newlib/libc/include/sys/reent.h
|
||||
@@ -416,6 +416,8 @@ struct _reent
|
||||
@@ -421,6 +421,8 @@ struct _reent
|
||||
__FILE *__sf; /* file descriptors */
|
||||
struct _misc_reent *_misc; /* strtok, multibyte states */
|
||||
char *_signal_buf; /* strsignal */
|
||||
@@ -7659,8 +7677,8 @@ index 1ef226194..ce3721a14 100644
|
||||
+ void *deviceData;
|
||||
};
|
||||
|
||||
extern const struct __sFILE_fake __sf_fake_stdin;
|
||||
@@ -647,6 +649,7 @@ struct _reent
|
||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||
@@ -691,6 +693,7 @@ struct _reent
|
||||
# ifndef _REENT_GLOBAL_STDIO_STREAMS
|
||||
__FILE __sf[3]; /* first three file descriptors */
|
||||
# endif
|
||||
@@ -7669,10 +7687,10 @@ index 1ef226194..ce3721a14 100644
|
||||
|
||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
|
||||
index eee98db64..aed9c1746 100644
|
||||
index 8769112b0..5526e59ee 100644
|
||||
--- a/newlib/libc/include/sys/stat.h
|
||||
+++ b/newlib/libc/include/sys/stat.h
|
||||
@@ -152,8 +152,9 @@ int mkfifo (const char *__path, mode_t __mode );
|
||||
@@ -142,8 +142,9 @@ int mkfifo (const char *__path, mode_t __mode );
|
||||
int stat (const char *__restrict __path, struct stat *__restrict __sbuf );
|
||||
mode_t umask (mode_t __mask );
|
||||
|
||||
@@ -7752,10 +7770,10 @@ index 5e937f103..635a7a6b8 100644
|
||||
};
|
||||
#endif
|
||||
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
|
||||
index baa5451a6..a11f89473 100644
|
||||
index 4c343e462..c04493460 100644
|
||||
--- a/newlib/libc/locale/locale.c
|
||||
+++ b/newlib/libc/locale/locale.c
|
||||
@@ -91,7 +91,7 @@ beginning with <<"LC_">>.
|
||||
@@ -92,7 +92,7 @@ beginning with <<"LC_">>.
|
||||
|
||||
<<localeconv>> returns a pointer to a structure (also defined in
|
||||
`<<locale.h>>') describing the locale-specific conventions currently
|
||||
@@ -7764,7 +7782,7 @@ index baa5451a6..a11f89473 100644
|
||||
|
||||
<<_localeconv_r>> and <<_setlocale_r>> are reentrant versions of
|
||||
<<localeconv>> and <<setlocale>> respectively. The extra argument
|
||||
@@ -165,15 +165,18 @@ No supporting OS subroutines are required.
|
||||
@@ -166,15 +166,18 @@ No supporting OS subroutines are required.
|
||||
#include "../ctype/ctype_.h"
|
||||
#include "../stdlib/local.h"
|
||||
|
||||
@@ -7783,7 +7801,7 @@ index baa5451a6..a11f89473 100644
|
||||
#ifdef _MB_CAPABLE
|
||||
/*
|
||||
* Category names for getenv()
|
||||
@@ -193,7 +196,11 @@ static char *categories[_LC_LAST] = {
|
||||
@@ -194,7 +197,11 @@ static char *categories[_LC_LAST] = {
|
||||
* Default locale per POSIX. Can be overridden on a per-target base.
|
||||
*/
|
||||
#ifndef DEFAULT_LOCALE
|
||||
@@ -7796,7 +7814,7 @@ index baa5451a6..a11f89473 100644
|
||||
#endif
|
||||
|
||||
#ifdef _MB_CAPABLE
|
||||
@@ -206,8 +213,13 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
|
||||
@@ -207,8 +214,13 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
|
||||
const struct __locale_t __C_locale =
|
||||
{
|
||||
{ "C", "C", "C", "C", "C", "C", "C", },
|
||||
@@ -7810,7 +7828,7 @@ index baa5451a6..a11f89473 100644
|
||||
0,
|
||||
DEFAULT_CTYPE_PTR,
|
||||
{
|
||||
@@ -218,9 +230,15 @@ const struct __locale_t __C_locale =
|
||||
@@ -219,9 +231,15 @@ const struct __locale_t __C_locale =
|
||||
CHAR_MAX, CHAR_MAX
|
||||
},
|
||||
#ifndef __HAVE_LOCALE_INFO__
|
||||
@@ -7826,7 +7844,7 @@ index baa5451a6..a11f89473 100644
|
||||
#else /* __HAVE_LOCALE_INFO__ */
|
||||
{
|
||||
{ NULL, NULL }, /* LC_ALL */
|
||||
@@ -239,10 +257,11 @@ const struct __locale_t __C_locale =
|
||||
@@ -240,10 +258,11 @@ const struct __locale_t __C_locale =
|
||||
};
|
||||
#endif /* _MB_CAPABLE */
|
||||
|
||||
@@ -7839,7 +7857,7 @@ index baa5451a6..a11f89473 100644
|
||||
__utf8_wctomb,
|
||||
__utf8_mbtowc,
|
||||
#else
|
||||
@@ -259,9 +278,15 @@ struct __locale_t __global_locale =
|
||||
@@ -260,9 +279,15 @@ struct __locale_t __global_locale =
|
||||
CHAR_MAX, CHAR_MAX
|
||||
},
|
||||
#ifndef __HAVE_LOCALE_INFO__
|
||||
@@ -7855,7 +7873,7 @@ index baa5451a6..a11f89473 100644
|
||||
#else /* __HAVE_LOCALE_INFO__ */
|
||||
{
|
||||
{ NULL, NULL }, /* LC_ALL */
|
||||
@@ -295,7 +320,7 @@ _setlocale_r (struct _reent *p,
|
||||
@@ -296,7 +321,7 @@ _setlocale_r (struct _reent *p,
|
||||
{
|
||||
#ifndef _MB_CAPABLE
|
||||
if (locale)
|
||||
@@ -7864,7 +7882,7 @@ index baa5451a6..a11f89473 100644
|
||||
if (strcmp (locale, "POSIX") && strcmp (locale, "C")
|
||||
&& strcmp (locale, ""))
|
||||
return NULL;
|
||||
@@ -982,6 +1007,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
|
||||
@@ -990,6 +1015,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
|
||||
|
||||
const char *
|
||||
__locale_ctype_ptr (void)
|
||||
@@ -7932,17 +7950,15 @@ index d9dbcd5c3..43712f813 100644
|
||||
|
||||
diff --git a/newlib/libc/machine/arm/sync_synchronize.c b/newlib/libc/machine/arm/sync_synchronize.c
|
||||
new file mode 100644
|
||||
index 000000000..3acc9e094
|
||||
index 000000000..f5a85c3a8
|
||||
--- /dev/null
|
||||
+++ b/newlib/libc/machine/arm/sync_synchronize.c
|
||||
@@ -0,0 +1,10 @@
|
||||
@@ -0,0 +1,8 @@
|
||||
+#if __ARM_ARCH < 6
|
||||
+#include <sys/cdefs.h>
|
||||
+void __attribute__((weak))
|
||||
+__sync_synchronize (void)
|
||||
+{
|
||||
+ __warn_references (__sync_synchronize,
|
||||
+ "legacy compatible __sync_synchronize used. Not suitable for multi-threaded applications");
|
||||
+ return;
|
||||
+}
|
||||
+#endif
|
||||
@@ -8015,7 +8031,7 @@ index 9b982a993..8c0aaac8c 100644
|
||||
+*/
|
||||
#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
|
||||
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
|
||||
index b358d2b4a..29cec0229 100644
|
||||
index b358d2b4a..a3e597fd2 100644
|
||||
--- a/newlib/libc/stdio/fread.c
|
||||
+++ b/newlib/libc/stdio/fread.c
|
||||
@@ -135,7 +135,7 @@ crlf_r (struct _reent * ptr,
|
||||
@@ -8027,7 +8043,24 @@ index b358d2b4a..29cec0229 100644
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -225,7 +225,32 @@ _fread_r (struct _reent * ptr,
|
||||
@@ -187,7 +187,6 @@ _fread_r (struct _reent * ptr,
|
||||
int rc = 0;
|
||||
/* save fp buffering state */
|
||||
void *old_base = fp->_bf._base;
|
||||
- void * old_p = fp->_p;
|
||||
int old_size = fp->_bf._size;
|
||||
/* allow __refill to use user's buffer */
|
||||
fp->_bf._base = (unsigned char *) p;
|
||||
@@ -197,7 +196,7 @@ _fread_r (struct _reent * ptr,
|
||||
/* restore fp buffering back to original state */
|
||||
fp->_bf._base = old_base;
|
||||
fp->_bf._size = old_size;
|
||||
- fp->_p = old_p;
|
||||
+ fp->_p = old_base;
|
||||
resid -= fp->_r;
|
||||
p += fp->_r;
|
||||
fp->_r = 0;
|
||||
@@ -225,7 +224,31 @@ _fread_r (struct _reent * ptr,
|
||||
/* fp->_r = 0 ... done in __srefill */
|
||||
p += r;
|
||||
resid -= r;
|
||||
@@ -8035,11 +8068,10 @@ index b358d2b4a..29cec0229 100644
|
||||
+
|
||||
+ int rc = 0;
|
||||
+
|
||||
+ if (resid>BUFSIZ)
|
||||
+ if (resid>fp->_bf._size)
|
||||
+ {
|
||||
+ /* save fp buffering state */
|
||||
+ void *old_base = fp->_bf._base;
|
||||
+ void * old_p = fp->_p;
|
||||
+ int old_size = fp->_bf._size;
|
||||
+ /* allow __refill to use user's buffer */
|
||||
+ fp->_bf._base = (unsigned char *) p;
|
||||
@@ -8049,7 +8081,7 @@ index b358d2b4a..29cec0229 100644
|
||||
+ /* restore fp buffering back to original state */
|
||||
+ fp->_bf._base = old_base;
|
||||
+ fp->_bf._size = old_size;
|
||||
+ fp->_p = old_p;
|
||||
+ fp->_p = old_base;
|
||||
+ resid -= fp->_r;
|
||||
+ p += fp->_r;
|
||||
+ fp->_r = 0;
|
||||
@@ -8093,7 +8125,7 @@ index c4bf2dbe3..d756df37d 100644
|
||||
if (ch == 'S' || (flags & LONGINT)) {
|
||||
mbstate_t ps;
|
||||
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
|
||||
index b97235559..298f68a9c 100644
|
||||
index 9c38eebf4..fbc8d877d 100644
|
||||
--- a/newlib/libc/stdio/vfscanf.c
|
||||
+++ b/newlib/libc/stdio/vfscanf.c
|
||||
@@ -74,6 +74,8 @@ These are GNU extensions.
|
||||
@@ -8120,7 +8152,7 @@ index 980b31e3b..722be905e 100644
|
||||
|
||||
#ifdef INTEGER_ONLY
|
||||
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
|
||||
index c3470a15c..626f13723 100644
|
||||
index ffb6cc85b..db33d4f29 100644
|
||||
--- a/newlib/libc/stdio/vfwscanf.c
|
||||
+++ b/newlib/libc/stdio/vfwscanf.c
|
||||
@@ -74,6 +74,9 @@ PORTABILITY
|
||||
@@ -8274,16 +8306,3 @@ index 000000000..567fed56b
|
||||
+ __libc_lock_release_recursive(&(NAME))
|
||||
+
|
||||
+#endif // __SYS_LOCK_H__
|
||||
diff --git a/newlib/libc/sys/arm/sys/param.h b/newlib/libc/sys/arm/sys/param.h
|
||||
index 5b9464cca..e8969b954 100644
|
||||
--- a/newlib/libc/sys/arm/sys/param.h
|
||||
+++ b/newlib/libc/sys/arm/sys/param.h
|
||||
@@ -19,6 +19,8 @@
|
||||
# define PATHSIZE (1024)
|
||||
#endif
|
||||
|
||||
+#define MAXPATHLEN PATHSIZE
|
||||
+
|
||||
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
||||
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
ifeq ($(strip $(DEVKITPRO)),)
|
||||
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro)
|
||||
endif
|
||||
|
||||
include $(DEVKITARM)/base_rules
|
||||
|
||||
PORTLIBS := $(PORTLIBS_PATH)/3ds
|
||||
|
||||
export PATH := $(PORTLIBS_PATH)/3ds/bin:$(PATH)
|
||||
|
||||
CTRULIB ?= $(DEVKITPRO)/libctru
|
||||
|
||||
ifeq ($(strip $(APP_TITLE)),)
|
||||
APP_TITLE := $(notdir $(OUTPUT))
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(APP_DESCRIPTION)),)
|
||||
APP_DESCRIPTION := Built with devkitARM & libctru
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(APP_AUTHOR)),)
|
||||
APP_AUTHOR := Unspecified Author
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(APP_ICON)),)
|
||||
APP_ICON := $(CTRULIB)/default_icon.png
|
||||
endif
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.smdh: $(APP_ICON) $(MAKEFILE_LIST)
|
||||
@smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
|
||||
@echo built ... $(notdir $@)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.3dsx: %.elf
|
||||
@3dsxtool $< $@ $(_3DSXFLAGS)
|
||||
@echo built ... $(notdir $@)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.elf:
|
||||
@echo linking $(notdir $@)
|
||||
@$(LD) $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
|
||||
@$(NM) -CSn $@ > $(notdir $*.lst)
|
||||
@@ -1,111 +0,0 @@
|
||||
include $(DEVKITARM)/base_tools
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# add portlibs path
|
||||
#---------------------------------------------------------------------------------
|
||||
export PORTLIBS_PATH := $(DEVKITPRO)/portlibs
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.a:
|
||||
#---------------------------------------------------------------------------------
|
||||
@echo $(notdir $@)
|
||||
@rm -f $@
|
||||
$(AR) -rc $@ $^
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.arm.o: %.arm.cpp
|
||||
@echo $(notdir $<)
|
||||
$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.arm.d $(CXXFLAGS) -marm -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.arm.o: %.arm.c
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.arm.d $(CFLAGS) -marm -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.arm.o: %.arm.m
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.arm.d $(OBJCFLAGS) -marm -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.thumb.o: %.thumb.cpp
|
||||
@echo $(notdir $<)
|
||||
$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.thumb.d $(CXXFLAGS) -mthumb -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.thumb.o: %.thumb.c
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.thumb.d $(CFLAGS) -mthumb -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.thumb.o: %.thumb.m
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.thumb.d $(OBJCFLAGS) -mthumb -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.iwram.o: %.iwram.cpp
|
||||
@echo $(notdir $<)
|
||||
$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.iwram.d $(CXXFLAGS) -marm -mlong-calls -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.iwram.o: %.iwram.c
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.iwram.d $(CFLAGS) -marm -mlong-calls -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.iwram.o: %.iwram.m
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.iwram.d $(OBJCFLAGS) -marm -mlong-calls -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.itcm.o: %.itcm.cpp
|
||||
@echo $(notdir $<)
|
||||
$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.itcm.d $(CXXFLAGS) -marm -mlong-calls -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.itcm.o: %.itcm.c
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.itcm.d $(CFLAGS) -marm -mlong-calls -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.itcm.o: %.itcm.m
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.itcm.d $(OBJCFLAGS) -marm -mlong-calls -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.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: %.m
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d $(OBJCFLAGS) -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/' -e 's/[^A-Za-z0-9_]/_/g')`"_end[];" > `(echo $(<F) | tr . _)`.h
|
||||
echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"[];" >> `(echo $(<F) | tr . _)`.h
|
||||
echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`_size";" >> `(echo $(<F) | tr . _)`.h
|
||||
endef
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
#---------------------------------------------------------------------------------
|
||||
# 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
|
||||
#---------------------------------------------------------------------------------
|
||||
DEVKITPATH=$(shell echo "$(DEVKITPRO)" | sed -e 's/^\([a-zA-Z]\):/\/\1/')
|
||||
export PATH := $(DEVKITPATH)/tools/bin:$(DEVKITPATH)/devkitARM/bin:$(PATH)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# the prefix on the compiler executables
|
||||
#---------------------------------------------------------------------------------
|
||||
PREFIX := arm-none-eabi-
|
||||
|
||||
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
|
||||
@@ -1,54 +0,0 @@
|
||||
ifeq ($(strip $(DEVKITPRO)),)
|
||||
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro)
|
||||
endif
|
||||
|
||||
include $(DEVKITARM)/base_rules
|
||||
|
||||
PORTLIBS := $(PORTLIBS_PATH)/nds $(PORTLIBS_PATH)/armv5te
|
||||
|
||||
LIBNDS := $(DEVKITPRO)/libnds
|
||||
|
||||
ifeq ($(strip $(GAME_TITLE)),)
|
||||
GAME_TITLE := $(notdir $(OUTPUT))
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(GAME_SUBTITLE1)),)
|
||||
GAME_SUBTITLE1 := built with devkitARM
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(GAME_SUBTITLE2)),)
|
||||
GAME_SUBTITLE2 := http://devkitpro.org
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(GAME_ICON)),)
|
||||
GAME_ICON := $(DEVKITPRO)/libnds/icon.bmp
|
||||
endif
|
||||
|
||||
ifneq ($(strip $(NITRO_FILES)),)
|
||||
_ADDFILES := -d $(NITRO_FILES)
|
||||
endif
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.nds: %.arm9
|
||||
@ndstool -c $@ -9 $< -b $(GAME_ICON) "$(GAME_TITLE);$(GAME_SUBTITLE1);$(GAME_SUBTITLE2)" $(_ADDFILES)
|
||||
@echo built ... $(notdir $@)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.nds: %.elf
|
||||
@ndstool -c $@ -9 $< -b $(GAME_ICON) "$(GAME_TITLE);$(GAME_SUBTITLE1);$(GAME_SUBTITLE2)" $(_ADDFILES)
|
||||
@echo built ... $(notdir $@)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.arm9: %.elf
|
||||
@$(OBJCOPY) -O binary $< $@
|
||||
@echo built ... $(notdir $@)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.arm7: %.elf
|
||||
@$(OBJCOPY) -O binary $< $@
|
||||
@echo built ... $(notdir $@)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.elf:
|
||||
@echo linking $(notdir $@)
|
||||
@$(LD) $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
|
||||
@@ -1,25 +0,0 @@
|
||||
ifeq ($(strip $(DEVKITPRO)),)
|
||||
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro)
|
||||
endif
|
||||
|
||||
include $(DEVKITARM)/base_rules
|
||||
|
||||
PORTLIBS := $(PORTLIBS_PATH)/gba $(PORTLIBS_PATH)/armv4
|
||||
|
||||
LIBGBA := $(DEVKITPRO)/libgba
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.gba: %.elf
|
||||
@$(OBJCOPY) -O binary $< $@
|
||||
@echo built ... $(notdir $@)
|
||||
@gbafix $@
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%_mb.elf:
|
||||
@echo linking multiboot
|
||||
@$(LD) -specs=gba_mb.specs $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.elf:
|
||||
@echo linking cartridge
|
||||
@$(LD) $(LDFLAGS) -specs=gba.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $@
|
||||
@@ -1,20 +0,0 @@
|
||||
-include $(DEVKITARM)/base_rules
|
||||
|
||||
PORTLIBS := $(PORTLIBS_PATH)/gp32 $(PORTLIBS_PATH)/armv4
|
||||
|
||||
LIBMIRKO := $(DEVKITPRO)/libmirko
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.fxe: %.bin
|
||||
@b2fxec -a "$(AUTHOR)" -t "$(TITLE)" $< $@
|
||||
@echo built ... $(notdir $@)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.bin: %.elf
|
||||
@$(OBJCOPY) -O binary $< $@
|
||||
@echo built ... $(notdir $@)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.elf:
|
||||
@echo linking binary
|
||||
@$(LD) $(LDFLAGS) -specs=gp32.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $@
|
||||
28
dkarm-eabi/scripts/build-crtls.sh
Executable file
28
dkarm-eabi/scripts/build-crtls.sh
Executable file
@@ -0,0 +1,28 @@
|
||||
#!/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
|
||||
|
||||
@@ -64,7 +64,9 @@ then
|
||||
--prefix=$prefix \
|
||||
--enable-lto\
|
||||
--with-system-zlib \
|
||||
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 50" \
|
||||
--disable-tm-clone-registry \
|
||||
--disable-__cxa_atexit \
|
||||
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 55" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
|| { echo "Error configuring gcc"; exit 1; }
|
||||
@@ -150,68 +152,3 @@ fi
|
||||
rm -fr $prefix/$target/sys-include
|
||||
|
||||
cd $BUILDDIR
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# copy base rulesets
|
||||
#---------------------------------------------------------------------------------
|
||||
cp -v $BUILDSCRIPTDIR/dkarm-eabi/rules/* $prefix
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# set env variables
|
||||
#---------------------------------------------------------------------------------
|
||||
export DEVKITPRO=$TOOLPATH
|
||||
export DEVKITARM=$DEVKITPRO/devkitARM
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install and build the crt0 files
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
cp -v $BUILDSCRIPTDIR/dkarm-eabi/crtls/* $prefix/$target/lib/
|
||||
cd $prefix/$target/lib/
|
||||
|
||||
|
||||
$MAKE CRT=gba
|
||||
$MAKE CRT=gp32
|
||||
$MAKE CRT=er
|
||||
$MAKE CRT=gp32_gpsdk
|
||||
$MAKE CRT=ds_arm7
|
||||
$MAKE CRT=ds_arm9
|
||||
$MAKE CRT=ds_cart
|
||||
$MAKE ds_arm7_vram_crt0
|
||||
$MAKE 3dsx_crt0
|
||||
|
||||
cd $BUILDDIR
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install the debugger
|
||||
#---------------------------------------------------------------------------------
|
||||
mkdir -p $target/gdb
|
||||
cd $target/gdb
|
||||
|
||||
PLATFORM=`uname -s`
|
||||
|
||||
if [ ! -f configured-gdb ]
|
||||
then
|
||||
CPPFLAGS="$cppflags $CPPFLAGS" \
|
||||
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
|
||||
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
export DEVKITPRO=$TOOLPATH
|
||||
export DEVKITARM=$DEVKITPRO/devkitARM
|
||||
|
||||
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 libctru"; exit 1; }
|
||||
$MAKE install || { echo "error installing libctru"; exit 1; }
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/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
|
||||
CPPFLAGS="$cppflags $CPPFLAGS" ./configure --prefix=$toolsprefix $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
|
||||
12
dkppc/patches/binutils-2.34.patch
Normal file
12
dkppc/patches/binutils-2.34.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff -NBaur binutils-2.34/opcodes/ppc-opc.c binutils-2.34-ppc/opcodes/ppc-opc.c
|
||||
--- binutils-2.34/opcodes/ppc-opc.c 2020-01-18 13:55:49.000000000 +0000
|
||||
+++ binutils-2.34-ppc/opcodes/ppc-opc.c 2020-05-22 10:47:37.900308413 +0000
|
||||
@@ -3747,7 +3747,7 @@
|
||||
#define MFDEC2 (PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
|
||||
| PPC_OPCODE_TITAN)
|
||||
#define BOOKE PPC_OPCODE_BOOKE
|
||||
-#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
|
||||
+#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
|
||||
#define PPCE300 PPC_OPCODE_E300
|
||||
#define PPCSPE PPC_OPCODE_SPE
|
||||
#define PPCSPE2 PPC_OPCODE_SPE2
|
||||
@@ -1,30 +1,59 @@
|
||||
diff --git a/config/gthr.m4 b/config/gthr.m4
|
||||
index 7b29f1f3327..814104f32a2 100644
|
||||
index 4b937306ad0..bfd0375bd60 100644
|
||||
--- a/config/gthr.m4
|
||||
+++ b/config/gthr.m4
|
||||
@@ -12,6 +12,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
|
||||
[
|
||||
@@ -13,6 +13,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
|
||||
case $1 in
|
||||
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||
dce) thread_header=config/pa/gthr-dce.h ;;
|
||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||
gcn) thread_header=config/gcn/gthr-gcn.h ;;
|
||||
lynx) thread_header=config/gthr-lynx.h ;;
|
||||
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index 532c33f4c2b..bb87330bbbe 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -2461,7 +2461,7 @@ powerpc-xilinx-eabi*)
|
||||
use_gcc_stdint=wrap
|
||||
;;
|
||||
powerpc-*-eabi*)
|
||||
- tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h"
|
||||
+ tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/750cl.h"
|
||||
extra_options="${extra_options} rs6000/sysv4.opt"
|
||||
tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
|
||||
use_gcc_stdint=wrap
|
||||
diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
|
||||
index 250fef59b55..36b2239aa5d 100644
|
||||
--- a/gcc/config/i386/host-mingw32.c
|
||||
+++ b/gcc/config/i386/host-mingw32.c
|
||||
@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
|
||||
|
||||
static inline void w32_error(const char*, const char*, int, const char*);
|
||||
|
||||
-/* FIXME: Is this big enough? */
|
||||
-static const size_t pch_VA_max_size = 128 * 1024 * 1024;
|
||||
-
|
||||
/* Granularity for reserving address space. */
|
||||
static size_t va_granularity = 0x10000;
|
||||
|
||||
@@ -88,9 +85,6 @@ static void *
|
||||
mingw32_gt_pch_get_address (size_t size, int)
|
||||
{
|
||||
void* res;
|
||||
- size = (size + va_granularity - 1) & ~(va_granularity - 1);
|
||||
- if (size > pch_VA_max_size)
|
||||
- return NULL;
|
||||
|
||||
/* FIXME: We let system determine base by setting first arg to NULL.
|
||||
Allocating at top of available address space avoids unnecessary
|
||||
@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
|
||||
If we allocate at bottom we need to reserve the address as early
|
||||
as possible and at the same point in each invocation. */
|
||||
|
||||
- res = VirtualAlloc (NULL, pch_VA_max_size,
|
||||
+ res = VirtualAlloc (NULL, size,
|
||||
MEM_RESERVE | MEM_TOP_DOWN,
|
||||
PAGE_NOACCESS);
|
||||
if (!res)
|
||||
@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
|
||||
|
||||
/* Offset must be also be a multiple of allocation granularity for
|
||||
this to work. We can't change the offset. */
|
||||
- if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
|
||||
+ if ((offset & (va_granularity - 1)) != 0)
|
||||
return -1;
|
||||
|
||||
|
||||
diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
|
||||
index f46e797d610..fd39e64c38d 100644
|
||||
index 2e086f16de9..1c27c6467bc 100644
|
||||
--- a/gcc/config/newlib-stdint.h
|
||||
+++ b/gcc/config/newlib-stdint.h
|
||||
@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
@@ -37,18 +66,18 @@ index f46e797d610..fd39e64c38d 100644
|
||||
|
||||
#define SIG_ATOMIC_TYPE "int"
|
||||
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
|
||||
index b83b304e3eb..b85359edcfc 100644
|
||||
index 1adc371d70f..a7e1220981c 100644
|
||||
--- a/gcc/config/rs6000/rs6000.h
|
||||
+++ b/gcc/config/rs6000/rs6000.h
|
||||
@@ -212,6 +212,7 @@
|
||||
{ "asm_cpu_476", ASM_CPU_476_SPEC }, \
|
||||
SUBTARGET_EXTRA_SPECS
|
||||
|
||||
+#if 0
|
||||
@@ -196,6 +196,7 @@ ASM_OPT_ANY
|
||||
/* -mcpu=native handling only makes sense with compiler running on
|
||||
an PowerPC chip. If changing this condition, also change
|
||||
the condition in driver-rs6000.c. */
|
||||
@@ -226,6 +227,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||
+#if 0
|
||||
#if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
|
||||
/* In driver-rs6000.c. */
|
||||
extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||
@@ -207,6 +208,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||
#else
|
||||
#define ASM_CPU_NATIVE_SPEC "%(asm_default)"
|
||||
#endif
|
||||
@@ -58,10 +87,10 @@ index b83b304e3eb..b85359edcfc 100644
|
||||
#ifndef CC1_CPU_SPEC
|
||||
#ifdef HAVE_LOCAL_CPU_DETECT
|
||||
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
||||
index bb19d0dcd41..74d1e474432 100644
|
||||
index 9ade72114e9..cede792d3a7 100644
|
||||
--- a/gcc/config/rs6000/sysv4.h
|
||||
+++ b/gcc/config/rs6000/sysv4.h
|
||||
@@ -565,7 +565,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||
@@ -590,7 +590,11 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
/* Default starting address if specified. */
|
||||
#define LINK_START_SPEC "\
|
||||
@@ -74,7 +103,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
myellowknife : %(link_start_yellowknife) ; \
|
||||
mmvme : %(link_start_mvme) ; \
|
||||
msim : %(link_start_sim) ; \
|
||||
@@ -596,7 +600,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||
@@ -621,7 +625,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
/* Any specific OS flags. */
|
||||
#define LINK_OS_SPEC "\
|
||||
@@ -84,7 +113,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
myellowknife : %(link_os_yellowknife) ; \
|
||||
mmvme : %(link_os_mvme) ; \
|
||||
msim : %(link_os_sim) ; \
|
||||
@@ -614,7 +619,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||
@@ -636,7 +641,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
/* Override rs6000.h definition. */
|
||||
#undef CPP_SPEC
|
||||
#define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
|
||||
@@ -96,7 +125,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
myellowknife : %(cpp_os_yellowknife) ; \
|
||||
mmvme : %(cpp_os_mvme) ; \
|
||||
msim : %(cpp_os_sim) ; \
|
||||
@@ -628,7 +636,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||
@@ -650,7 +658,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
#undef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC "\
|
||||
@@ -108,7 +137,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
myellowknife : %(startfile_yellowknife) ; \
|
||||
mmvme : %(startfile_mvme) ; \
|
||||
msim : %(startfile_sim) ; \
|
||||
@@ -642,7 +653,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||
@@ -664,7 +675,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
#undef LIB_SPEC
|
||||
#define LIB_SPEC "\
|
||||
@@ -118,7 +147,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
myellowknife : %(lib_yellowknife) ; \
|
||||
mmvme : %(lib_mvme) ; \
|
||||
msim : %(lib_sim) ; \
|
||||
@@ -652,11 +664,12 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||
@@ -674,11 +686,12 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
mcall-openbsd: %(lib_openbsd) ; \
|
||||
: %(lib_default) }"
|
||||
|
||||
@@ -133,7 +162,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
myellowknife : %(endfile_yellowknife) ; \
|
||||
mmvme : %(endfile_mvme) ; \
|
||||
msim : %(endfile_sim) ; \
|
||||
@@ -672,16 +685,27 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
||||
@@ -694,16 +707,27 @@ GNU_USER_TARGET_CC1_SPEC
|
||||
|
||||
/* Motorola ADS support. */
|
||||
#define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
|
||||
@@ -161,7 +190,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
|
||||
/* Motorola Yellowknife support. */
|
||||
#define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
|
||||
@@ -882,6 +906,7 @@ ncrtn.o%s"
|
||||
@@ -851,6 +875,7 @@ ncrtn.o%s"
|
||||
#undef SUBTARGET_EXTRA_SPECS
|
||||
#define SUBTARGET_EXTRA_SPECS \
|
||||
{ "crtsavres_default", CRTSAVRES_DEFAULT_SPEC }, \
|
||||
@@ -169,7 +198,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
{ "lib_ads", LIB_ADS_SPEC }, \
|
||||
{ "lib_yellowknife", LIB_YELLOWKNIFE_SPEC }, \
|
||||
{ "lib_mvme", LIB_MVME_SPEC }, \
|
||||
@@ -891,6 +916,7 @@ ncrtn.o%s"
|
||||
@@ -860,6 +885,7 @@ ncrtn.o%s"
|
||||
{ "lib_netbsd", LIB_NETBSD_SPEC }, \
|
||||
{ "lib_openbsd", LIB_OPENBSD_SPEC }, \
|
||||
{ "lib_default", LIB_DEFAULT_SPEC }, \
|
||||
@@ -177,7 +206,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
{ "startfile_ads", STARTFILE_ADS_SPEC }, \
|
||||
{ "startfile_yellowknife", STARTFILE_YELLOWKNIFE_SPEC }, \
|
||||
{ "startfile_mvme", STARTFILE_MVME_SPEC }, \
|
||||
@@ -900,6 +926,7 @@ ncrtn.o%s"
|
||||
@@ -869,6 +895,7 @@ ncrtn.o%s"
|
||||
{ "startfile_netbsd", STARTFILE_NETBSD_SPEC }, \
|
||||
{ "startfile_openbsd", STARTFILE_OPENBSD_SPEC }, \
|
||||
{ "startfile_default", STARTFILE_DEFAULT_SPEC }, \
|
||||
@@ -185,7 +214,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
{ "endfile_ads", ENDFILE_ADS_SPEC }, \
|
||||
{ "endfile_yellowknife", ENDFILE_YELLOWKNIFE_SPEC }, \
|
||||
{ "endfile_mvme", ENDFILE_MVME_SPEC }, \
|
||||
@@ -911,7 +938,11 @@ ncrtn.o%s"
|
||||
@@ -880,7 +907,11 @@ ncrtn.o%s"
|
||||
{ "endfile_default", ENDFILE_DEFAULT_SPEC }, \
|
||||
{ "link_shlib", LINK_SHLIB_SPEC }, \
|
||||
{ "link_start", LINK_START_SPEC }, \
|
||||
@@ -197,7 +226,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
{ "link_start_yellowknife", LINK_START_YELLOWKNIFE_SPEC }, \
|
||||
{ "link_start_mvme", LINK_START_MVME_SPEC }, \
|
||||
{ "link_start_sim", LINK_START_SIM_SPEC }, \
|
||||
@@ -921,6 +952,7 @@ ncrtn.o%s"
|
||||
@@ -890,6 +921,7 @@ ncrtn.o%s"
|
||||
{ "link_start_openbsd", LINK_START_OPENBSD_SPEC }, \
|
||||
{ "link_start_default", LINK_START_DEFAULT_SPEC }, \
|
||||
{ "link_os", LINK_OS_SPEC }, \
|
||||
@@ -205,7 +234,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
{ "link_os_ads", LINK_OS_ADS_SPEC }, \
|
||||
{ "link_os_yellowknife", LINK_OS_YELLOWKNIFE_SPEC }, \
|
||||
{ "link_os_mvme", LINK_OS_MVME_SPEC }, \
|
||||
@@ -932,6 +964,9 @@ ncrtn.o%s"
|
||||
@@ -901,6 +933,9 @@ ncrtn.o%s"
|
||||
{ "link_os_default", LINK_OS_DEFAULT_SPEC }, \
|
||||
{ "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
|
||||
{ "link_secure_plt", LINK_SECURE_PLT_SPEC }, \
|
||||
@@ -216,7 +245,7 @@ index bb19d0dcd41..74d1e474432 100644
|
||||
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
|
||||
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
|
||||
diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
|
||||
index 34fea0ddd08..084a8ae435e 100644
|
||||
index b49ba261f3c..4eda763dfca 100644
|
||||
--- a/gcc/config/rs6000/sysv4.opt
|
||||
+++ b/gcc/config/rs6000/sysv4.opt
|
||||
@@ -124,6 +124,26 @@ mads
|
||||
@@ -247,10 +276,10 @@ index 34fea0ddd08..084a8ae435e 100644
|
||||
Target RejectNegative
|
||||
Link with libyk.a, libc.a and crt0.o.
|
||||
diff --git a/gcc/configure b/gcc/configure
|
||||
index 6121e163259..6584112e6a1 100755
|
||||
index cd3d9516fce..fcb4b206b60 100755
|
||||
--- a/gcc/configure
|
||||
+++ b/gcc/configure
|
||||
@@ -11692,7 +11692,7 @@ case ${enable_threads} in
|
||||
@@ -12208,7 +12208,7 @@ case ${enable_threads} in
|
||||
# default
|
||||
target_thread_file='single'
|
||||
;;
|
||||
@@ -260,10 +289,10 @@ index 6121e163259..6584112e6a1 100755
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||||
index b066cc609e1..c42b3ef5fc6 100644
|
||||
index 0de3b4bf97b..739aa4ae3da 100644
|
||||
--- a/gcc/configure.ac
|
||||
+++ b/gcc/configure.ac
|
||||
@@ -1611,7 +1611,7 @@ case ${enable_threads} in
|
||||
@@ -1800,7 +1800,7 @@ case ${enable_threads} in
|
||||
# default
|
||||
target_thread_file='single'
|
||||
;;
|
||||
@@ -273,7 +302,7 @@ index b066cc609e1..c42b3ef5fc6 100644
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
|
||||
index ba2b2623301..8d866107142 100644
|
||||
index 260fe4d1af6..664808cd19c 100644
|
||||
--- a/libgcc/config/rs6000/crtrestvr.S
|
||||
+++ b/libgcc/config/rs6000/crtrestvr.S
|
||||
@@ -24,7 +24,7 @@
|
||||
@@ -291,7 +320,7 @@ index ba2b2623301..8d866107142 100644
|
||||
#endif
|
||||
+#endif
|
||||
diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
|
||||
index 077e33f34d5..b7be68b710f 100644
|
||||
index 7e1d5c5df98..2c62480d165 100644
|
||||
--- a/libgcc/config/rs6000/crtsavevr.S
|
||||
+++ b/libgcc/config/rs6000/crtsavevr.S
|
||||
@@ -24,7 +24,7 @@
|
||||
@@ -310,10 +339,10 @@ index 077e33f34d5..b7be68b710f 100644
|
||||
+#endif
|
||||
diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
|
||||
new file mode 100644
|
||||
index 00000000000..94d6ba94ec0
|
||||
index 00000000000..26180aa7f36
|
||||
--- /dev/null
|
||||
+++ b/libgcc/config/rs6000/gthr-dkp.c
|
||||
@@ -0,0 +1,349 @@
|
||||
@@ -0,0 +1,319 @@
|
||||
+/* Threads compatibility routines for libgcc2 and libobjc. */
|
||||
+/* Compile this one with gcc. */
|
||||
+/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
||||
@@ -339,336 +368,306 @@ index 00000000000..94d6ba94ec0
|
||||
+see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
+<http://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+#define _BUILDING_LIBGCC
|
||||
+#include "gthr-dkp.h"
|
||||
+#include <stddef.h>
|
||||
+
|
||||
+__gthread_impl_t __gthread_impl = {
|
||||
+ NULL, // active
|
||||
+ NULL, // create
|
||||
+ NULL, // join
|
||||
+ NULL, // detach
|
||||
+ NULL, // equal
|
||||
+ NULL, // self
|
||||
+ NULL, // yield
|
||||
+ NULL, // once
|
||||
+ NULL, // key_create
|
||||
+ NULL, // key_delete
|
||||
+ NULL, // getspecific
|
||||
+ NULL, // setspecific
|
||||
+ NULL, // mutex_init_function
|
||||
+ NULL, // mutex_destroy
|
||||
+ NULL, // mutex_lock
|
||||
+ NULL, // mutex_trylock
|
||||
+ NULL, // mutex_unlock
|
||||
+ NULL, // recursive_mutex_init_function
|
||||
+ NULL, // recursive_mutex_lock
|
||||
+ NULL, // recursive_mutex_trylock
|
||||
+ NULL, // recursive_mutex_unlock
|
||||
+ NULL, // recursive_mutex_destroy
|
||||
+ NULL, // cond_init_function
|
||||
+ NULL, // cond_broadcast
|
||||
+ NULL, // cond_signal
|
||||
+ NULL, // cond_wait
|
||||
+ NULL, // cond_timedwait
|
||||
+ NULL, // cond_wait_recursive
|
||||
+ NULL, // cond_destroy
|
||||
+};
|
||||
+
|
||||
+int
|
||||
+__gthread_active_p (void)
|
||||
+{
|
||||
+ if (!__gthread_impl.active) {
|
||||
+ if (!__has_gthr_impl(active)) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.active();
|
||||
+ return __gthr_impl_active();
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
|
||||
+ void *__args)
|
||||
+{
|
||||
+ if (!__gthread_impl.create) {
|
||||
+ if (!__has_gthr_impl(create)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.create(__threadid, __func, __args);
|
||||
+ return __gthr_impl_create(__threadid, __func, __args);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_join (__gthread_t __threadid, void **__value_ptr)
|
||||
+{
|
||||
+ if (!__gthread_impl.join) {
|
||||
+ if (!__has_gthr_impl(join)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.join(__threadid, __value_ptr);
|
||||
+ return __gthr_impl_join(__threadid, __value_ptr);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_detach (__gthread_t __threadid)
|
||||
+{
|
||||
+ if (!__gthread_impl.detach) {
|
||||
+ if (!__has_gthr_impl(detach)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.detach(__threadid);
|
||||
+ return __gthr_impl_detach(__threadid);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_equal (__gthread_t __t1, __gthread_t __t2)
|
||||
+{
|
||||
+ if (!__gthread_impl.equal) {
|
||||
+ if (!__has_gthr_impl(equal)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.equal(__t1, __t2);
|
||||
+ return __gthr_impl_equal(__t1, __t2);
|
||||
+}
|
||||
+
|
||||
+__gthread_t
|
||||
+__gthread_self (void)
|
||||
+{
|
||||
+ if (!__gthread_impl.self) {
|
||||
+ if (!__has_gthr_impl(self)) {
|
||||
+ __gthread_t result = { 0 };
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.self();
|
||||
+ return __gthr_impl_self();
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_yield (void)
|
||||
+{
|
||||
+ if (!__gthread_impl.yield) {
|
||||
+ if (!__has_gthr_impl(yield)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.yield();
|
||||
+ return __gthr_impl_yield();
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_once (__gthread_once_t *__once, void (*__func) (void))
|
||||
+{
|
||||
+ if (!__gthread_impl.once) {
|
||||
+ if (!__has_gthr_impl(once)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.once(__once, __func);
|
||||
+ return __gthr_impl_once(__once, __func);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
|
||||
+{
|
||||
+ if (!__gthread_impl.key_create) {
|
||||
+ if (!__has_gthr_impl(key_create)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.key_create(__key, __dtor);
|
||||
+ return __gthr_impl_key_create(__key, __dtor);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_key_delete (__gthread_key_t __key)
|
||||
+{
|
||||
+ if (!__gthread_impl.key_delete) {
|
||||
+ if (!__has_gthr_impl(key_delete)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.key_delete(__key);
|
||||
+ return __gthr_impl_key_delete(__key);
|
||||
+}
|
||||
+
|
||||
+void *
|
||||
+__gthread_getspecific (__gthread_key_t __key)
|
||||
+{
|
||||
+ if (!__gthread_impl.getspecific) {
|
||||
+ if (!__has_gthr_impl(getspecific)) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.getspecific(__key);
|
||||
+ return __gthr_impl_getspecific(__key);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
|
||||
+{
|
||||
+ if (!__gthread_impl.setspecific) {
|
||||
+ if (!__has_gthr_impl(setspecific)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.setspecific(__key, __ptr);
|
||||
+ return __gthr_impl_setspecific(__key, __ptr);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (__gthread_impl.mutex_init_function) {
|
||||
+ __gthread_impl.mutex_init_function(__mutex);
|
||||
+ if (__has_gthr_impl(mutex_init_function)) {
|
||||
+ __gthr_impl_mutex_init_function(__mutex);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.mutex_destroy) {
|
||||
+ if (!__has_gthr_impl(mutex_destroy)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.mutex_destroy(__mutex);
|
||||
+ return __gthr_impl_mutex_destroy(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_lock (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.mutex_lock) {
|
||||
+ if (!__has_gthr_impl(mutex_lock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.mutex_lock(__mutex);
|
||||
+ return __gthr_impl_mutex_lock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.mutex_trylock) {
|
||||
+ if (!__has_gthr_impl(mutex_trylock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.mutex_trylock(__mutex);
|
||||
+ return __gthr_impl_mutex_trylock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.mutex_unlock) {
|
||||
+ if (!__has_gthr_impl(mutex_unlock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.mutex_unlock(__mutex);
|
||||
+ return __gthr_impl_mutex_unlock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.recursive_mutex_init_function) {
|
||||
+ if (!__has_gthr_impl(recursive_mutex_init_function)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.recursive_mutex_init_function(__mutex);
|
||||
+ return __gthr_impl_recursive_mutex_init_function(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.recursive_mutex_lock) {
|
||||
+ if (!__has_gthr_impl(recursive_mutex_lock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.recursive_mutex_lock(__mutex);
|
||||
+ return __gthr_impl_recursive_mutex_lock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.recursive_mutex_trylock) {
|
||||
+ if (!__has_gthr_impl(recursive_mutex_trylock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.recursive_mutex_trylock(__mutex);
|
||||
+ return __gthr_impl_recursive_mutex_trylock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.recursive_mutex_unlock) {
|
||||
+ if (!__has_gthr_impl(recursive_mutex_unlock)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.recursive_mutex_unlock(__mutex);
|
||||
+ return __gthr_impl_recursive_mutex_unlock(__mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.recursive_mutex_destroy) {
|
||||
+ if (!__has_gthr_impl(recursive_mutex_destroy)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.recursive_mutex_destroy(__mutex);
|
||||
+ return __gthr_impl_recursive_mutex_destroy(__mutex);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+__gthread_cond_init_function (__gthread_cond_t *__cond)
|
||||
+{
|
||||
+ if (__gthread_impl.cond_init_function) {
|
||||
+ __gthread_impl.cond_init_function(__cond);
|
||||
+ if (__has_gthr_impl(cond_init_function)) {
|
||||
+ __gthr_impl_cond_init_function(__cond);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_broadcast (__gthread_cond_t *__cond)
|
||||
+{
|
||||
+ if (!__gthread_impl.cond_broadcast) {
|
||||
+ if (!__has_gthr_impl(cond_broadcast)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.cond_broadcast(__cond);
|
||||
+ return __gthr_impl_cond_broadcast(__cond);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_signal (__gthread_cond_t *__cond)
|
||||
+{
|
||||
+ if (!__gthread_impl.cond_signal) {
|
||||
+ if (!__has_gthr_impl(cond_signal)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.cond_signal(__cond);
|
||||
+ return __gthr_impl_cond_signal(__cond);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.cond_wait) {
|
||||
+ if (!__has_gthr_impl(cond_wait)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.cond_wait(__cond, __mutex);
|
||||
+ return __gthr_impl_cond_wait(__cond, __mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
||||
+ const __gthread_time_t *__abs_timeout)
|
||||
+{
|
||||
+ if (!__gthread_impl.cond_timedwait) {
|
||||
+ if (!__has_gthr_impl(cond_timedwait)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.cond_timedwait(__cond, __mutex, __abs_timeout);
|
||||
+ return __gthr_impl_cond_timedwait(__cond, __mutex, __abs_timeout);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
|
||||
+ __gthread_recursive_mutex_t *__mutex)
|
||||
+{
|
||||
+ if (!__gthread_impl.cond_wait_recursive) {
|
||||
+ if (!__has_gthr_impl(cond_wait_recursive)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.cond_wait_recursive(__cond, __mutex);
|
||||
+ return __gthr_impl_cond_wait_recursive(__cond, __mutex);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+__gthread_cond_destroy (__gthread_cond_t* __cond)
|
||||
+{
|
||||
+ if (!__gthread_impl.cond_destroy) {
|
||||
+ if (!__has_gthr_impl(cond_destroy)) {
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return __gthread_impl.cond_destroy(__cond);
|
||||
+ return __gthr_impl_cond_destroy(__cond);
|
||||
+}
|
||||
diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
|
||||
new file mode 100644
|
||||
index 00000000000..281c19d2a60
|
||||
index 00000000000..72ecf82ab83
|
||||
--- /dev/null
|
||||
+++ b/libgcc/config/rs6000/gthr-dkp.h
|
||||
@@ -0,0 +1,185 @@
|
||||
@@ -0,0 +1,187 @@
|
||||
+/* Threads compatibility routines for libgcc2 and libobjc. */
|
||||
+/* Compile this one with gcc. */
|
||||
+/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
||||
@@ -722,42 +721,44 @@ index 00000000000..281c19d2a60
|
||||
+#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
|
||||
+#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
|
||||
+
|
||||
+typedef struct {
|
||||
+ int (*active) (void);
|
||||
+ int (*create) (__gthread_t *__threadid, void *(*__func) (void*),
|
||||
+ void *__args);
|
||||
+ int (*join) (__gthread_t __threadid, void **__value_ptr);
|
||||
+ int (*detach) (__gthread_t __threadid);
|
||||
+ int (*equal) (__gthread_t __t1, __gthread_t __t2);
|
||||
+ __gthread_t (*self) (void);
|
||||
+ int (*yield) (void);
|
||||
+ int (*once) (__gthread_once_t *__once, void (*__func) (void));
|
||||
+ int (*key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
|
||||
+ int (*key_delete) (__gthread_key_t __key);
|
||||
+ void * (*getspecific) (__gthread_key_t __key);
|
||||
+ int (*setspecific) (__gthread_key_t __key, const void *__ptr);
|
||||
+ void (*mutex_init_function) (__gthread_mutex_t *__mutex);
|
||||
+ int (*mutex_destroy) (__gthread_mutex_t *__mutex);
|
||||
+ int (*mutex_lock) (__gthread_mutex_t *__mutex);
|
||||
+ int (*mutex_trylock) (__gthread_mutex_t *__mutex);
|
||||
+ int (*mutex_unlock) (__gthread_mutex_t *__mutex);
|
||||
+ int (*recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
|
||||
+ int (*recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
|
||||
+ int (*recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
|
||||
+ int (*recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
|
||||
+ int (*recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
|
||||
+ void (*cond_init_function) (__gthread_cond_t *__cond);
|
||||
+ int (*cond_broadcast) (__gthread_cond_t *__cond);
|
||||
+ int (*cond_signal) (__gthread_cond_t *__cond);
|
||||
+ int (*cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
|
||||
+ int (*cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
||||
+ const __gthread_time_t *__abs_timeout);
|
||||
+ int (*cond_wait_recursive) (__gthread_cond_t *__cond,
|
||||
+ __gthread_recursive_mutex_t *__mutex);
|
||||
+ int (*cond_destroy) (__gthread_cond_t* __cond);
|
||||
+} __gthread_impl_t;
|
||||
+#ifdef _BUILDING_LIBGCC
|
||||
+#define __GTHR_IMPL(_name) __attribute__((weak)) __gthr_impl_##_name
|
||||
+#define __has_gthr_impl(_name) (&__gthr_impl_##_name)
|
||||
+#else
|
||||
+#define __GTHR_IMPL(_name) __gthr_impl_##_name
|
||||
+#endif
|
||||
+
|
||||
+extern __gthread_impl_t __gthread_impl;
|
||||
+int __GTHR_IMPL(active) (void);
|
||||
+int __GTHR_IMPL(create) (__gthread_t *__threadid, void *(*__func) (void*), void *__args);
|
||||
+int __GTHR_IMPL(join) (__gthread_t __threadid, void **__value_ptr);
|
||||
+int __GTHR_IMPL(detach) (__gthread_t __threadid);
|
||||
+int __GTHR_IMPL(equal) (__gthread_t __t1, __gthread_t __t2);
|
||||
+__gthread_t __GTHR_IMPL(self) (void);
|
||||
+int __GTHR_IMPL(yield) (void);
|
||||
+int __GTHR_IMPL(once) (__gthread_once_t *__once, void (*__func) (void));
|
||||
+int __GTHR_IMPL(key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
|
||||
+int __GTHR_IMPL(key_delete) (__gthread_key_t __key);
|
||||
+void * __GTHR_IMPL(getspecific) (__gthread_key_t __key);
|
||||
+int __GTHR_IMPL(setspecific) (__gthread_key_t __key, const void *__ptr);
|
||||
+void __GTHR_IMPL(mutex_init_function) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(mutex_destroy) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(mutex_lock) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(mutex_trylock) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(mutex_unlock) (__gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
|
||||
+void __GTHR_IMPL(cond_init_function) (__gthread_cond_t *__cond);
|
||||
+int __GTHR_IMPL(cond_broadcast) (__gthread_cond_t *__cond);
|
||||
+int __GTHR_IMPL(cond_signal) (__gthread_cond_t *__cond);
|
||||
+int __GTHR_IMPL(cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
||||
+ const __gthread_time_t *__abs_timeout);
|
||||
+int __GTHR_IMPL(cond_wait_recursive) (__gthread_cond_t *__cond,
|
||||
+ __gthread_recursive_mutex_t *__mutex);
|
||||
+int __GTHR_IMPL(cond_destroy) (__gthread_cond_t* __cond);
|
||||
+
|
||||
+int
|
||||
+__gthread_active_p (void);
|
||||
@@ -865,38 +866,26 @@ index fb812d3801f..7f6669d530f 100644
|
||||
|
||||
# This can't end up in shared libgcc
|
||||
diff --git a/libgcc/configure b/libgcc/configure
|
||||
index b2f3f870844..c6f93f8b3ac 100644
|
||||
index 26bf75789e0..1f663d2cfb0 100755
|
||||
--- a/libgcc/configure
|
||||
+++ b/libgcc/configure
|
||||
@@ -5442,6 +5442,7 @@ tm_file="${tm_file_}"
|
||||
|
||||
@@ -5640,6 +5640,7 @@ tm_file="${tm_file_}"
|
||||
case $target_thread_file in
|
||||
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||
dce) thread_header=config/pa/gthr-dce.h ;;
|
||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||
gcn) thread_header=config/gcn/gthr-gcn.h ;;
|
||||
lynx) thread_header=config/gthr-lynx.h ;;
|
||||
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||
index 5e894455e16..f2347455de0 100644
|
||||
--- a/libgcc/crtstuff.c
|
||||
+++ b/libgcc/crtstuff.c
|
||||
@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
|
||||
/* 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 --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
||||
index fbc9daeb195..90c15adda62 100755
|
||||
index 9f9c5a2419a..c9bb6c548be 100755
|
||||
--- a/libstdc++-v3/configure
|
||||
+++ b/libstdc++-v3/configure
|
||||
@@ -15178,6 +15178,7 @@ $as_echo "$target_thread_file" >&6; }
|
||||
|
||||
@@ -15637,6 +15637,7 @@ $as_echo "$target_thread_file" >&6; }
|
||||
case $target_thread_file in
|
||||
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||
dce) thread_header=config/pa/gthr-dce.h ;;
|
||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||
gcn) thread_header=config/gcn/gthr-gcn.h ;;
|
||||
lynx) thread_header=config/gthr-lynx.h ;;
|
||||
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
||||
60
dkppc/patches/gdb-8.2.1.patch
Normal file
60
dkppc/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-02-19 17:30:16.449175937 +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-02-19 17:31:05.266578008 +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-02-19 17:31:33.301731324 +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-02-19 17:29:35.744567941 +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-02-19 17:28:53.178460364 +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. */
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/libgloss/configure b/libgloss/configure
|
||||
index aa6f8f834..0e8579890 100755
|
||||
index 0d2918cee..bccfb07b4 100755
|
||||
--- a/libgloss/configure
|
||||
+++ b/libgloss/configure
|
||||
@@ -2594,6 +2594,8 @@ if test "${config_libnosys}" = "true"; then
|
||||
@@ -2604,6 +2604,8 @@ if test "${config_libnosys}" = "true"; then
|
||||
|
||||
fi
|
||||
|
||||
@@ -12,7 +12,7 @@ index aa6f8f834..0e8579890 100755
|
||||
|
||||
ac_config_commands="$ac_config_commands depfiles"
|
||||
diff --git a/libgloss/configure.in b/libgloss/configure.in
|
||||
index 6da164352..0375cabbc 100644
|
||||
index f38d5298e..db6b33ab8 100644
|
||||
--- a/libgloss/configure.in
|
||||
+++ b/libgloss/configure.in
|
||||
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
|
||||
@@ -33,7 +33,7 @@ index 6da164352..0375cabbc 100644
|
||||
case "${target}" in
|
||||
aarch64*-*-*)
|
||||
AC_CONFIG_SUBDIRS(aarch64)
|
||||
@@ -188,6 +192,10 @@ if test "${config_libnosys}" = "true"; then
|
||||
@@ -194,6 +198,10 @@ if test "${config_libnosys}" = "true"; then
|
||||
AC_CONFIG_SUBDIRS([libnosys])
|
||||
fi
|
||||
|
||||
@@ -46,7 +46,7 @@ index 6da164352..0375cabbc 100644
|
||||
AC_SUBST(AS)
|
||||
diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
|
||||
new file mode 100644
|
||||
index 000000000..183f9acc7
|
||||
index 000000000..bd69599a8
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/Makefile.in
|
||||
@@ -0,0 +1,148 @@
|
||||
@@ -121,8 +121,8 @@ index 000000000..183f9acc7
|
||||
+ 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 \
|
||||
+ chdir.o mkdir.o rename.o build_argv.o statvfs.o \
|
||||
+ flock.o syscall_support.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
|
||||
+ fchmod.o chmod.o rmdir.o utime.o scandir.o
|
||||
+ flock.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
|
||||
+ fchmod.o chmod.o rmdir.o utime.o scandir.o syscall_support.o
|
||||
+
|
||||
+# Object files specific to particular targets.
|
||||
+EVALOBJS = ${OBJS}
|
||||
@@ -143,10 +143,10 @@ index 000000000..183f9acc7
|
||||
+AR_FLAGS = qc
|
||||
+
|
||||
+.c.o:
|
||||
+ $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
|
||||
+ $(CC) $(CFLAGS_FOR_TARGET) -D_BUILDING_LIBSYSBASE -O2 $(INCLUDES) -c $(CFLAGS) $<
|
||||
+
|
||||
+.C.o:
|
||||
+ $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
|
||||
+ $(CC) $(CFLAGS_FOR_TARGET) -D_BUILDING_LIBSYSBASE -O2 $(INCLUDES) -c $(CFLAGS) $<
|
||||
+.s.o:
|
||||
+ $(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
|
||||
+
|
||||
@@ -200,7 +200,7 @@ index 000000000..183f9acc7
|
||||
+ $(SHELL) config.status --recheck
|
||||
diff --git a/libgloss/libsysbase/_exit.c b/libgloss/libsysbase/_exit.c
|
||||
new file mode 100644
|
||||
index 000000000..e5cb5a9ed
|
||||
index 000000000..6effb1105
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/_exit.c
|
||||
@@ -0,0 +1,17 @@
|
||||
@@ -215,8 +215,8 @@ index 000000000..e5cb5a9ed
|
||||
+void _exit(int rc)
|
||||
+{
|
||||
+
|
||||
+ if ( __syscalls.exit ) {
|
||||
+ __syscalls.exit(rc);
|
||||
+ if ( __has_syscall(exit) ) {
|
||||
+ __syscall_exit(rc);
|
||||
+ }
|
||||
+
|
||||
+ while(1);
|
||||
@@ -622,10 +622,10 @@ index 000000000..b6cdfaeb8
|
||||
+m4_include([../acinclude.m4])
|
||||
diff --git a/libgloss/libsysbase/build_argv.c b/libgloss/libsysbase/build_argv.c
|
||||
new file mode 100644
|
||||
index 000000000..3ca95d5b6
|
||||
index 000000000..a969a0482
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/build_argv.c
|
||||
@@ -0,0 +1,31 @@
|
||||
@@ -0,0 +1,32 @@
|
||||
+struct __argv {
|
||||
+ int argvMagic;
|
||||
+ char *commandLine;
|
||||
@@ -652,10 +652,11 @@ index 000000000..3ca95d5b6
|
||||
+ } while (data < end);
|
||||
+
|
||||
+ *end = '\0'; // Force NULL terminator for last arg
|
||||
+ argv[argCount] = 0; // Force NULL terminator for argv
|
||||
+
|
||||
+ argstruct->argv = argv;
|
||||
+ argstruct->argc = argCount;
|
||||
+ argstruct->endARGV = &argv[argCount];
|
||||
+ argstruct->endARGV = &argv[argCount + 1];
|
||||
+}
|
||||
diff --git a/libgloss/libsysbase/chdir.c b/libgloss/libsysbase/chdir.c
|
||||
new file mode 100644
|
||||
@@ -902,7 +903,7 @@ index 000000000..3668b5801
|
||||
+
|
||||
diff --git a/libgloss/libsysbase/clocks.c b/libgloss/libsysbase/clocks.c
|
||||
new file mode 100644
|
||||
index 000000000..01cfee469
|
||||
index 000000000..b36b5c079
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/clocks.c
|
||||
@@ -0,0 +1,34 @@
|
||||
@@ -912,8 +913,8 @@ index 000000000..01cfee469
|
||||
+
|
||||
+int clock_gettime(clockid_t clock_id, struct timespec *tp)
|
||||
+{
|
||||
+ if ( __syscalls.clock_gettime ) {
|
||||
+ return __syscalls.clock_gettime(clock_id, tp);
|
||||
+ if ( __has_syscall(clock_gettime) ) {
|
||||
+ return __syscall_clock_gettime(clock_id, tp);
|
||||
+ } else {
|
||||
+ errno = ENOSYS;
|
||||
+ return -1;
|
||||
@@ -922,8 +923,8 @@ index 000000000..01cfee469
|
||||
+
|
||||
+int clock_settime(clockid_t clock_id, const struct timespec *tp)
|
||||
+{
|
||||
+ if ( __syscalls.clock_settime ) {
|
||||
+ return __syscalls.clock_settime(clock_id, tp);
|
||||
+ if ( __has_syscall(clock_settime) ) {
|
||||
+ return __syscall_clock_settime(clock_id, tp);
|
||||
+ } else {
|
||||
+ errno = ENOSYS;
|
||||
+ return -1;
|
||||
@@ -932,8 +933,8 @@ index 000000000..01cfee469
|
||||
+
|
||||
+int clock_getres (clockid_t clock_id, struct timespec *res)
|
||||
+{
|
||||
+ if ( __syscalls.clock_getres ) {
|
||||
+ return __syscalls.clock_getres(clock_id, res);
|
||||
+ if ( __has_syscall(clock_getres) ) {
|
||||
+ return __syscall_clock_getres(clock_id, res);
|
||||
+ } else {
|
||||
+ errno = ENOSYS;
|
||||
+ return -1;
|
||||
@@ -5937,7 +5938,7 @@ index 000000000..ec3b84037
|
||||
+
|
||||
diff --git a/libgloss/libsysbase/gettod.c b/libgloss/libsysbase/gettod.c
|
||||
new file mode 100644
|
||||
index 000000000..11dc528fa
|
||||
index 000000000..ee8947f51
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/gettod.c
|
||||
@@ -0,0 +1,26 @@
|
||||
@@ -5960,7 +5961,7 @@ index 000000000..11dc528fa
|
||||
+ struct _reent *ptr = _REENT;
|
||||
+#endif
|
||||
+
|
||||
+ if ( __syscalls.gettod_r ) return __syscalls.gettod_r(ptr, ptimeval, ptimezone);
|
||||
+ if ( __has_syscall(gettod_r) ) return __syscall_gettod_r(ptr, ptimeval, ptimezone);
|
||||
+
|
||||
+ ptr->_errno = ENOSYS;
|
||||
+ return -1;
|
||||
@@ -6517,7 +6518,7 @@ index 000000000..b4fcbd3d7
|
||||
+}
|
||||
diff --git a/libgloss/libsysbase/nanosleep.c b/libgloss/libsysbase/nanosleep.c
|
||||
new file mode 100644
|
||||
index 000000000..3c96fc61b
|
||||
index 000000000..a233b9df6
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/nanosleep.c
|
||||
@@ -0,0 +1,14 @@
|
||||
@@ -6527,8 +6528,8 @@ index 000000000..3c96fc61b
|
||||
+
|
||||
+int nanosleep(const struct timespec *req, struct timespec *rem)
|
||||
+{
|
||||
+ if ( __syscalls.nanosleep ) {
|
||||
+ return __syscalls.nanosleep(req, rem);
|
||||
+ if ( __has_syscall(nanosleep) ) {
|
||||
+ return __syscall_nanosleep(req, rem);
|
||||
+ } else {
|
||||
+ *rem = *req;
|
||||
+ errno = ENOSYS;
|
||||
@@ -6710,7 +6711,7 @@ index 000000000..2692a2997
|
||||
+}
|
||||
diff --git a/libgloss/libsysbase/sbrk.c b/libgloss/libsysbase/sbrk.c
|
||||
new file mode 100644
|
||||
index 000000000..e2bdb9edc
|
||||
index 000000000..83d922d85
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/sbrk.c
|
||||
@@ -0,0 +1,26 @@
|
||||
@@ -6730,8 +6731,8 @@ index 000000000..e2bdb9edc
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
+ if ( __syscalls.sbrk_r ) {
|
||||
+ return __syscalls.sbrk_r(ptr, incr);
|
||||
+ if ( __has_syscall(sbrk_r) ) {
|
||||
+ return __syscall_sbrk_r(ptr, incr);
|
||||
+ } else {
|
||||
+
|
||||
+ ptr->_errno = ENOMEM;
|
||||
@@ -6921,34 +6922,16 @@ index 000000000..84e221340
|
||||
+}
|
||||
diff --git a/libgloss/libsysbase/syscall_support.c b/libgloss/libsysbase/syscall_support.c
|
||||
new file mode 100644
|
||||
index 000000000..f02714764
|
||||
index 000000000..39e75fd0b
|
||||
--- /dev/null
|
||||
+++ b/libgloss/libsysbase/syscall_support.c
|
||||
@@ -0,0 +1,67 @@
|
||||
@@ -0,0 +1,49 @@
|
||||
+#include <sys/iosupport.h>
|
||||
+
|
||||
+//---------------------------------------------------------------------------------
|
||||
+__syscalls_t __syscalls = {
|
||||
+//---------------------------------------------------------------------------------
|
||||
+ NULL, // sbrk
|
||||
+ NULL, // lock_init
|
||||
+ NULL, // lock_close
|
||||
+ NULL, // lock_release
|
||||
+ NULL, // lock_acquire
|
||||
+ NULL, // malloc_lock
|
||||
+ NULL, // malloc_unlock
|
||||
+ NULL, // exit
|
||||
+ NULL, // gettod_r
|
||||
+ NULL, // clock_gettime
|
||||
+ NULL, // clock_settime
|
||||
+ NULL, // clock_getres
|
||||
+ NULL // nanosleep
|
||||
+};
|
||||
+
|
||||
+int __libc_lock_init(int *lock,int recursive) {
|
||||
+
|
||||
+ if ( __syscalls.lock_init ) {
|
||||
+ return __syscalls.lock_init(lock, recursive);
|
||||
+ if ( __has_syscall(lock_init) ) {
|
||||
+ return __syscall_lock_init(lock, recursive);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
@@ -6956,8 +6939,8 @@ index 000000000..f02714764
|
||||
+
|
||||
+int __libc_lock_close( int *lock ) {
|
||||
+
|
||||
+ if ( __syscalls.lock_close) {
|
||||
+ return __syscalls.lock_close(lock);
|
||||
+ if ( __has_syscall(lock_close)) {
|
||||
+ return __syscall_lock_close(lock);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
@@ -6965,8 +6948,8 @@ index 000000000..f02714764
|
||||
+
|
||||
+int __libc_lock_release( int *lock ) {
|
||||
+
|
||||
+ if ( __syscalls.lock_release) {
|
||||
+ return __syscalls.lock_release(lock);
|
||||
+ if ( __has_syscall(lock_release)) {
|
||||
+ return __syscall_lock_release(lock);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
@@ -6974,22 +6957,22 @@ index 000000000..f02714764
|
||||
+
|
||||
+int __libc_lock_acquire( int *lock ) {
|
||||
+
|
||||
+ if ( __syscalls.lock_acquire) {
|
||||
+ return __syscalls.lock_acquire(lock);
|
||||
+ if ( __has_syscall(lock_acquire)) {
|
||||
+ return __syscall_lock_acquire(lock);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+void __malloc_lock( struct _reent *ptr ) {
|
||||
+ if ( __syscalls.malloc_lock) {
|
||||
+ __syscalls.malloc_lock(ptr);
|
||||
+ if ( __has_syscall(malloc_lock) ){
|
||||
+ __syscall_malloc_lock(ptr);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void __malloc_unlock( struct _reent *ptr ) {
|
||||
+ if ( __syscalls.malloc_unlock) {
|
||||
+ __syscalls.malloc_unlock(ptr);
|
||||
+ if ( __has_syscall(malloc_unlock)) {
|
||||
+ __syscall_malloc_unlock(ptr);
|
||||
+ }
|
||||
+}
|
||||
diff --git a/libgloss/libsysbase/times.c b/libgloss/libsysbase/times.c
|
||||
@@ -7389,10 +7372,10 @@ index 000000000..bd25d775d
|
||||
+ exit ( main(__system_argv->argc,__system_argv->argv) );
|
||||
+}
|
||||
diff --git a/newlib/configure.host b/newlib/configure.host
|
||||
index eb645868b..b9a006453 100644
|
||||
index a84c0c80a..0921e00be 100644
|
||||
--- a/newlib/configure.host
|
||||
+++ b/newlib/configure.host
|
||||
@@ -797,7 +797,12 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
|
||||
@@ -853,7 +853,12 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
|
||||
default_newlib_io_long_long="yes"
|
||||
newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
|
||||
;;
|
||||
@@ -7470,7 +7453,7 @@ index a3fb5c02c..adb8e1083 100644
|
||||
+
|
||||
+#endif // _dirent_h_
|
||||
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
|
||||
index 2900b332f..6efb54eb3 100644
|
||||
index 218807178..c9efd7d03 100644
|
||||
--- a/newlib/libc/include/sys/features.h
|
||||
+++ b/newlib/libc/include/sys/features.h
|
||||
@@ -330,6 +330,9 @@ extern "C" {
|
||||
@@ -7485,10 +7468,10 @@ index 2900b332f..6efb54eb3 100644
|
||||
#ifdef __rtems__
|
||||
diff --git a/newlib/libc/include/sys/iosupport.h b/newlib/libc/include/sys/iosupport.h
|
||||
new file mode 100644
|
||||
index 000000000..8b6d8da30
|
||||
index 000000000..9bec9e473
|
||||
--- /dev/null
|
||||
+++ b/newlib/libc/include/sys/iosupport.h
|
||||
@@ -0,0 +1,108 @@
|
||||
@@ -0,0 +1,117 @@
|
||||
+//---------------------------------------------------------------------------------
|
||||
+#ifndef __iosupp_h__
|
||||
+#define __iosupp_h__
|
||||
@@ -7523,6 +7506,7 @@ index 000000000..8b6d8da30
|
||||
+ void *dirStruct;
|
||||
+} DIR_ITER;
|
||||
+
|
||||
+
|
||||
+typedef struct {
|
||||
+ const char *name;
|
||||
+ size_t structSize;
|
||||
@@ -7561,23 +7545,31 @@ index 000000000..8b6d8da30
|
||||
+
|
||||
+extern const devoptab_t *devoptab_list[];
|
||||
+
|
||||
+typedef struct {
|
||||
+ void *(*sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
|
||||
+ int (*lock_init) (int *lock,int recursive);
|
||||
+ int (*lock_close) (int *lock);
|
||||
+ int (*lock_release) (int *lock);
|
||||
+ int (*lock_acquire) (int *lock);
|
||||
+ void (*malloc_lock) (struct _reent *ptr);
|
||||
+ void (*malloc_unlock) (struct _reent *ptr);
|
||||
+ void (*exit) ( int rc );
|
||||
+ int (*gettod_r) (struct _reent *ptr, struct timeval *tp, struct timezone *tz);
|
||||
+ int (*clock_gettime)(clockid_t clock_id, struct timespec *tp);
|
||||
+ int (*clock_settime)(clockid_t clock_id, const struct timespec *tp);
|
||||
+ int (*clock_getres)(clockid_t clock_id, struct timespec *res);
|
||||
+ int (*nanosleep)(const struct timespec *req, struct timespec *rem);
|
||||
+} __syscalls_t;
|
||||
+#ifdef _BUILDING_LIBSYSBASE
|
||||
+#define __SYSCALL(_name) __attribute__((weak)) __syscall_##_name
|
||||
+#define __has_syscall(_name) (&__syscall_##_name)
|
||||
+#else
|
||||
+#define __SYSCALL(_name) __syscall_##_name
|
||||
+#endif
|
||||
+
|
||||
+extern __syscalls_t __syscalls;
|
||||
+void *__SYSCALL(sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
|
||||
+int __SYSCALL(lock_init) (int *lock,int recursive);
|
||||
+
|
||||
+int __SYSCALL(lock_close) (int *lock);
|
||||
+int __SYSCALL(lock_release) (int *lock);
|
||||
+int __SYSCALL(lock_acquire) (int *lock);
|
||||
+void __SYSCALL(malloc_lock) (struct _reent *ptr);
|
||||
+void __SYSCALL(malloc_unlock) (struct _reent *ptr);
|
||||
+
|
||||
+void __SYSCALL(exit)(int rc);
|
||||
+
|
||||
+int __SYSCALL(gettod_r)(struct _reent *ptr, struct timeval *tp, struct timezone *tz);
|
||||
+int __SYSCALL(clock_gettime)(clockid_t clock_id, struct timespec *tp);
|
||||
+int __SYSCALL(clock_settime)(clockid_t clock_id, const struct timespec *tp);
|
||||
+int __SYSCALL(clock_getres)(clockid_t clock_id, struct timespec *res);
|
||||
+int __SYSCALL(nanosleep)(const struct timespec *req, struct timespec *rem);
|
||||
+
|
||||
+#undef __SYSCALL
|
||||
+
|
||||
+int AddDevice( const devoptab_t* device);
|
||||
+int FindDevice(const char* name);
|
||||
@@ -7598,10 +7590,10 @@ index 000000000..8b6d8da30
|
||||
+#endif // __iosupp_h__
|
||||
+//---------------------------------------------------------------------------------
|
||||
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
|
||||
index 1ef226194..ce3721a14 100644
|
||||
index 74b70e9c0..d8c5410ec 100644
|
||||
--- a/newlib/libc/include/sys/reent.h
|
||||
+++ b/newlib/libc/include/sys/reent.h
|
||||
@@ -416,6 +416,8 @@ struct _reent
|
||||
@@ -421,6 +421,8 @@ struct _reent
|
||||
__FILE *__sf; /* file descriptors */
|
||||
struct _misc_reent *_misc; /* strtok, multibyte states */
|
||||
char *_signal_buf; /* strsignal */
|
||||
@@ -7609,8 +7601,8 @@ index 1ef226194..ce3721a14 100644
|
||||
+ void *deviceData;
|
||||
};
|
||||
|
||||
extern const struct __sFILE_fake __sf_fake_stdin;
|
||||
@@ -647,6 +649,7 @@ struct _reent
|
||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||
@@ -691,6 +693,7 @@ struct _reent
|
||||
# ifndef _REENT_GLOBAL_STDIO_STREAMS
|
||||
__FILE __sf[3]; /* first three file descriptors */
|
||||
# endif
|
||||
@@ -7619,10 +7611,10 @@ index 1ef226194..ce3721a14 100644
|
||||
|
||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
|
||||
index eee98db64..aed9c1746 100644
|
||||
index 8769112b0..5526e59ee 100644
|
||||
--- a/newlib/libc/include/sys/stat.h
|
||||
+++ b/newlib/libc/include/sys/stat.h
|
||||
@@ -152,8 +152,9 @@ int mkfifo (const char *__path, mode_t __mode );
|
||||
@@ -142,8 +142,9 @@ int mkfifo (const char *__path, mode_t __mode );
|
||||
int stat (const char *__restrict __path, struct stat *__restrict __sbuf );
|
||||
mode_t umask (mode_t __mask );
|
||||
|
||||
@@ -7721,10 +7713,10 @@ index 5e937f103..635a7a6b8 100644
|
||||
};
|
||||
#endif
|
||||
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
|
||||
index baa5451a6..236746f54 100644
|
||||
index 4c343e462..835b3a712 100644
|
||||
--- a/newlib/libc/locale/locale.c
|
||||
+++ b/newlib/libc/locale/locale.c
|
||||
@@ -165,15 +165,18 @@ No supporting OS subroutines are required.
|
||||
@@ -166,15 +166,18 @@ No supporting OS subroutines are required.
|
||||
#include "../ctype/ctype_.h"
|
||||
#include "../stdlib/local.h"
|
||||
|
||||
@@ -7743,7 +7735,7 @@ index baa5451a6..236746f54 100644
|
||||
#ifdef _MB_CAPABLE
|
||||
/*
|
||||
* Category names for getenv()
|
||||
@@ -193,7 +196,11 @@ static char *categories[_LC_LAST] = {
|
||||
@@ -194,7 +197,11 @@ static char *categories[_LC_LAST] = {
|
||||
* Default locale per POSIX. Can be overridden on a per-target base.
|
||||
*/
|
||||
#ifndef DEFAULT_LOCALE
|
||||
@@ -7756,7 +7748,7 @@ index baa5451a6..236746f54 100644
|
||||
#endif
|
||||
|
||||
#ifdef _MB_CAPABLE
|
||||
@@ -206,8 +213,13 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
|
||||
@@ -207,8 +214,13 @@ char __default_locale[ENCODING_LEN + 1] = DEFAULT_LOCALE;
|
||||
const struct __locale_t __C_locale =
|
||||
{
|
||||
{ "C", "C", "C", "C", "C", "C", "C", },
|
||||
@@ -7770,7 +7762,7 @@ index baa5451a6..236746f54 100644
|
||||
0,
|
||||
DEFAULT_CTYPE_PTR,
|
||||
{
|
||||
@@ -218,9 +230,15 @@ const struct __locale_t __C_locale =
|
||||
@@ -219,9 +231,15 @@ const struct __locale_t __C_locale =
|
||||
CHAR_MAX, CHAR_MAX
|
||||
},
|
||||
#ifndef __HAVE_LOCALE_INFO__
|
||||
@@ -7786,7 +7778,7 @@ index baa5451a6..236746f54 100644
|
||||
#else /* __HAVE_LOCALE_INFO__ */
|
||||
{
|
||||
{ NULL, NULL }, /* LC_ALL */
|
||||
@@ -239,10 +257,11 @@ const struct __locale_t __C_locale =
|
||||
@@ -240,10 +258,11 @@ const struct __locale_t __C_locale =
|
||||
};
|
||||
#endif /* _MB_CAPABLE */
|
||||
|
||||
@@ -7799,7 +7791,7 @@ index baa5451a6..236746f54 100644
|
||||
__utf8_wctomb,
|
||||
__utf8_mbtowc,
|
||||
#else
|
||||
@@ -259,9 +278,15 @@ struct __locale_t __global_locale =
|
||||
@@ -260,9 +279,15 @@ struct __locale_t __global_locale =
|
||||
CHAR_MAX, CHAR_MAX
|
||||
},
|
||||
#ifndef __HAVE_LOCALE_INFO__
|
||||
@@ -7815,7 +7807,7 @@ index baa5451a6..236746f54 100644
|
||||
#else /* __HAVE_LOCALE_INFO__ */
|
||||
{
|
||||
{ NULL, NULL }, /* LC_ALL */
|
||||
@@ -982,6 +1007,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
|
||||
@@ -990,6 +1015,7 @@ __locale_ctype_ptr_l (struct __locale_t *locale)
|
||||
|
||||
const char *
|
||||
__locale_ctype_ptr (void)
|
||||
@@ -7823,6 +7815,34 @@ index baa5451a6..236746f54 100644
|
||||
{
|
||||
return __get_current_locale ()->ctype_ptr;
|
||||
}
|
||||
diff --git a/newlib/libc/locale/setlocale.h b/newlib/libc/locale/setlocale.h
|
||||
index a0c80843a..efabdcfc4 100644
|
||||
--- a/newlib/libc/locale/setlocale.h
|
||||
+++ b/newlib/libc/locale/setlocale.h
|
||||
@@ -217,11 +217,7 @@ __get_global_locale ()
|
||||
_ELIDABLE_INLINE struct __locale_t *
|
||||
__get_locale_r (struct _reent *r)
|
||||
{
|
||||
-#ifdef __HAVE_LOCALE_INFO__
|
||||
return r->_locale;
|
||||
-#else
|
||||
- return __get_global_locale();
|
||||
-#endif
|
||||
}
|
||||
|
||||
/* In POSIX terms the current locale is the locale used by all functions
|
||||
@@ -231,11 +227,7 @@ __get_locale_r (struct _reent *r)
|
||||
_ELIDABLE_INLINE struct __locale_t *
|
||||
__get_current_locale (void)
|
||||
{
|
||||
-#ifdef __HAVE_LOCALE_INFO__
|
||||
return _REENT->_locale ?: __get_global_locale ();
|
||||
-#else
|
||||
- return __get_global_locale();
|
||||
-#endif
|
||||
}
|
||||
|
||||
/* Only access fixed "C" locale using this function. Fake for !_MB_CAPABLE
|
||||
diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
|
||||
index e86afdf1c..007bd1567 100644
|
||||
--- a/newlib/libc/machine/powerpc/Makefile.am
|
||||
@@ -8024,10 +8044,10 @@ index 000000000..04ebd1ee0
|
||||
+#endif /* _NEWLIB_STDIO_H */
|
||||
+
|
||||
diff --git a/newlib/libc/misc/init.c b/newlib/libc/misc/init.c
|
||||
index c85d6020f..1beb783b8 100644
|
||||
index 95f1a7422..c797d2e64 100644
|
||||
--- a/newlib/libc/misc/init.c
|
||||
+++ b/newlib/libc/misc/init.c
|
||||
@@ -40,4 +40,8 @@ __libc_init_array (void)
|
||||
@@ -44,4 +44,8 @@ __libc_init_array (void)
|
||||
for (i = 0; i < count; i++)
|
||||
__init_array_start[i] ();
|
||||
}
|
||||
@@ -8076,39 +8096,54 @@ index 022992b8d..bdf4c7bb0 100644
|
||||
fp->_flags = flags;
|
||||
fp->_cookie = (void *) fp;
|
||||
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
|
||||
index b358d2b4a..9cab2180e 100644
|
||||
index b358d2b4a..78bb0df30 100644
|
||||
--- a/newlib/libc/stdio/fread.c
|
||||
+++ b/newlib/libc/stdio/fread.c
|
||||
@@ -225,7 +225,31 @@ _fread_r (struct _reent * ptr,
|
||||
@@ -187,7 +187,6 @@ _fread_r (struct _reent * ptr,
|
||||
int rc = 0;
|
||||
/* save fp buffering state */
|
||||
void *old_base = fp->_bf._base;
|
||||
- void * old_p = fp->_p;
|
||||
int old_size = fp->_bf._size;
|
||||
/* allow __refill to use user's buffer */
|
||||
fp->_bf._base = (unsigned char *) p;
|
||||
@@ -197,7 +196,7 @@ _fread_r (struct _reent * ptr,
|
||||
/* restore fp buffering back to original state */
|
||||
fp->_bf._base = old_base;
|
||||
fp->_bf._size = old_size;
|
||||
- fp->_p = old_p;
|
||||
+ fp->_p = old_base;
|
||||
resid -= fp->_r;
|
||||
p += fp->_r;
|
||||
fp->_r = 0;
|
||||
@@ -225,7 +224,29 @@ _fread_r (struct _reent * ptr,
|
||||
/* fp->_r = 0 ... done in __srefill */
|
||||
p += r;
|
||||
resid -= r;
|
||||
- if (__srefill_r (ptr, fp))
|
||||
+ int rc = 0;
|
||||
+
|
||||
+ if (resid>BUFSIZ)
|
||||
+ if (resid>fp->_bf._size)
|
||||
+ {
|
||||
+ /* save fp buffering state */
|
||||
+ void *old_base = fp->_bf._base;
|
||||
+ void * old_p = fp->_p;
|
||||
+ int old_size = fp->_bf._size;
|
||||
+ /* allow __refill to use user's buffer */
|
||||
+ fp->_bf._base = (unsigned char *) p;
|
||||
+ fp->_bf._size = resid;
|
||||
+ fp->_bf._size = resid - old_size;
|
||||
+ fp->_p = (unsigned char *) p;
|
||||
+ rc = __srefill_r (ptr, fp);
|
||||
+ /* restore fp buffering back to original state */
|
||||
+ fp->_bf._base = old_base;
|
||||
+ fp->_bf._size = old_size;
|
||||
+ fp->_p = old_p;
|
||||
+ fp->_p = old_base;
|
||||
+ resid -= fp->_r;
|
||||
+ p += fp->_r;
|
||||
+ fp->_r = 0;
|
||||
+
|
||||
+ } else {
|
||||
+ rc = __srefill_r (ptr, fp);
|
||||
+ //fp->_r = 0;
|
||||
+ }
|
||||
+ if (rc)
|
||||
+ rc = __srefill_r (ptr, fp);
|
||||
+
|
||||
+ if (rc)
|
||||
{
|
||||
/* no more input: return partial result */
|
||||
#ifdef __SCLE
|
||||
@@ -1,45 +0,0 @@
|
||||
include $(DEVKITPPC)/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: %.m
|
||||
@echo $(notdir $<)
|
||||
@$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d $(OBJCFLAGS) -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 -a 32 $< | $(AS) -o $(@)
|
||||
echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"_end[];" > `(echo $(<F) | tr . _)`.h
|
||||
echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`"[];" >> `(echo $(<F) | tr . _)`.h
|
||||
echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -e 's/[^A-Za-z0-9_]/_/g')`_size";" >> `(echo $(<F) | tr . _)`.h
|
||||
endef
|
||||
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
#---------------------------------------------------------------------------------
|
||||
# change shell on Snow Leopard
|
||||
#---------------------------------------------------------------------------------
|
||||
UNAME_S := $(shell uname -s)
|
||||
UNAME_R := $(shell uname -r)
|
||||
|
||||
ifneq (,$(findstring Darwin,$(UNAME_S)))
|
||||
ifneq (,$(findstring 10.8.0,$(UNAME_R)))
|
||||
export SHELL=/bin/bash
|
||||
endif
|
||||
endif
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# path to tools
|
||||
#---------------------------------------------------------------------------------
|
||||
DEVKITPATH=$(shell echo "$(DEVKITPRO)" | sed -e 's/^\([a-zA-Z]\):/\/\1/')
|
||||
|
||||
export PORTLIBS := $(DEVKITPATH)/portlibs/ppc
|
||||
export PATH := $(DEVKITPATH)/tools/bin:$(DEVKITPATH)/devkitPPC/bin:$(PORTLIBS)/bin:$(PATH)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# the prefix on the compiler executables
|
||||
#---------------------------------------------------------------------------------
|
||||
PREFIX := powerpc-eabi-
|
||||
|
||||
export AS := $(PREFIX)as
|
||||
export CC := $(PREFIX)gcc
|
||||
export CXX := $(PREFIX)g++
|
||||
export AR := $(PREFIX)ar
|
||||
export OBJCOPY := $(PREFIX)objcopy
|
||||
|
||||
|
||||
ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
|
||||
|
||||
ifneq (,$(ISVC))
|
||||
ERROR_FILTER := 2>&1 | sed -e 's/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/g'
|
||||
endif
|
||||
@@ -1,25 +0,0 @@
|
||||
ifeq ($(strip $(DEVKITPPC)),)
|
||||
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPro/devkitPPC)
|
||||
endif
|
||||
|
||||
export LIBOGC_INC := $(DEVKITPRO)/libogc/include
|
||||
export LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/cube
|
||||
|
||||
include $(DEVKITPPC)/base_rules
|
||||
|
||||
MACHDEP = -DGEKKO -mogc -mcpu=750 -meabi -mhard-float
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.dol: %.elf
|
||||
@echo output ... $(notdir $@)
|
||||
@elf2dol $< $@
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.tpl : %.scf
|
||||
@echo $(notdir $<)
|
||||
@gxtexconv -s $< -d $(DEPSDIR)/$*.d -o $@
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.elf:
|
||||
@echo linking ... $(notdir $@)
|
||||
@$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIBS) -o $@
|
||||
@@ -1,25 +0,0 @@
|
||||
ifeq ($(strip $(DEVKITPPC)),)
|
||||
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPro/devkitPPC)
|
||||
endif
|
||||
|
||||
export LIBOGC_INC := $(DEVKITPRO)/libogc/include
|
||||
export LIBOGC_LIB := $(DEVKITPRO)/libogc/lib/wii
|
||||
|
||||
MACHDEP = -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
|
||||
|
||||
include $(DEVKITPPC)/base_rules
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.dol: %.elf
|
||||
@echo output ... $(notdir $@)
|
||||
@elf2dol $< $@
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.tpl : %.scf
|
||||
@echo $(notdir $<)
|
||||
@gxtexconv -s $< -d $(DEPSDIR)/$*.d -o $@
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.elf:
|
||||
@echo linking ... $(notdir $@)
|
||||
@$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIBS) -o $@
|
||||
@@ -1,12 +0,0 @@
|
||||
ifeq ($(strip $(DEVKITPPC)),)
|
||||
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPro/devkitPPC)
|
||||
endif
|
||||
|
||||
MACHDEP = -DESPRESSO -mwup -mcpu=750 -meabi -mhard-float
|
||||
|
||||
include $(DEVKITPPC)/base_rules
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.elf:
|
||||
@echo linking ... $(notdir $@)
|
||||
@$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIBS) -o $@
|
||||
17
dkppc/scripts/build-crtls.sh
Executable file
17
dkppc/scripts/build-crtls.sh
Executable file
@@ -0,0 +1,17 @@
|
||||
#!/bin/sh
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# set env variables
|
||||
#---------------------------------------------------------------------------------
|
||||
export DEVKITPRO=$TOOLPATH
|
||||
export DEVKITPPC=$DEVKITPRO/devkitPPC
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install the rules files
|
||||
#---------------------------------------------------------------------------------
|
||||
cd $BUILDDIR
|
||||
|
||||
mkdir -p rules
|
||||
cd rules
|
||||
tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
|
||||
make install
|
||||
@@ -97,7 +97,7 @@ then
|
||||
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||
--prefix=$prefix\
|
||||
--with-system-zlib\
|
||||
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 34" \
|
||||
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 37" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/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=$toolsprefix --disable-dependency-tracking $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
|
||||
touch configured
|
||||
fi
|
||||
if [ ! -f built ]; then
|
||||
$MAKE || { echo "error building $archive"; exit 1; }
|
||||
touch built
|
||||
fi
|
||||
if [ ! -f installed ]; then
|
||||
$MAKE install || { echo "error installing $archive"; exit 1; }
|
||||
touch installed
|
||||
fi
|
||||
done
|
||||
@@ -17,8 +17,8 @@ do
|
||||
echo
|
||||
echo "Please select the toolchain you require"
|
||||
echo
|
||||
echo "1: devkitARM (gba gp32 ds)"
|
||||
echo "2: devkitPPC (gamecube wii)"
|
||||
echo "1: devkitARM (gba gp32 ds 3ds)"
|
||||
echo "2: devkitPPC (gamecube wii wii-u)"
|
||||
echo "3: devkitA64 (switch)"
|
||||
read VERSION
|
||||
|
||||
@@ -30,31 +30,29 @@ done
|
||||
|
||||
case "$VERSION" in
|
||||
"1" )
|
||||
GCC_VER=8.2.0
|
||||
BINUTILS_VER=2.31.1
|
||||
NEWLIB_VER=3.0.0
|
||||
GDB_VER=8.2
|
||||
GCC_VER=10.2.0
|
||||
BINUTILS_VER=2.34
|
||||
NEWLIB_VER=3.3.0
|
||||
basedir='dkarm-eabi'
|
||||
package=devkitARM
|
||||
target=arm-none-eabi
|
||||
toolchain=DEVKITARM
|
||||
;;
|
||||
"2" )
|
||||
GCC_VER=8.2.0
|
||||
BINUTILS_VER=2.32
|
||||
GCC_VER=10.1.0
|
||||
BINUTILS_VER=2.34
|
||||
MN_BINUTILS_VER=2.17
|
||||
NEWLIB_VER=3.0.0
|
||||
GDB_VER=8.2
|
||||
NEWLIB_VER=3.3.0
|
||||
GDB_VER=8.2.1
|
||||
basedir='dkppc'
|
||||
package=devkitPPC
|
||||
target=powerpc-eabi
|
||||
toolchain=DEVKITPPC
|
||||
;;
|
||||
"3" )
|
||||
GCC_VER=8.2.0
|
||||
BINUTILS_VER=2.31.1
|
||||
NEWLIB_VER=3.0.0
|
||||
GDB_VER=8.0
|
||||
GCC_VER=10.2.0
|
||||
BINUTILS_VER=2.32
|
||||
NEWLIB_VER=3.3.0
|
||||
basedir='dka64'
|
||||
package=devkitA64
|
||||
target=aarch64-none-elf
|
||||
|
||||
0
strip_bins.sh
Normal file → Executable file
0
strip_bins.sh
Normal file → Executable file
Reference in New Issue
Block a user