mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-04-15 06:16:05 -05:00
Compare commits
60 Commits
devkitARM_
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
174e0edc3f | ||
|
|
d2e6e22b37 | ||
|
|
f1a462cc36 | ||
|
|
9681963375 | ||
|
|
e9f9826e26 | ||
|
|
6af2efa45a | ||
|
|
0aa89d4699 | ||
|
|
9fa34ef096 | ||
|
|
86cc404510 | ||
|
|
4b0ff1e466 | ||
|
|
0ddec6ce6d | ||
|
|
8d894d563c | ||
|
|
51244357b7 | ||
|
|
f1d8ff0e21 | ||
|
|
ae56dba8d0 | ||
|
|
e755556799 | ||
|
|
9acf8a8bbc | ||
|
|
1d87636f62 | ||
|
|
b8319d6d2a | ||
|
|
74e2c3ebc4 | ||
|
|
1118d68a97 | ||
|
|
5c0124ec01 | ||
|
|
329ce986eb | ||
|
|
73d0dafa21 | ||
|
|
5fb027fd3b | ||
|
|
b5cdec82b7 | ||
|
|
2d21601d71 | ||
|
|
c879ba7e62 | ||
|
|
b6613d5f5f | ||
|
|
b970a10d09 | ||
|
|
dbcb7aa399 | ||
|
|
67b34f5df3 | ||
|
|
141c30be36 | ||
|
|
1e91020d5c | ||
|
|
24164cca86 | ||
|
|
d6434abd04 | ||
|
|
55eb881d09 | ||
|
|
3a70b58ce2 | ||
|
|
3fedda9d74 | ||
|
|
7e4aed9985 | ||
|
|
1b09b3a824 | ||
|
|
a133b4d622 | ||
|
|
f1428f47e8 | ||
|
|
1a3f555292 | ||
|
|
6ea8070246 | ||
|
|
57928f194f | ||
|
|
6628e681e2 | ||
|
|
72ca8f813f | ||
|
|
ce700b701d | ||
|
|
8b3fb07490 | ||
|
|
5599e42c8c | ||
|
|
57b7f68921 | ||
|
|
88bd526925 | ||
|
|
d3d636cb54 | ||
|
|
78eb432d11 | ||
|
|
aa76a0ea46 | ||
|
|
2429e9ee7d | ||
|
|
f0b081246c | ||
|
|
a280f18794 | ||
|
|
c012acf8d8 |
35
build-binutils.sh
Normal file
35
build-binutils.sh
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
#!/bin/sh
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install binutils
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
mkdir -p $target/binutils
|
||||
pushd $target/binutils
|
||||
|
||||
if [ ! -f configured-binutils ]
|
||||
then
|
||||
CPPFLAGS="$cppflags $CPPFLAGS" LDFLAGS="$ldflags $LDFLAGS" ../../binutils-$BINUTILS_VER/configure \
|
||||
--prefix=$prefix --target=$target \
|
||||
--disable-nls --disable-werror \
|
||||
--disable-shared --disable-debug \
|
||||
--enable-lto --enable-plugins \
|
||||
--enable-poison-system-directories \
|
||||
$CROSS_PARAMS \
|
||||
|| { echo "Error configuring binutils"; exit 1; }
|
||||
touch configured-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f built-binutils ]
|
||||
then
|
||||
$MAKE || { echo "Error building binutils"; exit 1; }
|
||||
touch built-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f installed-binutils ]
|
||||
then
|
||||
$MAKE install || { echo "Error installing binutils"; exit 1; }
|
||||
touch installed-binutils
|
||||
fi
|
||||
popd
|
||||
40
build-crtls.sh
Executable file
40
build-crtls.sh
Executable file
|
|
@ -0,0 +1,40 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# set env variables
|
||||
#---------------------------------------------------------------------------------
|
||||
export DEVKITPRO=$TOOLPATH
|
||||
export DEVKITPPC=$DEVKITPRO/devkitPPC
|
||||
export DEVKITARM=$DEVKITPRO/devkitARM
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install the rules files
|
||||
#---------------------------------------------------------------------------------
|
||||
cd $BUILDDIR
|
||||
|
||||
if [ ! -f extracted-${_prefix}-rules ]; then
|
||||
tar -xvf $SRCDIR/${_prefix}-rules-${_rules_ver}.tar.gz || touch extracted-${_prefix}-rules
|
||||
fi
|
||||
|
||||
cd ${_prefix}-rules-${_rules_ver}
|
||||
|
||||
if [ ! -f installed-${_prefix}-rules ]; then
|
||||
$MAKE install || touch installed-${_prefix}-rules
|
||||
fi
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install the linkscripts
|
||||
#---------------------------------------------------------------------------------
|
||||
if [ $VERSION -ne 3 ]; then
|
||||
cd $BUILDDIR
|
||||
|
||||
if [ ! -f extracted-${_prefix}-crtls ]; then
|
||||
tar -xvf $SRCDIR/${_prefix}-crtls-${_crtls_ver}.tar.gz || touch extracted-${_prefix}-crtls
|
||||
fi
|
||||
|
||||
cd ${_prefix}-crtls-${_crtls_ver}
|
||||
|
||||
if [ ! -f installed-${_prefix}-crtls ]; then
|
||||
$MAKE install || touch installed-${_prefix}-crtls
|
||||
fi
|
||||
fi
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
#!/usr/bin/env bash
|
||||
#---------------------------------------------------------------------------------
|
||||
# devkitARM release 64
|
||||
# devkitPPC release 45.2
|
||||
# devkitA64 release 25.1
|
||||
# devkitARM release 67.2
|
||||
# devkitPPC release 49.2
|
||||
# devkitA64 release 29.2
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
if [ 0 -eq 1 ] ; then
|
||||
|
|
@ -27,26 +27,39 @@ echo
|
|||
|
||||
|
||||
|
||||
DKARM_RULES_VER=1.5.1
|
||||
DKARM_CRTLS_VER=1.2.5
|
||||
DKARM_RULES_VER=1.6.1
|
||||
DKARM_CRTLS_VER=1.2.7
|
||||
|
||||
DKPPC_RULES_VER=1.2.1
|
||||
DKPPC_CRTLS_VER=1.0.0
|
||||
|
||||
DKA64_RULES_VER=1.1.1
|
||||
|
||||
OSXMIN=${OSXMIN:-10.9}
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# find proper patch
|
||||
#---------------------------------------------------------------------------------
|
||||
if [ -z "$PATCH" -a -x "$(which gpatch)" ]; then PATCH=$(which gpatch); fi
|
||||
if [ -z "$PATCH" -a -x "$(which patch)" ]; then PATCH=$(which patch); fi
|
||||
if [ -z "$PATCH" ]; then
|
||||
echo no patch found
|
||||
exit 1
|
||||
fi
|
||||
echo use $PATCH as patch
|
||||
export PATCH
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
function extract_and_patch {
|
||||
#---------------------------------------------------------------------------------
|
||||
if [ ! -f extracted-$1-$2 ]; then
|
||||
echo "extracting $1-$2"
|
||||
tar -xf "$SRCDIR/$1-$2.tar.$3" || { echo "Error extracting "$1; exit 1; }
|
||||
tar -xf "$SRCDIR/$1-$2.tar.$4" || { echo "Error extracting "$1; exit 1; }
|
||||
touch extracted-$1-$2
|
||||
fi
|
||||
if [[ ! -f patched-$1-$2 && -f $patchdir/$1-$2.patch ]]; then
|
||||
if [[ ! -f patched-$1-$2 && -f $patchdir/$1-$2-$3.patch ]]; then
|
||||
echo "patching $1-$2"
|
||||
patch -p1 -d $1-$2 -i $patchdir/$1-$2.patch || { echo "Error patching $1"; exit 1; }
|
||||
$PATCH -p1 -d $1-$2 -i $patchdir/$1-$2-$3.patch || { echo "Error patching $1"; exit 1; }
|
||||
touch patched-$1-$2
|
||||
fi
|
||||
}
|
||||
|
|
@ -87,10 +100,10 @@ INSTALLDIR=/opt/devkitpro
|
|||
|
||||
[ ! -z "$INSTALLDIR" ] && mkdir -p $INSTALLDIR && touch $INSTALLDIR/nonexistantfile && rm $INSTALLDIR/nonexistantfile || exit 1;
|
||||
|
||||
if test "`curl -V`"; then
|
||||
if test "`wget -V`"; then
|
||||
FETCH='wget -U "dkp-buildscript"'
|
||||
elif test "`curl -V`"; then
|
||||
FETCH="curl -f -L -O"
|
||||
elif test "`wget -V`"; then
|
||||
FETCH=wget
|
||||
else
|
||||
echo "ERROR: Please make sure you have wget or curl installed."
|
||||
exit 1
|
||||
|
|
@ -119,6 +132,7 @@ if [ ! -z $CROSSBUILD ]; then
|
|||
CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH --with-isl=$CROSSPATH --with-zstd=$CROSSPATH"
|
||||
else
|
||||
prefix=$INSTALLDIR/$package
|
||||
CROSS_PARAMS="$CROSS_PARAMS --host=`./config.guess`"
|
||||
fi
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
|
|
@ -168,7 +182,7 @@ if [ ! -z $CROSSBUILD ]; then
|
|||
BUILDDIR=$BUILDDIR-$CROSSBUILD
|
||||
fi
|
||||
|
||||
patchdir=$(pwd)/$basedir/patches
|
||||
patchdir=$(pwd)/patches
|
||||
scriptdir=$(pwd)/$basedir/scripts
|
||||
|
||||
archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz"
|
||||
|
|
@ -183,7 +197,7 @@ if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ]; then
|
|||
fi
|
||||
|
||||
if [ $VERSION -eq 2 ]; then
|
||||
archives="devkitppc-rules-$DKPPC_RULES_VER.tar.gz $archives"
|
||||
archives="devkitppc-crtls-$DKPPC_CRTLS_VER.tar.gz devkitppc-rules-$DKPPC_RULES_VER.tar.gz $archives"
|
||||
fi
|
||||
|
||||
if [ $VERSION -eq 3 ]; then
|
||||
|
|
@ -210,20 +224,32 @@ cd $BUILDSCRIPTDIR
|
|||
mkdir -p $BUILDDIR
|
||||
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 binutils $BINUTILS_VER $BINUTILS_PKGREL xz
|
||||
|
||||
extract_and_patch gcc $GCC_VER $GCC_PKGREL xz
|
||||
if [ "$GCC_DOWNLOAD_PREREQS" != "0" ] && [ ! -f downloaded_prereqs ]; then
|
||||
cd gcc-${GCC_VER}
|
||||
./contrib/download_prerequisites && touch downloaded_prereqs
|
||||
cd ..
|
||||
fi
|
||||
|
||||
extract_and_patch newlib $NEWLIB_VER $NEWLIB_PKGREL gz
|
||||
|
||||
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
|
||||
. ${BUILDSCRIPTDIR}/build-binutils.sh || { echo "Error building binutils"; exit 1; };
|
||||
if [ $VERSION -eq 2 ]; then . ${BUILDSCRIPTDIR}/build-mn10200-binutils.sh || { echo "Error building mn10200 binutils"; exit 1; }; fi
|
||||
|
||||
. ${BUILDSCRIPTDIR}/build-gcc-stage1.sh || { echo "Error building gcc stage1"; exit 1; };
|
||||
. ${BUILDSCRIPTDIR}/build-newlib.sh || { echo "Error building newlib"; exit 1; };
|
||||
. ${BUILDSCRIPTDIR}/build-gcc-stage2.sh || { echo "Error building gcc stage2"; exit 1; };
|
||||
|
||||
|
||||
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;
|
||||
if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ]; then
|
||||
. ${BUILDSCRIPTDIR}/build-crtls.sh || { echo "Error building crtls & rules"; exit 1; };
|
||||
fi
|
||||
|
||||
cd $BUILDSCRIPTDIR
|
||||
|
|
|
|||
56
build-gcc-stage1.sh
Executable file
56
build-gcc-stage1.sh
Executable file
|
|
@ -0,0 +1,56 @@
|
|||
#!/usr/bin/env bash
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install the full compiler
|
||||
#---------------------------------------------------------------------------------
|
||||
mkdir -p ${BUILDDIR}/$target/gcc
|
||||
cd ${BUILDDIR}/$target/gcc
|
||||
|
||||
|
||||
if [ ! -f configured-gcc ]
|
||||
then
|
||||
CPPFLAGS="$cppflags $CPPFLAGS" \
|
||||
LDFLAGS="$ldflags $LDFLAGS" \
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
LDFLAGS_FOR_TARGET="" \
|
||||
../../gcc-$GCC_VER/configure \
|
||||
--target=$target \
|
||||
--prefix=$prefix \
|
||||
--enable-languages=c,c++,objc,lto \
|
||||
--with-gnu-as --with-gnu-ld --with-gcc \
|
||||
--enable-cxx-flags='-ffunction-sections' \
|
||||
--disable-libstdcxx-verbose \
|
||||
--enable-poison-system-directories \
|
||||
--enable-threads=posix --disable-win32-registry --disable-nls --disable-debug \
|
||||
--disable-libmudflap --disable-libssp --disable-libgomp \
|
||||
--disable-libstdcxx-pch \
|
||||
--enable-libstdcxx-time=yes \
|
||||
--enable-libstdcxx-filesystem-ts \
|
||||
--with-newlib=yes \
|
||||
--with-native-system-header-dir=/include \
|
||||
--with-sysroot=${prefix}/${target} \
|
||||
--enable-lto \
|
||||
--disable-tm-clone-registry \
|
||||
--disable-__cxa_atexit \
|
||||
--with-bugurl="https://devkitpro.org" \
|
||||
${_toolchain_options} \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
$EXTRA_GCC_PARAMS \
|
||||
|| { echo "Error configuring gcc"; exit 1; }
|
||||
touch configured-gcc
|
||||
fi
|
||||
|
||||
if [ ! -f built-gcc ]
|
||||
then
|
||||
$MAKE all-gcc || { echo "Error building gcc stage1"; exit 1; }
|
||||
touch built-gcc
|
||||
fi
|
||||
|
||||
if [ ! -f installed-gcc ]
|
||||
then
|
||||
$MAKE install-gcc || { echo "Error installing gcc stage 1"; exit 1; }
|
||||
touch installed-gcc
|
||||
fi
|
||||
21
build-gcc-stage2.sh
Executable file
21
build-gcc-stage2.sh
Executable file
|
|
@ -0,0 +1,21 @@
|
|||
#!/usr/bin/env bash
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install the full compiler
|
||||
#---------------------------------------------------------------------------------
|
||||
mkdir -p ${BUILDDIR}/$target/gcc
|
||||
cd ${BUILDDIR}/$target/gcc
|
||||
|
||||
|
||||
if [ ! -f built-gcc-stage2 ]
|
||||
then
|
||||
$MAKE || { echo "Error building gcc stage2"; exit 1; }
|
||||
touch built-gcc-stage2
|
||||
fi
|
||||
|
||||
if [ ! -f installed-gcc-stage2 ]
|
||||
then
|
||||
$MAKE install-strip || { echo "Error installing gcc"; exit 1; }
|
||||
touch installed-gcc-stage2
|
||||
fi
|
||||
33
build-mn10200-binutils.sh
Normal file
33
build-mn10200-binutils.sh
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
#---------------------------------------------------------------------------------
|
||||
# build and install mn10200 binutils
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
# Use modern config.sub for aarch64 host
|
||||
cp binutils-$BINUTILS_VER/config.sub binutils-$MN_BINUTILS_VER/config.sub
|
||||
|
||||
mkdir -p mn10200/binutils
|
||||
pushd mn10200/binutils
|
||||
|
||||
if [ ! -f configured-binutils ]
|
||||
then
|
||||
../../binutils-$MN_BINUTILS_VER/configure \
|
||||
--prefix=$prefix --target=mn10200 --disable-nls --disable-debug \
|
||||
--disable-multilib \
|
||||
--disable-werror $CROSS_PARAMS \
|
||||
|| { echo "Error configuing mn10200 binutils"; exit 1; }
|
||||
touch configured-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f built-binutils ]
|
||||
then
|
||||
$MAKE || { echo "Error building mn10200 binutils"; exit 1; }
|
||||
touch built-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f installed-binutils ]
|
||||
then
|
||||
$MAKE install || { echo "Error installing mn10200 binutils"; exit 1; }
|
||||
touch installed-binutils
|
||||
fi
|
||||
|
||||
popd
|
||||
56
build-newlib.sh
Normal file
56
build-newlib.sh
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
#!/usr/bin/env bash
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install newlib
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
unset CFLAGS
|
||||
cd $BUILDDIR
|
||||
|
||||
OLD_CC=$CC
|
||||
OLDCXX=$CXX
|
||||
unset CC
|
||||
unset CXX
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install newlib
|
||||
#---------------------------------------------------------------------------------
|
||||
mkdir -p ${BUILDDIR}/$target/newlib
|
||||
cd ${BUILDDIR}/$target/newlib
|
||||
|
||||
_target_cflags="-O2 -ffunction-sections -fdata-sections"
|
||||
|
||||
if [ $VERSION -eq 2 ]; then
|
||||
_target_cflags="${_target_cflags} -DCUSTOM_MALLOC_LOCK"
|
||||
fi
|
||||
|
||||
if [ ! -f configured-newlib ]
|
||||
then
|
||||
CFLAGS_FOR_TARGET="${_target_cflags}" \
|
||||
../../newlib-$NEWLIB_VER/configure \
|
||||
--disable-newlib-supplied-syscalls \
|
||||
--enable-newlib-mb \
|
||||
--disable-newlib-wide-orient \
|
||||
--enable-newlib-register-fini \
|
||||
--target=$target \
|
||||
--prefix=$prefix \
|
||||
|| { echo "Error configuring newlib"; exit 1; }
|
||||
touch configured-newlib
|
||||
fi
|
||||
|
||||
if [ ! -f built-newlib ]
|
||||
then
|
||||
$MAKE || { echo "Error building newlib"; exit 1; }
|
||||
touch built-newlib
|
||||
fi
|
||||
|
||||
|
||||
if [ ! -f installed-newlib ]
|
||||
then
|
||||
$MAKE install -j1 || { echo "Error installing newlib"; exit 1; }
|
||||
touch installed-newlib
|
||||
fi
|
||||
|
||||
export CC=$OLD_CC
|
||||
export CXX=$OLD_CXX
|
||||
2016
config.guess
vendored
2016
config.guess
vendored
File diff suppressed because it is too large
Load Diff
|
|
@ -29,6 +29,7 @@ BUILD_DKPRO_PACKAGE=0
|
|||
#---------------------------------------------------------------------------------
|
||||
#BUILD_DKPRO_SKIP_CRTLS=1
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Automated script execution
|
||||
#---------------------------------------------------------------------------------
|
||||
# 0: Ask to delete build folders & patched sources
|
||||
|
|
@ -36,6 +37,14 @@ BUILD_DKPRO_PACKAGE=0
|
|||
#---------------------------------------------------------------------------------
|
||||
BUILD_DKPRO_AUTOMATED=0
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Download prerequisites before building gcc
|
||||
#---------------------------------------------------------------------------------
|
||||
# 0: use pre-compiled prereqs
|
||||
# 1: run included download script
|
||||
#---------------------------------------------------------------------------------
|
||||
GCC_DOWNLOAD_PREREQS=0
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# set OSX SDK path if needed
|
||||
#---------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,507 +0,0 @@
|
|||
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
|
||||
index ec856764519..436098cbcc2 100644
|
||||
--- a/bfd/elf-bfd.h
|
||||
+++ b/bfd/elf-bfd.h
|
||||
@@ -1966,6 +1966,14 @@ struct output_elf_obj_tdata
|
||||
asection *sec;
|
||||
} package_metadata;
|
||||
|
||||
+ /* Data for .nx-module-name. */
|
||||
+ struct
|
||||
+ {
|
||||
+ bool (*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 d38e0afff2e..372e6615931 100644
|
||||
--- a/bfd/elf.c
|
||||
+++ b/bfd/elf.c
|
||||
@@ -7321,6 +7321,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
|
||||
&& !(*t->o->build_id.after_write_object_contents) (abfd))
|
||||
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
|
||||
index 4592bd6da27..dc27042cfe2 100644
|
||||
--- a/bfd/elfnn-aarch64.c
|
||||
+++ b/bfd/elfnn-aarch64.c
|
||||
@@ -2441,6 +2441,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. */
|
||||
@@ -6916,11 +6922,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;
|
||||
bool unresolved_reloc = false;
|
||||
+ bool resolved_to_zero = false;
|
||||
char *error_message = NULL;
|
||||
|
||||
r_symndx = ELFNN_R_SYM (rel->r_info);
|
||||
@@ -7060,6 +7068,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:
|
||||
@@ -7083,7 +7095,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);
|
||||
@@ -7178,7 +7190,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);
|
||||
@@ -7227,7 +7239,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
|
||||
|
||||
need_relocs = (h == NULL
|
||||
- || 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);
|
||||
@@ -7553,6 +7565,23 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
|
||||
return false;
|
||||
}
|
||||
|
||||
+/* Remove undefined weak symbol from the dynamic symbol table if it
|
||||
+ is resolved to 0. */
|
||||
+
|
||||
+static bool
|
||||
+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
|
||||
@@ -8771,6 +8800,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
struct elf_aarch64_link_hash_table *htab;
|
||||
struct elf_aarch64_link_hash_entry *eh;
|
||||
struct elf_dyn_relocs *p;
|
||||
+ bool resolved_to_zero;
|
||||
|
||||
/* An example of a bfd_link_hash_indirect symbol is versioned
|
||||
symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
|
||||
@@ -8790,6 +8820,10 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
info = (struct bfd_link_info *) inf;
|
||||
htab = elf_aarch64_hash_table (info);
|
||||
|
||||
+ 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
|
||||
@@ -8799,7 +8833,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
{
|
||||
/* Make sure this symbol is output as a dynamic symbol.
|
||||
Undefined weak syms won't yet be marked as dynamic. */
|
||||
- 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))
|
||||
@@ -8833,6 +8867,11 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
of relaxing into these from the large model PLT entries. */
|
||||
s->size += htab->plt_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;
|
||||
@@ -8861,6 +8900,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
htab->variant_pcs = 1;
|
||||
|
||||
}
|
||||
+ }
|
||||
else
|
||||
{
|
||||
h->plt.offset = (bfd_vma) - 1;
|
||||
@@ -8873,9 +8913,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)
|
||||
{
|
||||
bool dyn;
|
||||
@@ -8887,7 +8924,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
|
||||
/* Make sure this symbol is output as a dynamic symbol.
|
||||
Undefined weak syms won't yet be marked as dynamic. */
|
||||
- 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))
|
||||
@@ -8901,7 +8938,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
{
|
||||
h->got.offset = htab->root.sgot->size;
|
||||
htab->root.sgot->size += GOT_ENTRY_SIZE;
|
||||
- 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))
|
||||
@@ -8937,7 +8974,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
|
||||
@@ -9019,7 +9056,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
visibility. */
|
||||
if (h->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak)
|
||||
{
|
||||
- if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
||||
+ if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT || resolved_to_zero
|
||||
|| UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
||||
h->dyn_relocs = NULL;
|
||||
|
||||
@@ -9039,7 +9076,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
symbols which turn out to need copy relocs or are not
|
||||
dynamic. */
|
||||
|
||||
- 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
|
||||
@@ -9050,6 +9089,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
Undefined weak syms won't yet be marked as dynamic. */
|
||||
if (h->dynindx == -1
|
||||
&& !h->forced_local
|
||||
+ && !resolved_to_zero
|
||||
&& h->root.type == bfd_link_hash_undefweak
|
||||
&& !bfd_elf_link_record_dynamic_symbol (info, h))
|
||||
return false;
|
||||
@@ -9607,8 +9647,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
Elf_Internal_Sym *sym)
|
||||
{
|
||||
struct elf_aarch64_link_hash_table *htab;
|
||||
+ struct elf_aarch64_link_hash_entry *eh;
|
||||
+ bool 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;
|
||||
@@ -9643,7 +9692,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
return false;
|
||||
|
||||
elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
|
||||
- if (!h->def_regular)
|
||||
+ if (!local_undefweak && !h->def_regular)
|
||||
{
|
||||
/* Mark the symbol as undefined, rather than as defined in
|
||||
the .plt section. */
|
||||
@@ -9665,7 +9714,8 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
&& elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
|
||||
/* Undefined weak symbol in static PIE resolves to 0 without
|
||||
any dynamic relocations. */
|
||||
- && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
||||
+ && !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)
|
||||
+ && !local_undefweak)
|
||||
{
|
||||
Elf_Internal_Rela rela;
|
||||
bfd_byte *loc;
|
||||
@@ -10312,6 +10362,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
|
||||
#define elf_backend_init_index_section \
|
||||
_bfd_elf_init_2_index_sections
|
||||
|
||||
+#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/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
|
||||
index 8f68e517b45..260a590e69e 100644
|
||||
--- a/ld/emulparams/aarch64elf.sh
|
||||
+++ b/ld/emulparams/aarch64elf.sh
|
||||
@@ -1,3 +1,5 @@
|
||||
+source_sh ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||
+
|
||||
ARCH=aarch64
|
||||
MACHINE=
|
||||
NOP=0x1f2003d5
|
||||
diff --git a/ld/emulparams/aarch64elf32.sh b/ld/emulparams/aarch64elf32.sh
|
||||
index 5a08d9e29f1..e4c9abf85a1 100644
|
||||
--- a/ld/emulparams/aarch64elf32.sh
|
||||
+++ b/ld/emulparams/aarch64elf32.sh
|
||||
@@ -1,3 +1,5 @@
|
||||
+source_sh ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||
+
|
||||
ARCH="aarch64:ilp32"
|
||||
MACHINE=
|
||||
NOP=0x1f2003d5
|
||||
diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
|
||||
index d47bdbf9937..b6f76d5c8d7 100644
|
||||
--- a/ld/emultempl/aarch64elf.em
|
||||
+++ b/ld/emultempl/aarch64elf.em
|
||||
@@ -378,7 +378,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/elf.em b/ld/emultempl/elf.em
|
||||
index 3f67f8b09d9..eb8e8e1596e 100644
|
||||
--- a/ld/emultempl/elf.em
|
||||
+++ b/ld/emultempl/elf.em
|
||||
@@ -572,6 +572,7 @@ enum elf_options
|
||||
OPTION_EXCLUDE_LIBS,
|
||||
OPTION_HASH_STYLE,
|
||||
OPTION_BUILD_ID,
|
||||
+ OPTION_NX_MODULE_NAME,
|
||||
OPTION_PACKAGE_METADATA,
|
||||
OPTION_AUDIT,
|
||||
OPTION_COMPRESS_DEBUG
|
||||
@@ -603,6 +604,7 @@ EOF
|
||||
fi
|
||||
fragment <<EOF
|
||||
{"build-id", optional_argument, NULL, OPTION_BUILD_ID},
|
||||
+ {"nx-module-name", optional_argument, NULL, OPTION_NX_MODULE_NAME},
|
||||
{"package-metadata", optional_argument, NULL, OPTION_PACKAGE_METADATA},
|
||||
{"compress-debug-sections", required_argument, NULL, OPTION_COMPRESS_DEBUG},
|
||||
EOF
|
||||
@@ -673,6 +675,16 @@ gld${EMULATION_NAME}_handle_option (int optc)
|
||||
einfo (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
|
||||
optarg);
|
||||
break;
|
||||
+ case OPTION_NX_MODULE_NAME:
|
||||
+ if (ldelf_emit_nx_module_name != NULL)
|
||||
+ {
|
||||
+ free ((char *) ldelf_emit_nx_module_name);
|
||||
+ ldelf_emit_nx_module_name = NULL;
|
||||
+ }
|
||||
+ if (optarg == NULL)
|
||||
+ optarg = "";
|
||||
+ ldelf_emit_nx_module_name = xstrdup (optarg);
|
||||
+ break;
|
||||
EOF
|
||||
|
||||
if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
|
||||
diff --git a/ld/ldelf.c b/ld/ldelf.c
|
||||
index f9a6819366f..99e982ef5eb 100644
|
||||
--- a/ld/ldelf.c
|
||||
+++ b/ld/ldelf.c
|
||||
@@ -55,6 +55,9 @@ const char *ldelf_emit_note_gnu_build_id;
|
||||
/* Content of .note.package section. */
|
||||
const char *ldelf_emit_note_fdo_package_metadata;
|
||||
|
||||
+/* NX module name. */
|
||||
+const char *ldelf_emit_nx_module_name;
|
||||
+
|
||||
/* These variables are required to pass information back and forth
|
||||
between after_open and check_needed and stat_needed and vercheck. */
|
||||
|
||||
@@ -1206,8 +1209,93 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
|
||||
*save_input_bfd_tail = NULL;
|
||||
}
|
||||
|
||||
-/* This is called before calling plugin 'all symbols read' hook. */
|
||||
+static bool
|
||||
+write_nx_module_name (bfd *abfd)
|
||||
+{
|
||||
+ struct elf_obj_tdata *t = elf_tdata (abfd);
|
||||
+ 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 bool
|
||||
+setup_nx_module_name (bfd *ibfd, bfd *obfd)
|
||||
+{
|
||||
+ asection *s;
|
||||
+ bfd_size_type size;
|
||||
+ flagword flags;
|
||||
+
|
||||
+ if (ldelf_emit_nx_module_name[0] == '\0')
|
||||
+ {
|
||||
+ /* Extract the basename of the output bfd and use it as the module name. */
|
||||
+ char *dot_pos;
|
||||
+ free ((char *) ldelf_emit_nx_module_name);
|
||||
+ ldelf_emit_nx_module_name = (char *) lbasename (bfd_get_filename (obfd));
|
||||
+ ldelf_emit_nx_module_name = xstrdup (ldelf_emit_nx_module_name);
|
||||
+ dot_pos = strrchr (ldelf_emit_nx_module_name, '.');
|
||||
+ if (dot_pos != NULL)
|
||||
+ {
|
||||
+ /* Remove extension. */
|
||||
+ *dot_pos = 0;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ size = 8 + strlen(ldelf_emit_nx_module_name) + 1; /* extra null terminator for AMS */
|
||||
+ flags = (SEC_ALLOC | SEC_LOAD | SEC_IN_MEMORY
|
||||
+ | SEC_LINKER_CREATED | SEC_READONLY | SEC_DATA);
|
||||
+ s = bfd_make_section_with_flags (ibfd, ".nx-module-name", flags);
|
||||
+ if (s != NULL && bfd_set_section_alignment (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 = ldelf_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 before calling plugin 'all symbols read' hook. */
|
||||
void
|
||||
ldelf_before_plugin_all_symbols_read (int use_libpath, int native,
|
||||
int is_linux, int is_freebsd,
|
||||
@@ -1286,6 +1374,24 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
|
||||
}
|
||||
}
|
||||
|
||||
+ if (ldelf_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 *) ldelf_emit_nx_module_name);
|
||||
+ ldelf_emit_nx_module_name = NULL;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
get_elf_backend_data (link_info.output_bfd)->setup_gnu_properties (&link_info);
|
||||
|
||||
/* Do not allow executable files to be used as inputs to the link. */
|
||||
diff --git a/ld/ldelf.h b/ld/ldelf.h
|
||||
index f82bd9234a7..96173dcd671 100644
|
||||
--- a/ld/ldelf.h
|
||||
+++ b/ld/ldelf.h
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
extern const char *ldelf_emit_note_gnu_build_id;
|
||||
extern const char *ldelf_emit_note_fdo_package_metadata;
|
||||
+extern const char *ldelf_emit_nx_module_name;
|
||||
|
||||
extern void ldelf_after_parse (void);
|
||||
extern bool ldelf_load_symbols (lang_input_statement_type *);
|
||||
|
|
@ -1,346 +0,0 @@
|
|||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index 648b3dc2110..ed605b28956 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -1132,7 +1132,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
||||
tmake_file="${tmake_file} aarch64/t-aarch64"
|
||||
case $target in
|
||||
aarch64-*-elf*)
|
||||
+ default_use_cxa_atexit=yes
|
||||
use_gcc_stdint=wrap
|
||||
+ tm_file="${tm_file} devkitpro.h"
|
||||
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
|
||||
+ extra_options="${extra_options} devkitpro.opt"
|
||||
+ case ${enable_threads} in
|
||||
+ "" | yes | posix) thread_file='posix' ;;
|
||||
+ esac
|
||||
;;
|
||||
aarch64-*-fuchsia*)
|
||||
tm_file="${tm_file} fuchsia.h"
|
||||
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
index ec45f23fa41..a208eabd806 100644
|
||||
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||
@@ -22,6 +22,7 @@
|
||||
#ifndef GCC_AARCH64_ELF_RAW_H
|
||||
#define GCC_AARCH64_ELF_RAW_H
|
||||
|
||||
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
||||
#define STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
|
||||
#define ENDFILE_SPEC \
|
||||
" crtend%O%s crtn%O%s " \
|
||||
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
||||
index a9f3e2715ca..0c7304e1d81 100644
|
||||
--- a/gcc/config/aarch64/aarch64-opts.h
|
||||
+++ b/gcc/config/aarch64/aarch64-opts.h
|
||||
@@ -52,6 +52,12 @@ enum aarch64_tls_type {
|
||||
TLS_DESCRIPTORS
|
||||
};
|
||||
|
||||
+/* Which thread pointer access sequence to use. */
|
||||
+enum aarch64_tp_type {
|
||||
+ TP_HARD,
|
||||
+ TP_SOFT
|
||||
+};
|
||||
+
|
||||
/* The code model defines the address generation strategy.
|
||||
Most have a PIC and non-PIC variant. */
|
||||
enum aarch64_code_model {
|
||||
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
|
||||
index f5db5379543..f582e5a7543 100644
|
||||
--- a/gcc/config/aarch64/aarch64.cc
|
||||
+++ b/gcc/config/aarch64/aarch64.cc
|
||||
@@ -19550,8 +19550,24 @@ aarch64_load_tp (rtx target)
|
||||
|| !register_operand (target, Pmode))
|
||||
target = gen_reg_rtx (Pmode);
|
||||
|
||||
- /* 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 73b09e20508..ad62b5080cc 100644
|
||||
--- a/gcc/config/aarch64/aarch64.h
|
||||
+++ b/gcc/config/aarch64/aarch64.h
|
||||
@@ -1154,6 +1154,10 @@ typedef struct
|
||||
/* Check TLS Descriptors mechanism is selected. */
|
||||
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
||||
|
||||
+/* 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 36d0bb3f718..cfa2f7efc7f 100644
|
||||
--- a/gcc/config/aarch64/aarch64.md
|
||||
+++ b/gcc/config/aarch64/aarch64.md
|
||||
@@ -7068,11 +7068,22 @@
|
||||
(define_insn "aarch64_load_tp_hard"
|
||||
[(set (match_operand:DI 0 "register_operand" "=r")
|
||||
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
||||
- ""
|
||||
- "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 1d7967db9c0..17870f18b8b 100644
|
||||
--- a/gcc/config/aarch64/aarch64.opt
|
||||
+++ b/gcc/config/aarch64/aarch64.opt
|
||||
@@ -128,6 +128,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
|
||||
EnumValue
|
||||
Enum(aarch64_tls_size) String(48) Value(48)
|
||||
|
||||
+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.
|
||||
@@ -266,7 +281,7 @@ TargetVariable
|
||||
long aarch64_stack_protector_guard_offset = 0
|
||||
|
||||
moutline-atomics
|
||||
-Target Var(aarch64_flag_outline_atomics) Init(2) Save
|
||||
+Target 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 a9a244ab6d6..a29f2772d63 100644
|
||||
--- a/gcc/config/aarch64/t-aarch64
|
||||
+++ b/gcc/config/aarch64/t-aarch64
|
||||
@@ -177,8 +177,10 @@ aarch64-cc-fusion.o: $(srcdir)/config/aarch64/aarch64-cc-fusion.cc \
|
||||
$(srcdir)/config/aarch64/aarch64-cc-fusion.cc
|
||||
|
||||
comma=,
|
||||
-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..a25459e4352
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/devkitpro.h
|
||||
@@ -0,0 +1,32 @@
|
||||
+/* 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__"); \
|
||||
+ builtin_define ("__DEVKITPRO__"); \
|
||||
+ } 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.cc b/gcc/config/i386/host-mingw32.cc
|
||||
index acff6138d63..8dc91b75f93 100644
|
||||
--- a/gcc/config/i386/host-mingw32.cc
|
||||
+++ b/gcc/config/i386/host-mingw32.cc
|
||||
@@ -93,7 +93,10 @@ mingw32_gt_pch_get_address (size_t size, int)
|
||||
for NT system dlls is in 0x70000000 to 0x78000000 range.
|
||||
If we allocate at bottom we need to reserve the address as early
|
||||
as possible and at the same point in each invocation. */
|
||||
-
|
||||
+
|
||||
+#if __MINGW64__
|
||||
+ size = UINT64_C(64 * 1024 * 1024 * 1024);
|
||||
+#endif
|
||||
res = VirtualAlloc (NULL, size,
|
||||
MEM_RESERVE | MEM_TOP_DOWN,
|
||||
PAGE_NOACCESS);
|
||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
||||
index 16bb07f2cdc..22a181a3a1c 100644
|
||||
--- a/gcc/gcc.cc
|
||||
+++ b/gcc/gcc.cc
|
||||
@@ -868,6 +868,11 @@ proper position among the other output files. */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#ifndef LIBGLOSS_SPEC
|
||||
+# define LIBGLOSS_SPEC "-lsysbase"
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||
#ifndef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC \
|
||||
@@ -1191,6 +1196,7 @@ static const char *link_spec = LINK_SPEC;
|
||||
static const char *lib_spec = LIB_SPEC;
|
||||
static const char *link_gomp_spec = "";
|
||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||
+static const char *libgloss_spec = LIBGLOSS_SPEC;
|
||||
static const char *endfile_spec = ENDFILE_SPEC;
|
||||
static const char *startfile_spec = STARTFILE_SPEC;
|
||||
static const char *linker_name_spec = LINKER_NAME;
|
||||
@@ -1701,6 +1707,7 @@ static struct spec_list static_specs[] =
|
||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||
+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec),
|
||||
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||
index 93ff5b81dc5..20c0fe89a28 100644
|
||||
--- a/libgcc/crtstuff.c
|
||||
+++ b/libgcc/crtstuff.c
|
||||
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
||||
|
||||
#ifdef OBJECT_FORMAT_ELF
|
||||
|
||||
-#if DEFAULT_USE_CXA_ATEXIT
|
||||
+#if 1 /* DEFAULT_USE_CXA_ATEXIT */
|
||||
/* Declare the __dso_handle variable. It should have a unique value
|
||||
in every shared-object; in a main program its value is zero. The
|
||||
object should in any case be protected. This means the instance
|
||||
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
||||
index 1989c0c86ed..f1c49b2d4b1 100644
|
||||
--- a/libgcc/gthr.h
|
||||
+++ b/libgcc/gthr.h
|
||||
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
/* The pe-coff weak support isn't fully compatible to ELF's weak.
|
||||
For static libraries it might would work, but as we need to deal
|
||||
with shared versions too, we disable it for mingw-targets. */
|
||||
-#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 a880e8ee227..c58249f986c 100644
|
||||
--- a/libstdc++-v3/include/Makefile.am
|
||||
+++ b/libstdc++-v3/include/Makefile.am
|
||||
@@ -1417,6 +1417,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||
+ -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 0ff875b280b..37820c57a0a 100644
|
||||
--- a/libstdc++-v3/include/Makefile.in
|
||||
+++ b/libstdc++-v3/include/Makefile.in
|
||||
@@ -1891,6 +1891,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||
+ -e 's/_GLIBCXX___DEVKITA64_GLIBCXX___/__DEVKITA64__/g' \
|
||||
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
||||
< $< > $@
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
include $(DEVKITPRO)/devkitA64/base_tools
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.a:
|
||||
#---------------------------------------------------------------------------------
|
||||
@echo $(notdir $@)
|
||||
@rm -f $@
|
||||
$(AR) -rc $@ $^
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.o: %.cpp
|
||||
@echo $(notdir $<)
|
||||
$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.d $(CXXFLAGS) -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.o: %.c
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d $(CFLAGS) -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.o: %.s
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
%.o: %.S
|
||||
@echo $(notdir $<)
|
||||
$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ $(ERROR_FILTER)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# canned command sequence for binary data
|
||||
#---------------------------------------------------------------------------------
|
||||
define bin2o
|
||||
bin2s $< | $(AS) -o $(@)
|
||||
echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' -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,41 +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)/devkitA64/bin:$(PATH)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# add portlibs path
|
||||
#---------------------------------------------------------------------------------
|
||||
export PORTLIBS_PATH := $(DEVKITPATH)/portlibs
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# the prefix on the compiler executables
|
||||
#---------------------------------------------------------------------------------
|
||||
PREFIX := aarch64-none-elf-
|
||||
|
||||
export CC := $(PREFIX)gcc
|
||||
export CXX := $(PREFIX)g++
|
||||
export AS := $(PREFIX)as
|
||||
export AR := $(PREFIX)gcc-ar
|
||||
export OBJCOPY := $(PREFIX)objcopy
|
||||
export STRIP := $(PREFIX)strip
|
||||
export NM := $(PREFIX)gcc-nm
|
||||
export RANLIB := $(PREFIX)gcc-ranlib
|
||||
|
||||
ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
|
||||
|
||||
ifneq (,$(ISVC))
|
||||
ERROR_FILTER := 2>&1 | sed -e 's/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/g'
|
||||
endif
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# set env variables
|
||||
#---------------------------------------------------------------------------------
|
||||
export DEVKITPRO=$TOOLPATH
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install the rules files
|
||||
#---------------------------------------------------------------------------------
|
||||
cd $BUILDDIR
|
||||
|
||||
tar -xvf $SRCDIR/devkita64-rules-$DKA64_RULES_VER.tar.gz
|
||||
cd devkita64-rules-$DKA64_RULES_VER
|
||||
make install
|
||||
|
|
@ -1,149 +0,0 @@
|
|||
#!/bin/sh
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install binutils
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
mkdir -p $target/binutils
|
||||
cd $target/binutils
|
||||
|
||||
if [ ! -f configured-binutils ]
|
||||
then
|
||||
../../binutils-$BINUTILS_VER/configure \
|
||||
--prefix=$prefix --target=$target --disable-nls --disable-werror \
|
||||
--enable-lto --enable-plugins --enable-poison-system-directories \
|
||||
$CROSS_PARAMS \
|
||||
|| { echo "Error configuring binutils"; exit 1; }
|
||||
touch configured-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f built-binutils ]
|
||||
then
|
||||
$MAKE || { echo "Error building binutils"; exit 1; }
|
||||
touch built-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f installed-binutils ]
|
||||
then
|
||||
$MAKE install || { echo "Error installing binutils"; exit 1; }
|
||||
touch installed-binutils
|
||||
fi
|
||||
cd $BUILDDIR
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install just the c compiler
|
||||
#---------------------------------------------------------------------------------
|
||||
mkdir -p $target/gcc
|
||||
cd $target/gcc
|
||||
|
||||
if [ ! -f configured-gcc ]
|
||||
then
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
LDFLAGS_FOR_TARGET="" \
|
||||
../../gcc-$GCC_VER/configure \
|
||||
--enable-languages=c,c++,objc,lto \
|
||||
--with-gnu-as --with-gnu-ld --with-gcc \
|
||||
--with-march=armv8\
|
||||
--enable-cxx-flags='-ffunction-sections' \
|
||||
--disable-libstdcxx-verbose \
|
||||
--enable-poison-system-directories \
|
||||
--enable-multilib \
|
||||
--enable-threads --disable-win32-registry --disable-nls --disable-debug\
|
||||
--disable-libmudflap --disable-libssp --disable-libgomp \
|
||||
--disable-libstdcxx-pch \
|
||||
--enable-libstdcxx-time \
|
||||
--enable-libstdcxx-filesystem-ts \
|
||||
--target=$target \
|
||||
--with-newlib=yes \
|
||||
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||
--prefix=$prefix \
|
||||
--enable-lto \
|
||||
--disable-tm-clone-registry \
|
||||
--disable-__cxa_atexit \
|
||||
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 25.1" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
$EXTRA_GCC_PARAMS \
|
||||
|| { echo "Error configuring gcc"; exit 1; }
|
||||
touch configured-gcc
|
||||
fi
|
||||
|
||||
if [ ! -f built-gcc ]
|
||||
then
|
||||
$MAKE all-gcc || { echo "Error building gcc stage1"; exit 1; }
|
||||
touch built-gcc
|
||||
fi
|
||||
|
||||
if [ ! -f installed-gcc ]
|
||||
then
|
||||
$MAKE install-gcc || { echo "Error installing gcc"; exit 1; }
|
||||
touch installed-gcc
|
||||
fi
|
||||
|
||||
|
||||
unset CFLAGS
|
||||
cd $BUILDDIR
|
||||
|
||||
OLD_CC=$CC
|
||||
OLDCXX=$CXX
|
||||
unset CC
|
||||
unset CXX
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install newlib
|
||||
#---------------------------------------------------------------------------------
|
||||
mkdir -p $target/newlib
|
||||
cd $target/newlib
|
||||
|
||||
if [ ! -f configured-newlib ]
|
||||
then
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
../../newlib-$NEWLIB_VER/configure \
|
||||
--disable-newlib-supplied-syscalls \
|
||||
--enable-newlib-mb \
|
||||
--disable-newlib-wide-orient \
|
||||
--target=$target \
|
||||
--prefix=$prefix \
|
||||
|| { echo "Error configuring newlib"; exit 1; }
|
||||
touch configured-newlib
|
||||
fi
|
||||
|
||||
if [ ! -f built-newlib ]
|
||||
then
|
||||
$MAKE || { echo "Error building newlib"; exit 1; }
|
||||
touch built-newlib
|
||||
fi
|
||||
|
||||
|
||||
if [ ! -f installed-newlib ]
|
||||
then
|
||||
$MAKE install -j1 || { echo "Error installing newlib"; exit 1; }
|
||||
touch installed-newlib
|
||||
fi
|
||||
|
||||
export CC=$OLD_CC
|
||||
export CXX=$OLD_CXX
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install the final compiler
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
cd $BUILDDIR
|
||||
|
||||
cd $target/gcc
|
||||
|
||||
if [ ! -f built-stage2 ]
|
||||
then
|
||||
$MAKE all || { echo "Error building gcc stage2"; exit 1; }
|
||||
touch built-stage2
|
||||
fi
|
||||
|
||||
if [ ! -f installed-stage2 ]
|
||||
then
|
||||
$MAKE install || { echo "Error installing gcc stage2"; exit 1; }
|
||||
touch installed-stage2
|
||||
fi
|
||||
|
||||
rm -fr $prefix/$target/sys-include
|
||||
|
|
@ -1,552 +0,0 @@
|
|||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||
index 95c91ee02be..19f003c7952 100644
|
||||
--- a/gcc/config.gcc
|
||||
+++ b/gcc/config.gcc
|
||||
@@ -1482,6 +1482,11 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems* | arm*-*-fuchsia*)
|
||||
tm_file="$tm_file newlib-stdint.h"
|
||||
tmake_file="${tmake_file} arm/t-bpabi"
|
||||
use_gcc_stdint=wrap
|
||||
+ tm_file="${tm_file} devkitpro.h"
|
||||
+ extra_options="${extra_options} devkitpro.opt"
|
||||
+ case ${enable_threads} in
|
||||
+ "" | yes | posix) thread_file='posix' ;;
|
||||
+ esac
|
||||
;;
|
||||
arm*-*-fuchsia*)
|
||||
tm_file="${tm_file} fuchsia.h arm/fuchsia-elf.h glibc-stdint.h"
|
||||
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
|
||||
index 451b15fe9f9..c9efaf21c8c 100644
|
||||
--- a/gcc/config/arm/arm-cpus.in
|
||||
+++ b/gcc/config/arm/arm-cpus.in
|
||||
@@ -416,7 +416,7 @@ begin arch armv6k
|
||||
tune for mpcore
|
||||
tune flags CO_PROC
|
||||
base 6K
|
||||
- isa ARMv6k
|
||||
+ isa ARMv6k VFPv2 FP_DBL
|
||||
option fp add VFPv2 FP_DBL
|
||||
optalias vfpv2 fp
|
||||
option nofp remove ALL_FP
|
||||
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
|
||||
index aa64e50edeb..99cc8199ec5 100644
|
||||
--- a/gcc/config/arm/t-arm-elf
|
||||
+++ b/gcc/config/arm/t-arm-elf
|
||||
@@ -16,120 +16,22 @@
|
||||
# along with GCC; see the file COPYING3. If not see
|
||||
# <http://www.gnu.org/licenses/>.
|
||||
|
||||
-# Build a very basic set of libraries that should cater for most cases.
|
||||
-
|
||||
-# Single-precision floating-point is NOT supported; we don't build a
|
||||
-# suitable library for that. Use the rm-profile config in that case.
|
||||
-
|
||||
-# PART 1 - Useful groups of options
|
||||
-
|
||||
-dp_fpus := vfp vfpv2 vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16 \
|
||||
- neon neon-vfpv3 neon-fp16 vfpv4 neon-vfpv4 vfpv4-d16 \
|
||||
- fpv5-d16 fp-armv8 neon-fp-armv8 crypto-neon-fp-armv8 \
|
||||
- vfp3
|
||||
-
|
||||
-sp_fpus := vfpv3xd vfpv3xd-fp16 fpv4-sp-d16 fpv5-sp-d16
|
||||
-
|
||||
-v7a_fps := vfpv3 vfpv3-fp16 vfpv4 simd neon-fp16 neon-vfpv4
|
||||
-v7ve_fps := vfpv3-d16 vfpv3 vfpv3-d16-fp16 vfpv3-fp16 vfpv4 neon \
|
||||
- neon-fp16 simd
|
||||
-
|
||||
-# Not all these permutations exist for all architecture variants, but
|
||||
-# it seems to work ok.
|
||||
-v8_fps := simd fp16 crypto fp16+crypto dotprod fp16fml
|
||||
-
|
||||
-v9_fps := simd fp16 crypto fp16+crypto dotprod fp16fml
|
||||
-
|
||||
-# We don't do anything special with these. Pre-v4t probably doesn't work.
|
||||
-all_early_nofp := armv4 armv4t armv5t
|
||||
-
|
||||
-all_early_arch := armv5tej armv6 armv6j armv6k armv6z armv6kz \
|
||||
- armv6zk armv6t2 iwmmxt iwmmxt2
|
||||
-
|
||||
-all_v7_a_r := armv7-a armv7ve armv7-r
|
||||
-
|
||||
-all_v8_archs := armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a \
|
||||
- armv8.5-a armv8.6-a
|
||||
-
|
||||
-all_v9_archs := armv9-a
|
||||
-
|
||||
-# No floating point variants, require thumb1 softfp
|
||||
-all_nofp_t := armv6-m armv6s-m armv8-m.base
|
||||
-
|
||||
-all_nofp_t2 := armv7-m
|
||||
-
|
||||
-all_sp_only := armv7e-m armv8-m.main
|
||||
-
|
||||
-MULTILIB_OPTIONS =
|
||||
-MULTILIB_DIRNAMES =
|
||||
+MULTILIB_OPTIONS = mthumb mbig-endian march=armv6k march=armv6s-m mfloat-abi=hard mfloat-abi=soft
|
||||
+MULTILIB_DIRNAMES = thumb be armv6k v6-m fpu nofp
|
||||
MULTILIB_EXCEPTIONS =
|
||||
MULTILIB_MATCHES =
|
||||
-MULTILIB_REUSE =
|
||||
-
|
||||
-# PART 2 - multilib build rules
|
||||
-
|
||||
-MULTILIB_OPTIONS += marm/mthumb
|
||||
-MULTILIB_DIRNAMES += arm thumb
|
||||
-
|
||||
-MULTILIB_OPTIONS += mfpu=auto
|
||||
-MULTILIB_DIRNAMES += autofp
|
||||
-
|
||||
-MULTILIB_OPTIONS += march=armv5te+fp/march=armv7+fp
|
||||
-MULTILIB_DIRNAMES += v5te v7
|
||||
-
|
||||
-MULTILIB_OPTIONS += mfloat-abi=hard
|
||||
-MULTILIB_DIRNAMES += fpu
|
||||
-
|
||||
-# Build a total of 4 library variants (base options plus the following):
|
||||
-MULTILIB_REQUIRED += mthumb
|
||||
-MULTILIB_REQUIRED += marm/mfpu=auto/march=armv5te+fp/mfloat-abi=hard
|
||||
-MULTILIB_REQUIRED += mthumb/mfpu=auto/march=armv7+fp/mfloat-abi=hard
|
||||
-
|
||||
-# PART 3 - Match rules
|
||||
-
|
||||
-# Map all supported FPUs onto mfpu=auto
|
||||
-MULTILIB_MATCHES += $(foreach FPU, $(dp_fpus), \
|
||||
- mfpu?auto=mfpu?$(FPU))
|
||||
-
|
||||
-MULTILIB_MATCHES += march?armv5te+fp=march?armv5te
|
||||
-
|
||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_early_arch), \
|
||||
- march?armv5te+fp=march?$(ARCH) \
|
||||
- march?armv5te+fp=march?$(ARCH)+fp)
|
||||
-
|
||||
-MULTILIB_MATCHES += march?armv7+fp=march?armv7
|
||||
-
|
||||
-MULTILIB_MATCHES += $(foreach FPARCH, $(v7a_fps), \
|
||||
- march?armv7+fp=march?armv7-a+$(FPARCH))
|
||||
-
|
||||
-MULTILIB_MATCHES += $(foreach FPARCH, $(v7ve_fps), \
|
||||
- march?armv7+fp=march?armv7ve+$(FPARCH))
|
||||
-
|
||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v7_a_r), \
|
||||
- march?armv7+fp=march?$(ARCH) \
|
||||
- march?armv7+fp=march?$(ARCH)+fp)
|
||||
|
||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v8_archs), \
|
||||
- march?armv7+fp=march?$(ARCH) \
|
||||
- $(foreach FPARCH, $(v8_fps), \
|
||||
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
|
||||
+MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard mthumb/march=armv6s-m/mfloat-abi=soft
|
||||
|
||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v9_archs), \
|
||||
- march?armv7+fp=march?$(ARCH) \
|
||||
- $(foreach FPARCH, $(v9_fps), \
|
||||
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
|
||||
|
||||
-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \
|
||||
- march?armv7+fp=march?$(ARCH)+fp.dp)
|
||||
+MULTILIB_MATCHES += march?armv6k=mtune?mpcore
|
||||
+MULTILIB_MATCHES += march?armv6k=mcpu?mpcore
|
||||
|
||||
-# PART 4 - Reuse rules
|
||||
+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m0
|
||||
+MULTILIB_MATCHES += march?armv6s-m=mtune?cortex-m0
|
||||
+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m0plus
|
||||
+MULTILIB_MATCHES += march?armv6s-m=mtune?cortex-m0plus
|
||||
+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m1
|
||||
+MULTILIB_MATCHES += march?armv6s-m=mtune?cortex-m1
|
||||
|
||||
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto
|
||||
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp
|
||||
-MULTILIB_REUSE += mthumb=mthumb/march.armv5te+fp
|
||||
-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=marm/march.armv5te+fp/mfloat-abi.hard
|
||||
-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=march.armv5te+fp/mfloat-abi.hard
|
||||
-MULTILIB_REUSE += marm/mfpu.auto/march.armv5te+fp/mfloat-abi.hard=mfpu.auto/march.armv5te+fp/mfloat-abi.hard
|
||||
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
|
||||
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard
|
||||
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
|
||||
+MULTILIB_REUSE = mthumb/march.armv6s-m/mfloat-abi.soft=mthumb/march.armv6s-m
|
||||
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
|
||||
index 6b313042f20..7b39702224a 100644
|
||||
--- a/gcc/config/arm/unknown-elf.h
|
||||
+++ b/gcc/config/arm/unknown-elf.h
|
||||
@@ -29,7 +29,7 @@
|
||||
#endif
|
||||
|
||||
/* Now we define the strings used to build the spec file. */
|
||||
-#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s crt0%O%s"
|
||||
+#define UNKNOWN_ELF_STARTFILE_SPEC " crti%O%s crtbegin%O%s"
|
||||
|
||||
#undef STARTFILE_SPEC
|
||||
#define STARTFILE_SPEC \
|
||||
@@ -93,4 +93,5 @@
|
||||
udivmoddi4, which will depend on the exception unwind routines,
|
||||
which will depend on abort, which is defined in libc. */
|
||||
#undef LINK_GCC_C_SEQUENCE_SPEC
|
||||
-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %{!nolibc:%L} --end-group"
|
||||
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
||||
+
|
||||
diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
|
||||
new file mode 100644
|
||||
index 00000000000..180a9ea8553
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/devkitpro.h
|
||||
@@ -0,0 +1,27 @@
|
||||
+/* Definitions for devkitPro toolchains.
|
||||
+ Copyright (C) 2016-2018 Free Software Foundation, Inc.
|
||||
+ This file is part of GCC.
|
||||
+ GCC is free software; you can redistribute it and/or modify it
|
||||
+ under the terms of the GNU General Public License as published
|
||||
+ by the Free Software Foundation; either version 3, or (at your
|
||||
+ option) any later version.
|
||||
+ GCC is distributed in the hope that it will be useful, but WITHOUT
|
||||
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
+ License for more details.
|
||||
+ Under Section 7 of GPL version 3, you are granted additional
|
||||
+ permissions described in the GCC Runtime Library Exception, version
|
||||
+ 3.1, as published by the Free Software Foundation.
|
||||
+ You should have received a copy of the GNU General Public License and
|
||||
+ a copy of the GCC Runtime Library Exception along with this program;
|
||||
+ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
+ <http://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+#undef TARGET_OS_CPP_BUILTINS
|
||||
+#define TARGET_OS_CPP_BUILTINS() \
|
||||
+ do { \
|
||||
+ builtin_define ("__DEVKITPRO__"); \
|
||||
+ builtin_define ("__DEVKITARM__"); \
|
||||
+ } while (0)
|
||||
+
|
||||
+
|
||||
diff --git a/gcc/config/devkitpro.opt b/gcc/config/devkitpro.opt
|
||||
new file mode 100644
|
||||
index 00000000000..9acbbf9d27c
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/devkitpro.opt
|
||||
@@ -0,0 +1,29 @@
|
||||
+; Options for devkitPro toolchains.
|
||||
+
|
||||
+; Copyright (C) 2011-2018 Free Software Foundation, Inc.
|
||||
+;
|
||||
+; This file is part of GCC.
|
||||
+;
|
||||
+; GCC is free software; you can redistribute it and/or modify it under
|
||||
+; the terms of the GNU General Public License as published by the Free
|
||||
+; Software Foundation; either version 3, or (at your option) any later
|
||||
+; version.
|
||||
+;
|
||||
+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
+; for more details.
|
||||
+;
|
||||
+; You should have received a copy of the GNU General Public License
|
||||
+; along with GCC; see the file COPYING3. If not see
|
||||
+; <http://www.gnu.org/licenses/>.
|
||||
+
|
||||
+; See the GCC internals manual (options.texi) for a description of
|
||||
+; this file's format.
|
||||
+
|
||||
+; Please try to keep this file in ASCII collating order.
|
||||
+
|
||||
+pthread
|
||||
+Driver
|
||||
+
|
||||
+; This comment is to ensure we retain the blank line above.
|
||||
diff --git a/gcc/config/devkitpro.opt.urls b/gcc/config/devkitpro.opt.urls
|
||||
new file mode 100644
|
||||
index 00000000000..ab7b466aa71
|
||||
--- /dev/null
|
||||
+++ b/gcc/config/devkitpro.opt.urls
|
||||
@@ -0,0 +1 @@
|
||||
+; Autogenerated by regenerate-opt-urls.py from gcc/config/devkitpro.opt and generated HTML
|
||||
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
|
||||
index 728332b8153..47fc03eb8c8 100644
|
||||
--- a/gcc/gcc.cc
|
||||
+++ b/gcc/gcc.cc
|
||||
@@ -881,6 +881,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 \
|
||||
@@ -1208,6 +1213,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;
|
||||
@@ -1720,6 +1726,7 @@ static struct spec_list static_specs[] =
|
||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||
+ INIT_STATIC_SPEC ("libgloss", &libgloss_spec),
|
||||
INIT_STATIC_SPEC ("startfile", &startfile_spec),
|
||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||
diff --git a/libgcc/config/arm/t-bpabi b/libgcc/config/arm/t-bpabi
|
||||
index dddddc7c444..c2502597953 100644
|
||||
--- a/libgcc/config/arm/t-bpabi
|
||||
+++ b/libgcc/config/arm/t-bpabi
|
||||
@@ -17,4 +17,4 @@ SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver
|
||||
# On ARM, specifying -fnon-call-exceptions will needlessly pull in
|
||||
# the unwinder in simple programs which use 64-bit division. Omitting
|
||||
# the option is safe.
|
||||
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
|
||||
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
|
||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||
index 38d3859a73c..f97358d9787 100644
|
||||
--- a/libgcc/crtstuff.c
|
||||
+++ b/libgcc/crtstuff.c
|
||||
@@ -326,7 +326,7 @@ register_tm_clones (void)
|
||||
|
||||
#ifdef OBJECT_FORMAT_ELF
|
||||
|
||||
-#if DEFAULT_USE_CXA_ATEXIT
|
||||
+#if 1 /* DEFAULT_USE_CXA_ATEXIT */
|
||||
/* Declare the __dso_handle variable. It should have a unique value
|
||||
in every shared-object; in a main program its value is zero. The
|
||||
object should in any case be protected. This means the instance
|
||||
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
||||
index 33c2d8ff630..e23c2a7990f 100644
|
||||
--- a/libgcc/gthr.h
|
||||
+++ b/libgcc/gthr.h
|
||||
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
/* The pe-coff weak support isn't fully compatible to ELF's weak.
|
||||
For static libraries it might would work, but as we need to deal
|
||||
with shared versions too, we disable it for mingw-targets. */
|
||||
-#ifdef __MINGW32__
|
||||
+#ifdef __MINGW32__ || defined(__DEVKITARM__)
|
||||
#undef GTHREAD_USE_WEAK
|
||||
#define GTHREAD_USE_WEAK 0
|
||||
#endif
|
||||
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
||||
index 21abaeb0778..0ef23891978 100755
|
||||
--- a/libstdc++-v3/configure
|
||||
+++ b/libstdc++-v3/configure
|
||||
@@ -893,6 +893,7 @@ infodir
|
||||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
+runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
@@ -1027,6 +1028,7 @@ datadir='${datarootdir}'
|
||||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
+runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
@@ -1279,6 +1281,15 @@ do
|
||||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
+ | --runstate | --runstat | --runsta | --runst | --runs \
|
||||
+ | --run | --ru | --r)
|
||||
+ ac_prev=runstatedir ;;
|
||||
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
+ | --run=* | --ru=* | --r=*)
|
||||
+ runstatedir=$ac_optarg ;;
|
||||
+
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
@@ -1416,7 +1427,7 @@ fi
|
||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
- libdir localedir mandir
|
||||
+ libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
@@ -1569,6 +1580,7 @@ Fine tuning of the installation directories:
|
||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
@@ -5080,7 +5092,7 @@ else
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -5126,7 +5138,7 @@ else
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -5150,7 +5162,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -5195,7 +5207,7 @@ else
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -5219,7 +5231,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -12280,7 +12292,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
-#line 12283 "configure"
|
||||
+#line 12295 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -12386,7 +12398,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
-#line 12389 "configure"
|
||||
+#line 12401 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -16182,7 +16194,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
|
||||
# Fake what AC_TRY_COMPILE does.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
-#line 16185 "configure"
|
||||
+#line 16197 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef bool atomic_type;
|
||||
@@ -16217,7 +16229,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
-#line 16220 "configure"
|
||||
+#line 16232 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef short atomic_type;
|
||||
@@ -16252,7 +16264,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
-#line 16255 "configure"
|
||||
+#line 16267 "configure"
|
||||
int main()
|
||||
{
|
||||
// NB: _Atomic_word not necessarily int.
|
||||
@@ -16288,7 +16300,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
-#line 16291 "configure"
|
||||
+#line 16303 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef long long atomic_type;
|
||||
@@ -16444,7 +16456,7 @@ $as_echo "mutex" >&6; }
|
||||
# unnecessary for this test.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
-#line 16447 "configure"
|
||||
+#line 16459 "configure"
|
||||
int main()
|
||||
{
|
||||
_Decimal32 d1;
|
||||
@@ -16486,7 +16498,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
# unnecessary for this test.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
-#line 16489 "configure"
|
||||
+#line 16501 "configure"
|
||||
template<typename T1, typename T2>
|
||||
struct same
|
||||
{ typedef T2 type; };
|
||||
@@ -28575,6 +28587,8 @@ _ACEOF
|
||||
|
||||
$as_echo "#define HAVE_MEMALIGN 1" >>confdefs.h
|
||||
|
||||
+ $as_echo "#define HAVE_ALIGNED_ALLOC 1" >>confdefs.h
|
||||
+
|
||||
|
||||
case "${target}" in
|
||||
*-rtems*)
|
||||
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
|
||||
index 37396bd6ebb..1dadf658c08 100644
|
||||
--- a/libstdc++-v3/configure.ac
|
||||
+++ b/libstdc++-v3/configure.ac
|
||||
@@ -378,6 +378,7 @@ dnl # rather than hardcoding that information.
|
||||
|
||||
AC_DEFINE(HAVE_ICONV)
|
||||
AC_DEFINE(HAVE_MEMALIGN)
|
||||
+ AC_DEFINE(HAVE_ALIGNED_ALLOC)
|
||||
|
||||
case "${target}" in
|
||||
*-rtems*)
|
||||
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
||||
index 422a0f4bd0a..42185df9517 100644
|
||||
--- a/libstdc++-v3/include/Makefile.am
|
||||
+++ b/libstdc++-v3/include/Makefile.am
|
||||
@@ -1429,6 +1429,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||
+ -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
|
||||
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
||||
< $< > $@
|
||||
|
||||
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
||||
index 9fd4ab4848c..0b7ba4021ee 100644
|
||||
--- a/libstdc++-v3/include/Makefile.in
|
||||
+++ b/libstdc++-v3/include/Makefile.in
|
||||
@@ -336,6 +336,7 @@ prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
python_mod_dir = @python_mod_dir@
|
||||
+runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
@@ -1903,6 +1904,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||
+ -e 's/_GLIBCXX___DEVKITARM_GLIBCXX___/__DEVKITARM__/g' \
|
||||
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
|
||||
< $< > $@
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# set env variables
|
||||
#---------------------------------------------------------------------------------
|
||||
export DEVKITPRO=$TOOLPATH
|
||||
export DEVKITARM=$DEVKITPRO/devkitARM
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install the rules files
|
||||
#---------------------------------------------------------------------------------
|
||||
cd $BUILDDIR
|
||||
|
||||
tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.gz
|
||||
cd devkitarm-rules-$DKARM_RULES_VER
|
||||
make install
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install and build the crt0 files
|
||||
#---------------------------------------------------------------------------------
|
||||
cd $BUILDDIR
|
||||
|
||||
tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.gz
|
||||
cd devkitarm-crtls-$DKARM_CRTLS_VER
|
||||
make install
|
||||
|
||||
|
|
@ -1,155 +0,0 @@
|
|||
#!/bin/sh
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install binutils
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
mkdir -p $target/binutils
|
||||
cd $target/binutils
|
||||
|
||||
if [ ! -f configured-binutils ]
|
||||
then
|
||||
CPPFLAGS="$cppflags $CPPFLAGS" LDFLAGS="$ldflags $LDFLAGS" ../../binutils-$BINUTILS_VER/configure \
|
||||
--prefix=$prefix --target=$target --disable-nls --disable-werror \
|
||||
--enable-lto --enable-plugins \
|
||||
--enable-poison-system-directories \
|
||||
$CROSS_PARAMS \
|
||||
|| { echo "Error configuring binutils"; exit 1; }
|
||||
touch configured-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f built-binutils ]
|
||||
then
|
||||
$MAKE || { echo "Error building binutils"; exit 1; }
|
||||
touch built-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f installed-binutils ]
|
||||
then
|
||||
$MAKE install || { echo "Error installing binutils"; exit 1; }
|
||||
touch installed-binutils
|
||||
fi
|
||||
cd $BUILDDIR
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install just the c compiler
|
||||
#---------------------------------------------------------------------------------
|
||||
mkdir -p $target/gcc
|
||||
cd $target/gcc
|
||||
|
||||
if [ ! -f configured-gcc ]
|
||||
then
|
||||
CPPFLAGS="$cppflags $CPPFLAGS" \
|
||||
LDFLAGS="$ldflags $LDFLAGS" \
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
LDFLAGS_FOR_TARGET="" \
|
||||
../../gcc-$GCC_VER/configure \
|
||||
--enable-languages=c,c++,objc,lto \
|
||||
--with-gnu-as --with-gnu-ld --with-gcc \
|
||||
--with-march=armv4t\
|
||||
--enable-cxx-flags='-ffunction-sections' \
|
||||
--disable-libstdcxx-verbose \
|
||||
--enable-poison-system-directories \
|
||||
--enable-interwork --enable-multilib \
|
||||
--enable-threads --disable-win32-registry --disable-nls --disable-debug\
|
||||
--disable-libmudflap --disable-libssp --disable-libgomp \
|
||||
--disable-libstdcxx-pch \
|
||||
--enable-libstdcxx-time=yes \
|
||||
--enable-libstdcxx-filesystem-ts \
|
||||
--target=$target \
|
||||
--with-newlib \
|
||||
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||
--prefix=$prefix \
|
||||
--enable-lto\
|
||||
--with-system-zlib \
|
||||
--disable-tm-clone-registry \
|
||||
--disable-__cxa_atexit \
|
||||
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 64" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
$EXTRA_GCC_PARAMS \
|
||||
|| { echo "Error configuring gcc"; exit 1; }
|
||||
touch configured-gcc
|
||||
fi
|
||||
|
||||
if [ ! -f built-gcc ]
|
||||
then
|
||||
$MAKE all-gcc || { echo "Error building gcc stage1"; exit 1; }
|
||||
touch built-gcc
|
||||
fi
|
||||
|
||||
if [ ! -f installed-gcc ]
|
||||
then
|
||||
$MAKE install-gcc || { echo "Error installing gcc"; exit 1; }
|
||||
touch installed-gcc
|
||||
fi
|
||||
|
||||
|
||||
unset CFLAGS
|
||||
cd $BUILDDIR
|
||||
|
||||
OLD_CC=$CC
|
||||
OLDCXX=$CXX
|
||||
unset CC
|
||||
unset CXX
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install newlib
|
||||
#---------------------------------------------------------------------------------
|
||||
mkdir -p $target/newlib
|
||||
cd $target/newlib
|
||||
|
||||
if [ ! -f configured-newlib ]
|
||||
then
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
../../newlib-$NEWLIB_VER/configure \
|
||||
--disable-newlib-supplied-syscalls \
|
||||
--enable-newlib-mb \
|
||||
--disable-newlib-wide-orient \
|
||||
--target=$target \
|
||||
--prefix=$prefix \
|
||||
|| { echo "Error configuring newlib"; exit 1; }
|
||||
touch configured-newlib
|
||||
fi
|
||||
|
||||
if [ ! -f built-newlib ]
|
||||
then
|
||||
$MAKE || { echo "Error building newlib"; exit 1; }
|
||||
touch built-newlib
|
||||
fi
|
||||
|
||||
|
||||
if [ ! -f installed-newlib ]
|
||||
then
|
||||
$MAKE install -j1 || { echo "Error installing newlib"; exit 1; }
|
||||
touch installed-newlib
|
||||
fi
|
||||
|
||||
export CC=$OLD_CC
|
||||
export CXX=$OLD_CXX
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install the final compiler
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
cd $BUILDDIR
|
||||
|
||||
cd $target/gcc
|
||||
|
||||
if [ ! -f built-stage2 ]
|
||||
then
|
||||
$MAKE all || { echo "Error building gcc stage2"; exit 1; }
|
||||
touch built-stage2
|
||||
fi
|
||||
|
||||
if [ ! -f installed-stage2 ]
|
||||
then
|
||||
$MAKE install || { echo "Error installing gcc stage2"; exit 1; }
|
||||
touch installed-stage2
|
||||
fi
|
||||
|
||||
rm -fr $prefix/$target/sys-include
|
||||
|
||||
cd $BUILDDIR
|
||||
|
|
@ -1,303 +0,0 @@
|
|||
/* Default linker script, for normal executables */
|
||||
OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc",
|
||||
"elf32-powerpc")
|
||||
OUTPUT_ARCH(powerpc:common)
|
||||
ENTRY(_start)
|
||||
SEARCH_DIR("/powerpc/powerpc-eabi-elf/lib");
|
||||
/* Do we need any of these for elf?
|
||||
__DYNAMIC = 0; */
|
||||
PROVIDE (__stack = 0x817F0000);
|
||||
SECTIONS
|
||||
{
|
||||
|
||||
/* DOL header (from TITANIK's GC docs)
|
||||
*/
|
||||
. = 0x80003000;
|
||||
|
||||
.header :
|
||||
{
|
||||
file_start = .;
|
||||
/* 0000-001B Text[0..6] sections File Positions */
|
||||
LONG(text_file_start);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
|
||||
/* 001C-0047 Data[0..10] sections File Positions */
|
||||
LONG(data_file_start);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
|
||||
/* 0048-0063 Text[0..6] sections Mem Address */
|
||||
LONG(text_mem_start);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
|
||||
/* 0064-008F Data[0..10] sections Mem Address */
|
||||
LONG(data_mem_start);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
|
||||
/* 0090-00AB Text[0..6] sections Sizes */
|
||||
LONG(text_mem_size);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
|
||||
/* 00AC-00D7 Data[0..10] sections Sizes */
|
||||
LONG(data_mem_size);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
LONG(0);
|
||||
|
||||
/* 00D8 BSS Mem address
|
||||
* 00DC BSS Size */
|
||||
LONG(bss_mem_start);
|
||||
LONG(bss_mem_size);
|
||||
|
||||
/* 00E0 Entry Point */
|
||||
LONG(ABSOLUTE(_start));
|
||||
}
|
||||
|
||||
|
||||
. = file_start + 0x100;
|
||||
|
||||
text_mem_start = .;
|
||||
|
||||
.init :
|
||||
{
|
||||
KEEP (*(.init))
|
||||
} =0
|
||||
/* Read-only sections, merged into text segment: */
|
||||
.interp : { *(.interp) }
|
||||
.hash : { *(.hash) }
|
||||
.dynsym : { *(.dynsym) }
|
||||
.dynstr : { *(.dynstr) }
|
||||
.gnu.version : { *(.gnu.version) }
|
||||
.gnu.version_d : { *(.gnu.version_d) }
|
||||
.gnu.version_r : { *(.gnu.version_r) }
|
||||
.rel.init : { *(.rel.init) }
|
||||
.rela.init : { *(.rela.init) }
|
||||
.rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
|
||||
.rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
|
||||
.rel.fini : { *(.rel.fini) }
|
||||
.rela.fini : { *(.rela.fini) }
|
||||
.rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
|
||||
.rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
|
||||
.rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
|
||||
.rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
|
||||
.rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
|
||||
.rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
|
||||
.rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
|
||||
.rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
|
||||
.rel.ctors : { *(.rel.ctors) }
|
||||
.rela.ctors : { *(.rela.ctors) }
|
||||
.rel.dtors : { *(.rel.dtors) }
|
||||
.rela.dtors : { *(.rela.dtors) }
|
||||
.rel.got : { *(.rel.got) }
|
||||
.rela.got : { *(.rela.got) }
|
||||
.rela.got1 : { *(.rela.got1) }
|
||||
.rela.got2 : { *(.rela.got2) }
|
||||
.rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
|
||||
.rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
|
||||
.rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
|
||||
.rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
|
||||
.rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
|
||||
.rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
|
||||
.rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
|
||||
.rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
|
||||
.rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
|
||||
.rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
|
||||
.rel.plt : { *(.rel.plt) }
|
||||
.rela.plt : { *(.rela.plt) }
|
||||
|
||||
.text :
|
||||
{
|
||||
*(.text .stub .text.* .gnu.linkonce.t.*)
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
} =0
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
} =0
|
||||
PROVIDE (__etext = .);
|
||||
PROVIDE (_etext = .);
|
||||
PROVIDE (etext = .);
|
||||
. = ALIGN(32);
|
||||
text_mem_size = . - text_mem_start;
|
||||
data_mem_start = .;
|
||||
.rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
|
||||
.rodata1 : { *(.rodata1) }
|
||||
.sdata2 : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) }
|
||||
.sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
|
||||
.eh_frame_hdr : { *(.eh_frame_hdr) }
|
||||
. = ALIGN(32);
|
||||
/* 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 : { *(.preinit_array) }
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { *(.init_array) }
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { *(.fini_array) }
|
||||
PROVIDE (__fini_array_end = .);
|
||||
.data :
|
||||
{
|
||||
*(.data .data.* .gnu.linkonce.d.*)
|
||||
SORT(CONSTRUCTORS)
|
||||
}
|
||||
.data1 : { *(.data1) }
|
||||
.tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
|
||||
.tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
|
||||
.eh_frame : { KEEP (*(.eh_frame)) }
|
||||
.gcc_except_table : { *(.gcc_except_table) }
|
||||
.fixup : { *(.fixup) }
|
||||
.got1 : { *(.got1) }
|
||||
.got2 : { *(.got2) }
|
||||
.dynamic : { *(.dynamic) }
|
||||
.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))
|
||||
/* We don't want to include the .ctor section from
|
||||
from the crtend.o file until after the sorted ctors.
|
||||
The .ctor section from the crtend file contains the
|
||||
end of ctors marker and it must be last */
|
||||
KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
}
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin*.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
}
|
||||
.jcr : { KEEP (*(.jcr)) }
|
||||
.got : { *(.got.plt) *(.got) }
|
||||
/* We want the small data sections together, so single-instruction offsets
|
||||
can access them all, and initialized data all before uninitialized, so
|
||||
we can shorten the on-disk segment size. */
|
||||
.sdata :
|
||||
{
|
||||
*(.sdata .sdata.* .gnu.linkonce.s.*)
|
||||
}
|
||||
_edata = .;
|
||||
PROVIDE (edata = .);
|
||||
|
||||
data_mem_size = . - data_mem_start;
|
||||
bss_mem_start = .;
|
||||
|
||||
__bss_start = .;
|
||||
.sbss :
|
||||
{
|
||||
PROVIDE (__sbss_start = .);
|
||||
PROVIDE (___sbss_start = .);
|
||||
*(.dynsbss)
|
||||
*(.sbss .sbss.* .gnu.linkonce.sb.*)
|
||||
*(.scommon)
|
||||
PROVIDE (__sbss_end = .);
|
||||
PROVIDE (___sbss_end = .);
|
||||
}
|
||||
.plt : { *(.plt) }
|
||||
.bss :
|
||||
{
|
||||
*(.dynbss)
|
||||
*(.bss .bss.* .gnu.linkonce.b.*)
|
||||
*(COMMON)
|
||||
/* Align here to ensure that the .bss section occupies space up to
|
||||
_end. Align after .bss to ensure correct alignment even if the
|
||||
.bss section disappears because there are no input sections. */
|
||||
. = ALIGN(32 / 8);
|
||||
}
|
||||
. = ALIGN(32 / 8);
|
||||
bss_mem_size = . - bss_mem_start;
|
||||
text_file_start = text_mem_start - file_start;
|
||||
data_file_start = data_mem_start - file_start;
|
||||
|
||||
|
||||
_end = .;
|
||||
__end = .;
|
||||
PROVIDE (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 .gnu.linkonce.wi.*) }
|
||||
.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) }
|
||||
}
|
||||
|
|
@ -1,283 +0,0 @@
|
|||
/*
|
||||
* Linkscript for GC
|
||||
*
|
||||
*/
|
||||
|
||||
OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc");
|
||||
OUTPUT_ARCH(powerpc:common);
|
||||
EXTERN(_start);
|
||||
ENTRY(_start);
|
||||
|
||||
PHDRS
|
||||
{
|
||||
stub PT_LOAD FLAGS(5);
|
||||
text PT_LOAD FLAGS(5);
|
||||
data PT_LOAD FLAGS(6);
|
||||
bss PT_LOAD;
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
/* default base address */
|
||||
/* use -Wl,--section-start,.init=0xADDRESS to change */
|
||||
. = 0x80003100;
|
||||
|
||||
/* Program */
|
||||
.init :
|
||||
{
|
||||
KEEP (*crt0.o(*.init))
|
||||
KEEP (*(.init))
|
||||
} :text = 0
|
||||
.plt : { *(.plt) }
|
||||
.interp : { *(.interp) }
|
||||
.hash : { *(.hash) }
|
||||
.dynsym : { *(.dynsym) }
|
||||
.dynstr : { *(.dynstr) }
|
||||
.gnu.version : { *(.gnu.version) }
|
||||
.gnu.version_d : { *(.gnu.version_d) }
|
||||
.gnu.version_r : { *(.gnu.version_r) }
|
||||
.rel.init : { *(.rel.init) }
|
||||
.rela.init : { *(.rela.init) }
|
||||
.rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
|
||||
.rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
|
||||
.rel.fini : { *(.rel.fini) }
|
||||
.rela.fini : { *(.rela.fini) }
|
||||
.rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
|
||||
.rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
|
||||
.rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
|
||||
.rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
|
||||
.rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
|
||||
.rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
|
||||
.rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
|
||||
.rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
|
||||
.rel.ctors : { *(.rel.ctors) }
|
||||
.rela.ctors : { *(.rela.ctors) }
|
||||
.rel.dtors : { *(.rel.dtors) }
|
||||
.rela.dtors : { *(.rela.dtors) }
|
||||
.rel.got : { *(.rel.got) }
|
||||
.rela.got : { *(.rela.got) }
|
||||
.rela.got1 : { *(.rela.got1) }
|
||||
.rela.got2 : { *(.rela.got2) }
|
||||
.rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
|
||||
.rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
|
||||
.rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
|
||||
.rela.sbss : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
|
||||
.rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
|
||||
.rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
|
||||
.rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
|
||||
.rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
|
||||
.rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
|
||||
.rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
|
||||
.rel.plt : { *(.rel.plt) }
|
||||
.rela.plt : { *(.rela.plt) }
|
||||
|
||||
.text :
|
||||
{
|
||||
*(.text)
|
||||
*(.text.*)
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.gnu.linkonce.t.*)
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
} = 0
|
||||
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
} = 0
|
||||
|
||||
PROVIDE (__etext = .);
|
||||
PROVIDE (_etext = .);
|
||||
PROVIDE (etext = .);
|
||||
|
||||
.rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } :data
|
||||
.rodata1 : { *(.rodata1) }
|
||||
.sdata2 : {
|
||||
PROVIDE(_SDA2_BASE_ = . );
|
||||
*(.sdata2) *(.sdata2.*)
|
||||
*(.gnu.linkonce.s2.*)
|
||||
}
|
||||
.sbss2 : { *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) }
|
||||
/* Adjust the address for the data segment. We want to adjust up to
|
||||
the same address within the page on the next page up. */
|
||||
/* 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 : { *(.preinit_array) }
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { *(.init_array) }
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { *(.fini_array) }
|
||||
PROVIDE (__fini_array_end = .);
|
||||
.data :
|
||||
{
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d.*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
}
|
||||
|
||||
.data1 : { *(.data1) }
|
||||
.tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
|
||||
.tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
|
||||
.eh_frame : { KEEP (*(.eh_frame)) }
|
||||
.gcc_except_table : { *(.gcc_except_table) }
|
||||
.fixup : { *(.fixup) }
|
||||
.got1 : { *(.got1) }
|
||||
.got2 : { *(.got2) }
|
||||
.dynamic : { *(.dynamic) }
|
||||
|
||||
.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))
|
||||
|
||||
/* We don't want to include the .ctor section from
|
||||
from the crtend.o file until after the sorted ctors.
|
||||
The .ctor section from the crtend file contains the
|
||||
end of ctors marker and it must be last */
|
||||
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
}
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
}
|
||||
|
||||
.jcr : { KEEP (*(.jcr)) }
|
||||
.got : { *(.got.plt) *(.got) }
|
||||
|
||||
|
||||
/* We want the small data sections together, so single-instruction offsets
|
||||
can access them all, and initialized data all before uninitialized, so
|
||||
we can shorten the on-disk segment size. */
|
||||
|
||||
.sdata :
|
||||
{
|
||||
PROVIDE(_SDA_BASE_ = . );
|
||||
*(.sdata)
|
||||
*(.sdata.*)
|
||||
*(.gnu.linkonce.s.*)
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
}
|
||||
|
||||
_edata = .;
|
||||
PROVIDE (edata = .);
|
||||
|
||||
.sbss :
|
||||
{
|
||||
__sbss_start = .;
|
||||
PROVIDE (__sbss_start = .);
|
||||
PROVIDE (___sbss_start = .);
|
||||
*(.dynsbss)
|
||||
*(.sbss)
|
||||
*(.sbss.*)
|
||||
*(.gnu.linkonce.sb.*)
|
||||
*(.scommon)
|
||||
PROVIDE (__sbss_end = .);
|
||||
PROVIDE (___sbss_end = .);
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
__sbss_end = .;
|
||||
} :bss
|
||||
|
||||
.bss :
|
||||
{
|
||||
__bss_start = .;
|
||||
PROVIDE (__bss_start = .);
|
||||
*(.dynbss)
|
||||
*(.bss)
|
||||
*(.bss.*)
|
||||
*(.gnu.linkonce.b.*)
|
||||
*(COMMON)
|
||||
/* Align here to ensure that the .bss section occupies space up to
|
||||
_end. Align after .bss to ensure correct alignment even if the
|
||||
.bss section disappears because there are no input sections. */
|
||||
|
||||
. = ALIGN(32);
|
||||
|
||||
PROVIDE (__bss_end = .);
|
||||
__bss_end = .;
|
||||
}
|
||||
|
||||
_end = .;
|
||||
PROVIDE(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) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
|
||||
__isIPL = 0;
|
||||
__stack_addr = (__bss_start + SIZEOF(.bss) + 0x20000 + 7) & (-8);
|
||||
__stack_end = (__bss_start + SIZEOF(.bss));
|
||||
__intrstack_addr = (__stack_addr + 0x4000);
|
||||
__intrstack_end = (__stack_addr);
|
||||
__Arena1Lo = (__intrstack_addr + 31) & (-32);
|
||||
__Arena1Hi = (0x817FEFF0);
|
||||
|
||||
__gxregs = (__Arena1Hi + 31) & (-32);
|
||||
/* for backward compatibility with old crt0 */
|
||||
PROVIDE (__stack = (0x817FEFF0));
|
||||
|
||||
PROVIDE(__isIPL = __isIPL);
|
||||
PROVIDE(__stack_addr = __stack_addr);
|
||||
PROVIDE(__stack_end = __stack_end);
|
||||
PROVIDE(__intrstack_addr = __intrstack_addr);
|
||||
PROVIDE(__intrstack_end = __intrstack_end);
|
||||
PROVIDE(__Arena1Lo = __Arena1Lo);
|
||||
PROVIDE(__Arena1Hi = __Arena1Hi);
|
||||
PROVIDE(__gxregs = __gxregs);
|
||||
|
|
@ -1,304 +0,0 @@
|
|||
/*
|
||||
* Linkscript for Wii
|
||||
*/
|
||||
|
||||
OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc");
|
||||
OUTPUT_ARCH(powerpc:common);
|
||||
EXTERN(_start);
|
||||
ENTRY(_start);
|
||||
|
||||
PHDRS
|
||||
{
|
||||
stub PT_LOAD FLAGS(5);
|
||||
text PT_LOAD FLAGS(5);
|
||||
data PT_LOAD FLAGS(6);
|
||||
bss1 PT_LOAD;
|
||||
bss2 PT_LOAD;
|
||||
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
/* stub is loaded at physical address 0x00003400 (though both 0x80003400 and 0x00003400 are equivalent for IOS) */
|
||||
/* This can also be used to load an arbitrary standalone stub at an arbitrary address in memory, for any purpose */
|
||||
/* Use -Wl,--section-start,.stub=0xADDRESS to change */
|
||||
. = 0x00003400;
|
||||
|
||||
.stub :
|
||||
{
|
||||
KEEP(*(.stub))
|
||||
} :stub = 0
|
||||
|
||||
/* default base address */
|
||||
/* use -Wl,--section-start,.init=0xADDRESS to change */
|
||||
. = 0x80004000;
|
||||
|
||||
/* Program */
|
||||
.init :
|
||||
{
|
||||
KEEP (*crt0.o(*.init))
|
||||
KEEP (*(.init))
|
||||
} :text = 0
|
||||
.plt : { *(.plt) }
|
||||
.interp : { *(.interp) }
|
||||
.hash : { *(.hash) }
|
||||
.dynsym : { *(.dynsym) }
|
||||
.dynstr : { *(.dynstr) }
|
||||
.gnu.version : { *(.gnu.version) }
|
||||
.gnu.version_d : { *(.gnu.version_d) }
|
||||
.gnu.version_r : { *(.gnu.version_r) }
|
||||
.rel.init : { *(.rel.init) }
|
||||
.rela.init : { *(.rela.init) }
|
||||
.rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
|
||||
.rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
|
||||
.rel.fini : { *(.rel.fini) }
|
||||
.rela.fini : { *(.rela.fini) }
|
||||
.rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
|
||||
.rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
|
||||
.rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
|
||||
.rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
|
||||
.rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
|
||||
.rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
|
||||
.rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
|
||||
.rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
|
||||
.rel.ctors : { *(.rel.ctors) }
|
||||
.rela.ctors : { *(.rela.ctors) }
|
||||
.rel.dtors : { *(.rel.dtors) }
|
||||
.rela.dtors : { *(.rela.dtors) }
|
||||
.rel.got : { *(.rel.got) }
|
||||
.rela.got : { *(.rela.got) }
|
||||
.rela.got1 : { *(.rela.got1) }
|
||||
.rela.got2 : { *(.rela.got2) }
|
||||
.rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
|
||||
.rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
|
||||
.rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
|
||||
.rela.sbss : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
|
||||
.rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
|
||||
.rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
|
||||
.rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
|
||||
.rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
|
||||
.rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
|
||||
.rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
|
||||
.rel.plt : { *(.rel.plt) }
|
||||
.rela.plt : { *(.rela.plt) }
|
||||
|
||||
.text :
|
||||
{
|
||||
*(.text)
|
||||
*(.text.*)
|
||||
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||
*(.gnu.warning)
|
||||
*(.gnu.linkonce.t.*)
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
} = 0
|
||||
|
||||
.fini :
|
||||
{
|
||||
KEEP (*(.fini))
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
} = 0
|
||||
|
||||
PROVIDE (__etext = .);
|
||||
PROVIDE (_etext = .);
|
||||
PROVIDE (etext = .);
|
||||
|
||||
.rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } :data
|
||||
.rodata1 : { *(.rodata1) }
|
||||
.sdata2 : {
|
||||
PROVIDE(_SDA2_BASE_ = .);
|
||||
*(.sdata2)
|
||||
*(.sdata2.*)
|
||||
*(.gnu.linkonce.s2.*)
|
||||
}
|
||||
.sbss2 : { *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) }
|
||||
/* Adjust the address for the data segment. We want to adjust up to
|
||||
the same address within the page on the next page up. */
|
||||
/* 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 : { *(.preinit_array) }
|
||||
PROVIDE (__preinit_array_end = .);
|
||||
PROVIDE (__init_array_start = .);
|
||||
.init_array : { *(.init_array) }
|
||||
PROVIDE (__init_array_end = .);
|
||||
PROVIDE (__fini_array_start = .);
|
||||
.fini_array : { *(.fini_array) }
|
||||
PROVIDE (__fini_array_end = .);
|
||||
.data :
|
||||
{
|
||||
*(.data)
|
||||
*(.data.*)
|
||||
*(.gnu.linkonce.d.*)
|
||||
SORT(CONSTRUCTORS)
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
}
|
||||
|
||||
.data1 : { *(.data1) }
|
||||
.tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
|
||||
.tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
|
||||
.eh_frame : { KEEP (*(.eh_frame)) }
|
||||
.gcc_except_table : { *(.gcc_except_table) }
|
||||
.fixup : { *(.fixup) }
|
||||
.got1 : { *(.got1) }
|
||||
.got2 : { *(.got2) }
|
||||
.dynamic : { *(.dynamic) }
|
||||
|
||||
.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))
|
||||
|
||||
/* We don't want to include the .ctor section from
|
||||
from the crtend.o file until after the sorted ctors.
|
||||
The .ctor section from the crtend file contains the
|
||||
end of ctors marker and it must be last */
|
||||
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
|
||||
KEEP (*(SORT(.ctors.*)))
|
||||
KEEP (*(.ctors))
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
}
|
||||
|
||||
.dtors :
|
||||
{
|
||||
KEEP (*crtbegin.o(.dtors))
|
||||
KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
|
||||
KEEP (*(SORT(.dtors.*)))
|
||||
KEEP (*(.dtors))
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
}
|
||||
|
||||
.jcr : { KEEP (*(.jcr)) }
|
||||
.got : { *(.got.plt) *(.got) }
|
||||
|
||||
|
||||
/* We want the small data sections together, so single-instruction offsets
|
||||
can access them all, and initialized data all before uninitialized, so
|
||||
we can shorten the on-disk segment size. */
|
||||
|
||||
.sdata :
|
||||
{
|
||||
PROVIDE(_SDA_BASE_ = .);
|
||||
*(.sdata)
|
||||
*(.sdata.*)
|
||||
*(.gnu.linkonce.s.*)
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
}
|
||||
|
||||
_edata = .;
|
||||
PROVIDE (edata = .);
|
||||
|
||||
.sbss :
|
||||
{
|
||||
__sbss_start = .;
|
||||
PROVIDE (__sbss_start = .);
|
||||
PROVIDE (___sbss_start = .);
|
||||
*(.dynsbss)
|
||||
*(.sbss)
|
||||
*(.sbss.*)
|
||||
*(.gnu.linkonce.sb.*)
|
||||
*(.scommon)
|
||||
PROVIDE (__sbss_end = .);
|
||||
PROVIDE (___sbss_end = .);
|
||||
. = ALIGN(32); /* REQUIRED. LD is flaky without it. */
|
||||
__sbss_end = .;
|
||||
} :bss1
|
||||
|
||||
.bss :
|
||||
{
|
||||
__bss_start = .;
|
||||
PROVIDE (__bss_start = .);
|
||||
*(.dynbss)
|
||||
*(.bss)
|
||||
*(.bss.*)
|
||||
*(.gnu.linkonce.b.*)
|
||||
*(COMMON)
|
||||
/* Align here to ensure that the .bss section occupies space up to
|
||||
_end. Align after .bss to ensure correct alignment even if the
|
||||
.bss section disappears because there are no input sections. */
|
||||
|
||||
. = ALIGN(32);
|
||||
|
||||
PROVIDE (__bss_end = .);
|
||||
__bss_end = .;
|
||||
} :bss2
|
||||
|
||||
_end = .;
|
||||
PROVIDE(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) }
|
||||
/* These must appear regardless of . */
|
||||
}
|
||||
|
||||
__isIPL = 0;
|
||||
__stack_addr = (__bss_start + SIZEOF(.bss) + 0x20000 + 7) & (-8);
|
||||
__stack_end = (__bss_start + SIZEOF(.bss));
|
||||
__intrstack_addr = (__stack_addr + 0x4000);
|
||||
__intrstack_end = (__stack_addr);
|
||||
__Arena1Lo = (__intrstack_addr + 31) & (-32);
|
||||
__Arena1Hi = (0x817FEFF0);
|
||||
__Arena2Lo = (0x90002000);
|
||||
__Arena2Hi = (0x933E0000);
|
||||
|
||||
__gxregs = (__Arena1Hi + 31) & (-32);
|
||||
__ipcbufferLo = (0x933e0000);
|
||||
__ipcbufferHi = (0x93400000);
|
||||
|
||||
/* for backward compatibility with old crt0 */
|
||||
PROVIDE (__stack = (0x817FEFF0));
|
||||
|
||||
PROVIDE(__isIPL = __isIPL);
|
||||
PROVIDE(__stack_addr = __stack_addr);
|
||||
PROVIDE(__stack_end = __stack_end);
|
||||
PROVIDE(__intrstack_addr = __intrstack_addr);
|
||||
PROVIDE(__intrstack_end = __intrstack_end);
|
||||
PROVIDE(__Arena1Lo = __Arena1Lo);
|
||||
PROVIDE(__Arena1Hi = __Arena1Hi);
|
||||
PROVIDE(__Arena2Lo = __Arena2Lo);
|
||||
PROVIDE(__Arena2Hi = __Arena2Hi);
|
||||
PROVIDE(__ipcbufferLo = __ipcbufferLo);
|
||||
PROVIDE(__ipcbufferHi = __ipcbufferHi);
|
||||
PROVIDE(__gxregs = __gxregs);
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
|
||||
index da892988f5d..6b8efb9bbdb 100644
|
||||
--- a/ld/emulparams/elf32ppccommon.sh
|
||||
+++ b/ld/emulparams/elf32ppccommon.sh
|
||||
@@ -23,7 +23,7 @@ else
|
||||
unset SBSS_START_SYMBOLS
|
||||
unset SBSS_END_SYMBOLS
|
||||
fi
|
||||
-OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};"
|
||||
+OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};${CREATE_SHLIB+PROVIDE (}__end__ = .${CREATE_SHLIB+)};"
|
||||
OTHER_RELRO_SECTIONS="
|
||||
.fixup ${RELOCATING-0} : { *(.fixup) }
|
||||
.got1 ${RELOCATING-0} : { *(.got1) }
|
||||
diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
|
||||
index 37f1aeb780c..f8de8aacc44 100644
|
||||
--- a/opcodes/ppc-opc.c
|
||||
+++ b/opcodes/ppc-opc.c
|
||||
@@ -4988,7 +4988,7 @@ const unsigned int num_powerpc_operands = ARRAY_SIZE (powerpc_operands);
|
||||
#define MFDEC2 (PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
|
||||
| PPC_OPCODE_TITAN)
|
||||
#define BOOKE PPC_OPCODE_BOOKE
|
||||
-#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
|
||||
+#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
|
||||
#define PPCE300 PPC_OPCODE_E300
|
||||
#define PPCSPE PPC_OPCODE_SPE
|
||||
#define PPCSPE2 PPC_OPCODE_SPE2
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,16 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# set env variables
|
||||
#---------------------------------------------------------------------------------
|
||||
export DEVKITPRO=$TOOLPATH
|
||||
export DEVKITPPC=$DEVKITPRO/devkitPPC
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install the rules files
|
||||
#---------------------------------------------------------------------------------
|
||||
cd $BUILDDIR
|
||||
|
||||
tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.gz
|
||||
cd devkitppc-rules-$DKPPC_RULES_VER
|
||||
make install
|
||||
|
|
@ -1,195 +0,0 @@
|
|||
#!/bin/bash
|
||||
#---------------------------------------------------------------------------------
|
||||
# Check Parameters
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install ppc binutils
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
mkdir -p $target/binutils
|
||||
cd $target/binutils
|
||||
|
||||
if [ ! -f configured-binutils ]
|
||||
then
|
||||
../../binutils-$BINUTILS_VER/configure \
|
||||
--prefix=$prefix --target=$target --disable-nls --disable-shared --disable-debug \
|
||||
--disable-werror \
|
||||
--enable-poison-system-directories \
|
||||
--enable-plugins --enable-lto \
|
||||
--disable-werror $CROSS_PARAMS \
|
||||
|| { echo "Error configuing ppc binutils"; exit 1; }
|
||||
touch configured-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f built-binutils ]
|
||||
then
|
||||
$MAKE || { echo "Error building ppc binutils"; exit 1; }
|
||||
touch built-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f installed-binutils ]
|
||||
then
|
||||
$MAKE install || { echo "Error installing ppc binutils"; exit 1; }
|
||||
touch installed-binutils
|
||||
fi
|
||||
cd $BUILDDIR
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install mn10200 binutils
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
# Use modern config.sub for aarch64 host
|
||||
cp binutils-$BINUTILS_VER/config.sub binutils-$MN_BINUTILS_VER/config.sub
|
||||
|
||||
mkdir -p mn10200/binutils
|
||||
cd mn10200/binutils
|
||||
|
||||
if [ ! -f configured-binutils ]
|
||||
then
|
||||
../../binutils-$MN_BINUTILS_VER/configure \
|
||||
--prefix=$prefix --target=mn10200 --disable-nls --disable-debug \
|
||||
--disable-multilib \
|
||||
--disable-werror $CROSS_PARAMS \
|
||||
|| { echo "Error configuing mn10200 binutils"; exit 1; }
|
||||
touch configured-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f built-binutils ]
|
||||
then
|
||||
$MAKE || { echo "Error building mn10200 binutils"; exit 1; }
|
||||
touch built-binutils
|
||||
fi
|
||||
|
||||
if [ ! -f installed-binutils ]
|
||||
then
|
||||
$MAKE install || { echo "Error installing mn10200 binutils"; exit 1; }
|
||||
touch installed-binutils
|
||||
fi
|
||||
|
||||
cd $BUILDDIR
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install just the c compiler
|
||||
#---------------------------------------------------------------------------------
|
||||
mkdir -p $target/gcc
|
||||
cd $target/gcc
|
||||
|
||||
export gcc_cv_libc_provides_ssp=yes
|
||||
|
||||
if [ ! -f configured-gcc ]
|
||||
then
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
CXXFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
LDFLAGS_FOR_TARGET="" \
|
||||
../../gcc-$GCC_VER/configure \
|
||||
--enable-languages=c,c++,objc,lto \
|
||||
--enable-lto \
|
||||
--with-cpu=750 \
|
||||
--disable-nls --disable-shared --enable-threads=dkp --disable-multilib \
|
||||
--disable-win32-registry \
|
||||
--disable-libstdcxx-pch \
|
||||
--disable-libstdcxx-verbose \
|
||||
--enable-libstdcxx-time=yes \
|
||||
--enable-libstdcxx-filesystem-ts \
|
||||
--disable-tm-clone-registry \
|
||||
--disable-__cxa_atexit \
|
||||
--disable-libssp \
|
||||
--enable-cxx-flags='-ffunction-sections -fdata-sections' \
|
||||
--target=$target \
|
||||
--with-newlib \
|
||||
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||
--prefix=$prefix \
|
||||
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 45.2" \
|
||||
$CROSS_PARAMS \
|
||||
$CROSS_GCC_PARAMS \
|
||||
$EXTRA_GCC_PARAMS \
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||
|| { echo "Error configuring gcc stage 1"; exit 1; }
|
||||
touch configured-gcc
|
||||
fi
|
||||
|
||||
if [ ! -f built-gcc-stage1 ]
|
||||
then
|
||||
$MAKE all-gcc || { echo "Error building gcc stage1"; exit 1; }
|
||||
touch built-gcc-stage1
|
||||
fi
|
||||
|
||||
if [ ! -f installed-gcc-stage1 ]
|
||||
then
|
||||
$MAKE install-gcc || { echo "Error installing gcc stage1"; exit 1; }
|
||||
touch installed-gcc-stage1
|
||||
fi
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install newlib
|
||||
#---------------------------------------------------------------------------------
|
||||
cd $BUILDDIR
|
||||
mkdir -p $target/newlib
|
||||
cd $target/newlib
|
||||
|
||||
unset CFLAGS
|
||||
unset LDFLAGS
|
||||
|
||||
OLD_CC=$CC
|
||||
OLD_CXX=$CXX
|
||||
unset CC
|
||||
unset CXX
|
||||
|
||||
if [ ! -f configured-newlib ]
|
||||
then
|
||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections -DCUSTOM_MALLOC_LOCK" \
|
||||
../../newlib-$NEWLIB_VER/configure \
|
||||
--target=$target \
|
||||
--prefix=$prefix \
|
||||
--enable-newlib-mb \
|
||||
--enable-newlib-register-fini \
|
||||
|| { echo "Error configuring newlib"; exit 1; }
|
||||
touch configured-newlib
|
||||
fi
|
||||
|
||||
if [ ! -f built-newlib ]
|
||||
then
|
||||
$MAKE || { echo "Error building newlib"; exit 1; }
|
||||
touch built-newlib
|
||||
fi
|
||||
if [ ! -f installed-newlib ]
|
||||
then
|
||||
$MAKE install -j1 || { echo "Error installing newlib"; exit 1; }
|
||||
touch installed-newlib
|
||||
fi
|
||||
|
||||
export CC=$OLD_CC
|
||||
export CXX=$OLD_CXX
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build and install the final compiler
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
cd $BUILDDIR
|
||||
|
||||
cd $target/gcc
|
||||
|
||||
if [ ! -f built-stage2 ]
|
||||
then
|
||||
$MAKE all || { echo "Error building gcc stage2"; exit 1; }
|
||||
touch built-stage2
|
||||
fi
|
||||
|
||||
if [ ! -f installed-stage2 ]
|
||||
then
|
||||
$MAKE install || { echo "Error installing gcc stage2"; exit 1; }
|
||||
touch installed-stage2
|
||||
fi
|
||||
|
||||
rm -fr $prefix/$target/sys-include
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# Install and build the gamecube crt and libogc
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
echo "installing linkscripts ..."
|
||||
cp $BUILDSCRIPTDIR/dkppc/crtls/*.ld $prefix/$target/lib/
|
||||
|
||||
cd $BUILDDIR
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
|
||||
index 3ed22fa6c52..16cec309746 100644
|
||||
index 68190dbaa27..3413eaca5b3 100644
|
||||
--- a/bfd/elf-bfd.h
|
||||
+++ b/bfd/elf-bfd.h
|
||||
@@ -1984,6 +1984,14 @@ struct output_elf_obj_tdata
|
||||
@@ -2020,6 +2020,14 @@ struct output_elf_obj_tdata
|
||||
asection *sec;
|
||||
} package_metadata;
|
||||
|
||||
|
|
@ -18,10 +18,10 @@ index 3ed22fa6c52..16cec309746 100644
|
|||
bfd_size_type program_header_size;
|
||||
|
||||
diff --git a/bfd/elf.c b/bfd/elf.c
|
||||
index 88c75ae3ce0..c4b5cda59a7 100644
|
||||
index dfa04c9268d..12b76d3ffb8 100644
|
||||
--- a/bfd/elf.c
|
||||
+++ b/bfd/elf.c
|
||||
@@ -7359,6 +7359,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
|
||||
@@ -7223,6 +7223,14 @@ _bfd_elf_write_object_contents (bfd *abfd)
|
||||
if (!bed->s->write_shdrs_and_ehdr (abfd))
|
||||
return false;
|
||||
|
||||
|
|
@ -37,10 +37,10 @@ index 88c75ae3ce0..c4b5cda59a7 100644
|
|||
if (t->o->build_id.after_write_object_contents != NULL
|
||||
&& !(*t->o->build_id.after_write_object_contents) (abfd))
|
||||
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
|
||||
index 109517db4aa..36ea8726544 100644
|
||||
index e86f0280c2a..debb627a00f 100644
|
||||
--- a/bfd/elfnn-aarch64.c
|
||||
+++ b/bfd/elfnn-aarch64.c
|
||||
@@ -2441,6 +2441,12 @@ enum elf_aarch64_stub_type
|
||||
@@ -2444,6 +2444,12 @@ enum elf_aarch64_stub_type
|
||||
aarch64_stub_erratum_843419_veneer,
|
||||
};
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
struct elf_aarch64_stub_hash_entry
|
||||
{
|
||||
/* Base hash table entry structure. */
|
||||
@@ -6947,11 +6953,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -6986,11 +6992,13 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
Elf_Internal_Sym *sym;
|
||||
asection *sec;
|
||||
struct elf_link_hash_entry *h;
|
||||
|
|
@ -67,7 +67,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
char *error_message = NULL;
|
||||
|
||||
r_symndx = ELFNN_R_SYM (rel->r_info);
|
||||
@@ -7091,6 +7099,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -7130,6 +7138,10 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
h, &unresolved_reloc,
|
||||
save_addend, &addend, sym);
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
switch (elfNN_aarch64_bfd_reloc_from_type (input_bfd, r_type))
|
||||
{
|
||||
case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
|
||||
@@ -7114,7 +7126,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -7153,7 +7165,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
need_relocs =
|
||||
(!bfd_link_executable (info) || indx != 0) &&
|
||||
(h == NULL
|
||||
|
|
@ -87,7 +87,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
|| h->root.type != bfd_link_hash_undefweak);
|
||||
|
||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||
@@ -7209,7 +7221,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -7248,7 +7260,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
need_relocs =
|
||||
(!bfd_link_executable (info) || indx != 0) &&
|
||||
(h == NULL
|
||||
|
|
@ -96,7 +96,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
|| h->root.type != bfd_link_hash_undefweak);
|
||||
|
||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||
@@ -7258,7 +7270,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
@@ -7297,7 +7309,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd,
|
||||
bfd_vma off = symbol_tlsdesc_got_offset (input_bfd, h, r_symndx);
|
||||
|
||||
need_relocs = (h == NULL
|
||||
|
|
@ -105,7 +105,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
|| h->root.type != bfd_link_hash_undefweak);
|
||||
|
||||
BFD_ASSERT (globals->root.srelgot != NULL);
|
||||
@@ -7584,6 +7596,23 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
|
||||
@@ -7623,6 +7635,23 @@ need_copy_relocation_p (struct elf_aarch64_link_hash_entry *eh)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -129,7 +129,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
/* 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
|
||||
@@ -8802,6 +8831,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8728,6 +8757,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;
|
||||
|
|
@ -137,7 +137,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
|
||||
/* An example of a bfd_link_hash_indirect symbol is versioned
|
||||
symbol. For example: __gxx_personality_v0(bfd_link_hash_indirect)
|
||||
@@ -8821,6 +8851,10 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8747,6 +8777,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);
|
||||
|
||||
|
|
@ -148,7 +148,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
/* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
|
||||
here if it is defined and referenced in a non-shared object. */
|
||||
if (h->type == STT_GNU_IFUNC
|
||||
@@ -8830,7 +8864,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8756,7 +8790,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. */
|
||||
|
|
@ -157,7 +157,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
&& h->root.type == bfd_link_hash_undefweak)
|
||||
{
|
||||
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
||||
@@ -8864,6 +8898,11 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8790,6 +8824,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 += htab->plt_entry_size;
|
||||
|
||||
|
|
@ -169,7 +169,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
/* We also need to make an entry in the .got.plt section, which
|
||||
will be placed in the .got section by the linker script. */
|
||||
htab->root.sgotplt->size += GOT_ENTRY_SIZE;
|
||||
@@ -8892,6 +8931,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8818,6 +8857,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
htab->variant_pcs = 1;
|
||||
|
||||
}
|
||||
|
|
@ -177,7 +177,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
else
|
||||
{
|
||||
h->plt.offset = (bfd_vma) - 1;
|
||||
@@ -8904,9 +8944,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8830,9 +8870,6 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
h->needs_plt = 0;
|
||||
}
|
||||
|
||||
|
|
@ -187,7 +187,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
if (h->got.refcount > 0)
|
||||
{
|
||||
bool dyn;
|
||||
@@ -8918,7 +8955,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8844,7 +8881,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. */
|
||||
|
|
@ -196,7 +196,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
&& h->root.type == bfd_link_hash_undefweak)
|
||||
{
|
||||
if (!bfd_elf_link_record_dynamic_symbol (info, h))
|
||||
@@ -8932,7 +8969,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8858,7 +8895,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;
|
||||
|
|
@ -205,7 +205,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
|| h->root.type != bfd_link_hash_undefweak)
|
||||
&& (bfd_link_pic (info)
|
||||
|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
|
||||
@@ -8968,7 +9005,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8894,7 +8931,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
}
|
||||
|
||||
indx = h && h->dynindx != -1 ? h->dynindx : 0;
|
||||
|
|
@ -214,7 +214,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
|| h->root.type != bfd_link_hash_undefweak)
|
||||
&& (!bfd_link_executable (info)
|
||||
|| indx != 0
|
||||
@@ -9050,7 +9087,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8976,7 +9013,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
visibility. */
|
||||
if (h->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak)
|
||||
{
|
||||
|
|
@ -223,7 +223,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
|| UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
|
||||
h->dyn_relocs = NULL;
|
||||
|
||||
@@ -9070,7 +9107,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -8996,7 +9033,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. */
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
&& ((h->def_dynamic
|
||||
&& !h->def_regular)
|
||||
|| (htab->root.dynamic_sections_created
|
||||
@@ -9081,6 +9120,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
|
||||
@@ -9007,6 +9046,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
|
||||
|
|
@ -242,7 +242,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
&& h->root.type == bfd_link_hash_undefweak
|
||||
&& !bfd_elf_link_record_dynamic_symbol (info, h))
|
||||
return false;
|
||||
@@ -9638,8 +9678,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
@@ -9978,8 +10018,17 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
Elf_Internal_Sym *sym)
|
||||
{
|
||||
struct elf_aarch64_link_hash_table *htab;
|
||||
|
|
@ -260,8 +260,8 @@ index 109517db4aa..36ea8726544 100644
|
|||
if (h->plt.offset != (bfd_vma) - 1)
|
||||
{
|
||||
asection *plt, *gotplt, *relplt;
|
||||
@@ -9674,7 +9723,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
return false;
|
||||
@@ -10014,7 +10063,7 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
abort ();
|
||||
|
||||
elfNN_aarch64_create_small_pltn_entry (h, htab, output_bfd, info);
|
||||
- if (!h->def_regular)
|
||||
|
|
@ -269,7 +269,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
{
|
||||
/* Mark the symbol as undefined, rather than as defined in
|
||||
the .plt section. */
|
||||
@@ -9696,7 +9745,8 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
@@ -10036,7 +10085,8 @@ elfNN_aarch64_finish_dynamic_symbol (bfd *output_bfd,
|
||||
&& elf_aarch64_hash_entry (h)->got_type == GOT_NORMAL
|
||||
/* Undefined weak symbol in static PIE resolves to 0 without
|
||||
any dynamic relocations. */
|
||||
|
|
@ -279,7 +279,7 @@ index 109517db4aa..36ea8726544 100644
|
|||
{
|
||||
Elf_Internal_Rela rela;
|
||||
bfd_byte *loc;
|
||||
@@ -10343,6 +10393,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
|
||||
@@ -10704,6 +10754,9 @@ const struct elf_size_info elfNN_aarch64_size_info =
|
||||
#define elf_backend_init_index_section \
|
||||
_bfd_elf_init_2_index_sections
|
||||
|
||||
|
|
@ -290,30 +290,43 @@ index 109517db4aa..36ea8726544 100644
|
|||
elfNN_aarch64_finish_dynamic_sections
|
||||
|
||||
diff --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh
|
||||
index 8f68e517b45..260a590e69e 100644
|
||||
index aa051c76a7a..073d3a47b65 100644
|
||||
--- a/ld/emulparams/aarch64elf.sh
|
||||
+++ b/ld/emulparams/aarch64elf.sh
|
||||
@@ -1,3 +1,5 @@
|
||||
@@ -1,4 +1,5 @@
|
||||
source_sh ${srcdir}/emulparams/dt-relr.sh
|
||||
+source_sh ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||
+
|
||||
|
||||
ARCH=aarch64
|
||||
MACHINE=
|
||||
NOP=0x1f2003d5
|
||||
diff --git a/ld/emulparams/aarch64elf32.sh b/ld/emulparams/aarch64elf32.sh
|
||||
index 5a08d9e29f1..e4c9abf85a1 100644
|
||||
index 0565b7a066c..64821b1fc31 100644
|
||||
--- a/ld/emulparams/aarch64elf32.sh
|
||||
+++ b/ld/emulparams/aarch64elf32.sh
|
||||
@@ -1,3 +1,5 @@
|
||||
@@ -1,4 +1,5 @@
|
||||
source_sh ${srcdir}/emulparams/dt-relr.sh
|
||||
+source_sh ${srcdir}/emulparams/dynamic_undefined_weak.sh
|
||||
+
|
||||
|
||||
ARCH="aarch64:ilp32"
|
||||
MACHINE=
|
||||
NOP=0x1f2003d5
|
||||
diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
|
||||
index da892988f5d..6b8efb9bbdb 100644
|
||||
--- a/ld/emulparams/elf32ppccommon.sh
|
||||
+++ b/ld/emulparams/elf32ppccommon.sh
|
||||
@@ -23,7 +23,7 @@ else
|
||||
unset SBSS_START_SYMBOLS
|
||||
unset SBSS_END_SYMBOLS
|
||||
fi
|
||||
-OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};"
|
||||
+OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};${CREATE_SHLIB+PROVIDE (}__end__ = .${CREATE_SHLIB+)};"
|
||||
OTHER_RELRO_SECTIONS="
|
||||
.fixup ${RELOCATING-0} : { *(.fixup) }
|
||||
.got1 ${RELOCATING-0} : { *(.got1) }
|
||||
diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
|
||||
index b647909ae63..3e2d7a171b9 100644
|
||||
index 91d58d8fe5a..e1ac4a6b139 100644
|
||||
--- a/ld/emultempl/aarch64elf.em
|
||||
+++ b/ld/emultempl/aarch64elf.em
|
||||
@@ -378,7 +378,7 @@ PARSE_AND_LIST_LONGOPTS='
|
||||
@@ -489,7 +489,7 @@ PARSE_AND_LIST_LONGOPTS='
|
||||
{ "no-apply-dynamic-relocs", no_argument, NULL, OPTION_NO_APPLY_DYNAMIC_RELOCS},
|
||||
'
|
||||
|
||||
|
|
@ -323,29 +336,22 @@ index b647909ae63..3e2d7a171b9 100644
|
|||
" enum sizes\n"));
|
||||
fprintf (file, _(" --no-wchar-size-warning Don'\''t warn about objects with incompatible\n"
|
||||
diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
|
||||
index 71cec19fdc6..3fd0585dee6 100644
|
||||
index 431205fe644..ce288649513 100644
|
||||
--- a/ld/emultempl/elf.em
|
||||
+++ b/ld/emultempl/elf.em
|
||||
@@ -574,6 +574,7 @@ enum elf_options
|
||||
OPTION_EXCLUDE_LIBS,
|
||||
OPTION_HASH_STYLE,
|
||||
OPTION_BUILD_ID,
|
||||
+ OPTION_NX_MODULE_NAME,
|
||||
OPTION_PACKAGE_METADATA,
|
||||
OPTION_AUDIT,
|
||||
OPTION_COMPRESS_DEBUG
|
||||
@@ -605,6 +606,7 @@ EOF
|
||||
@@ -814,6 +814,7 @@ EOF
|
||||
fi
|
||||
fragment <<EOF
|
||||
{"build-id", optional_argument, NULL, OPTION_BUILD_ID},
|
||||
+ {"nx-module-name", optional_argument, NULL, OPTION_NX_MODULE_NAME},
|
||||
{"package-metadata", optional_argument, NULL, OPTION_PACKAGE_METADATA},
|
||||
{"compress-debug-sections", required_argument, NULL, OPTION_COMPRESS_DEBUG},
|
||||
EOF
|
||||
@@ -675,6 +677,16 @@ gld${EMULATION_NAME}_handle_option (int optc)
|
||||
einfo (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
|
||||
optarg);
|
||||
{"rosegment", no_argument, NULL, OPTION_ROSEGMENT},
|
||||
@@ -901,6 +902,18 @@ gld${EMULATION_NAME}_handle_option (int optc)
|
||||
case OPTION_NO_ROSEGMENT:
|
||||
link_info.one_rosegment = false;
|
||||
break;
|
||||
+
|
||||
+ case OPTION_NX_MODULE_NAME:
|
||||
+ if (ldelf_emit_nx_module_name != NULL)
|
||||
+ {
|
||||
|
|
@ -356,11 +362,12 @@ index 71cec19fdc6..3fd0585dee6 100644
|
|||
+ optarg = "";
|
||||
+ ldelf_emit_nx_module_name = xstrdup (optarg);
|
||||
+ break;
|
||||
+
|
||||
EOF
|
||||
|
||||
if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
|
||||
diff --git a/ld/ldelf.c b/ld/ldelf.c
|
||||
index 2852851dcd5..0b1efa9675a 100644
|
||||
index f4f27fc3873..4028cbabdc7 100644
|
||||
--- a/ld/ldelf.c
|
||||
+++ b/ld/ldelf.c
|
||||
@@ -55,6 +55,9 @@ const char *ldelf_emit_note_gnu_build_id;
|
||||
|
|
@ -373,7 +380,7 @@ index 2852851dcd5..0b1efa9675a 100644
|
|||
/* These variables are required to pass information back and forth
|
||||
between after_open and check_needed and stat_needed and vercheck. */
|
||||
|
||||
@@ -1209,8 +1212,93 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
|
||||
@@ -1213,8 +1216,93 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
|
||||
*save_input_bfd_tail = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -388,7 +395,7 @@ index 2852851dcd5..0b1efa9675a 100644
|
|||
+ unsigned char *contents;
|
||||
+ bfd_size_type size;
|
||||
+ file_ptr position;
|
||||
|
||||
+
|
||||
+ name = t->o->nx_module_name.name;
|
||||
+ asec = t->o->nx_module_name.sec;
|
||||
+ if (bfd_is_abs_section (asec->output_section))
|
||||
|
|
@ -419,7 +426,7 @@ index 2852851dcd5..0b1efa9675a 100644
|
|||
+ return (bfd_seek (abfd, position, SEEK_SET) == 0
|
||||
+ && bfd_write (contents, size, abfd) == size);
|
||||
+}
|
||||
+
|
||||
|
||||
+/* Make .nx-module-name section, and set up elf_tdata->nx_module_name. */
|
||||
+
|
||||
+static bool
|
||||
|
|
@ -468,7 +475,7 @@ index 2852851dcd5..0b1efa9675a 100644
|
|||
void
|
||||
ldelf_before_plugin_all_symbols_read (int use_libpath, int native,
|
||||
int is_linux, int is_freebsd,
|
||||
@@ -1289,6 +1377,24 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
|
||||
@@ -1291,6 +1379,24 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -494,7 +501,7 @@ index 2852851dcd5..0b1efa9675a 100644
|
|||
|
||||
/* Do not allow executable files to be used as inputs to the link. */
|
||||
diff --git a/ld/ldelf.h b/ld/ldelf.h
|
||||
index 239194772c4..68516dbf45e 100644
|
||||
index e8b7c8c7eb8..0b76923d834 100644
|
||||
--- a/ld/ldelf.h
|
||||
+++ b/ld/ldelf.h
|
||||
@@ -20,6 +20,7 @@
|
||||
|
|
@ -503,5 +510,30 @@ index 239194772c4..68516dbf45e 100644
|
|||
extern const char *ldelf_emit_note_fdo_package_metadata;
|
||||
+extern const char *ldelf_emit_nx_module_name;
|
||||
|
||||
extern void ldelf_finish (void);
|
||||
extern void ldelf_after_parse (void);
|
||||
extern bool ldelf_load_symbols (lang_input_statement_type *);
|
||||
diff --git a/ld/ldlex.h b/ld/ldlex.h
|
||||
index c8d61478c60..a5bb71b1dc5 100644
|
||||
--- a/ld/ldlex.h
|
||||
+++ b/ld/ldlex.h
|
||||
@@ -188,6 +188,7 @@ enum option_values
|
||||
/* Used by emultempl/elf.em, emultempl/pe.em and emultempl/pep.em. */
|
||||
OPTION_BUILD_ID,
|
||||
OPTION_EXCLUDE_LIBS,
|
||||
+ OPTION_NX_MODULE_NAME,
|
||||
/* Used by emulparams/elf32mcore.sh, emultempl/beos.em, emultempl/pe.em
|
||||
and emultempl/pep.em. */
|
||||
OPTION_BASE_FILE,
|
||||
diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
|
||||
index 712cd31d19e..5d6dbb3b48d 100644
|
||||
--- a/opcodes/ppc-opc.c
|
||||
+++ b/opcodes/ppc-opc.c
|
||||
@@ -5107,7 +5107,7 @@ const unsigned int num_powerpc_operands = ARRAY_SIZE (powerpc_operands);
|
||||
#define MFDEC2 (PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
|
||||
| PPC_OPCODE_TITAN)
|
||||
#define BOOKE PPC_OPCODE_BOOKE
|
||||
-#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
|
||||
+#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
|
||||
#define PPCE300 PPC_OPCODE_E300
|
||||
#define PPCSPE PPC_OPCODE_SPE
|
||||
#define PPCSPE2 PPC_OPCODE_SPE2
|
||||
1203
patches/gcc-15.2.0-7.patch
Normal file
1203
patches/gcc-15.2.0-7.patch
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -30,31 +30,53 @@ done
|
|||
|
||||
case "$VERSION" in
|
||||
"1" )
|
||||
GCC_VER=14.1.0
|
||||
BINUTILS_VER=2.42
|
||||
NEWLIB_VER=4.4.0.20231231
|
||||
BINUTILS_VER=2.45.1
|
||||
GCC_VER=15.2.0
|
||||
NEWLIB_VER=4.6.0.20260123
|
||||
BINUTILS_PKGREL=2
|
||||
GCC_PKGREL=7
|
||||
NEWLIB_PKGREL=5
|
||||
basedir='dkarm-eabi'
|
||||
package=devkitARM
|
||||
target=arm-none-eabi
|
||||
toolchain=DEVKITARM
|
||||
_prefix=devkitarm
|
||||
_toolchain_options='--with-march=armv4t --enable-interwork --enable-multilib --with-pkgversion="devkitARM"'
|
||||
_rules_ver=${DKARM_RULES_VER}
|
||||
_crtls_ver=${DKARM_CRTLS_VER}
|
||||
;;
|
||||
"2" )
|
||||
GCC_VER=13.2.0
|
||||
BINUTILS_VER=2.42
|
||||
BINUTILS_VER=2.45.1
|
||||
GCC_VER=15.2.0
|
||||
MN_BINUTILS_VER=2.24
|
||||
NEWLIB_VER=4.4.0.20231231
|
||||
NEWLIB_VER=4.6.0.20260123
|
||||
BINUTILS_PKGREL=2
|
||||
GCC_PKGREL=7
|
||||
NEWLIB_PKGREL=4
|
||||
basedir='dkppc'
|
||||
package=devkitPPC
|
||||
target=powerpc-eabi
|
||||
toolchain=DEVKITPPC
|
||||
_prefix=devkitppc
|
||||
cppflags="-DSTDINT_LONG32=0 ${cppflags}"
|
||||
_toolchain_options='--with-cpu=750 --disable-multilib --with-pkgversion="devkitPPC"'
|
||||
_rules_ver=${DKPPC_RULES_VER}
|
||||
_crtls_ver=${DKPPC_CRTLS_VER}
|
||||
;;
|
||||
"3" )
|
||||
GCC_VER=13.2.0
|
||||
BINUTILS_VER=2.42
|
||||
NEWLIB_VER=4.4.0.20231231
|
||||
GCC_VER=15.2.0
|
||||
BINUTILS_VER=2.45.1
|
||||
NEWLIB_VER=4.6.0.20260123
|
||||
BINUTILS_PKGREL=2
|
||||
GCC_PKGREL=7
|
||||
NEWLIB_PKGREL=4
|
||||
basedir='dka64'
|
||||
package=devkitA64
|
||||
target=aarch64-none-elf
|
||||
toolchain=DEVKITA64
|
||||
_prefix=devkita64
|
||||
_toolchain_options='--with-march=armv8 --enable-multilib --with-pkgversion="devkitA64"'
|
||||
_rules_ver=${DKA64_RULES_VER}
|
||||
_crtls_ver=${DKA64_CRTLS_VER}
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user