mirror of
https://github.com/devkitPro/buildscripts.git
synced 2026-08-21 09:54:03 -05:00
Compare commits
53 Commits
devkitA64_
...
devkitPPC_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a74f83616 | ||
|
|
953cf2a761 | ||
|
|
60efdbd109 | ||
|
|
ef789eddb7 | ||
|
|
502f832a5b | ||
|
|
848924d332 | ||
|
|
1f5f5eedf5 | ||
|
|
5664d84c44 | ||
|
|
6e8de1b1d2 | ||
|
|
b16276e9da | ||
|
|
7f142c7583 | ||
|
|
1a1b35aa3b | ||
|
|
70c8df8709 | ||
|
|
bc52f6ac2b | ||
|
|
81719c49e3 | ||
|
|
d4a84c9884 | ||
|
|
25f22b6c93 | ||
|
|
a0fe0c5297 | ||
|
|
77ad8b785c | ||
|
|
e4b1370595 | ||
|
|
dcfd0e271e | ||
|
|
9bf0973c2a | ||
|
|
0b31c7ab1c | ||
|
|
90e2936222 | ||
|
|
556a2a2e02 | ||
|
|
6da9ea33f7 | ||
|
|
433a4bdd80 | ||
|
|
20bf4948a1 | ||
|
|
5e720e01c1 | ||
|
|
183ab79cfc | ||
|
|
ad4246dfc4 | ||
|
|
9165c280f3 | ||
|
|
116613adc8 | ||
|
|
fbc790a8dd | ||
|
|
91789e0ca8 | ||
|
|
fddf563787 | ||
|
|
45bf89586f | ||
|
|
ddaf472951 | ||
|
|
0adc00806f | ||
|
|
fa1972f5e9 | ||
|
|
2a306b5e49 | ||
|
|
1857d52ede | ||
|
|
57ec7b67ac | ||
|
|
d9392f8f56 | ||
|
|
e0c908dfc2 | ||
|
|
2ddef0ade4 | ||
|
|
e68aaf8cdd | ||
|
|
0add4d1b5c | ||
|
|
736db33e06 | ||
|
|
96f7acc919 | ||
|
|
c2aae79d59 | ||
|
|
fe202a6f50 | ||
|
|
aeb6482da9 |
145
build-devkit.sh
145
build-devkit.sh
@@ -1,8 +1,9 @@
|
|||||||
|
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# devkitARM release 52
|
# devkitARM release 55
|
||||||
# devkitPPC release 35
|
# devkitPPC release 38
|
||||||
# devkitA64 release 13
|
# devkitA64 release 16
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
if [ 0 -eq 1 ] ; then
|
if [ 0 -eq 1 ] ; then
|
||||||
@@ -26,45 +27,13 @@ echo "https://github.com/devkitPro/buildscripts/pulls"
|
|||||||
echo
|
echo
|
||||||
|
|
||||||
|
|
||||||
GENERAL_TOOLS_VER=1.0.2
|
|
||||||
|
|
||||||
LIBGBA_VER=0.5.2
|
DKARM_RULES_VER=1.2.0
|
||||||
GBATOOLS_VER=1.1.0
|
|
||||||
DKARM_RULES_VER=1.0.0
|
|
||||||
DKARM_CRTLS_VER=1.0.0
|
DKARM_CRTLS_VER=1.0.0
|
||||||
|
|
||||||
LIBNDS_VER=1.7.2
|
|
||||||
DEFAULT_ARM7_VER=0.7.4
|
|
||||||
DSWIFI_VER=0.4.2
|
|
||||||
MAXMOD_VER=1.0.11
|
|
||||||
FILESYSTEM_VER=0.9.14
|
|
||||||
LIBFAT_VER=1.1.3
|
|
||||||
DSTOOLS_VER=1.2.1
|
|
||||||
GRIT_VER=0.8.15
|
|
||||||
NDSTOOL_VER=2.1.1
|
|
||||||
MMUTIL_VER=1.8.7
|
|
||||||
|
|
||||||
DFU_UTIL_VER=0.9.1
|
|
||||||
STLINK_VER=1.2.3
|
|
||||||
|
|
||||||
GAMECUBE_TOOLS_VER=1.0.2
|
|
||||||
LIBOGC_VER=1.8.21
|
|
||||||
WIILOAD_VER=0.5.1
|
|
||||||
DKPPC_RULES_VER=1.0.0
|
DKPPC_RULES_VER=1.0.0
|
||||||
|
|
||||||
LIBCTRU_VER=1.5.1
|
DKA64_RULES_VER=1.0.0
|
||||||
CITRO3D_VER=1.5.0
|
|
||||||
CITRO2D_VER=1.1.0
|
|
||||||
TOOLS3DS_VER=1.1.4
|
|
||||||
LINK3DS_VER=0.5.2
|
|
||||||
PICASSO_VER=2.7.0
|
|
||||||
TEX3DS_VER=1.0.0
|
|
||||||
|
|
||||||
GP32_TOOLS_VER=1.0.3
|
|
||||||
LIBMIRKO_VER=0.9.8
|
|
||||||
|
|
||||||
SWITCH_TOOLS_VER=1.4.1
|
|
||||||
LIBNX_VER=1.3.0
|
|
||||||
|
|
||||||
OSXMIN=${OSXMIN:-10.9}
|
OSXMIN=${OSXMIN:-10.9}
|
||||||
|
|
||||||
@@ -151,24 +120,22 @@ fi
|
|||||||
echo use $MAKE as make
|
echo use $MAKE as make
|
||||||
export MAKE
|
export MAKE
|
||||||
|
|
||||||
|
CROSS_PARAMS="--build=`./config.guess`"
|
||||||
|
|
||||||
|
if [ ! -z $CROSSBUILD ]; then
|
||||||
|
export PATH=/opt/devkitpro/$package/bin:$PATH
|
||||||
|
prefix=$INSTALLDIR/$CROSSBUILD/$package
|
||||||
|
CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
|
||||||
|
CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
|
||||||
|
else
|
||||||
|
prefix=$INSTALLDIR/$package
|
||||||
|
fi
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# Add installed devkit to the path, adjusting path on minsys
|
# Add installed devkit to the path, adjusting path on minsys
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
TOOLPATH=$(echo $INSTALLDIR | sed -e 's/^\([a-zA-Z]\):/\/\1/')
|
TOOLPATH=$(echo $INSTALLDIR | sed -e 's/^\([a-zA-Z]\):/\/\1/')
|
||||||
export PATH=$PATH:$TOOLPATH/$package/bin
|
export PATH=$TOOLPATH/$package/bin:$PATH
|
||||||
|
|
||||||
CROSS_PARAMS="--build=`./config.guess`"
|
|
||||||
|
|
||||||
if [ ! -z $CROSSBUILD ]; then
|
|
||||||
toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
|
|
||||||
prefix=$INSTALLDIR/$CROSSBUILD/$package
|
|
||||||
toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
|
|
||||||
CROSS_PARAMS="$CROSS_PARAMS --host=$CROSSBUILD"
|
|
||||||
CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
|
|
||||||
else
|
|
||||||
toolsprefix=$INSTALLDIR/tools
|
|
||||||
prefix=$INSTALLDIR/$package
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then
|
if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then
|
||||||
|
|
||||||
@@ -214,43 +181,26 @@ fi
|
|||||||
patchdir=$(pwd)/$basedir/patches
|
patchdir=$(pwd)/$basedir/patches
|
||||||
scriptdir=$(pwd)/$basedir/scripts
|
scriptdir=$(pwd)/$basedir/scripts
|
||||||
|
|
||||||
archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.xz"
|
archives="binutils-${BINUTILS_VER}.tar.xz gcc-${GCC_VER}.tar.xz newlib-${NEWLIB_VER}.tar.gz"
|
||||||
|
|
||||||
if [ $VERSION -eq 1 ]; then
|
|
||||||
|
|
||||||
targetarchives="libnds-src-${LIBNDS_VER}.tar.bz2 libgba-src-${LIBGBA_VER}.tar.bz2
|
|
||||||
libmirko-src-${LIBMIRKO_VER}.tar.bz2 dswifi-src-${DSWIFI_VER}.tar.bz2 maxmod-src-${MAXMOD_VER}.tar.bz2
|
|
||||||
default-arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
|
|
||||||
libfat-src-${LIBFAT_VER}.tar.bz2 libctru-src-${LIBCTRU_VER}.tar.bz2 citro3d-src-${CITRO3D_VER}.tar.bz2
|
|
||||||
citro2d-src-${CITRO2D_VER}.tar.bz2"
|
|
||||||
|
|
||||||
hostarchives="gba-tools-$GBATOOLS_VER.tar.bz2 gp32-tools-$GP32_TOOLS_VER.tar.bz2
|
|
||||||
dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
|
|
||||||
general-tools-$GENERAL_TOOLS_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2
|
|
||||||
dfu-util-$DFU_UTIL_VER.tar.bz2 stlink-$STLINK_VER.tar.bz2 3dstools-$TOOLS3DS_VER.tar.bz2
|
|
||||||
picasso-$PICASSO_VER.tar.bz2 tex3ds-$TEX3DS_VER.tar.bz2 3dslink-$LINK3DS_VER.tar.bz2"
|
|
||||||
|
|
||||||
archives="devkitarm-rules-$DKARM_RULES_VER.tar.xz devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz $archives"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $VERSION -eq 2 ]; then
|
if [ $VERSION -eq 2 ]; then
|
||||||
|
archives="binutils-${MN_BINUTILS_VER}.tar.bz2 $archives"
|
||||||
targetarchives="libogc-src-${LIBOGC_VER}.tar.bz2 libfat-src-${LIBFAT_VER}.tar.bz2"
|
|
||||||
|
|
||||||
hostarchives="gamecube-tools-$GAMECUBE_TOOLS_VER.tar.bz2 wiiload-$WIILOAD_VER.tar.bz2 general-tools-$GENERAL_TOOLS_VER.tar.bz2"
|
|
||||||
|
|
||||||
archives="binutils-${MN_BINUTILS_VER}.tar.bz2 devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $VERSION -eq 3 ]; then
|
if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ]; then
|
||||||
|
if [ $VERSION -eq 1 ]; then
|
||||||
|
archives="devkitarm-rules-$DKARM_RULES_VER.tar.xz devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz $archives"
|
||||||
|
fi
|
||||||
|
|
||||||
targetarchives=" libnx-src-${LIBNX_VER}.tar.bz2"
|
if [ $VERSION -eq 2 ]; then
|
||||||
|
archives="devkitppc-rules-$DKPPC_RULES_VER.tar.xz $archives"
|
||||||
hostarchives="general-tools-$GENERAL_TOOLS_VER.tar.bz2 switch-tools-$SWITCH_TOOLS_VER.tar.bz2"
|
fi
|
||||||
|
|
||||||
|
if [ $VERSION -eq 3 ]; then
|
||||||
|
archives="devkita64-rules-$DKA64_RULES_VER.tar.xz $archives"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
|
if [ ! -z "$BUILD_DKPRO_SRCDIR" ] ; then
|
||||||
SRCDIR="$BUILD_DKPRO_SRCDIR"
|
SRCDIR="$BUILD_DKPRO_SRCDIR"
|
||||||
else
|
else
|
||||||
@@ -258,7 +208,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cd "$SRCDIR"
|
cd "$SRCDIR"
|
||||||
for archive in $archives $targetarchives $hostarchives
|
for archive in $archives
|
||||||
do
|
do
|
||||||
echo $archive
|
echo $archive
|
||||||
if [ ! -f $archive ]; then
|
if [ ! -f $archive ]; then
|
||||||
@@ -273,47 +223,24 @@ cd $BUILDDIR
|
|||||||
extract_and_patch binutils $BINUTILS_VER xz
|
extract_and_patch binutils $BINUTILS_VER xz
|
||||||
extract_and_patch gcc $GCC_VER xz
|
extract_and_patch gcc $GCC_VER xz
|
||||||
extract_and_patch newlib $NEWLIB_VER gz
|
extract_and_patch newlib $NEWLIB_VER gz
|
||||||
extract_and_patch gdb $GDB_VER xz
|
|
||||||
|
|
||||||
if [ $VERSION -eq 2 ]; then
|
if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2; fi
|
||||||
extract_and_patch binutils $MN_BINUTILS_VER bz2
|
|
||||||
fi
|
|
||||||
|
|
||||||
for archive in $targetarchives
|
|
||||||
do
|
|
||||||
destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
|
|
||||||
echo $destdir
|
|
||||||
if [ ! -d $destdir ]; then
|
|
||||||
mkdir -p $destdir
|
|
||||||
bzip2 -cd "$SRCDIR/$archive" | tar -xf - -C $destdir || { echo "Error extracting "$archive; exit 1; }
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
for archive in $hostarchives
|
|
||||||
do
|
|
||||||
destdir=$(echo $archive | sed -e 's/\(.*\)-src-\(.*\)\.tar\.bz2/\1-\2/' )
|
|
||||||
if [ ! -d $destdir ]; then
|
|
||||||
tar -xjf "$SRCDIR/$archive"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# Build and install devkit components
|
# Build and install devkit components
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
if [ -f $scriptdir/build-gcc.sh ]; then . $scriptdir/build-gcc.sh || { echo "Error building toolchain"; exit 1; }; cd $BUILDSCRIPTDIR; fi
|
if [ -f $scriptdir/build-gcc.sh ]; then . $scriptdir/build-gcc.sh || { echo "Error building toolchain"; exit 1; }; cd $BUILDSCRIPTDIR; fi
|
||||||
|
|
||||||
if [ "$BUILD_DKPRO_SKIP_TOOLS" != "1" ] && [ -f $scriptdir/build-tools.sh ]; then
|
|
||||||
. $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$BUILD_DKPRO_SKIP_LIBRARIES" != "1" ] && [ -f $scriptdir/build-libs.sh ]; then
|
if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ] && [ -f $scriptdir/build-crtls.sh ]; then
|
||||||
. $scriptdir/build-libs.sh || { echo "Error building libraries"; exit 1; }; cd $BUILDSCRIPTDIR;
|
. $scriptdir/build-crtls.sh || { echo "Error building crtls & rules"; exit 1; }; cd $BUILDSCRIPTDIR;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd $BUILDSCRIPTDIR
|
cd $BUILDSCRIPTDIR
|
||||||
|
|
||||||
if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
|
if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then
|
||||||
cp -v $CROSSBINPATH//libwinpthread-1.dll $prefix/bin
|
cp -v $CROSSBINPATH/libwinpthread-1.dll $prefix/bin/
|
||||||
|
cp -v $CROSSBINPATH/libwinpthread-1.dll $prefix/libexec/gcc/$target/$GCC_VER/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "stripping installed binaries"
|
echo "stripping installed binaries"
|
||||||
|
|||||||
@@ -31,15 +31,9 @@ BUILD_DKPRO_PACKAGE=0
|
|||||||
#export MAKEFLAGS="$MAKEFLAGS -j${numcores}"
|
#export MAKEFLAGS="$MAKEFLAGS -j${numcores}"
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
# Uncomment to skip building of tools
|
# Uncomment to skip building of crtls and rules files
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
#BUILD_DKPRO_SKIP_TOOLS=1
|
#BUILD_DKPRO_SKIP_CRTLS=1
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# Uncomment to skip building of libraries
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
#BUILD_DKPRO_SKIP_LIBRARIES=1
|
|
||||||
|
|
||||||
|
|
||||||
# Automated script execution
|
# Automated script execution
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|||||||
6
cross-build-aarch64-linux-gnu.sh
Executable file
6
cross-build-aarch64-linux-gnu.sh
Executable file
@@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
export CROSSBUILD=aarch64-linux-gnu
|
||||||
|
export CROSSPATH=/opt/aarch64-linux-gnu
|
||||||
|
export CROSSLIBPATH=$CROSSPATH/lib
|
||||||
|
export CROSSBINPATH=$CROSSPATH/bin
|
||||||
|
|
||||||
0
cross-build-x86_64-linux-gnu.sh
Executable file
0
cross-build-x86_64-linux-gnu.sh
Executable file
@@ -1,10 +1,12 @@
|
|||||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||||
index 7af8e028104..90a3a50f624 100644
|
index 6a349965c0a..2206091e057 100644
|
||||||
--- a/gcc/config.gcc
|
--- a/gcc/config.gcc
|
||||||
+++ b/gcc/config.gcc
|
+++ b/gcc/config.gcc
|
||||||
@@ -945,6 +945,12 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
@@ -1039,7 +1039,14 @@ aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
|
||||||
|
tmake_file="${tmake_file} aarch64/t-aarch64"
|
||||||
case $target in
|
case $target in
|
||||||
aarch64-*-elf*)
|
aarch64-*-elf*)
|
||||||
|
+ default_use_cxa_atexit=yes
|
||||||
use_gcc_stdint=wrap
|
use_gcc_stdint=wrap
|
||||||
+ tm_file="${tm_file} devkitpro.h"
|
+ tm_file="${tm_file} devkitpro.h"
|
||||||
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
|
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
|
||||||
@@ -16,7 +18,7 @@ index 7af8e028104..90a3a50f624 100644
|
|||||||
aarch64-*-fuchsia*)
|
aarch64-*-fuchsia*)
|
||||||
tm_file="${tm_file} fuchsia.h"
|
tm_file="${tm_file} fuchsia.h"
|
||||||
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
diff --git a/gcc/config/aarch64/aarch64-elf-raw.h b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
index c074238df06..ef503ddd5a6 100644
|
index da5872cf4d8..ca840ab29cb 100644
|
||||||
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
--- a/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
+++ b/gcc/config/aarch64/aarch64-elf-raw.h
|
||||||
@@ -22,6 +22,7 @@
|
@@ -22,6 +22,7 @@
|
||||||
@@ -28,7 +30,7 @@ index c074238df06..ef503ddd5a6 100644
|
|||||||
#define ENDFILE_SPEC \
|
#define ENDFILE_SPEC \
|
||||||
" crtend%O%s crtn%O%s " \
|
" crtend%O%s crtn%O%s " \
|
||||||
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
diff --git a/gcc/config/aarch64/aarch64-opts.h b/gcc/config/aarch64/aarch64-opts.h
|
||||||
index 7a5c6d7664f..687793841de 100644
|
index ee7bed34924..d1e2742d750 100644
|
||||||
--- a/gcc/config/aarch64/aarch64-opts.h
|
--- a/gcc/config/aarch64/aarch64-opts.h
|
||||||
+++ b/gcc/config/aarch64/aarch64-opts.h
|
+++ b/gcc/config/aarch64/aarch64-opts.h
|
||||||
@@ -48,6 +48,12 @@ enum aarch64_tls_type {
|
@@ -48,6 +48,12 @@ enum aarch64_tls_type {
|
||||||
@@ -45,10 +47,10 @@ index 7a5c6d7664f..687793841de 100644
|
|||||||
Most have a PIC and non-PIC variant. */
|
Most have a PIC and non-PIC variant. */
|
||||||
enum aarch64_code_model {
|
enum aarch64_code_model {
|
||||||
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
||||||
index 349ca0c047b..5c03c42c28e 100644
|
index b86434a6acf..389e3fe3910 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.c
|
--- a/gcc/config/aarch64/aarch64.c
|
||||||
+++ b/gcc/config/aarch64/aarch64.c
|
+++ b/gcc/config/aarch64/aarch64.c
|
||||||
@@ -12005,8 +12005,24 @@ aarch64_load_tp (rtx target)
|
@@ -15983,8 +15983,24 @@ aarch64_load_tp (rtx target)
|
||||||
|| !register_operand (target, Pmode))
|
|| !register_operand (target, Pmode))
|
||||||
target = gen_reg_rtx (Pmode);
|
target = gen_reg_rtx (Pmode);
|
||||||
|
|
||||||
@@ -76,10 +78,10 @@ index 349ca0c047b..5c03c42c28e 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
||||||
index 976f9afae54..73263bcb5e7 100644
|
index 1ce23c68781..57216651648 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.h
|
--- a/gcc/config/aarch64/aarch64.h
|
||||||
+++ b/gcc/config/aarch64/aarch64.h
|
+++ b/gcc/config/aarch64/aarch64.h
|
||||||
@@ -957,6 +957,10 @@ typedef struct
|
@@ -1134,6 +1134,10 @@ typedef struct
|
||||||
/* Check TLS Descriptors mechanism is selected. */
|
/* Check TLS Descriptors mechanism is selected. */
|
||||||
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
#define TARGET_TLS_DESC (aarch64_tls_dialect == TLS_DESCRIPTORS)
|
||||||
|
|
||||||
@@ -91,10 +93,10 @@ index 976f9afae54..73263bcb5e7 100644
|
|||||||
|
|
||||||
/* When using the tiny addressing model conditional and unconditional branches
|
/* When using the tiny addressing model conditional and unconditional branches
|
||||||
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
|
||||||
index 32a0e1f3685..783c655acf0 100644
|
index 8c8be3c2740..1257616a659 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.md
|
--- a/gcc/config/aarch64/aarch64.md
|
||||||
+++ b/gcc/config/aarch64/aarch64.md
|
+++ b/gcc/config/aarch64/aarch64.md
|
||||||
@@ -5693,11 +5693,22 @@
|
@@ -6789,11 +6789,22 @@
|
||||||
(define_insn "aarch64_load_tp_hard"
|
(define_insn "aarch64_load_tp_hard"
|
||||||
[(set (match_operand:DI 0 "register_operand" "=r")
|
[(set (match_operand:DI 0 "register_operand" "=r")
|
||||||
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
(unspec:DI [(const_int 0)] UNSPEC_TLS))]
|
||||||
@@ -120,10 +122,10 @@ index 32a0e1f3685..783c655acf0 100644
|
|||||||
;; instructions in the TLS stubs, in order to enable linker relaxation.
|
;; instructions in the TLS stubs, in order to enable linker relaxation.
|
||||||
;; Therefore we treat the stubs as an atomic sequence.
|
;; Therefore we treat the stubs as an atomic sequence.
|
||||||
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
|
||||||
index 52eaf8c6f40..52bccddc6e3 100644
|
index d99d14c137d..08e52537dc6 100644
|
||||||
--- a/gcc/config/aarch64/aarch64.opt
|
--- a/gcc/config/aarch64/aarch64.opt
|
||||||
+++ b/gcc/config/aarch64/aarch64.opt
|
+++ b/gcc/config/aarch64/aarch64.opt
|
||||||
@@ -115,6 +115,20 @@ Enum(aarch64_tls_size) String(32) Value(32)
|
@@ -118,6 +118,21 @@ Enum(aarch64_tls_size) String(32) Value(32)
|
||||||
EnumValue
|
EnumValue
|
||||||
Enum(aarch64_tls_size) String(48) Value(48)
|
Enum(aarch64_tls_size) String(48) Value(48)
|
||||||
|
|
||||||
@@ -140,16 +142,26 @@ index 52eaf8c6f40..52bccddc6e3 100644
|
|||||||
+
|
+
|
||||||
+EnumValue
|
+EnumValue
|
||||||
+Enum(aarch64_tp_type) String(soft) Value(TP_SOFT)
|
+Enum(aarch64_tp_type) String(soft) Value(TP_SOFT)
|
||||||
|
+
|
||||||
+
|
+
|
||||||
march=
|
march=
|
||||||
Target RejectNegative ToLower Joined Var(aarch64_arch_string)
|
Target RejectNegative Negative(march=) ToLower Joined Var(aarch64_arch_string)
|
||||||
-march=ARCH Use features of architecture ARCH.
|
Use features of architecture ARCH.
|
||||||
|
@@ -256,7 +271,7 @@ TargetVariable
|
||||||
|
long aarch64_stack_protector_guard_offset = 0
|
||||||
|
|
||||||
|
moutline-atomics
|
||||||
|
-Target Report Var(aarch64_flag_outline_atomics) Init(2) Save
|
||||||
|
+Target Report Var(aarch64_flag_outline_atomics) Save
|
||||||
|
Generate local calls to out-of-line atomic operations.
|
||||||
|
|
||||||
|
-param=aarch64-sve-compare-costs=
|
||||||
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
|
||||||
index 0be1f0d63aa..a54068bfd96 100644
|
index 11d20b7be14..02ca761d3bf 100644
|
||||||
--- a/gcc/config/aarch64/t-aarch64
|
--- a/gcc/config/aarch64/t-aarch64
|
||||||
+++ b/gcc/config/aarch64/t-aarch64
|
+++ b/gcc/config/aarch64/t-aarch64
|
||||||
@@ -68,5 +68,7 @@ cortex-a57-fma-steering.o: $(srcdir)/config/aarch64/cortex-a57-fma-steering.c \
|
@@ -159,8 +159,10 @@ aarch64-bti-insert.o: $(srcdir)/config/aarch64/aarch64-bti-insert.c \
|
||||||
$(srcdir)/config/aarch64/cortex-a57-fma-steering.c
|
$(srcdir)/config/aarch64/aarch64-bti-insert.c
|
||||||
|
|
||||||
comma=,
|
comma=,
|
||||||
-MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
|
-MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
|
||||||
@@ -158,6 +170,9 @@ index 0be1f0d63aa..a54068bfd96 100644
|
|||||||
+MULTILIB_DIRNAMES = large pic
|
+MULTILIB_DIRNAMES = large pic
|
||||||
+MULTILIB_REQUIRED = mcmodel=large fPIC
|
+MULTILIB_REQUIRED = mcmodel=large fPIC
|
||||||
+MULTILIB_MATCHES = fPIC=fpic fPIC=fpie fPIC=fPIE
|
+MULTILIB_MATCHES = fPIC=fpic fPIC=fpie fPIC=fPIE
|
||||||
|
|
||||||
|
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
|
diff --git a/gcc/config/devkitpro.h b/gcc/config/devkitpro.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 00000000000..11ba0f5ab1c
|
index 00000000000..11ba0f5ab1c
|
||||||
@@ -230,11 +245,53 @@ index 00000000000..9acbbf9d27c
|
|||||||
+Driver
|
+Driver
|
||||||
+
|
+
|
||||||
+; This comment is to ensure we retain the blank line above.
|
+; This comment is to ensure we retain the blank line above.
|
||||||
|
diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
|
||||||
|
index 250fef59b55..36b2239aa5d 100644
|
||||||
|
--- a/gcc/config/i386/host-mingw32.c
|
||||||
|
+++ b/gcc/config/i386/host-mingw32.c
|
||||||
|
@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
|
||||||
|
|
||||||
|
static inline void w32_error(const char*, const char*, int, const char*);
|
||||||
|
|
||||||
|
-/* FIXME: Is this big enough? */
|
||||||
|
-static const size_t pch_VA_max_size = 128 * 1024 * 1024;
|
||||||
|
-
|
||||||
|
/* Granularity for reserving address space. */
|
||||||
|
static size_t va_granularity = 0x10000;
|
||||||
|
|
||||||
|
@@ -88,9 +85,6 @@ static void *
|
||||||
|
mingw32_gt_pch_get_address (size_t size, int)
|
||||||
|
{
|
||||||
|
void* res;
|
||||||
|
- size = (size + va_granularity - 1) & ~(va_granularity - 1);
|
||||||
|
- if (size > pch_VA_max_size)
|
||||||
|
- return NULL;
|
||||||
|
|
||||||
|
/* FIXME: We let system determine base by setting first arg to NULL.
|
||||||
|
Allocating at top of available address space avoids unnecessary
|
||||||
|
@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
|
||||||
|
If we allocate at bottom we need to reserve the address as early
|
||||||
|
as possible and at the same point in each invocation. */
|
||||||
|
|
||||||
|
- res = VirtualAlloc (NULL, pch_VA_max_size,
|
||||||
|
+ res = VirtualAlloc (NULL, size,
|
||||||
|
MEM_RESERVE | MEM_TOP_DOWN,
|
||||||
|
PAGE_NOACCESS);
|
||||||
|
if (!res)
|
||||||
|
@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
|
||||||
|
|
||||||
|
/* Offset must be also be a multiple of allocation granularity for
|
||||||
|
this to work. We can't change the offset. */
|
||||||
|
- if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
|
||||||
|
+ if ((offset & (va_granularity - 1)) != 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
|
||||||
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
||||||
index a716f708259..6a11011dba7 100644
|
index 9f790db0daf..97f52d0b893 100644
|
||||||
--- a/gcc/gcc.c
|
--- a/gcc/gcc.c
|
||||||
+++ b/gcc/gcc.c
|
+++ b/gcc/gcc.c
|
||||||
@@ -786,6 +786,11 @@ proper position among the other output files. */
|
@@ -793,6 +793,11 @@ proper position among the other output files. */
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -246,7 +303,7 @@ index a716f708259..6a11011dba7 100644
|
|||||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||||
#ifndef STARTFILE_SPEC
|
#ifndef STARTFILE_SPEC
|
||||||
#define STARTFILE_SPEC \
|
#define STARTFILE_SPEC \
|
||||||
@@ -1081,6 +1086,7 @@ static const char *link_spec = LINK_SPEC;
|
@@ -1085,6 +1090,7 @@ static const char *link_spec = LINK_SPEC;
|
||||||
static const char *lib_spec = LIB_SPEC;
|
static const char *lib_spec = LIB_SPEC;
|
||||||
static const char *link_gomp_spec = "";
|
static const char *link_gomp_spec = "";
|
||||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||||
@@ -254,7 +311,7 @@ index a716f708259..6a11011dba7 100644
|
|||||||
static const char *endfile_spec = ENDFILE_SPEC;
|
static const char *endfile_spec = ENDFILE_SPEC;
|
||||||
static const char *startfile_spec = STARTFILE_SPEC;
|
static const char *startfile_spec = STARTFILE_SPEC;
|
||||||
static const char *linker_name_spec = LINKER_NAME;
|
static const char *linker_name_spec = LINKER_NAME;
|
||||||
@@ -1577,6 +1583,7 @@ static struct spec_list static_specs[] =
|
@@ -1582,6 +1588,7 @@ static struct spec_list static_specs[] =
|
||||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||||
@@ -263,19 +320,20 @@ index a716f708259..6a11011dba7 100644
|
|||||||
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
|
||||||
INIT_STATIC_SPEC ("version", &compiler_version),
|
INIT_STATIC_SPEC ("version", &compiler_version),
|
||||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||||
index 5e894455e16..f2347455de0 100644
|
index 3f769a1c660..e005d8304b7 100644
|
||||||
--- a/libgcc/crtstuff.c
|
--- a/libgcc/crtstuff.c
|
||||||
+++ b/libgcc/crtstuff.c
|
+++ b/libgcc/crtstuff.c
|
||||||
@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
@@ -325,7 +325,7 @@ register_tm_clones (void)
|
||||||
|
|
||||||
/* Target machine header files require this define. */
|
#ifdef OBJECT_FORMAT_ELF
|
||||||
#define IN_LIBGCC2
|
|
||||||
+#define USED_FOR_TARGET
|
|
||||||
|
|
||||||
/* FIXME: Including auto-host is incorrect, but until we have
|
-#if DEFAULT_USE_CXA_ATEXIT
|
||||||
identified the set of defines that need to go into auto-target.h,
|
+#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
|
diff --git a/libgcc/gthr.h b/libgcc/gthr.h
|
||||||
index 88b0178f9e3..e94fcf9d721 100644
|
index f31cf083cbe..649f900aac3 100644
|
||||||
--- a/libgcc/gthr.h
|
--- a/libgcc/gthr.h
|
||||||
+++ b/libgcc/gthr.h
|
+++ b/libgcc/gthr.h
|
||||||
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
@@ -288,10 +346,10 @@ index 88b0178f9e3..e94fcf9d721 100644
|
|||||||
#define GTHREAD_USE_WEAK 0
|
#define GTHREAD_USE_WEAK 0
|
||||||
#endif
|
#endif
|
||||||
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
|
||||||
index 77e6dc2f6be..3a102997371 100644
|
index 80aeb3f8959..308ceedc673 100644
|
||||||
--- a/libstdc++-v3/include/Makefile.am
|
--- a/libstdc++-v3/include/Makefile.am
|
||||||
+++ b/libstdc++-v3/include/Makefile.am
|
+++ b/libstdc++-v3/include/Makefile.am
|
||||||
@@ -1293,6 +1293,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
@@ -1315,6 +1315,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||||
@@ -300,10 +358,10 @@ index 77e6dc2f6be..3a102997371 100644
|
|||||||
< $< > $@
|
< $< > $@
|
||||||
|
|
||||||
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
|
||||||
index 948a5c1f1c5..ee8e240f6c5 100644
|
index eb437ad8d8d..6e076fc63bd 100644
|
||||||
--- a/libstdc++-v3/include/Makefile.in
|
--- a/libstdc++-v3/include/Makefile.in
|
||||||
+++ b/libstdc++-v3/include/Makefile.in
|
+++ b/libstdc++-v3/include/Makefile.in
|
||||||
@@ -1719,6 +1719,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
@@ -1793,6 +1793,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
|
||||||
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
|
||||||
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
|
||||||
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
-e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
|
|
||||||
--- gdb-8.2.1/gdb/dtrace-probe.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/dtrace-probe.c 2019-03-23 19:45:04.743529457 +0000
|
|
||||||
@@ -100,7 +100,7 @@
|
|
||||||
|
|
||||||
/* DTrace static_probe_ops. */
|
|
||||||
|
|
||||||
-const dtrace_static_probe_ops dtrace_static_probe_ops;
|
|
||||||
+const dtrace_static_probe_ops dtrace_static_probe_ops = {};
|
|
||||||
|
|
||||||
/* The following structure represents a dtrace probe. */
|
|
||||||
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
|
|
||||||
--- gdb-8.2.1/gdb/probe.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/probe.c 2019-03-23 19:35:59.701401090 +0000
|
|
||||||
@@ -60,7 +60,7 @@
|
|
||||||
|
|
||||||
/* Static operations associated with a generic probe. */
|
|
||||||
|
|
||||||
-const any_static_probe_ops any_static_probe_ops;
|
|
||||||
+const any_static_probe_ops any_static_probe_ops = {};
|
|
||||||
|
|
||||||
/* A helper for parse_probes that decodes a probe specification in
|
|
||||||
SEARCH_PSPACE. It appends matching SALs to RESULT. */
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
|
|
||||||
--- gdb-8.2.1/gdb/record-btrace.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/record-btrace.c 2019-03-23 19:35:59.705388987 +0000
|
|
||||||
@@ -144,7 +144,7 @@
|
|
||||||
|
|
||||||
/* Token associated with a new-thread observer enabling branch tracing
|
|
||||||
for the new thread. */
|
|
||||||
-static const gdb::observers::token record_btrace_thread_observer_token;
|
|
||||||
+static const gdb::observers::token record_btrace_thread_observer_token = {};
|
|
||||||
|
|
||||||
/* Memory access types used in set/show record btrace replay-memory-access. */
|
|
||||||
static const char replay_memory_access_read_only[] = "read-only";
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
|
|
||||||
--- gdb-8.2.1/gdb/stap-probe.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/stap-probe.c 2019-03-23 19:35:59.705388987 +0000
|
|
||||||
@@ -119,7 +119,7 @@
|
|
||||||
|
|
||||||
/* SystemTap static_probe_ops. */
|
|
||||||
|
|
||||||
-const stap_static_probe_ops stap_static_probe_ops;
|
|
||||||
+const stap_static_probe_ops stap_static_probe_ops = {};
|
|
||||||
|
|
||||||
class stap_probe : public probe
|
|
||||||
{
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
|
|
||||||
--- gdb-8.2.1/gdb/tui/tui-hooks.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c 2019-03-23 19:35:59.705388987 +0000
|
|
||||||
@@ -205,7 +205,7 @@
|
|
||||||
|
|
||||||
/* Token associated with observers registered while TUI hooks are
|
|
||||||
installed. */
|
|
||||||
-static const gdb::observers::token tui_observers_token;
|
|
||||||
+static const gdb::observers::token tui_observers_token = {};
|
|
||||||
|
|
||||||
/* Attach or detach a single observer, according to ATTACH. */
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
16
dka64/scripts/build-crtls.sh
Normal file
16
dka64/scripts/build-crtls.sh
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# set env variables
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
export DEVKITPRO=$TOOLPATH
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# Install the rules files
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
cd $BUILDDIR
|
||||||
|
|
||||||
|
mkdir -p rules
|
||||||
|
cd rules
|
||||||
|
tar -xvf $SRCDIR/devkita64-rules-$DKA64_RULES_VER.tar.xz
|
||||||
|
make install
|
||||||
@@ -59,12 +59,14 @@ then
|
|||||||
--enable-libstdcxx-time \
|
--enable-libstdcxx-time \
|
||||||
--enable-libstdcxx-filesystem-ts \
|
--enable-libstdcxx-filesystem-ts \
|
||||||
--target=$target \
|
--target=$target \
|
||||||
--with-newlib \
|
--with-newlib=yes \
|
||||||
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||||
--prefix=$prefix \
|
--prefix=$prefix \
|
||||||
--enable-lto $plugin_ld\
|
--enable-lto $plugin_ld\
|
||||||
--with-system-zlib \
|
--with-system-zlib \
|
||||||
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 13" \
|
--disable-tm-clone-registry \
|
||||||
|
--disable-__cxa_atexit \
|
||||||
|
--with-bugurl="https://github.com/devkitPro/buildscripts/issues" --with-pkgversion="devkitA64 release 16" \
|
||||||
$CROSS_PARAMS \
|
$CROSS_PARAMS \
|
||||||
$CROSS_GCC_PARAMS \
|
$CROSS_GCC_PARAMS \
|
||||||
|| { echo "Error configuring gcc"; exit 1; }
|
|| { echo "Error configuring gcc"; exit 1; }
|
||||||
@@ -148,42 +150,3 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
rm -fr $prefix/$target/sys-include
|
rm -fr $prefix/$target/sys-include
|
||||||
|
|
||||||
cd $BUILDDIR
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# build and install the debugger
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
mkdir -p $target/gdb
|
|
||||||
cd $target/gdb
|
|
||||||
|
|
||||||
PLATFORM=`uname -s`
|
|
||||||
|
|
||||||
if [ ! -f configured-gdb ]
|
|
||||||
then
|
|
||||||
CFLAGS="$cflags" \
|
|
||||||
CXXFLAGS="$cflags" \
|
|
||||||
LDFLAGS="$ldflags" \
|
|
||||||
../../gdb-$GDB_VER/configure \
|
|
||||||
--disable-nls --prefix=$prefix --target=$target --disable-werror \
|
|
||||||
$CROSS_PARAMS \
|
|
||||||
|| { echo "Error configuring gdb"; exit 1; }
|
|
||||||
touch configured-gdb
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f built-gdb ]
|
|
||||||
then
|
|
||||||
$MAKE || { echo "Error building gdb"; exit 1; }
|
|
||||||
touch built-gdb
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f installed-gdb ]
|
|
||||||
then
|
|
||||||
$MAKE install || { echo "Error installing gdb"; exit 1; }
|
|
||||||
touch installed-gdb
|
|
||||||
fi
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# copy base rulesets
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
cp -v $BUILDSCRIPTDIR/dka64/rules/* $prefix
|
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
export DEVKITPRO=$TOOLPATH
|
|
||||||
|
|
||||||
cd $BUILDDIR/libnx-$LIBNX_VER
|
|
||||||
$MAKE || { echo "error building libnx"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libnx"; exit 1; }
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
cd $BUILDDIR
|
|
||||||
|
|
||||||
for archive in $hostarchives
|
|
||||||
do
|
|
||||||
dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
|
|
||||||
cd $BUILDDIR/$dir
|
|
||||||
if [ ! -f configured ]; then
|
|
||||||
CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
|
|
||||||
touch configured
|
|
||||||
fi
|
|
||||||
if [ ! -f built ]; then
|
|
||||||
$MAKE || { echo "error building $dir"; exit 1; }
|
|
||||||
touch built
|
|
||||||
fi
|
|
||||||
if [ ! -f installed ]; then
|
|
||||||
$MAKE install || { echo "error installing $dir"; exit 1; }
|
|
||||||
touch installed
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
|
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
|
||||||
index ba194a80229..12e023c3728 100644
|
index 728be500b80..74c1abad635 100644
|
||||||
--- a/gcc/config/arm/arm-cpus.in
|
--- a/gcc/config/arm/arm-cpus.in
|
||||||
+++ b/gcc/config/arm/arm-cpus.in
|
+++ b/gcc/config/arm/arm-cpus.in
|
||||||
@@ -401,7 +401,7 @@ begin arch armv6k
|
@@ -392,7 +392,7 @@ begin arch armv6k
|
||||||
tune for mpcore
|
tune for mpcore
|
||||||
tune flags CO_PROC
|
tune flags CO_PROC
|
||||||
base 6K
|
base 6K
|
||||||
@@ -12,16 +12,10 @@ index ba194a80229..12e023c3728 100644
|
|||||||
optalias vfpv2 fp
|
optalias vfpv2 fp
|
||||||
option nofp remove ALL_FP
|
option nofp remove ALL_FP
|
||||||
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
|
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
|
||||||
index 9ec5bf065ac..9ab3ffb109d 100644
|
index 3d92bd23322..35cefcde676 100644
|
||||||
--- a/gcc/config/arm/t-arm-elf
|
--- a/gcc/config/arm/t-arm-elf
|
||||||
+++ b/gcc/config/arm/t-arm-elf
|
+++ b/gcc/config/arm/t-arm-elf
|
||||||
@@ -1,4 +1,4 @@
|
@@ -16,111 +16,14 @@
|
||||||
-# Copyright (C) 1998-2018 Free Software Foundation, Inc.
|
|
||||||
+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# This file is part of GCC.
|
|
||||||
#
|
|
||||||
@@ -16,110 +16,83 @@
|
|
||||||
# along with GCC; see the file COPYING3. If not see
|
# along with GCC; see the file COPYING3. If not see
|
||||||
# <http://www.gnu.org/licenses/>.
|
# <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
@@ -48,14 +42,15 @@ index 9ec5bf065ac..9ab3ffb109d 100644
|
|||||||
-v8_fps := simd fp16 crypto fp16+crypto dotprod fp16fml
|
-v8_fps := simd fp16 crypto fp16+crypto dotprod fp16fml
|
||||||
-
|
-
|
||||||
-# We don't do anything special with these. Pre-v4t probably doesn't work.
|
-# We don't do anything special with these. Pre-v4t probably doesn't work.
|
||||||
-all_early_nofp := armv2 armv2a armv3 armv3m armv4 armv4t armv5 armv5t
|
-all_early_nofp := armv4 armv4t armv5t
|
||||||
-
|
-
|
||||||
-all_early_arch := armv5e armv5tej armv6 armv6j armv6k armv6z armv6kz \
|
-all_early_arch := armv5tej armv6 armv6j armv6k armv6z armv6kz \
|
||||||
- armv6zk armv6t2 iwmmxt iwmmxt2
|
- armv6zk armv6t2 iwmmxt iwmmxt2
|
||||||
-
|
-
|
||||||
-all_v7_a_r := armv7-a armv7ve armv7-r
|
-all_v7_a_r := armv7-a armv7ve armv7-r
|
||||||
-
|
-
|
||||||
-all_v8_archs := armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a
|
-all_v8_archs := armv8-a armv8-a+crc armv8.1-a armv8.2-a armv8.3-a armv8.4-a \
|
||||||
|
- armv8.5-a armv8.6-a
|
||||||
-
|
-
|
||||||
-# No floating point variants, require thumb1 softfp
|
-# No floating point variants, require thumb1 softfp
|
||||||
-all_nofp_t := armv6-m armv6s-m armv8-m.base
|
-all_nofp_t := armv6-m armv6s-m armv8-m.base
|
||||||
@@ -114,16 +109,19 @@ index 9ec5bf065ac..9ab3ffb109d 100644
|
|||||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v7_a_r), \
|
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v7_a_r), \
|
||||||
- march?armv7+fp=march?$(ARCH) \
|
- march?armv7+fp=march?$(ARCH) \
|
||||||
- march?armv7+fp=march?$(ARCH)+fp)
|
- march?armv7+fp=march?$(ARCH)+fp)
|
||||||
-
|
|
||||||
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v8_archs), \
|
-MULTILIB_MATCHES += $(foreach ARCH, $(all_v8_archs), \
|
||||||
- march?armv7+fp=march?$(ARCH) \
|
- march?armv7+fp=march?$(ARCH) \
|
||||||
- $(foreach FPARCH, $(v8_fps), \
|
- $(foreach FPARCH, $(v8_fps), \
|
||||||
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
|
- march?armv7+fp=march?$(ARCH)+$(FPARCH)))
|
||||||
-
|
+MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard
|
||||||
|
|
||||||
-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \
|
-MULTILIB_MATCHES += $(foreach ARCH, armv7e-m armv8-m.mainline, \
|
||||||
- march?armv7+fp=march?$(ARCH)+fp.dp)
|
- march?armv7+fp=march?$(ARCH)+fp.dp)
|
||||||
-
|
|
||||||
-# PART 4 - Reuse rules
|
-# PART 4 - Reuse rules
|
||||||
|
+MULTILIB_MATCHES += march?armv6k=mtune?mpcore
|
||||||
|
+MULTILIB_MATCHES += march?armv6k=mcpu?mpcore
|
||||||
|
|
||||||
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto
|
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto
|
||||||
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp
|
-MULTILIB_REUSE += mthumb=mthumb/mfpu.auto/march.armv5te+fp
|
||||||
@@ -134,83 +132,8 @@ index 9ec5bf065ac..9ab3ffb109d 100644
|
|||||||
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
|
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mthumb/march.armv7+fp/mfloat-abi.hard
|
||||||
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard
|
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=mfpu.auto/march.armv7+fp/mfloat-abi.hard
|
||||||
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
|
-MULTILIB_REUSE += mthumb/mfpu.auto/march.armv7+fp/mfloat-abi.hard=march.armv7+fp/mfloat-abi.hard
|
||||||
+MULTILIB_REQUIRED = mthumb mbig-endian mthumb/mbig-endian march=armv6k/mfloat-abi=hard
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+MULTILIB_MATCHES += march?armv6k=mtune?mpcore
|
|
||||||
+MULTILIB_MATCHES += march?armv6k=mcpu?mpcore
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#MULTILIB_OPTIONS += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te
|
|
||||||
+#MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te
|
|
||||||
+#MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626
|
|
||||||
+
|
|
||||||
+#MULTILIB_OPTIONS += march=armv7
|
|
||||||
+#MULTILIB_DIRNAMES += thumb2
|
|
||||||
+#MULTILIB_EXCEPTIONS += march=armv7* marm/*march=armv7*
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=march?armv7-a
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=march?armv7-r
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=march?armv7-m
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=mcpu?cortex-a8
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4
|
|
||||||
+#MULTILIB_MATCHES += march?armv7=mcpu?cortex-m3
|
|
||||||
+
|
|
||||||
+# Not quite true. We can support hard-vfp calling in Thumb2, but how do we
|
|
||||||
+# express that here? Also, we really need architecture v5e or later
|
|
||||||
+# (mcrr etc).
|
|
||||||
+#MULTILIB_OPTIONS += mfloat-abi=hard
|
|
||||||
+#MULTILIB_DIRNAMES += fpu
|
|
||||||
+#MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
|
|
||||||
+#MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard*
|
|
||||||
+#MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard*
|
|
||||||
+
|
|
||||||
+# MULTILIB_OPTIONS += mcpu=ep9312
|
|
||||||
+# MULTILIB_DIRNAMES += ep9312
|
|
||||||
+# MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312*
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += mlittle-endian/mbig-endian
|
|
||||||
+# MULTILIB_DIRNAMES += le be
|
|
||||||
+# MULTILIB_MATCHES += mbig-endian=mbe mlittle-endian=mle
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += mfloat-abi=hard/mfloat-abi=soft
|
|
||||||
+# MULTILIB_DIRNAMES += fpu soft
|
|
||||||
+# MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork
|
|
||||||
+# MULTILIB_DIRNAMES += normal interwork
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += fno-leading-underscore/fleading-underscore
|
|
||||||
+# MULTILIB_DIRNAMES += elf under
|
|
||||||
+#
|
|
||||||
+# MULTILIB_OPTIONS += mcpu=arm7
|
|
||||||
+# MULTILIB_DIRNAMES += nofmult
|
|
||||||
+# MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=arm7*
|
|
||||||
+# # Note: the multilib_exceptions matches both -mthumb and
|
|
||||||
+# # -mthumb-interwork
|
|
||||||
+# #
|
|
||||||
+# # We have to match all the arm cpu variants which do not have the
|
|
||||||
+# # multiply instruction and treat them as if the user had specified
|
|
||||||
+# # -mcpu=arm7. Note that in the following the ? is interpreted as
|
|
||||||
+# # an = for the purposes of matching command line options.
|
|
||||||
+# # FIXME: There ought to be a better way to do this.
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7d
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7di
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm70
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700i
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710c
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7100
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500fe
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm6
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm60
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm600
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm610
|
|
||||||
+# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm620
|
|
||||||
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
|
diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
|
||||||
index 12dd0931b08..59584fe64bc 100644
|
index 9ad2947505f..1790caa8e88 100644
|
||||||
--- a/gcc/config/arm/unknown-elf.h
|
--- a/gcc/config/arm/unknown-elf.h
|
||||||
+++ b/gcc/config/arm/unknown-elf.h
|
+++ b/gcc/config/arm/unknown-elf.h
|
||||||
@@ -29,7 +29,7 @@
|
@@ -29,7 +29,7 @@
|
||||||
@@ -222,22 +145,60 @@ index 12dd0931b08..59584fe64bc 100644
|
|||||||
|
|
||||||
#undef STARTFILE_SPEC
|
#undef STARTFILE_SPEC
|
||||||
#define STARTFILE_SPEC \
|
#define STARTFILE_SPEC \
|
||||||
@@ -93,4 +93,9 @@
|
@@ -93,4 +93,5 @@
|
||||||
udivmoddi4, which will depend on the exception unwind routines,
|
udivmoddi4, which will depend on the exception unwind routines,
|
||||||
which will depend on abort, which is defined in libc. */
|
which will depend on abort, which is defined in libc. */
|
||||||
#undef LINK_GCC_C_SEQUENCE_SPEC
|
#undef LINK_GCC_C_SEQUENCE_SPEC
|
||||||
-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L --end-group"
|
-#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %{!nolibc:%L} --end-group"
|
||||||
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
+#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
|
||||||
+
|
+
|
||||||
+/* The system headers under devkitARM are C++-aware. */
|
diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
|
||||||
+#undef NO_IMPLICIT_EXTERN_C
|
index 250fef59b55..36b2239aa5d 100644
|
||||||
+#define NO_IMPLICIT_EXTERN_C
|
--- a/gcc/config/i386/host-mingw32.c
|
||||||
+
|
+++ b/gcc/config/i386/host-mingw32.c
|
||||||
|
@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
|
||||||
|
|
||||||
|
static inline void w32_error(const char*, const char*, int, const char*);
|
||||||
|
|
||||||
|
-/* FIXME: Is this big enough? */
|
||||||
|
-static const size_t pch_VA_max_size = 128 * 1024 * 1024;
|
||||||
|
-
|
||||||
|
/* Granularity for reserving address space. */
|
||||||
|
static size_t va_granularity = 0x10000;
|
||||||
|
|
||||||
|
@@ -88,9 +85,6 @@ static void *
|
||||||
|
mingw32_gt_pch_get_address (size_t size, int)
|
||||||
|
{
|
||||||
|
void* res;
|
||||||
|
- size = (size + va_granularity - 1) & ~(va_granularity - 1);
|
||||||
|
- if (size > pch_VA_max_size)
|
||||||
|
- return NULL;
|
||||||
|
|
||||||
|
/* FIXME: We let system determine base by setting first arg to NULL.
|
||||||
|
Allocating at top of available address space avoids unnecessary
|
||||||
|
@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
|
||||||
|
If we allocate at bottom we need to reserve the address as early
|
||||||
|
as possible and at the same point in each invocation. */
|
||||||
|
|
||||||
|
- res = VirtualAlloc (NULL, pch_VA_max_size,
|
||||||
|
+ res = VirtualAlloc (NULL, size,
|
||||||
|
MEM_RESERVE | MEM_TOP_DOWN,
|
||||||
|
PAGE_NOACCESS);
|
||||||
|
if (!res)
|
||||||
|
@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
|
||||||
|
|
||||||
|
/* Offset must be also be a multiple of allocation granularity for
|
||||||
|
this to work. We can't change the offset. */
|
||||||
|
- if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
|
||||||
|
+ if ((offset & (va_granularity - 1)) != 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
|
||||||
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
||||||
index a716f708259..6a11011dba7 100644
|
index 9f790db0daf..97f52d0b893 100644
|
||||||
--- a/gcc/gcc.c
|
--- a/gcc/gcc.c
|
||||||
+++ b/gcc/gcc.c
|
+++ b/gcc/gcc.c
|
||||||
@@ -786,6 +786,11 @@ proper position among the other output files. */
|
@@ -793,6 +793,11 @@ proper position among the other output files. */
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -249,7 +210,7 @@ index a716f708259..6a11011dba7 100644
|
|||||||
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
/* config.h can define STARTFILE_SPEC to override the default crt0 files. */
|
||||||
#ifndef STARTFILE_SPEC
|
#ifndef STARTFILE_SPEC
|
||||||
#define STARTFILE_SPEC \
|
#define STARTFILE_SPEC \
|
||||||
@@ -1081,6 +1086,7 @@ static const char *link_spec = LINK_SPEC;
|
@@ -1085,6 +1090,7 @@ static const char *link_spec = LINK_SPEC;
|
||||||
static const char *lib_spec = LIB_SPEC;
|
static const char *lib_spec = LIB_SPEC;
|
||||||
static const char *link_gomp_spec = "";
|
static const char *link_gomp_spec = "";
|
||||||
static const char *libgcc_spec = LIBGCC_SPEC;
|
static const char *libgcc_spec = LIBGCC_SPEC;
|
||||||
@@ -257,7 +218,7 @@ index a716f708259..6a11011dba7 100644
|
|||||||
static const char *endfile_spec = ENDFILE_SPEC;
|
static const char *endfile_spec = ENDFILE_SPEC;
|
||||||
static const char *startfile_spec = STARTFILE_SPEC;
|
static const char *startfile_spec = STARTFILE_SPEC;
|
||||||
static const char *linker_name_spec = LINKER_NAME;
|
static const char *linker_name_spec = LINKER_NAME;
|
||||||
@@ -1577,6 +1583,7 @@ static struct spec_list static_specs[] =
|
@@ -1582,6 +1588,7 @@ static struct spec_list static_specs[] =
|
||||||
INIT_STATIC_SPEC ("lib", &lib_spec),
|
INIT_STATIC_SPEC ("lib", &lib_spec),
|
||||||
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
|
||||||
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
|
||||||
@@ -276,15 +237,15 @@ index dddddc7c444..c2502597953 100644
|
|||||||
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
|
-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
|
||||||
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
|
+LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
|
||||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||||
index 5e894455e16..f81c9c6a64c 100644
|
index 3f769a1c660..e005d8304b7 100644
|
||||||
--- a/libgcc/crtstuff.c
|
--- a/libgcc/crtstuff.c
|
||||||
+++ b/libgcc/crtstuff.c
|
+++ b/libgcc/crtstuff.c
|
||||||
@@ -47,7 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
@@ -325,7 +325,7 @@ register_tm_clones (void)
|
||||||
|
|
||||||
/* Target machine header files require this define. */
|
#ifdef OBJECT_FORMAT_ELF
|
||||||
#define IN_LIBGCC2
|
|
||||||
-
|
-#if DEFAULT_USE_CXA_ATEXIT
|
||||||
+#define USED_FOR_TARGET
|
+#if 1 /* DEFAULT_USE_CXA_ATEXIT */
|
||||||
/* FIXME: Including auto-host is incorrect, but until we have
|
/* Declare the __dso_handle variable. It should have a unique value
|
||||||
identified the set of defines that need to go into auto-target.h,
|
in every shared-object; in a main program its value is zero. The
|
||||||
this will have to do. */
|
object should in any case be protected. This means the instance
|
||||||
@@ -1,449 +0,0 @@
|
|||||||
diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
|
|
||||||
--- gdb-8.2.1/gdb/arm-3ds-tdep.c 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ gdb-8.2.1-apple/gdb/arm-3ds-tdep.c 2019-02-19 17:15:22.100604954 +0000
|
|
||||||
@@ -0,0 +1,157 @@
|
|
||||||
+/* Target-dependent code for 3DS. */
|
|
||||||
+
|
|
||||||
+/* This uses code from GDB, which license is: */
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ Copyright (C) 2002-2017 Free Software Foundation, Inc.
|
|
||||||
+
|
|
||||||
+ This file is part of GDB.
|
|
||||||
+
|
|
||||||
+ This program is free software; you can redistribute it and/or modify
|
|
||||||
+ it under the terms of the GNU General Public License as published by
|
|
||||||
+ the Free Software Foundation; either version 3 of the License, or
|
|
||||||
+ (at your option) any later version.
|
|
||||||
+
|
|
||||||
+ This program is distributed in the hope that it will be useful,
|
|
||||||
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
+ GNU General Public License for more details.
|
|
||||||
+
|
|
||||||
+ You should have received a copy of the GNU General Public License
|
|
||||||
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
+
|
|
||||||
+#include "defs.h"
|
|
||||||
+#include "gdbcore.h"
|
|
||||||
+#include "target.h"
|
|
||||||
+#include "osabi.h"
|
|
||||||
+#include "xml-syscall.h"
|
|
||||||
+
|
|
||||||
+#include "arch/arm.h"
|
|
||||||
+#include "arch/arm-get-next-pcs.h"
|
|
||||||
+#include "arm-tdep.h"
|
|
||||||
+
|
|
||||||
+static const gdb_byte arm_3ds_arm_le_breakpoint[] = {0xff, 0x00, 0x00, 0xef};
|
|
||||||
+static const gdb_byte arm_3ds_thumb_le_breakpoint[] = {0xff, 0xdf};
|
|
||||||
+
|
|
||||||
+static CORE_ADDR
|
|
||||||
+ arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self);
|
|
||||||
+
|
|
||||||
+/* Operation function pointers for get_next_pcs. */
|
|
||||||
+static struct arm_get_next_pcs_ops arm_3ds_get_next_pcs_ops = {
|
|
||||||
+ arm_get_next_pcs_read_memory_unsigned_integer,
|
|
||||||
+ arm_3ds_get_next_pcs_syscall_next_pc,
|
|
||||||
+ arm_get_next_pcs_addr_bits_remove,
|
|
||||||
+ arm_get_next_pcs_is_thumb,
|
|
||||||
+ NULL,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static CORE_ADDR
|
|
||||||
+arm_3ds_get_next_pcs_syscall_next_pc (struct arm_get_next_pcs *self)
|
|
||||||
+{
|
|
||||||
+ CORE_ADDR next_pc = 0;
|
|
||||||
+ CORE_ADDR pc = regcache_read_pc (self->regcache);
|
|
||||||
+ int is_thumb = arm_is_thumb (self->regcache);
|
|
||||||
+ ULONGEST svc_number = 0;
|
|
||||||
+
|
|
||||||
+ if (is_thumb)
|
|
||||||
+ {
|
|
||||||
+ next_pc = pc + 2;
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ next_pc = pc + 4;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Addresses for calling Thumb functions have the bit 0 set. */
|
|
||||||
+ if (is_thumb)
|
|
||||||
+ next_pc = MAKE_THUMB_ADDR (next_pc);
|
|
||||||
+
|
|
||||||
+ return next_pc;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static LONGEST
|
|
||||||
+arm_3ds_get_syscall_number (struct gdbarch *gdbarch,
|
|
||||||
+ thread_info *thread)
|
|
||||||
+{
|
|
||||||
+ struct regcache *regs = get_thread_regcache (thread);
|
|
||||||
+
|
|
||||||
+ ULONGEST pc;
|
|
||||||
+ ULONGEST cpsr;
|
|
||||||
+ ULONGEST t_bit = arm_psr_thumb_bit (gdbarch);
|
|
||||||
+ int is_thumb;
|
|
||||||
+ ULONGEST svc_number = -1;
|
|
||||||
+
|
|
||||||
+ regcache_cooked_read_unsigned (regs, ARM_PC_REGNUM, &pc);
|
|
||||||
+ regcache_cooked_read_unsigned (regs, ARM_PS_REGNUM, &cpsr);
|
|
||||||
+ is_thumb = (cpsr & t_bit) != 0;
|
|
||||||
+
|
|
||||||
+ if (is_thumb)
|
|
||||||
+ {
|
|
||||||
+ enum bfd_endian byte_order_for_code =
|
|
||||||
+ gdbarch_byte_order_for_code (gdbarch);
|
|
||||||
+
|
|
||||||
+ /* PC gets incremented before the syscall-stop, so read the
|
|
||||||
+ previous instruction. */
|
|
||||||
+ unsigned long this_instr =
|
|
||||||
+ read_memory_unsigned_integer (pc - 2, 2, byte_order_for_code);
|
|
||||||
+
|
|
||||||
+ unsigned long svc_operand = (0x00ff & this_instr);
|
|
||||||
+ svc_number = svc_operand;
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ enum bfd_endian byte_order_for_code =
|
|
||||||
+ gdbarch_byte_order_for_code (gdbarch);
|
|
||||||
+
|
|
||||||
+ /* PC gets incremented before the syscall-stop, so read the
|
|
||||||
+ previous instruction. */
|
|
||||||
+ unsigned long this_instr =
|
|
||||||
+ read_memory_unsigned_integer (pc - 4, 4, byte_order_for_code);
|
|
||||||
+
|
|
||||||
+ unsigned long svc_operand = (0x000000ff & this_instr);
|
|
||||||
+ svc_number = svc_operand;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (svc_number == 0xfe)
|
|
||||||
+ {
|
|
||||||
+ regcache_cooked_read_unsigned (regs, 12, &svc_number);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return svc_number;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+arm_3ds_init_abi (struct gdbarch_info info,
|
|
||||||
+ struct gdbarch *gdbarch)
|
|
||||||
+{
|
|
||||||
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
|
||||||
+
|
|
||||||
+ switch (info.byte_order)
|
|
||||||
+ {
|
|
||||||
+ case BFD_ENDIAN_LITTLE:
|
|
||||||
+ tdep->arm_breakpoint = arm_3ds_arm_le_breakpoint;
|
|
||||||
+ tdep->thumb_breakpoint = arm_3ds_thumb_le_breakpoint;
|
|
||||||
+ tdep->arm_breakpoint_size = sizeof (arm_3ds_arm_le_breakpoint);
|
|
||||||
+ tdep->thumb_breakpoint_size = sizeof (arm_3ds_thumb_le_breakpoint);
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ default:
|
|
||||||
+ internal_error (__FILE__, __LINE__,
|
|
||||||
+ _("arm_gdbarch_init: bad byte order"));
|
|
||||||
+ }
|
|
||||||
+ tdep->fp_model = ARM_FLOAT_VFP;
|
|
||||||
+
|
|
||||||
+ /* Single stepping. */
|
|
||||||
+ set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
|
|
||||||
+
|
|
||||||
+ /* `catch syscall' */
|
|
||||||
+ set_xml_syscall_file_name (gdbarch, "syscalls/arm-3ds.xml");
|
|
||||||
+ set_gdbarch_get_syscall_number (gdbarch, arm_3ds_get_syscall_number);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+_initialize_arm_3ds_tdep (void)
|
|
||||||
+{
|
|
||||||
+ gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_3DS,
|
|
||||||
+ arm_3ds_init_abi);
|
|
||||||
+}
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/configure.tgt gdb-8.2.1-apple/gdb/configure.tgt
|
|
||||||
--- gdb-8.2.1/gdb/configure.tgt 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/configure.tgt 2019-02-19 17:15:22.104618045 +0000
|
|
||||||
@@ -61,7 +61,7 @@
|
|
||||||
;;
|
|
||||||
|
|
||||||
arm*-*-*)
|
|
||||||
- cpu_obs="arch/arm.o arch/arm-get-next-pcs.o arm-tdep.o";;
|
|
||||||
+ cpu_obs="arch/arm.o arch/arm-get-next-pcs.o arm-tdep.o arm-3ds-tdep.o";;
|
|
||||||
|
|
||||||
hppa*-*-*)
|
|
||||||
# Target: HP PA-RISC
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/data-directory/Makefile.in gdb-8.2.1-apple/gdb/data-directory/Makefile.in
|
|
||||||
--- gdb-8.2.1/gdb/data-directory/Makefile.in 2018-01-05 04:07:23.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/data-directory/Makefile.in 2019-02-19 17:15:22.104618045 +0000
|
|
||||||
@@ -63,7 +63,7 @@
|
|
||||||
sparc-linux.xml \
|
|
||||||
sparc64-linux.xml
|
|
||||||
|
|
||||||
-SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml $(GEN_SYSCALLS_FILES)
|
|
||||||
+SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml arm-3ds.xml $(GEN_SYSCALLS_FILES)
|
|
||||||
|
|
||||||
PYTHON_DIR = python
|
|
||||||
PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/defs.h gdb-8.2.1-apple/gdb/defs.h
|
|
||||||
--- gdb-8.2.1/gdb/defs.h 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/defs.h 2019-02-19 17:15:22.104618045 +0000
|
|
||||||
@@ -495,6 +495,7 @@
|
|
||||||
GDB_OSABI_LYNXOS178,
|
|
||||||
GDB_OSABI_NEWLIB,
|
|
||||||
GDB_OSABI_SDE,
|
|
||||||
+ GDB_OSABI_3DS,
|
|
||||||
|
|
||||||
GDB_OSABI_INVALID /* keep this last */
|
|
||||||
};
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
|
|
||||||
--- gdb-8.2.1/gdb/dtrace-probe.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/dtrace-probe.c 2019-02-19 17:30:16.449175937 +0000
|
|
||||||
@@ -100,7 +100,7 @@
|
|
||||||
|
|
||||||
/* DTrace static_probe_ops. */
|
|
||||||
|
|
||||||
-const dtrace_static_probe_ops dtrace_static_probe_ops;
|
|
||||||
+const dtrace_static_probe_ops dtrace_static_probe_ops = {};
|
|
||||||
|
|
||||||
/* The following structure represents a dtrace probe. */
|
|
||||||
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/Makefile.in gdb-8.2.1-apple/gdb/Makefile.in
|
|
||||||
--- gdb-8.2.1/gdb/Makefile.in 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/Makefile.in 2019-02-19 17:15:22.104618045 +0000
|
|
||||||
@@ -684,6 +684,7 @@
|
|
||||||
arch/arm-linux.o \
|
|
||||||
arch/i386.o \
|
|
||||||
arch/ppc-linux-common.o \
|
|
||||||
+ arm-3ds-tdep.o \
|
|
||||||
arm-bsd-tdep.o \
|
|
||||||
arm-fbsd-tdep.o \
|
|
||||||
arm-linux-tdep.o \
|
|
||||||
@@ -2213,6 +2214,7 @@
|
|
||||||
amd64-tdep.c \
|
|
||||||
arc-tdep.c \
|
|
||||||
arm.c \
|
|
||||||
+ arm-3ds-tdep.c \
|
|
||||||
arm-bsd-tdep.c \
|
|
||||||
arm-fbsd-nat.c \
|
|
||||||
arm-fbsd-tdep.c \
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/osabi.c gdb-8.2.1-apple/gdb/osabi.c
|
|
||||||
--- gdb-8.2.1/gdb/osabi.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/osabi.c 2019-02-19 17:15:22.104618045 +0000
|
|
||||||
@@ -80,6 +80,7 @@
|
|
||||||
{ "LynxOS178", NULL },
|
|
||||||
{ "Newlib", NULL },
|
|
||||||
{ "SDE", NULL },
|
|
||||||
+ { "3DS", NULL },
|
|
||||||
|
|
||||||
{ "<invalid>", NULL }
|
|
||||||
};
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
|
|
||||||
--- gdb-8.2.1/gdb/probe.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/probe.c 2019-02-19 17:31:05.266578008 +0000
|
|
||||||
@@ -60,7 +60,7 @@
|
|
||||||
|
|
||||||
/* Static operations associated with a generic probe. */
|
|
||||||
|
|
||||||
-const any_static_probe_ops any_static_probe_ops;
|
|
||||||
+const any_static_probe_ops any_static_probe_ops = {};
|
|
||||||
|
|
||||||
/* A helper for parse_probes that decodes a probe specification in
|
|
||||||
SEARCH_PSPACE. It appends matching SALs to RESULT. */
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
|
|
||||||
--- gdb-8.2.1/gdb/record-btrace.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/record-btrace.c 2019-02-19 17:31:33.301731324 +0000
|
|
||||||
@@ -144,7 +144,7 @@
|
|
||||||
|
|
||||||
/* Token associated with a new-thread observer enabling branch tracing
|
|
||||||
for the new thread. */
|
|
||||||
-static const gdb::observers::token record_btrace_thread_observer_token;
|
|
||||||
+static const gdb::observers::token record_btrace_thread_observer_token = {};
|
|
||||||
|
|
||||||
/* Memory access types used in set/show record btrace replay-memory-access. */
|
|
||||||
static const char replay_memory_access_read_only[] = "read-only";
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
|
|
||||||
--- gdb-8.2.1/gdb/stap-probe.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/stap-probe.c 2019-02-19 17:29:35.744567941 +0000
|
|
||||||
@@ -119,7 +119,7 @@
|
|
||||||
|
|
||||||
/* SystemTap static_probe_ops. */
|
|
||||||
|
|
||||||
-const stap_static_probe_ops stap_static_probe_ops;
|
|
||||||
+const stap_static_probe_ops stap_static_probe_ops = {};
|
|
||||||
|
|
||||||
class stap_probe : public probe
|
|
||||||
{
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/syscalls/arm-3ds.xml gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml
|
|
||||||
--- gdb-8.2.1/gdb/syscalls/arm-3ds.xml 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml 2019-02-19 17:15:22.104618045 +0000
|
|
||||||
@@ -0,0 +1,159 @@
|
|
||||||
+<?xml version="1.0"?>
|
|
||||||
+<!DOCTYPE syscalls_info SYSTEM "gdb-syscalls.dtd">
|
|
||||||
+<!-- This file is located inside GDB and is based on files which license are: -->
|
|
||||||
+<!-- Copyright (C) 2009-2017 Free Software Foundation, Inc.
|
|
||||||
+
|
|
||||||
+ Copying and distribution of this file, with or without modification,
|
|
||||||
+ are permitted in any medium without royalty provided the copyright
|
|
||||||
+ notice and this notice are preserved. This file is offered as-is,
|
|
||||||
+ without any warranty. -->
|
|
||||||
+<syscalls_info>
|
|
||||||
+ <syscall name="ControlMemory" number="1" groups="memory"/>
|
|
||||||
+ <syscall name="QueryMemory" number="2" groups="memory"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="ExitProcess" number="3" groups="process"/>
|
|
||||||
+ <syscall name="GetProcessAffinityMask" number="4" groups="process"/>
|
|
||||||
+ <syscall name="SetProcessAffinityMask" number="5" groups="process"/>
|
|
||||||
+ <syscall name="GetProcessIdealProcessor" number="6" groups="process"/>
|
|
||||||
+ <syscall name="SetProcessIdealProcessor" number="7" groups="process"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="CreateThread" number="8" groups="thread"/>
|
|
||||||
+ <syscall name="ExitThread" number="9" groups="thread"/>
|
|
||||||
+ <syscall name="SleepThread" number="10" groups="thread"/>
|
|
||||||
+ <syscall name="GetThreadPriority" number="11" groups="thread"/>
|
|
||||||
+ <syscall name="SetThreadPriority" number="12" groups="thread"/>
|
|
||||||
+ <syscall name="GetThreadAffinityMask" number="13" groups="thread"/>
|
|
||||||
+ <syscall name="SetThreadAffinityMask" number="14" groups="thread"/> <!-- removed -->
|
|
||||||
+ <syscall name="GetThreadIdealProcessor" number="15" groups="thread"/>
|
|
||||||
+ <syscall name="SetThreadIdealProcessor" number="16" groups="thread"/> <!-- removed -->
|
|
||||||
+ <syscall name="GetCurrentProcessorNumber" number="17" groups="thread"/>
|
|
||||||
+ <syscall name="Run" number="18" groups="thread"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="CreateMutex" number="19" groups="synchronization"/>
|
|
||||||
+ <syscall name="ReleaseMutex" number="20" groups="synchronization"/>
|
|
||||||
+ <syscall name="CreateSemaphore" number="21" groups="synchronization"/>
|
|
||||||
+ <syscall name="ReleaseSemaphore" number="22" groups="synchronization"/>
|
|
||||||
+ <syscall name="CreateEvent" number="23" groups="synchronization"/>
|
|
||||||
+ <syscall name="SignalEvent" number="24" groups="synchronization"/>
|
|
||||||
+ <syscall name="ClearEvent" number="25" groups="synchronization"/>
|
|
||||||
+ <syscall name="CreateTimer" number="26" groups="synchronization"/>
|
|
||||||
+ <syscall name="SetTimer" number="27" groups="synchronization"/>
|
|
||||||
+ <syscall name="CancelTimer" number="28" groups="synchronization"/>
|
|
||||||
+ <syscall name="ClearTimer" number="29" groups="synchronization"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="CreateMemoryBlock" number="30" groups="memory,ipc"/>
|
|
||||||
+ <syscall name="MapMemoryBlock" number="31" groups="memory,ipc"/>
|
|
||||||
+ <syscall name="UnmapMemoryBlock" number="32" groups="memory,ipc"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="CreateAddressArbiter" number="33" groups="memory,synchronization"/>
|
|
||||||
+ <syscall name="ArbitrateAddress" number="34" groups="memory,synchronization"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="CloseHandle" number="35" groups="synchronization,ipc,memory,thread,process,debug"/>
|
|
||||||
+ <syscall name="WaitSynchronization" number="36" groups="synchronization,ipc,thread,process,debug"/>
|
|
||||||
+ <syscall name="WaitSynchronizationN" number="37" groups="synchronization,ipc,thread,process,debug"/>
|
|
||||||
+ <syscall name="SignalAndWait" number="38" groups="synchronization"/> <!-- removed -->
|
|
||||||
+ <syscall name="DuplicateHandle" number="39" groups="synchronization,ipc,memory,thread,process,debug"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="GetSystemTick" number="40" groups="information"/>
|
|
||||||
+ <syscall name="GetHandleInfo" number="41" groups="information,synchronization,ipc,memory,thread,process,debug"/>
|
|
||||||
+ <syscall name="GetSystemInfo" number="42" groups="information"/>
|
|
||||||
+ <syscall name="GetProcessInfo" number="43" groups="information,process"/>
|
|
||||||
+ <syscall name="GetThreadInfo" number="44" groups="information,thread"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="ConnectToPort" number="45" groups="ipc"/>
|
|
||||||
+ <syscall name="GetCFWInfo" number="46" groups="custom,information"/> <!-- deprecated -->
|
|
||||||
+ <syscall name="SendSyncRequest2" number="47" groups="ipc"/> <!-- removed -->
|
|
||||||
+ <syscall name="SendSyncRequest3" number="48" groups="ipc"/> <!-- removed -->
|
|
||||||
+ <syscall name="SendSyncRequest4" number="49" groups="ipc"/> <!-- removed -->
|
|
||||||
+ <syscall name="SendSyncRequest" number="50" groups="ipc"/> <!-- removed -->
|
|
||||||
+
|
|
||||||
+ <syscall name="OpenProcess" number="51" groups="process"/>
|
|
||||||
+ <syscall name="OpenThread" number="52" groups="thread"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="GetProcessId" number="53" groups="process"/>
|
|
||||||
+ <syscall name="GetProcessIdOfThread" number="54" groups="process,thread"/>
|
|
||||||
+ <syscall name="GetThreadId" number="55" groups="thread"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="GetResourceLimit" number="56" groups="process"/>
|
|
||||||
+ <syscall name="GetResourceLimitLimitValues" number="57" groups="process"/>
|
|
||||||
+ <syscall name="GetResourceLimitCurrentValues" number="58" groups="process"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="GetThreadContext" number="59" groups="debug,thread"/> <!-- removed -->
|
|
||||||
+ <syscall name="Break" number="60" groups="debug"/>
|
|
||||||
+ <syscall name="OutputDebugString" number="61" groups="debug"/>
|
|
||||||
+ <syscall name="ControlPerformanceCounter" number="62" groups="debug"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="CreatePort" number="71" groups="ipc"/>
|
|
||||||
+ <syscall name="CreateSessionToPort" number="72" groups="ipc"/>
|
|
||||||
+ <syscall name="CreateSession" number="73" groups="ipc"/>
|
|
||||||
+ <syscall name="AcceptSession" number="74" groups="ipc"/>
|
|
||||||
+ <syscall name="ReplyAndReceive1" number="75" groups="ipc"/>
|
|
||||||
+ <syscall name="ReplyAndReceive2" number="76" groups="ipc"/>
|
|
||||||
+ <syscall name="ReplyAndReceive3" number="77" groups="ipc"/>
|
|
||||||
+ <syscall name="ReplyAndReceive4" number="78" groups="ipc"/>
|
|
||||||
+ <syscall name="ReplyAndReceive" number="79" groups="ipc"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="BindInterrupt" number="80" groups="io,synchronization"/>
|
|
||||||
+ <syscall name="UnbindInterrupt" number="81" groups="io,synchronization"/>
|
|
||||||
+ <syscall name="InvalidateProcessDataCache" number="82" groups="io,memory,process"/>
|
|
||||||
+ <syscall name="StoreProcessDataCache" number="83" groups="io,memory,process"/>
|
|
||||||
+ <syscall name="FlushProcessDataCache" number="84" groups="io,memory,process"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="StartInterprocessDma" number="85" groups="io,memory,ipc"/>
|
|
||||||
+ <syscall name="StopDma" number="86" groups="io,memory,ipc"/>
|
|
||||||
+ <syscall name="GetDmaState" number="87" groups="io,memory,ipc"/>
|
|
||||||
+ <syscall name="RestartDma" number="88" groups="io,memory,ipc"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="SetGpuProt" number="89" groups="io"/>
|
|
||||||
+ <syscall name="SetWifiEnabled" number="90" groups="io"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="DebugActiveProcess" number="96" groups="debug,process"/>
|
|
||||||
+ <syscall name="BreakDebugProcess" number="97" groups="debug,process"/>
|
|
||||||
+ <syscall name="TerminateDebugProcess" number="98" groups="debug,process"/>
|
|
||||||
+ <syscall name="GetProcessDebugEvent" number="99" groups="debug"/>
|
|
||||||
+ <syscall name="ContinueDebugEvent" number="100" groups="debug"/>
|
|
||||||
+ <syscall name="GetProcessList" number="101" groups="information,debug,process"/>
|
|
||||||
+ <syscall name="GetThreadList" number="102" groups="information,debug,thread"/>
|
|
||||||
+ <syscall name="GetDebugThreadContext" number="103" groups="debug,thread"/>
|
|
||||||
+ <syscall name="SetDebugThreadContext" number="104" groups="debug,thread"/>
|
|
||||||
+ <syscall name="QueryDebugProcessMemory" number="105" groups="debug,process,memory"/>
|
|
||||||
+ <syscall name="ReadProcessMemory" number="106" groups="debug,process,memory"/>
|
|
||||||
+ <syscall name="WriteProcessMemory" number="107" groups="debug,process,memory"/>
|
|
||||||
+ <syscall name="SetHardwareBreakPoint" number="108" group="debug"/>
|
|
||||||
+ <syscall name="GetDebugThreadParam" number="109" group="debug,thread"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="ControlProcessMemory" number="112" group="process,memory"/>
|
|
||||||
+ <syscall name="MapProcessMemory" number="113" group="process,memory"/>
|
|
||||||
+ <syscall name="UnmapProcessMemory" number="114" group="process,memory"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="CreateCodeSet" number="115" group="process,memory"/>
|
|
||||||
+ <syscall name="RandomStub" number="116" group="process,memory"/> <!-- removed -->
|
|
||||||
+ <syscall name="CreateProcess" number="117" group="process"/>
|
|
||||||
+ <syscall name="TerminateProcess" number="118" group="process"/>
|
|
||||||
+ <syscall name="SetProcessResourceLimits" number="119" group="process"/>
|
|
||||||
+ <syscall name="CreateResourceLimit" number="120" group="process"/>
|
|
||||||
+ <syscall name="SetResourceLimitValues" number="121" group="process"/>
|
|
||||||
+ <syscall name="AddCodeSegment" number="122" group="process"/> <!-- removed -->
|
|
||||||
+
|
|
||||||
+ <syscall name="Backdoor" number="123" group="kernel"/>
|
|
||||||
+ <syscall name="KernelSetState" number="124" group="kernel"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="QueryProcessMemory" number="125" group="process,memory"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="CustomBackdoor" number="128" group="custom,kernel"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="ConvertVAToPA" number="144" group="custom,io,memory"/>
|
|
||||||
+ <syscall name="FlushDataCacheRange" number="145" group="custom,io,memory"/>
|
|
||||||
+ <syscall name="FlushEntireDataCache" number="146" group="custom,io,memory"/>
|
|
||||||
+ <syscall name="InvalidateInstructionCacheRange" number="147" group="custom,io,memory"/>
|
|
||||||
+ <syscall name="InvalidateEntireInstructionCache" number="148" group="custom,io,memory"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="MapProcessMemoryEx" number="160" group="custom,process,memory"/>
|
|
||||||
+ <syscall name="UnmapProcessMemoryEx" number="161" group="custom,process,memory"/>
|
|
||||||
+ <syscall name="ControlMemoryEx" number="162" group="custom,memory"/>
|
|
||||||
+
|
|
||||||
+ <syscall name="ControlService" number="176" group="custom,ipc"/>
|
|
||||||
+ <syscall name="CopyHandle" number="177" groups="custom,synchronization,ipc,thread,process,debug"/>
|
|
||||||
+ <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
|
|
||||||
+
|
|
||||||
+</syscalls_info>
|
|
||||||
diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
|
|
||||||
--- gdb-8.2.1/gdb/tui/tui-hooks.c 2018-12-23 05:51:54.000000000 +0000
|
|
||||||
+++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c 2019-02-19 17:28:53.178460364 +0000
|
|
||||||
@@ -205,7 +205,7 @@
|
|
||||||
|
|
||||||
/* Token associated with observers registered while TUI hooks are
|
|
||||||
installed. */
|
|
||||||
-static const gdb::observers::token tui_observers_token;
|
|
||||||
+static const gdb::observers::token tui_observers_token = {};
|
|
||||||
|
|
||||||
/* Attach or detach a single observer, according to ATTACH. */
|
|
||||||
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/libgloss/configure b/libgloss/configure
|
diff --git a/libgloss/configure b/libgloss/configure
|
||||||
index 1a4033dce..ba7aea7b0 100755
|
index 0d2918cee..bccfb07b4 100755
|
||||||
--- a/libgloss/configure
|
--- a/libgloss/configure
|
||||||
+++ b/libgloss/configure
|
+++ b/libgloss/configure
|
||||||
@@ -2599,6 +2599,8 @@ if test "${config_libnosys}" = "true"; then
|
@@ -2604,6 +2604,8 @@ if test "${config_libnosys}" = "true"; then
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -12,7 +12,7 @@ index 1a4033dce..ba7aea7b0 100755
|
|||||||
|
|
||||||
ac_config_commands="$ac_config_commands depfiles"
|
ac_config_commands="$ac_config_commands depfiles"
|
||||||
diff --git a/libgloss/configure.in b/libgloss/configure.in
|
diff --git a/libgloss/configure.in b/libgloss/configure.in
|
||||||
index 41843eed1..dc0e2a5fd 100644
|
index f38d5298e..509c31071 100644
|
||||||
--- a/libgloss/configure.in
|
--- a/libgloss/configure.in
|
||||||
+++ b/libgloss/configure.in
|
+++ b/libgloss/configure.in
|
||||||
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
|
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
|
||||||
@@ -23,7 +23,7 @@ index 41843eed1..dc0e2a5fd 100644
|
|||||||
|
|
||||||
if test "${enable_shared}" = "yes" ; then
|
if test "${enable_shared}" = "yes" ; then
|
||||||
echo "Shared libraries not supported for cross compiling, ignored"
|
echo "Shared libraries not supported for cross compiling, ignored"
|
||||||
@@ -190,6 +191,7 @@ dnl fi
|
@@ -193,6 +194,7 @@ dnl fi
|
||||||
if test "${config_libnosys}" = "true"; then
|
if test "${config_libnosys}" = "true"; then
|
||||||
AC_CONFIG_SUBDIRS([libnosys])
|
AC_CONFIG_SUBDIRS([libnosys])
|
||||||
fi
|
fi
|
||||||
@@ -33,7 +33,7 @@ index 41843eed1..dc0e2a5fd 100644
|
|||||||
AS=${AS-as}
|
AS=${AS-as}
|
||||||
diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
|
diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..0d2be31c6
|
index 000000000..7ee40deec
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/Makefile.in
|
+++ b/libgloss/libsysbase/Makefile.in
|
||||||
@@ -0,0 +1,148 @@
|
@@ -0,0 +1,148 @@
|
||||||
@@ -104,7 +104,7 @@ index 000000000..0d2be31c6
|
|||||||
+ else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
|
+ else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
|
||||||
+
|
+
|
||||||
+# object files needed
|
+# object files needed
|
||||||
+OBJS = abort.o iosupport.o clocks.o close.o environ.o execve.o fork.o fstat.o getpid.o gettod.o \
|
+OBJS = abort.o iosupport.o clocks.o environ.o execve.o fork.o fstat.o getpid.o gettod.o \
|
||||||
+ isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
|
+ isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
|
||||||
+ unlink.o wait.o write.o _exit.o malloc_vars.o \
|
+ unlink.o wait.o write.o _exit.o malloc_vars.o \
|
||||||
+ chdir.o mkdir.o rename.o build_argv.o statvfs.o \
|
+ chdir.o mkdir.o rename.o build_argv.o statvfs.o \
|
||||||
@@ -927,58 +927,6 @@ index 000000000..01cfee469
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
diff --git a/libgloss/libsysbase/close.c b/libgloss/libsysbase/close.c
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000..931ad07b1
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/libgloss/libsysbase/close.c
|
|
||||||
@@ -0,0 +1,46 @@
|
|
||||||
+#include "config.h"
|
|
||||||
+#include <_ansi.h>
|
|
||||||
+#include <_syslist.h>
|
|
||||||
+#include <stdio.h>
|
|
||||||
+#include <errno.h>
|
|
||||||
+
|
|
||||||
+#include <sys/iosupport.h>
|
|
||||||
+
|
|
||||||
+#ifdef REENTRANT_SYSCALLS_PROVIDED
|
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+int _close_r(struct _reent *ptr, int fileDesc) {
|
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+#else
|
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+int _close(int fileDesc) {
|
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+ struct _reent *ptr = _REENT;
|
|
||||||
+#endif
|
|
||||||
+ int ret = -1;
|
|
||||||
+ unsigned int dev = 0;
|
|
||||||
+
|
|
||||||
+ if(fileDesc!=-1) {
|
|
||||||
+
|
|
||||||
+ __handle *handle = __get_handle(fileDesc);
|
|
||||||
+
|
|
||||||
+ if ( handle != NULL) {
|
|
||||||
+ dev = handle->device;
|
|
||||||
+ handle->refcount--;
|
|
||||||
+ if (handle->refcount == 0 ) {
|
|
||||||
+
|
|
||||||
+ if(devoptab_list[dev]->close_r) {
|
|
||||||
+ ptr->deviceData = devoptab_list[dev]->deviceData;
|
|
||||||
+ ret = devoptab_list[dev]->close_r(ptr,handle->fileStruct);
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ ret = 0;
|
|
||||||
+
|
|
||||||
+ __release_handle(fileDesc);
|
|
||||||
+ } else {
|
|
||||||
+ ret = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
diff --git a/libgloss/libsysbase/config.h.in b/libgloss/libsysbase/config.h.in
|
diff --git a/libgloss/libsysbase/config.h.in b/libgloss/libsysbase/config.h.in
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..48ce950b4
|
index 000000000..48ce950b4
|
||||||
@@ -1012,7 +960,7 @@ index 000000000..48ce950b4
|
|||||||
+#undef __SYMBOL_PREFIX
|
+#undef __SYMBOL_PREFIX
|
||||||
diff --git a/libgloss/libsysbase/configure b/libgloss/libsysbase/configure
|
diff --git a/libgloss/libsysbase/configure b/libgloss/libsysbase/configure
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..c4b5a79b6
|
index 000000000..7fe331552
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/configure
|
+++ b/libgloss/libsysbase/configure
|
||||||
@@ -0,0 +1,4158 @@
|
@@ -0,0 +1,4158 @@
|
||||||
@@ -1599,7 +1547,7 @@ index 000000000..c4b5a79b6
|
|||||||
+PACKAGE_BUGREPORT=
|
+PACKAGE_BUGREPORT=
|
||||||
+PACKAGE_URL=
|
+PACKAGE_URL=
|
||||||
+
|
+
|
||||||
+ac_unique_file="close.c"
|
+ac_unique_file="abort.c"
|
||||||
+ac_subst_vars='LTLIBOBJS
|
+ac_subst_vars='LTLIBOBJS
|
||||||
+LIBOBJS
|
+LIBOBJS
|
||||||
+host_makefile_frag_path
|
+host_makefile_frag_path
|
||||||
@@ -5176,7 +5124,7 @@ index 000000000..c4b5a79b6
|
|||||||
+
|
+
|
||||||
diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
|
diff --git a/libgloss/libsysbase/configure.in b/libgloss/libsysbase/configure.in
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..bf276a413
|
index 000000000..3da91ed98
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/configure.in
|
+++ b/libgloss/libsysbase/configure.in
|
||||||
@@ -0,0 +1,199 @@
|
@@ -0,0 +1,199 @@
|
||||||
@@ -5195,7 +5143,7 @@ index 000000000..bf276a413
|
|||||||
+# Process this file with autoconf to produce a configure script.
|
+# Process this file with autoconf to produce a configure script.
|
||||||
+#
|
+#
|
||||||
+AC_PREREQ(2.59)
|
+AC_PREREQ(2.59)
|
||||||
+AC_INIT(close.c)
|
+AC_INIT(abort.c)
|
||||||
+AC_CONFIG_HEADER(config.h)
|
+AC_CONFIG_HEADER(config.h)
|
||||||
+
|
+
|
||||||
+if test "${enable_shared}" = "yes" ; then
|
+if test "${enable_shared}" = "yes" ; then
|
||||||
@@ -6001,10 +5949,13 @@ index 000000000..9d5b74724
|
|||||||
+
|
+
|
||||||
diff --git a/libgloss/libsysbase/handle_manager.c b/libgloss/libsysbase/handle_manager.c
|
diff --git a/libgloss/libsysbase/handle_manager.c b/libgloss/libsysbase/handle_manager.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..f3fcc88f7
|
index 000000000..6bf9ab89e
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/handle_manager.c
|
+++ b/libgloss/libsysbase/handle_manager.c
|
||||||
@@ -0,0 +1,173 @@
|
@@ -0,0 +1,229 @@
|
||||||
|
+#include "config.h"
|
||||||
|
+#include <_ansi.h>
|
||||||
|
+#include <_syslist.h>
|
||||||
+#include <stdlib.h>
|
+#include <stdlib.h>
|
||||||
+#include <stdio.h>
|
+#include <stdio.h>
|
||||||
+#include <errno.h>
|
+#include <errno.h>
|
||||||
@@ -6025,7 +5976,7 @@ index 000000000..f3fcc88f7
|
|||||||
+
|
+
|
||||||
+__LOCK_INIT(static, __hndl_lock);
|
+__LOCK_INIT(static, __hndl_lock);
|
||||||
+
|
+
|
||||||
+void __free_handle(__handle *handle) {
|
+static void __free_handle(__handle *handle) {
|
||||||
+
|
+
|
||||||
+ if ( NULL != handle
|
+ if ( NULL != handle
|
||||||
+ && handle != &__stdin_handle
|
+ && handle != &__stdin_handle
|
||||||
@@ -6093,8 +6044,11 @@ index 000000000..f3fcc88f7
|
|||||||
+
|
+
|
||||||
+ if ( fd < 0 || fd >= MAX_HANDLES ) return NULL;
|
+ if ( fd < 0 || fd >= MAX_HANDLES ) return NULL;
|
||||||
+
|
+
|
||||||
+ return handles[fd];
|
+ __lock_acquire (__hndl_lock);
|
||||||
|
+ __handle *handle = handles[fd];
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
+
|
+
|
||||||
|
+ return handle;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int dup(int oldfd) {
|
+int dup(int oldfd) {
|
||||||
@@ -6126,57 +6080,107 @@ index 000000000..f3fcc88f7
|
|||||||
+
|
+
|
||||||
+int dup2(int oldfd, int newfd) {
|
+int dup2(int oldfd, int newfd) {
|
||||||
+
|
+
|
||||||
+
|
|
||||||
+ __lock_acquire (__hndl_lock);
|
|
||||||
+
|
|
||||||
+ if ( newfd < 0 || newfd >= MAX_HANDLES ||
|
+ if ( newfd < 0 || newfd >= MAX_HANDLES ||
|
||||||
|
+ oldfd < 0 || oldfd >= MAX_HANDLES) {
|
||||||
+
|
+
|
||||||
+ oldfd < 0 || oldfd >= MAX_HANDLES ||
|
|
||||||
+ handles[oldfd] == NULL ) {
|
|
||||||
+
|
|
||||||
+ __lock_release (__hndl_lock);
|
|
||||||
+ errno = EBADF;
|
+ errno = EBADF;
|
||||||
+
|
+
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ if ( newfd == oldfd ) {
|
+ if ( newfd == oldfd ) {
|
||||||
+ __lock_release (__hndl_lock);
|
|
||||||
+ return newfd;
|
+ return newfd;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
+ __lock_acquire (__hndl_lock);
|
||||||
|
+
|
||||||
|
+ if ( handles[oldfd] == NULL ) {
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
|
+ errno = EBADF;
|
||||||
|
+
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ __handle *handle = handles[newfd];
|
+ __handle *handle = handles[newfd];
|
||||||
+
|
+
|
||||||
+ if ( NULL != handle ) {
|
|
||||||
+
|
|
||||||
+ handle->refcount--;
|
|
||||||
+
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ handles[newfd] = handles[oldfd];
|
+ handles[newfd] = handles[oldfd];
|
||||||
+ handles[newfd]->refcount++;
|
+ handles[newfd]->refcount++;
|
||||||
+
|
+
|
||||||
+ __lock_release (__hndl_lock);
|
+ if ( handle ) {
|
||||||
+
|
+
|
||||||
+ if ( NULL != handle ) {
|
+ int ref = --handle->refcount;
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
+
|
+
|
||||||
+ if (handle->refcount == 0 ) {
|
+ if ( ref == 0 ) {
|
||||||
+
|
+
|
||||||
+ if( devoptab_list[handle->device]->close_r != NULL) {
|
+ if ( devoptab_list[handle->device]->close_r ) {
|
||||||
+
|
+
|
||||||
|
+ _REENT->deviceData = devoptab_list[handle->device]->deviceData;
|
||||||
+ devoptab_list[handle->device]->close_r(_REENT,handle->fileStruct);
|
+ devoptab_list[handle->device]->close_r(_REENT,handle->fileStruct);
|
||||||
+
|
+
|
||||||
+ } else {
|
|
||||||
+
|
|
||||||
+ __free_handle(handle);
|
|
||||||
+
|
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
|
+ __free_handle(handle);
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
|
+ } else {
|
||||||
|
+
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
|
+
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return newfd;
|
+ return newfd;
|
||||||
|
+}
|
||||||
+
|
+
|
||||||
|
+#ifdef REENTRANT_SYSCALLS_PROVIDED
|
||||||
|
+//---------------------------------------------------------------------------------
|
||||||
|
+int _close_r(struct _reent *ptr, int fd) {
|
||||||
|
+//---------------------------------------------------------------------------------
|
||||||
|
+#else
|
||||||
|
+//---------------------------------------------------------------------------------
|
||||||
|
+int _close(int fd) {
|
||||||
|
+//---------------------------------------------------------------------------------
|
||||||
|
+ struct _reent *ptr = _REENT;
|
||||||
|
+#endif
|
||||||
|
+ int ret = 0;
|
||||||
|
+
|
||||||
|
+ if (fd < 0 || fd >= MAX_HANDLES) {
|
||||||
|
+
|
||||||
|
+ ptr->_errno = EBADF;
|
||||||
|
+ return -1;
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ __lock_acquire (__hndl_lock);
|
||||||
|
+
|
||||||
|
+ __handle *handle = handles[fd];
|
||||||
|
+
|
||||||
|
+ if ( !handle ) {
|
||||||
|
+
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
|
+ ptr->_errno = EBADF;
|
||||||
|
+ return -1;
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ int ref = --handle->refcount;
|
||||||
|
+ handles[fd] = NULL;
|
||||||
|
+
|
||||||
|
+ __lock_release (__hndl_lock);
|
||||||
|
+
|
||||||
|
+ if ( ref == 0 ) {
|
||||||
|
+
|
||||||
|
+ if ( devoptab_list[handle->device]->close_r ) {
|
||||||
|
+
|
||||||
|
+ ptr->deviceData = devoptab_list[handle->device]->deviceData;
|
||||||
|
+ ret = devoptab_list[handle->device]->close_r(ptr,handle->fileStruct);
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ __free_handle(handle);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/iosupport.c b/libgloss/libsysbase/iosupport.c
|
diff --git a/libgloss/libsysbase/iosupport.c b/libgloss/libsysbase/iosupport.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
@@ -7404,10 +7408,10 @@ index 000000000..61de918bc
|
|||||||
+ return ret;
|
+ return ret;
|
||||||
+}
|
+}
|
||||||
diff --git a/newlib/configure.host b/newlib/configure.host
|
diff --git a/newlib/configure.host b/newlib/configure.host
|
||||||
index 6c49cb750..6a5e1c78d 100644
|
index a84c0c80a..29fb7ed24 100644
|
||||||
--- a/newlib/configure.host
|
--- a/newlib/configure.host
|
||||||
+++ b/newlib/configure.host
|
+++ b/newlib/configure.host
|
||||||
@@ -666,6 +666,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
|
@@ -687,6 +687,14 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
|
||||||
syscall_dir=syscalls
|
syscall_dir=syscalls
|
||||||
default_newlib_io_long_long="yes"
|
default_newlib_io_long_long="yes"
|
||||||
;;
|
;;
|
||||||
@@ -7436,7 +7440,7 @@ index 164d95bca..083e48758 100644
|
|||||||
void clearerr (FILE *);
|
void clearerr (FILE *);
|
||||||
int feof (FILE *);
|
int feof (FILE *);
|
||||||
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
|
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
|
||||||
index 49b62ebf6..d84ffaa59 100644
|
index d746b15fc..80169d9b7 100644
|
||||||
--- a/newlib/libc/include/sys/config.h
|
--- a/newlib/libc/include/sys/config.h
|
||||||
+++ b/newlib/libc/include/sys/config.h
|
+++ b/newlib/libc/include/sys/config.h
|
||||||
@@ -4,6 +4,9 @@
|
@@ -4,6 +4,9 @@
|
||||||
@@ -7516,7 +7520,7 @@ index a3fb5c02c..5debd1525 100644
|
|||||||
+
|
+
|
||||||
+#endif // _dirent_h_
|
+#endif // _dirent_h_
|
||||||
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
|
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
|
||||||
index f28dd071b..96980676d 100644
|
index 218807178..c9efd7d03 100644
|
||||||
--- a/newlib/libc/include/sys/features.h
|
--- a/newlib/libc/include/sys/features.h
|
||||||
+++ b/newlib/libc/include/sys/features.h
|
+++ b/newlib/libc/include/sys/features.h
|
||||||
@@ -330,6 +330,9 @@ extern "C" {
|
@@ -330,6 +330,9 @@ extern "C" {
|
||||||
@@ -7647,11 +7651,25 @@ index 000000000..c190fa37d
|
|||||||
+//---------------------------------------------------------------------------------
|
+//---------------------------------------------------------------------------------
|
||||||
+#endif // __iosupp_h__
|
+#endif // __iosupp_h__
|
||||||
+//---------------------------------------------------------------------------------
|
+//---------------------------------------------------------------------------------
|
||||||
|
diff --git a/newlib/libc/include/sys/param.h b/newlib/libc/include/sys/param.h
|
||||||
|
index 9a6f115a6..142e71d35 100644
|
||||||
|
--- a/newlib/libc/include/sys/param.h
|
||||||
|
+++ b/newlib/libc/include/sys/param.h
|
||||||
|
@@ -19,9 +19,6 @@
|
||||||
|
#ifndef NOFILE
|
||||||
|
# define NOFILE (60)
|
||||||
|
#endif
|
||||||
|
-#ifndef PATHSIZE
|
||||||
|
-# define PATHSIZE (1024)
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
#define MAXPATHLEN PATH_MAX
|
||||||
|
|
||||||
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
|
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
|
||||||
index 6e55e1c1f..6e0c1c9cf 100644
|
index 74b70e9c0..d8c5410ec 100644
|
||||||
--- a/newlib/libc/include/sys/reent.h
|
--- a/newlib/libc/include/sys/reent.h
|
||||||
+++ b/newlib/libc/include/sys/reent.h
|
+++ b/newlib/libc/include/sys/reent.h
|
||||||
@@ -416,6 +416,8 @@ struct _reent
|
@@ -421,6 +421,8 @@ struct _reent
|
||||||
__FILE *__sf; /* file descriptors */
|
__FILE *__sf; /* file descriptors */
|
||||||
struct _misc_reent *_misc; /* strtok, multibyte states */
|
struct _misc_reent *_misc; /* strtok, multibyte states */
|
||||||
char *_signal_buf; /* strsignal */
|
char *_signal_buf; /* strsignal */
|
||||||
@@ -7660,7 +7678,7 @@ index 6e55e1c1f..6e0c1c9cf 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||||
@@ -686,6 +688,7 @@ struct _reent
|
@@ -691,6 +693,7 @@ struct _reent
|
||||||
# ifndef _REENT_GLOBAL_STDIO_STREAMS
|
# ifndef _REENT_GLOBAL_STDIO_STREAMS
|
||||||
__FILE __sf[3]; /* first three file descriptors */
|
__FILE __sf[3]; /* first three file descriptors */
|
||||||
# endif
|
# endif
|
||||||
@@ -7669,10 +7687,10 @@ index 6e55e1c1f..6e0c1c9cf 100644
|
|||||||
|
|
||||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||||
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
|
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
|
||||||
index eee98db64..aed9c1746 100644
|
index 8769112b0..5526e59ee 100644
|
||||||
--- a/newlib/libc/include/sys/stat.h
|
--- a/newlib/libc/include/sys/stat.h
|
||||||
+++ b/newlib/libc/include/sys/stat.h
|
+++ b/newlib/libc/include/sys/stat.h
|
||||||
@@ -152,8 +152,9 @@ int mkfifo (const char *__path, mode_t __mode );
|
@@ -142,8 +142,9 @@ int mkfifo (const char *__path, mode_t __mode );
|
||||||
int stat (const char *__restrict __path, struct stat *__restrict __sbuf );
|
int stat (const char *__restrict __path, struct stat *__restrict __sbuf );
|
||||||
mode_t umask (mode_t __mask );
|
mode_t umask (mode_t __mask );
|
||||||
|
|
||||||
@@ -8013,7 +8031,7 @@ index 9b982a993..8c0aaac8c 100644
|
|||||||
+*/
|
+*/
|
||||||
#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
|
#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
|
||||||
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
|
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
|
||||||
index b358d2b4a..29cec0229 100644
|
index b358d2b4a..a3e597fd2 100644
|
||||||
--- a/newlib/libc/stdio/fread.c
|
--- a/newlib/libc/stdio/fread.c
|
||||||
+++ b/newlib/libc/stdio/fread.c
|
+++ b/newlib/libc/stdio/fread.c
|
||||||
@@ -135,7 +135,7 @@ crlf_r (struct _reent * ptr,
|
@@ -135,7 +135,7 @@ crlf_r (struct _reent * ptr,
|
||||||
@@ -8025,7 +8043,24 @@ index b358d2b4a..29cec0229 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@@ -225,7 +225,32 @@ _fread_r (struct _reent * ptr,
|
@@ -187,7 +187,6 @@ _fread_r (struct _reent * ptr,
|
||||||
|
int rc = 0;
|
||||||
|
/* save fp buffering state */
|
||||||
|
void *old_base = fp->_bf._base;
|
||||||
|
- void * old_p = fp->_p;
|
||||||
|
int old_size = fp->_bf._size;
|
||||||
|
/* allow __refill to use user's buffer */
|
||||||
|
fp->_bf._base = (unsigned char *) p;
|
||||||
|
@@ -197,7 +196,7 @@ _fread_r (struct _reent * ptr,
|
||||||
|
/* restore fp buffering back to original state */
|
||||||
|
fp->_bf._base = old_base;
|
||||||
|
fp->_bf._size = old_size;
|
||||||
|
- fp->_p = old_p;
|
||||||
|
+ fp->_p = old_base;
|
||||||
|
resid -= fp->_r;
|
||||||
|
p += fp->_r;
|
||||||
|
fp->_r = 0;
|
||||||
|
@@ -225,7 +224,31 @@ _fread_r (struct _reent * ptr,
|
||||||
/* fp->_r = 0 ... done in __srefill */
|
/* fp->_r = 0 ... done in __srefill */
|
||||||
p += r;
|
p += r;
|
||||||
resid -= r;
|
resid -= r;
|
||||||
@@ -8033,11 +8068,10 @@ index b358d2b4a..29cec0229 100644
|
|||||||
+
|
+
|
||||||
+ int rc = 0;
|
+ int rc = 0;
|
||||||
+
|
+
|
||||||
+ if (resid>BUFSIZ)
|
+ if (resid>fp->_bf._size)
|
||||||
+ {
|
+ {
|
||||||
+ /* save fp buffering state */
|
+ /* save fp buffering state */
|
||||||
+ void *old_base = fp->_bf._base;
|
+ void *old_base = fp->_bf._base;
|
||||||
+ void * old_p = fp->_p;
|
|
||||||
+ int old_size = fp->_bf._size;
|
+ int old_size = fp->_bf._size;
|
||||||
+ /* allow __refill to use user's buffer */
|
+ /* allow __refill to use user's buffer */
|
||||||
+ fp->_bf._base = (unsigned char *) p;
|
+ fp->_bf._base = (unsigned char *) p;
|
||||||
@@ -8047,7 +8081,7 @@ index b358d2b4a..29cec0229 100644
|
|||||||
+ /* restore fp buffering back to original state */
|
+ /* restore fp buffering back to original state */
|
||||||
+ fp->_bf._base = old_base;
|
+ fp->_bf._base = old_base;
|
||||||
+ fp->_bf._size = old_size;
|
+ fp->_bf._size = old_size;
|
||||||
+ fp->_p = old_p;
|
+ fp->_p = old_base;
|
||||||
+ resid -= fp->_r;
|
+ resid -= fp->_r;
|
||||||
+ p += fp->_r;
|
+ p += fp->_r;
|
||||||
+ fp->_r = 0;
|
+ fp->_r = 0;
|
||||||
@@ -8118,7 +8152,7 @@ index 980b31e3b..722be905e 100644
|
|||||||
|
|
||||||
#ifdef INTEGER_ONLY
|
#ifdef INTEGER_ONLY
|
||||||
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
|
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
|
||||||
index 0464b0837..435fc0142 100644
|
index ffb6cc85b..db33d4f29 100644
|
||||||
--- a/newlib/libc/stdio/vfwscanf.c
|
--- a/newlib/libc/stdio/vfwscanf.c
|
||||||
+++ b/newlib/libc/stdio/vfwscanf.c
|
+++ b/newlib/libc/stdio/vfwscanf.c
|
||||||
@@ -74,6 +74,9 @@ PORTABILITY
|
@@ -74,6 +74,9 @@ PORTABILITY
|
||||||
@@ -8272,16 +8306,3 @@ index 000000000..567fed56b
|
|||||||
+ __libc_lock_release_recursive(&(NAME))
|
+ __libc_lock_release_recursive(&(NAME))
|
||||||
+
|
+
|
||||||
+#endif // __SYS_LOCK_H__
|
+#endif // __SYS_LOCK_H__
|
||||||
diff --git a/newlib/libc/sys/arm/sys/param.h b/newlib/libc/sys/arm/sys/param.h
|
|
||||||
index 5b9464cca..e8969b954 100644
|
|
||||||
--- a/newlib/libc/sys/arm/sys/param.h
|
|
||||||
+++ b/newlib/libc/sys/arm/sys/param.h
|
|
||||||
@@ -19,6 +19,8 @@
|
|
||||||
# define PATHSIZE (1024)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#define MAXPATHLEN PATHSIZE
|
|
||||||
+
|
|
||||||
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
|
||||||
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
|
||||||
|
|
||||||
28
dkarm-eabi/scripts/build-crtls.sh
Executable file
28
dkarm-eabi/scripts/build-crtls.sh
Executable file
@@ -0,0 +1,28 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# set env variables
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
export DEVKITPRO=$TOOLPATH
|
||||||
|
export DEVKITARM=$DEVKITPRO/devkitARM
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# Install the rules files
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
cd $BUILDDIR
|
||||||
|
|
||||||
|
mkdir -p rules
|
||||||
|
cd rules
|
||||||
|
tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
|
||||||
|
make install
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# Install and build the crt0 files
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
cd $BUILDDIR
|
||||||
|
|
||||||
|
mkdir -p crtls
|
||||||
|
cd crtls
|
||||||
|
tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
|
||||||
|
make install
|
||||||
|
|
||||||
@@ -64,7 +64,9 @@ then
|
|||||||
--prefix=$prefix \
|
--prefix=$prefix \
|
||||||
--enable-lto\
|
--enable-lto\
|
||||||
--with-system-zlib \
|
--with-system-zlib \
|
||||||
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 52" \
|
--disable-tm-clone-registry \
|
||||||
|
--disable-__cxa_atexit \
|
||||||
|
--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 55" \
|
||||||
$CROSS_PARAMS \
|
$CROSS_PARAMS \
|
||||||
$CROSS_GCC_PARAMS \
|
$CROSS_GCC_PARAMS \
|
||||||
|| { echo "Error configuring gcc"; exit 1; }
|
|| { echo "Error configuring gcc"; exit 1; }
|
||||||
@@ -150,35 +152,3 @@ fi
|
|||||||
rm -fr $prefix/$target/sys-include
|
rm -fr $prefix/$target/sys-include
|
||||||
|
|
||||||
cd $BUILDDIR
|
cd $BUILDDIR
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# build and install the debugger
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
mkdir -p $target/gdb
|
|
||||||
cd $target/gdb
|
|
||||||
|
|
||||||
PLATFORM=`uname -s`
|
|
||||||
|
|
||||||
if [ ! -f configured-gdb ]
|
|
||||||
then
|
|
||||||
CPPFLAGS="$cppflags $CPPFLAGS" \
|
|
||||||
LDFLAGS="$ldflags" \
|
|
||||||
../../gdb-$GDB_VER/configure \
|
|
||||||
--disable-nls --prefix=$prefix --target=$target --disable-werror \
|
|
||||||
$CROSS_PARAMS \
|
|
||||||
|| { echo "Error configuring gdb"; exit 1; }
|
|
||||||
touch configured-gdb
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f built-gdb ]
|
|
||||||
then
|
|
||||||
$MAKE || { echo "Error building gdb"; exit 1; }
|
|
||||||
touch built-gdb
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f installed-gdb ]
|
|
||||||
then
|
|
||||||
$MAKE install || { echo "Error installing gdb"; exit 1; }
|
|
||||||
touch installed-gdb
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# set env variables
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
export DEVKITPRO=$TOOLPATH
|
|
||||||
export DEVKITARM=$DEVKITPRO/devkitARM
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# Install the rules files
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
cd $BUILDDIR
|
|
||||||
|
|
||||||
mkdir -p rules
|
|
||||||
cd rules
|
|
||||||
tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
|
|
||||||
make install
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# Install and build the crt0 files
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
cd $BUILDDIR
|
|
||||||
|
|
||||||
mkdir -p crtls
|
|
||||||
cd crtls
|
|
||||||
tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
|
|
||||||
make install
|
|
||||||
|
|
||||||
cd $BUILDDIR/libgba-$LIBGBA_VER
|
|
||||||
$MAKE || { echo "error building libgba"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libgba"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/libnds-$LIBNDS_VER
|
|
||||||
$MAKE || { echo "error building libnds"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libnds"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/dswifi-$DSWIFI_VER
|
|
||||||
$MAKE || { echo "error building dswifi"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing dswifi"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/maxmod-$MAXMOD_VER
|
|
||||||
$MAKE || { echo "error building maxmod"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing maxmod"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/default_arm7-$DEFAULT_ARM7_VER
|
|
||||||
$MAKE || { echo "error building default arm7"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing default arm7"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/libfat-$LIBFAT_VER
|
|
||||||
$MAKE nds-install || { echo "error building nds libfat"; exit 1; }
|
|
||||||
$MAKE gba-install || { echo "error installing gba libfat"; exit 1; }
|
|
||||||
|
|
||||||
#cd $BUILDDIR/libmirko-$LIBMIRKO_VER
|
|
||||||
#$MAKE || { echo "error building libmirko"; exit 1; }
|
|
||||||
#$MAKE install || { echo "error installing libmirko"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/libfilesystem-$FILESYSTEM_VER
|
|
||||||
$MAKE || { echo "error building libfilesystem"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libfilesystem"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/libctru-$LIBCTRU_VER
|
|
||||||
$MAKE || { echo "error building libctru"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing libctru"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/citro3d-$CITRO3D_VER
|
|
||||||
$MAKE || { echo "error building citro3d"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing citro3d"; exit 1; }
|
|
||||||
|
|
||||||
cd $BUILDDIR/citro2d-$CITRO2D_VER
|
|
||||||
$MAKE || { echo "error building citro2d"; exit 1; }
|
|
||||||
$MAKE install || { echo "error installing citro2d"; exit 1; }
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
cd $BUILDDIR
|
|
||||||
|
|
||||||
for archive in $hostarchives
|
|
||||||
do
|
|
||||||
dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
|
|
||||||
cd $BUILDDIR/$dir
|
|
||||||
if [ ! -f configured ]; then
|
|
||||||
CPPFLAGS="$cppflags $CPPFLAGS" ./configure --prefix=$toolsprefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
|
|
||||||
touch configured
|
|
||||||
fi
|
|
||||||
if [ ! -f built ]; then
|
|
||||||
$MAKE || { echo "error building $dir"; exit 1; }
|
|
||||||
touch built
|
|
||||||
fi
|
|
||||||
if [ ! -f installed ]; then
|
|
||||||
$MAKE install || { echo "error installing $dir"; exit 1; }
|
|
||||||
touch installed
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
12
dkppc/patches/binutils-2.34.patch
Normal file
12
dkppc/patches/binutils-2.34.patch
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
diff -NBaur binutils-2.34/opcodes/ppc-opc.c binutils-2.34-ppc/opcodes/ppc-opc.c
|
||||||
|
--- binutils-2.34/opcodes/ppc-opc.c 2020-01-18 13:55:49.000000000 +0000
|
||||||
|
+++ binutils-2.34-ppc/opcodes/ppc-opc.c 2020-05-22 10:47:37.900308413 +0000
|
||||||
|
@@ -3747,7 +3747,7 @@
|
||||||
|
#define MFDEC2 (PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
|
||||||
|
| PPC_OPCODE_TITAN)
|
||||||
|
#define BOOKE PPC_OPCODE_BOOKE
|
||||||
|
-#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
|
||||||
|
+#define NO371 PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
|
||||||
|
#define PPCE300 PPC_OPCODE_E300
|
||||||
|
#define PPCSPE PPC_OPCODE_SPE
|
||||||
|
#define PPCSPE2 PPC_OPCODE_SPE2
|
||||||
@@ -1,30 +1,59 @@
|
|||||||
diff --git a/config/gthr.m4 b/config/gthr.m4
|
diff --git a/config/gthr.m4 b/config/gthr.m4
|
||||||
index 7b29f1f..814104f 100644
|
index 4b937306ad0..bfd0375bd60 100644
|
||||||
--- a/config/gthr.m4
|
--- a/config/gthr.m4
|
||||||
+++ b/config/gthr.m4
|
+++ b/config/gthr.m4
|
||||||
@@ -12,6 +12,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
|
@@ -13,6 +13,7 @@ AC_DEFUN([GCC_AC_THREAD_HEADER],
|
||||||
[
|
|
||||||
case $1 in
|
case $1 in
|
||||||
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
||||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
|
||||||
dce) thread_header=config/pa/gthr-dce.h ;;
|
dce) thread_header=config/pa/gthr-dce.h ;;
|
||||||
|
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||||
|
gcn) thread_header=config/gcn/gthr-gcn.h ;;
|
||||||
lynx) thread_header=config/gthr-lynx.h ;;
|
lynx) thread_header=config/gthr-lynx.h ;;
|
||||||
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
||||||
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
diff --git a/gcc/config/i386/host-mingw32.c b/gcc/config/i386/host-mingw32.c
|
||||||
index 7af8e02..dc58cab 100644
|
index 250fef59b55..36b2239aa5d 100644
|
||||||
--- a/gcc/config.gcc
|
--- a/gcc/config/i386/host-mingw32.c
|
||||||
+++ b/gcc/config.gcc
|
+++ b/gcc/config/i386/host-mingw32.c
|
||||||
@@ -2464,7 +2464,7 @@ powerpc-xilinx-eabi*)
|
@@ -44,9 +44,6 @@ static size_t mingw32_gt_pch_alloc_granularity (void);
|
||||||
use_gcc_stdint=wrap
|
|
||||||
;;
|
static inline void w32_error(const char*, const char*, int, const char*);
|
||||||
powerpc-*-eabi*)
|
|
||||||
- tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h"
|
-/* FIXME: Is this big enough? */
|
||||||
+ tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/750cl.h"
|
-static const size_t pch_VA_max_size = 128 * 1024 * 1024;
|
||||||
extra_options="${extra_options} rs6000/sysv4.opt"
|
-
|
||||||
tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
|
/* Granularity for reserving address space. */
|
||||||
use_gcc_stdint=wrap
|
static size_t va_granularity = 0x10000;
|
||||||
|
|
||||||
|
@@ -88,9 +85,6 @@ static void *
|
||||||
|
mingw32_gt_pch_get_address (size_t size, int)
|
||||||
|
{
|
||||||
|
void* res;
|
||||||
|
- size = (size + va_granularity - 1) & ~(va_granularity - 1);
|
||||||
|
- if (size > pch_VA_max_size)
|
||||||
|
- return NULL;
|
||||||
|
|
||||||
|
/* FIXME: We let system determine base by setting first arg to NULL.
|
||||||
|
Allocating at top of available address space avoids unnecessary
|
||||||
|
@@ -100,7 +94,7 @@ mingw32_gt_pch_get_address (size_t size, int)
|
||||||
|
If we allocate at bottom we need to reserve the address as early
|
||||||
|
as possible and at the same point in each invocation. */
|
||||||
|
|
||||||
|
- res = VirtualAlloc (NULL, pch_VA_max_size,
|
||||||
|
+ res = VirtualAlloc (NULL, size,
|
||||||
|
MEM_RESERVE | MEM_TOP_DOWN,
|
||||||
|
PAGE_NOACCESS);
|
||||||
|
if (!res)
|
||||||
|
@@ -150,7 +144,7 @@ mingw32_gt_pch_use_address (void *addr, size_t size, int fd,
|
||||||
|
|
||||||
|
/* Offset must be also be a multiple of allocation granularity for
|
||||||
|
this to work. We can't change the offset. */
|
||||||
|
- if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size)
|
||||||
|
+ if ((offset & (va_granularity - 1)) != 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
|
||||||
diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
|
diff --git a/gcc/config/newlib-stdint.h b/gcc/config/newlib-stdint.h
|
||||||
index f46e797..fd39e64 100644
|
index 2e086f16de9..1c27c6467bc 100644
|
||||||
--- a/gcc/config/newlib-stdint.h
|
--- a/gcc/config/newlib-stdint.h
|
||||||
+++ b/gcc/config/newlib-stdint.h
|
+++ b/gcc/config/newlib-stdint.h
|
||||||
@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
@@ -37,18 +66,18 @@ index f46e797..fd39e64 100644
|
|||||||
|
|
||||||
#define SIG_ATOMIC_TYPE "int"
|
#define SIG_ATOMIC_TYPE "int"
|
||||||
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
|
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
|
||||||
index b83b304..b85359e 100644
|
index 132ca20fd7d..119ee5bbc8c 100644
|
||||||
--- a/gcc/config/rs6000/rs6000.h
|
--- a/gcc/config/rs6000/rs6000.h
|
||||||
+++ b/gcc/config/rs6000/rs6000.h
|
+++ b/gcc/config/rs6000/rs6000.h
|
||||||
@@ -212,6 +212,7 @@
|
@@ -196,6 +196,7 @@ ASM_OPT_ANY
|
||||||
{ "asm_cpu_476", ASM_CPU_476_SPEC }, \
|
|
||||||
SUBTARGET_EXTRA_SPECS
|
|
||||||
|
|
||||||
+#if 0
|
|
||||||
/* -mcpu=native handling only makes sense with compiler running on
|
/* -mcpu=native handling only makes sense with compiler running on
|
||||||
an PowerPC chip. If changing this condition, also change
|
an PowerPC chip. If changing this condition, also change
|
||||||
the condition in driver-rs6000.c. */
|
the condition in driver-rs6000.c. */
|
||||||
@@ -226,6 +227,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
|
+#if 0
|
||||||
|
#if defined(__powerpc__) || defined(__POWERPC__) || defined(_AIX)
|
||||||
|
/* In driver-rs6000.c. */
|
||||||
|
extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||||
|
@@ -207,6 +208,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
|
||||||
#else
|
#else
|
||||||
#define ASM_CPU_NATIVE_SPEC "%(asm_default)"
|
#define ASM_CPU_NATIVE_SPEC "%(asm_default)"
|
||||||
#endif
|
#endif
|
||||||
@@ -57,42 +86,11 @@ index b83b304..b85359e 100644
|
|||||||
|
|
||||||
#ifndef CC1_CPU_SPEC
|
#ifndef CC1_CPU_SPEC
|
||||||
#ifdef HAVE_LOCAL_CPU_DETECT
|
#ifdef HAVE_LOCAL_CPU_DETECT
|
||||||
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
|
|
||||||
index 4d69c1d..af2d7b5 100644
|
|
||||||
--- a/gcc/config/rs6000/rs6000.md
|
|
||||||
+++ b/gcc/config/rs6000/rs6000.md
|
|
||||||
@@ -5625,19 +5625,19 @@
|
|
||||||
tmp = gen_reg_rtx (DImode);
|
|
||||||
|
|
||||||
emit_insn (gen_fctiwz_<mode> (tmp, src));
|
|
||||||
- if (MEM_P (dest))
|
|
||||||
+ if (TARGET_POWERPC64 && (TARGET_MFPGPR || TARGET_DIRECT_MOVE))
|
|
||||||
{
|
|
||||||
- dest = rs6000_address_for_fpconvert (dest);
|
|
||||||
- emit_insn (gen_stfiwx (dest, tmp));
|
|
||||||
+ dest = gen_lowpart (DImode, dest);
|
|
||||||
+ emit_move_insn (dest, tmp);
|
|
||||||
DONE;
|
|
||||||
}
|
|
||||||
- else if (TARGET_POWERPC64 && (TARGET_MFPGPR || TARGET_DIRECT_MOVE))
|
|
||||||
+ else if (MEM_P (dest) && MEM_ALIGN (dest) >= 32)
|
|
||||||
{
|
|
||||||
- dest = gen_lowpart (DImode, dest);
|
|
||||||
- emit_move_insn (dest, tmp);
|
|
||||||
+ dest = rs6000_address_for_fpconvert (dest);
|
|
||||||
+ emit_insn (gen_stfiwx (dest, tmp));
|
|
||||||
DONE;
|
|
||||||
}
|
|
||||||
- else
|
|
||||||
+ else
|
|
||||||
{
|
|
||||||
rtx stack = rs6000_allocate_stack_temp (SImode, false, true);
|
|
||||||
emit_insn (gen_stfiwx (stack, tmp));
|
|
||||||
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
|
||||||
index bb19d0d..74d1e47 100644
|
index 9ade72114e9..cede792d3a7 100644
|
||||||
--- a/gcc/config/rs6000/sysv4.h
|
--- a/gcc/config/rs6000/sysv4.h
|
||||||
+++ b/gcc/config/rs6000/sysv4.h
|
+++ b/gcc/config/rs6000/sysv4.h
|
||||||
@@ -565,7 +565,11 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
@@ -590,7 +590,11 @@ GNU_USER_TARGET_CC1_SPEC
|
||||||
|
|
||||||
/* Default starting address if specified. */
|
/* Default starting address if specified. */
|
||||||
#define LINK_START_SPEC "\
|
#define LINK_START_SPEC "\
|
||||||
@@ -105,7 +103,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
myellowknife : %(link_start_yellowknife) ; \
|
myellowknife : %(link_start_yellowknife) ; \
|
||||||
mmvme : %(link_start_mvme) ; \
|
mmvme : %(link_start_mvme) ; \
|
||||||
msim : %(link_start_sim) ; \
|
msim : %(link_start_sim) ; \
|
||||||
@@ -596,7 +600,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
@@ -621,7 +625,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||||
|
|
||||||
/* Any specific OS flags. */
|
/* Any specific OS flags. */
|
||||||
#define LINK_OS_SPEC "\
|
#define LINK_OS_SPEC "\
|
||||||
@@ -115,7 +113,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
myellowknife : %(link_os_yellowknife) ; \
|
myellowknife : %(link_os_yellowknife) ; \
|
||||||
mmvme : %(link_os_mvme) ; \
|
mmvme : %(link_os_mvme) ; \
|
||||||
msim : %(link_os_sim) ; \
|
msim : %(link_os_sim) ; \
|
||||||
@@ -614,7 +619,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
@@ -636,7 +641,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||||
/* Override rs6000.h definition. */
|
/* Override rs6000.h definition. */
|
||||||
#undef CPP_SPEC
|
#undef CPP_SPEC
|
||||||
#define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
|
#define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
|
||||||
@@ -127,7 +125,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
myellowknife : %(cpp_os_yellowknife) ; \
|
myellowknife : %(cpp_os_yellowknife) ; \
|
||||||
mmvme : %(cpp_os_mvme) ; \
|
mmvme : %(cpp_os_mvme) ; \
|
||||||
msim : %(cpp_os_sim) ; \
|
msim : %(cpp_os_sim) ; \
|
||||||
@@ -628,7 +636,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
@@ -650,7 +658,10 @@ GNU_USER_TARGET_CC1_SPEC
|
||||||
|
|
||||||
#undef STARTFILE_SPEC
|
#undef STARTFILE_SPEC
|
||||||
#define STARTFILE_SPEC "\
|
#define STARTFILE_SPEC "\
|
||||||
@@ -139,7 +137,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
myellowknife : %(startfile_yellowknife) ; \
|
myellowknife : %(startfile_yellowknife) ; \
|
||||||
mmvme : %(startfile_mvme) ; \
|
mmvme : %(startfile_mvme) ; \
|
||||||
msim : %(startfile_sim) ; \
|
msim : %(startfile_sim) ; \
|
||||||
@@ -642,7 +653,8 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
@@ -664,7 +675,8 @@ GNU_USER_TARGET_CC1_SPEC
|
||||||
|
|
||||||
#undef LIB_SPEC
|
#undef LIB_SPEC
|
||||||
#define LIB_SPEC "\
|
#define LIB_SPEC "\
|
||||||
@@ -149,7 +147,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
myellowknife : %(lib_yellowknife) ; \
|
myellowknife : %(lib_yellowknife) ; \
|
||||||
mmvme : %(lib_mvme) ; \
|
mmvme : %(lib_mvme) ; \
|
||||||
msim : %(lib_sim) ; \
|
msim : %(lib_sim) ; \
|
||||||
@@ -652,11 +664,12 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
@@ -674,11 +686,12 @@ GNU_USER_TARGET_CC1_SPEC
|
||||||
mcall-openbsd: %(lib_openbsd) ; \
|
mcall-openbsd: %(lib_openbsd) ; \
|
||||||
: %(lib_default) }"
|
: %(lib_default) }"
|
||||||
|
|
||||||
@@ -164,7 +162,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
myellowknife : %(endfile_yellowknife) ; \
|
myellowknife : %(endfile_yellowknife) ; \
|
||||||
mmvme : %(endfile_mvme) ; \
|
mmvme : %(endfile_mvme) ; \
|
||||||
msim : %(endfile_sim) ; \
|
msim : %(endfile_sim) ; \
|
||||||
@@ -672,16 +685,27 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
|
@@ -694,16 +707,27 @@ GNU_USER_TARGET_CC1_SPEC
|
||||||
|
|
||||||
/* Motorola ADS support. */
|
/* Motorola ADS support. */
|
||||||
#define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
|
#define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
|
||||||
@@ -192,7 +190,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
|
|
||||||
/* Motorola Yellowknife support. */
|
/* Motorola Yellowknife support. */
|
||||||
#define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
|
#define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
|
||||||
@@ -882,6 +906,7 @@ ncrtn.o%s"
|
@@ -851,6 +875,7 @@ ncrtn.o%s"
|
||||||
#undef SUBTARGET_EXTRA_SPECS
|
#undef SUBTARGET_EXTRA_SPECS
|
||||||
#define SUBTARGET_EXTRA_SPECS \
|
#define SUBTARGET_EXTRA_SPECS \
|
||||||
{ "crtsavres_default", CRTSAVRES_DEFAULT_SPEC }, \
|
{ "crtsavres_default", CRTSAVRES_DEFAULT_SPEC }, \
|
||||||
@@ -200,7 +198,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
{ "lib_ads", LIB_ADS_SPEC }, \
|
{ "lib_ads", LIB_ADS_SPEC }, \
|
||||||
{ "lib_yellowknife", LIB_YELLOWKNIFE_SPEC }, \
|
{ "lib_yellowknife", LIB_YELLOWKNIFE_SPEC }, \
|
||||||
{ "lib_mvme", LIB_MVME_SPEC }, \
|
{ "lib_mvme", LIB_MVME_SPEC }, \
|
||||||
@@ -891,6 +916,7 @@ ncrtn.o%s"
|
@@ -860,6 +885,7 @@ ncrtn.o%s"
|
||||||
{ "lib_netbsd", LIB_NETBSD_SPEC }, \
|
{ "lib_netbsd", LIB_NETBSD_SPEC }, \
|
||||||
{ "lib_openbsd", LIB_OPENBSD_SPEC }, \
|
{ "lib_openbsd", LIB_OPENBSD_SPEC }, \
|
||||||
{ "lib_default", LIB_DEFAULT_SPEC }, \
|
{ "lib_default", LIB_DEFAULT_SPEC }, \
|
||||||
@@ -208,7 +206,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
{ "startfile_ads", STARTFILE_ADS_SPEC }, \
|
{ "startfile_ads", STARTFILE_ADS_SPEC }, \
|
||||||
{ "startfile_yellowknife", STARTFILE_YELLOWKNIFE_SPEC }, \
|
{ "startfile_yellowknife", STARTFILE_YELLOWKNIFE_SPEC }, \
|
||||||
{ "startfile_mvme", STARTFILE_MVME_SPEC }, \
|
{ "startfile_mvme", STARTFILE_MVME_SPEC }, \
|
||||||
@@ -900,6 +926,7 @@ ncrtn.o%s"
|
@@ -869,6 +895,7 @@ ncrtn.o%s"
|
||||||
{ "startfile_netbsd", STARTFILE_NETBSD_SPEC }, \
|
{ "startfile_netbsd", STARTFILE_NETBSD_SPEC }, \
|
||||||
{ "startfile_openbsd", STARTFILE_OPENBSD_SPEC }, \
|
{ "startfile_openbsd", STARTFILE_OPENBSD_SPEC }, \
|
||||||
{ "startfile_default", STARTFILE_DEFAULT_SPEC }, \
|
{ "startfile_default", STARTFILE_DEFAULT_SPEC }, \
|
||||||
@@ -216,7 +214,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
{ "endfile_ads", ENDFILE_ADS_SPEC }, \
|
{ "endfile_ads", ENDFILE_ADS_SPEC }, \
|
||||||
{ "endfile_yellowknife", ENDFILE_YELLOWKNIFE_SPEC }, \
|
{ "endfile_yellowknife", ENDFILE_YELLOWKNIFE_SPEC }, \
|
||||||
{ "endfile_mvme", ENDFILE_MVME_SPEC }, \
|
{ "endfile_mvme", ENDFILE_MVME_SPEC }, \
|
||||||
@@ -911,7 +938,11 @@ ncrtn.o%s"
|
@@ -880,7 +907,11 @@ ncrtn.o%s"
|
||||||
{ "endfile_default", ENDFILE_DEFAULT_SPEC }, \
|
{ "endfile_default", ENDFILE_DEFAULT_SPEC }, \
|
||||||
{ "link_shlib", LINK_SHLIB_SPEC }, \
|
{ "link_shlib", LINK_SHLIB_SPEC }, \
|
||||||
{ "link_start", LINK_START_SPEC }, \
|
{ "link_start", LINK_START_SPEC }, \
|
||||||
@@ -228,7 +226,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
{ "link_start_yellowknife", LINK_START_YELLOWKNIFE_SPEC }, \
|
{ "link_start_yellowknife", LINK_START_YELLOWKNIFE_SPEC }, \
|
||||||
{ "link_start_mvme", LINK_START_MVME_SPEC }, \
|
{ "link_start_mvme", LINK_START_MVME_SPEC }, \
|
||||||
{ "link_start_sim", LINK_START_SIM_SPEC }, \
|
{ "link_start_sim", LINK_START_SIM_SPEC }, \
|
||||||
@@ -921,6 +952,7 @@ ncrtn.o%s"
|
@@ -890,6 +921,7 @@ ncrtn.o%s"
|
||||||
{ "link_start_openbsd", LINK_START_OPENBSD_SPEC }, \
|
{ "link_start_openbsd", LINK_START_OPENBSD_SPEC }, \
|
||||||
{ "link_start_default", LINK_START_DEFAULT_SPEC }, \
|
{ "link_start_default", LINK_START_DEFAULT_SPEC }, \
|
||||||
{ "link_os", LINK_OS_SPEC }, \
|
{ "link_os", LINK_OS_SPEC }, \
|
||||||
@@ -236,7 +234,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
{ "link_os_ads", LINK_OS_ADS_SPEC }, \
|
{ "link_os_ads", LINK_OS_ADS_SPEC }, \
|
||||||
{ "link_os_yellowknife", LINK_OS_YELLOWKNIFE_SPEC }, \
|
{ "link_os_yellowknife", LINK_OS_YELLOWKNIFE_SPEC }, \
|
||||||
{ "link_os_mvme", LINK_OS_MVME_SPEC }, \
|
{ "link_os_mvme", LINK_OS_MVME_SPEC }, \
|
||||||
@@ -932,6 +964,9 @@ ncrtn.o%s"
|
@@ -901,6 +933,9 @@ ncrtn.o%s"
|
||||||
{ "link_os_default", LINK_OS_DEFAULT_SPEC }, \
|
{ "link_os_default", LINK_OS_DEFAULT_SPEC }, \
|
||||||
{ "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
|
{ "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
|
||||||
{ "link_secure_plt", LINK_SECURE_PLT_SPEC }, \
|
{ "link_secure_plt", LINK_SECURE_PLT_SPEC }, \
|
||||||
@@ -247,7 +245,7 @@ index bb19d0d..74d1e47 100644
|
|||||||
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
|
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
|
||||||
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
|
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
|
||||||
diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
|
diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
|
||||||
index 34fea0d..084a8ae 100644
|
index b49ba261f3c..4eda763dfca 100644
|
||||||
--- a/gcc/config/rs6000/sysv4.opt
|
--- a/gcc/config/rs6000/sysv4.opt
|
||||||
+++ b/gcc/config/rs6000/sysv4.opt
|
+++ b/gcc/config/rs6000/sysv4.opt
|
||||||
@@ -124,6 +124,26 @@ mads
|
@@ -124,6 +124,26 @@ mads
|
||||||
@@ -278,10 +276,10 @@ index 34fea0d..084a8ae 100644
|
|||||||
Target RejectNegative
|
Target RejectNegative
|
||||||
Link with libyk.a, libc.a and crt0.o.
|
Link with libyk.a, libc.a and crt0.o.
|
||||||
diff --git a/gcc/configure b/gcc/configure
|
diff --git a/gcc/configure b/gcc/configure
|
||||||
index 6121e16..6584112 100755
|
index eb6061c1631..4c6e993ca3a 100755
|
||||||
--- a/gcc/configure
|
--- a/gcc/configure
|
||||||
+++ b/gcc/configure
|
+++ b/gcc/configure
|
||||||
@@ -11692,7 +11692,7 @@ case ${enable_threads} in
|
@@ -12208,7 +12208,7 @@ case ${enable_threads} in
|
||||||
# default
|
# default
|
||||||
target_thread_file='single'
|
target_thread_file='single'
|
||||||
;;
|
;;
|
||||||
@@ -291,10 +289,10 @@ index 6121e16..6584112 100755
|
|||||||
target_thread_file=${enable_threads}
|
target_thread_file=${enable_threads}
|
||||||
;;
|
;;
|
||||||
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||||||
index b066cc6..c42b3ef 100644
|
index 715fcba0482..779743b69ee 100644
|
||||||
--- a/gcc/configure.ac
|
--- a/gcc/configure.ac
|
||||||
+++ b/gcc/configure.ac
|
+++ b/gcc/configure.ac
|
||||||
@@ -1611,7 +1611,7 @@ case ${enable_threads} in
|
@@ -1800,7 +1800,7 @@ case ${enable_threads} in
|
||||||
# default
|
# default
|
||||||
target_thread_file='single'
|
target_thread_file='single'
|
||||||
;;
|
;;
|
||||||
@@ -304,7 +302,7 @@ index b066cc6..c42b3ef 100644
|
|||||||
target_thread_file=${enable_threads}
|
target_thread_file=${enable_threads}
|
||||||
;;
|
;;
|
||||||
diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
|
diff --git a/libgcc/config/rs6000/crtrestvr.S b/libgcc/config/rs6000/crtrestvr.S
|
||||||
index ba2b262..8d86610 100644
|
index 260fe4d1af6..664808cd19c 100644
|
||||||
--- a/libgcc/config/rs6000/crtrestvr.S
|
--- a/libgcc/config/rs6000/crtrestvr.S
|
||||||
+++ b/libgcc/config/rs6000/crtrestvr.S
|
+++ b/libgcc/config/rs6000/crtrestvr.S
|
||||||
@@ -24,7 +24,7 @@
|
@@ -24,7 +24,7 @@
|
||||||
@@ -322,7 +320,7 @@ index ba2b262..8d86610 100644
|
|||||||
#endif
|
#endif
|
||||||
+#endif
|
+#endif
|
||||||
diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
|
diff --git a/libgcc/config/rs6000/crtsavevr.S b/libgcc/config/rs6000/crtsavevr.S
|
||||||
index 077e33f..b7be68b 100644
|
index 7e1d5c5df98..2c62480d165 100644
|
||||||
--- a/libgcc/config/rs6000/crtsavevr.S
|
--- a/libgcc/config/rs6000/crtsavevr.S
|
||||||
+++ b/libgcc/config/rs6000/crtsavevr.S
|
+++ b/libgcc/config/rs6000/crtsavevr.S
|
||||||
@@ -24,7 +24,7 @@
|
@@ -24,7 +24,7 @@
|
||||||
@@ -341,10 +339,10 @@ index 077e33f..b7be68b 100644
|
|||||||
+#endif
|
+#endif
|
||||||
diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
|
diff --git a/libgcc/config/rs6000/gthr-dkp.c b/libgcc/config/rs6000/gthr-dkp.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..94d6ba9
|
index 00000000000..26180aa7f36
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgcc/config/rs6000/gthr-dkp.c
|
+++ b/libgcc/config/rs6000/gthr-dkp.c
|
||||||
@@ -0,0 +1,349 @@
|
@@ -0,0 +1,319 @@
|
||||||
+/* Threads compatibility routines for libgcc2 and libobjc. */
|
+/* Threads compatibility routines for libgcc2 and libobjc. */
|
||||||
+/* Compile this one with gcc. */
|
+/* Compile this one with gcc. */
|
||||||
+/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
+/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
||||||
@@ -370,336 +368,306 @@ index 0000000..94d6ba9
|
|||||||
+see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
+see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
+<http://www.gnu.org/licenses/>. */
|
+<http://www.gnu.org/licenses/>. */
|
||||||
+
|
+
|
||||||
|
+#define _BUILDING_LIBGCC
|
||||||
+#include "gthr-dkp.h"
|
+#include "gthr-dkp.h"
|
||||||
+#include <stddef.h>
|
+#include <stddef.h>
|
||||||
+
|
+
|
||||||
+__gthread_impl_t __gthread_impl = {
|
|
||||||
+ NULL, // active
|
|
||||||
+ NULL, // create
|
|
||||||
+ NULL, // join
|
|
||||||
+ NULL, // detach
|
|
||||||
+ NULL, // equal
|
|
||||||
+ NULL, // self
|
|
||||||
+ NULL, // yield
|
|
||||||
+ NULL, // once
|
|
||||||
+ NULL, // key_create
|
|
||||||
+ NULL, // key_delete
|
|
||||||
+ NULL, // getspecific
|
|
||||||
+ NULL, // setspecific
|
|
||||||
+ NULL, // mutex_init_function
|
|
||||||
+ NULL, // mutex_destroy
|
|
||||||
+ NULL, // mutex_lock
|
|
||||||
+ NULL, // mutex_trylock
|
|
||||||
+ NULL, // mutex_unlock
|
|
||||||
+ NULL, // recursive_mutex_init_function
|
|
||||||
+ NULL, // recursive_mutex_lock
|
|
||||||
+ NULL, // recursive_mutex_trylock
|
|
||||||
+ NULL, // recursive_mutex_unlock
|
|
||||||
+ NULL, // recursive_mutex_destroy
|
|
||||||
+ NULL, // cond_init_function
|
|
||||||
+ NULL, // cond_broadcast
|
|
||||||
+ NULL, // cond_signal
|
|
||||||
+ NULL, // cond_wait
|
|
||||||
+ NULL, // cond_timedwait
|
|
||||||
+ NULL, // cond_wait_recursive
|
|
||||||
+ NULL, // cond_destroy
|
|
||||||
+};
|
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_active_p (void)
|
+__gthread_active_p (void)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.active) {
|
+ if (!__has_gthr_impl(active)) {
|
||||||
+ return 0;
|
+ return 0;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.active();
|
+ return __gthr_impl_active();
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
|
+__gthread_create (__gthread_t *__threadid, void *(*__func) (void*),
|
||||||
+ void *__args)
|
+ void *__args)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.create) {
|
+ if (!__has_gthr_impl(create)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.create(__threadid, __func, __args);
|
+ return __gthr_impl_create(__threadid, __func, __args);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_join (__gthread_t __threadid, void **__value_ptr)
|
+__gthread_join (__gthread_t __threadid, void **__value_ptr)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.join) {
|
+ if (!__has_gthr_impl(join)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.join(__threadid, __value_ptr);
|
+ return __gthr_impl_join(__threadid, __value_ptr);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_detach (__gthread_t __threadid)
|
+__gthread_detach (__gthread_t __threadid)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.detach) {
|
+ if (!__has_gthr_impl(detach)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.detach(__threadid);
|
+ return __gthr_impl_detach(__threadid);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_equal (__gthread_t __t1, __gthread_t __t2)
|
+__gthread_equal (__gthread_t __t1, __gthread_t __t2)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.equal) {
|
+ if (!__has_gthr_impl(equal)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.equal(__t1, __t2);
|
+ return __gthr_impl_equal(__t1, __t2);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+__gthread_t
|
+__gthread_t
|
||||||
+__gthread_self (void)
|
+__gthread_self (void)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.self) {
|
+ if (!__has_gthr_impl(self)) {
|
||||||
+ __gthread_t result = { 0 };
|
+ __gthread_t result = { 0 };
|
||||||
+ return result;
|
+ return result;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.self();
|
+ return __gthr_impl_self();
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_yield (void)
|
+__gthread_yield (void)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.yield) {
|
+ if (!__has_gthr_impl(yield)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.yield();
|
+ return __gthr_impl_yield();
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_once (__gthread_once_t *__once, void (*__func) (void))
|
+__gthread_once (__gthread_once_t *__once, void (*__func) (void))
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.once) {
|
+ if (!__has_gthr_impl(once)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.once(__once, __func);
|
+ return __gthr_impl_once(__once, __func);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
|
+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.key_create) {
|
+ if (!__has_gthr_impl(key_create)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.key_create(__key, __dtor);
|
+ return __gthr_impl_key_create(__key, __dtor);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_key_delete (__gthread_key_t __key)
|
+__gthread_key_delete (__gthread_key_t __key)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.key_delete) {
|
+ if (!__has_gthr_impl(key_delete)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.key_delete(__key);
|
+ return __gthr_impl_key_delete(__key);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+void *
|
+void *
|
||||||
+__gthread_getspecific (__gthread_key_t __key)
|
+__gthread_getspecific (__gthread_key_t __key)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.getspecific) {
|
+ if (!__has_gthr_impl(getspecific)) {
|
||||||
+ return NULL;
|
+ return NULL;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.getspecific(__key);
|
+ return __gthr_impl_getspecific(__key);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
|
+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.setspecific) {
|
+ if (!__has_gthr_impl(setspecific)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.setspecific(__key, __ptr);
|
+ return __gthr_impl_setspecific(__key, __ptr);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+void
|
+void
|
||||||
+__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
|
+__gthread_mutex_init_function (__gthread_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (__gthread_impl.mutex_init_function) {
|
+ if (__has_gthr_impl(mutex_init_function)) {
|
||||||
+ __gthread_impl.mutex_init_function(__mutex);
|
+ __gthr_impl_mutex_init_function(__mutex);
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
|
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.mutex_destroy) {
|
+ if (!__has_gthr_impl(mutex_destroy)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.mutex_destroy(__mutex);
|
+ return __gthr_impl_mutex_destroy(__mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_mutex_lock (__gthread_mutex_t *__mutex)
|
+__gthread_mutex_lock (__gthread_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.mutex_lock) {
|
+ if (!__has_gthr_impl(mutex_lock)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.mutex_lock(__mutex);
|
+ return __gthr_impl_mutex_lock(__mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
|
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.mutex_trylock) {
|
+ if (!__has_gthr_impl(mutex_trylock)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.mutex_trylock(__mutex);
|
+ return __gthr_impl_mutex_trylock(__mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
|
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.mutex_unlock) {
|
+ if (!__has_gthr_impl(mutex_unlock)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.mutex_unlock(__mutex);
|
+ return __gthr_impl_mutex_unlock(__mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
|
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.recursive_mutex_init_function) {
|
+ if (!__has_gthr_impl(recursive_mutex_init_function)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.recursive_mutex_init_function(__mutex);
|
+ return __gthr_impl_recursive_mutex_init_function(__mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
|
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.recursive_mutex_lock) {
|
+ if (!__has_gthr_impl(recursive_mutex_lock)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.recursive_mutex_lock(__mutex);
|
+ return __gthr_impl_recursive_mutex_lock(__mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
|
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.recursive_mutex_trylock) {
|
+ if (!__has_gthr_impl(recursive_mutex_trylock)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.recursive_mutex_trylock(__mutex);
|
+ return __gthr_impl_recursive_mutex_trylock(__mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
|
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.recursive_mutex_unlock) {
|
+ if (!__has_gthr_impl(recursive_mutex_unlock)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.recursive_mutex_unlock(__mutex);
|
+ return __gthr_impl_recursive_mutex_unlock(__mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
|
+__gthread_recursive_mutex_destroy (__gthread_recursive_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.recursive_mutex_destroy) {
|
+ if (!__has_gthr_impl(recursive_mutex_destroy)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.recursive_mutex_destroy(__mutex);
|
+ return __gthr_impl_recursive_mutex_destroy(__mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+void
|
+void
|
||||||
+__gthread_cond_init_function (__gthread_cond_t *__cond)
|
+__gthread_cond_init_function (__gthread_cond_t *__cond)
|
||||||
+{
|
+{
|
||||||
+ if (__gthread_impl.cond_init_function) {
|
+ if (__has_gthr_impl(cond_init_function)) {
|
||||||
+ __gthread_impl.cond_init_function(__cond);
|
+ __gthr_impl_cond_init_function(__cond);
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_cond_broadcast (__gthread_cond_t *__cond)
|
+__gthread_cond_broadcast (__gthread_cond_t *__cond)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.cond_broadcast) {
|
+ if (!__has_gthr_impl(cond_broadcast)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.cond_broadcast(__cond);
|
+ return __gthr_impl_cond_broadcast(__cond);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_cond_signal (__gthread_cond_t *__cond)
|
+__gthread_cond_signal (__gthread_cond_t *__cond)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.cond_signal) {
|
+ if (!__has_gthr_impl(cond_signal)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.cond_signal(__cond);
|
+ return __gthr_impl_cond_signal(__cond);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
|
+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.cond_wait) {
|
+ if (!__has_gthr_impl(cond_wait)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.cond_wait(__cond, __mutex);
|
+ return __gthr_impl_cond_wait(__cond, __mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
+__gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
||||||
+ const __gthread_time_t *__abs_timeout)
|
+ const __gthread_time_t *__abs_timeout)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.cond_timedwait) {
|
+ if (!__has_gthr_impl(cond_timedwait)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.cond_timedwait(__cond, __mutex, __abs_timeout);
|
+ return __gthr_impl_cond_timedwait(__cond, __mutex, __abs_timeout);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
|
+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
|
||||||
+ __gthread_recursive_mutex_t *__mutex)
|
+ __gthread_recursive_mutex_t *__mutex)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.cond_wait_recursive) {
|
+ if (!__has_gthr_impl(cond_wait_recursive)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.cond_wait_recursive(__cond, __mutex);
|
+ return __gthr_impl_cond_wait_recursive(__cond, __mutex);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_cond_destroy (__gthread_cond_t* __cond)
|
+__gthread_cond_destroy (__gthread_cond_t* __cond)
|
||||||
+{
|
+{
|
||||||
+ if (!__gthread_impl.cond_destroy) {
|
+ if (!__has_gthr_impl(cond_destroy)) {
|
||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return __gthread_impl.cond_destroy(__cond);
|
+ return __gthr_impl_cond_destroy(__cond);
|
||||||
+}
|
+}
|
||||||
diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
|
diff --git a/libgcc/config/rs6000/gthr-dkp.h b/libgcc/config/rs6000/gthr-dkp.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..281c19d
|
index 00000000000..72ecf82ab83
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgcc/config/rs6000/gthr-dkp.h
|
+++ b/libgcc/config/rs6000/gthr-dkp.h
|
||||||
@@ -0,0 +1,185 @@
|
@@ -0,0 +1,187 @@
|
||||||
+/* Threads compatibility routines for libgcc2 and libobjc. */
|
+/* Threads compatibility routines for libgcc2 and libobjc. */
|
||||||
+/* Compile this one with gcc. */
|
+/* Compile this one with gcc. */
|
||||||
+/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
+/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
||||||
@@ -753,42 +721,44 @@ index 0000000..281c19d
|
|||||||
+#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
|
+#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
|
||||||
+#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
|
+#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
|
||||||
+
|
+
|
||||||
+typedef struct {
|
+#ifdef _BUILDING_LIBGCC
|
||||||
+ int (*active) (void);
|
+#define __GTHR_IMPL(_name) __attribute__((weak)) __gthr_impl_##_name
|
||||||
+ int (*create) (__gthread_t *__threadid, void *(*__func) (void*),
|
+#define __has_gthr_impl(_name) (&__gthr_impl_##_name)
|
||||||
+ void *__args);
|
+#else
|
||||||
+ int (*join) (__gthread_t __threadid, void **__value_ptr);
|
+#define __GTHR_IMPL(_name) __gthr_impl_##_name
|
||||||
+ int (*detach) (__gthread_t __threadid);
|
+#endif
|
||||||
+ int (*equal) (__gthread_t __t1, __gthread_t __t2);
|
|
||||||
+ __gthread_t (*self) (void);
|
|
||||||
+ int (*yield) (void);
|
|
||||||
+ int (*once) (__gthread_once_t *__once, void (*__func) (void));
|
|
||||||
+ int (*key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
|
|
||||||
+ int (*key_delete) (__gthread_key_t __key);
|
|
||||||
+ void * (*getspecific) (__gthread_key_t __key);
|
|
||||||
+ int (*setspecific) (__gthread_key_t __key, const void *__ptr);
|
|
||||||
+ void (*mutex_init_function) (__gthread_mutex_t *__mutex);
|
|
||||||
+ int (*mutex_destroy) (__gthread_mutex_t *__mutex);
|
|
||||||
+ int (*mutex_lock) (__gthread_mutex_t *__mutex);
|
|
||||||
+ int (*mutex_trylock) (__gthread_mutex_t *__mutex);
|
|
||||||
+ int (*mutex_unlock) (__gthread_mutex_t *__mutex);
|
|
||||||
+ int (*recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
|
|
||||||
+ int (*recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
|
|
||||||
+ int (*recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
|
|
||||||
+ int (*recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
|
|
||||||
+ int (*recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
|
|
||||||
+ void (*cond_init_function) (__gthread_cond_t *__cond);
|
|
||||||
+ int (*cond_broadcast) (__gthread_cond_t *__cond);
|
|
||||||
+ int (*cond_signal) (__gthread_cond_t *__cond);
|
|
||||||
+ int (*cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
|
|
||||||
+ int (*cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
|
||||||
+ const __gthread_time_t *__abs_timeout);
|
|
||||||
+ int (*cond_wait_recursive) (__gthread_cond_t *__cond,
|
|
||||||
+ __gthread_recursive_mutex_t *__mutex);
|
|
||||||
+ int (*cond_destroy) (__gthread_cond_t* __cond);
|
|
||||||
+} __gthread_impl_t;
|
|
||||||
+
|
+
|
||||||
+extern __gthread_impl_t __gthread_impl;
|
+int __GTHR_IMPL(active) (void);
|
||||||
|
+int __GTHR_IMPL(create) (__gthread_t *__threadid, void *(*__func) (void*), void *__args);
|
||||||
|
+int __GTHR_IMPL(join) (__gthread_t __threadid, void **__value_ptr);
|
||||||
|
+int __GTHR_IMPL(detach) (__gthread_t __threadid);
|
||||||
|
+int __GTHR_IMPL(equal) (__gthread_t __t1, __gthread_t __t2);
|
||||||
|
+__gthread_t __GTHR_IMPL(self) (void);
|
||||||
|
+int __GTHR_IMPL(yield) (void);
|
||||||
|
+int __GTHR_IMPL(once) (__gthread_once_t *__once, void (*__func) (void));
|
||||||
|
+int __GTHR_IMPL(key_create) (__gthread_key_t *__key, void (*__dtor) (void *));
|
||||||
|
+int __GTHR_IMPL(key_delete) (__gthread_key_t __key);
|
||||||
|
+void * __GTHR_IMPL(getspecific) (__gthread_key_t __key);
|
||||||
|
+int __GTHR_IMPL(setspecific) (__gthread_key_t __key, const void *__ptr);
|
||||||
|
+void __GTHR_IMPL(mutex_init_function) (__gthread_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(mutex_destroy) (__gthread_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(mutex_lock) (__gthread_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(mutex_trylock) (__gthread_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(mutex_unlock) (__gthread_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(recursive_mutex_init_function) (__gthread_recursive_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(recursive_mutex_lock) (__gthread_recursive_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(recursive_mutex_trylock) (__gthread_recursive_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(recursive_mutex_unlock) (__gthread_recursive_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(recursive_mutex_destroy) (__gthread_recursive_mutex_t *__mutex);
|
||||||
|
+void __GTHR_IMPL(cond_init_function) (__gthread_cond_t *__cond);
|
||||||
|
+int __GTHR_IMPL(cond_broadcast) (__gthread_cond_t *__cond);
|
||||||
|
+int __GTHR_IMPL(cond_signal) (__gthread_cond_t *__cond);
|
||||||
|
+int __GTHR_IMPL(cond_wait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(cond_timedwait) (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex,
|
||||||
|
+ const __gthread_time_t *__abs_timeout);
|
||||||
|
+int __GTHR_IMPL(cond_wait_recursive) (__gthread_cond_t *__cond,
|
||||||
|
+ __gthread_recursive_mutex_t *__mutex);
|
||||||
|
+int __GTHR_IMPL(cond_destroy) (__gthread_cond_t* __cond);
|
||||||
+
|
+
|
||||||
+int
|
+int
|
||||||
+__gthread_active_p (void);
|
+__gthread_active_p (void);
|
||||||
@@ -886,7 +856,7 @@ index 0000000..281c19d
|
|||||||
+
|
+
|
||||||
+#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
|
+#endif /* ! _GLIBCXX_GCC_GTHR_DKP_H */
|
||||||
diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
|
diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
|
||||||
index fb812d3..7f6669d 100644
|
index fb812d3801f..7f6669d530f 100644
|
||||||
--- a/libgcc/config/rs6000/t-ppccomm
|
--- a/libgcc/config/rs6000/t-ppccomm
|
||||||
+++ b/libgcc/config/rs6000/t-ppccomm
|
+++ b/libgcc/config/rs6000/t-ppccomm
|
||||||
@@ -1,4 +1,5 @@
|
@@ -1,4 +1,5 @@
|
||||||
@@ -896,38 +866,39 @@ index fb812d3..7f6669d 100644
|
|||||||
|
|
||||||
# This can't end up in shared libgcc
|
# This can't end up in shared libgcc
|
||||||
diff --git a/libgcc/configure b/libgcc/configure
|
diff --git a/libgcc/configure b/libgcc/configure
|
||||||
index b2f3f87..c6f93f8 100644
|
index 26bf75789e0..1f663d2cfb0 100755
|
||||||
--- a/libgcc/configure
|
--- a/libgcc/configure
|
||||||
+++ b/libgcc/configure
|
+++ b/libgcc/configure
|
||||||
@@ -5442,6 +5442,7 @@ tm_file="${tm_file_}"
|
@@ -5640,6 +5640,7 @@ tm_file="${tm_file_}"
|
||||||
|
|
||||||
case $target_thread_file in
|
case $target_thread_file in
|
||||||
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
||||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
|
||||||
dce) thread_header=config/pa/gthr-dce.h ;;
|
dce) thread_header=config/pa/gthr-dce.h ;;
|
||||||
|
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||||
|
gcn) thread_header=config/gcn/gthr-gcn.h ;;
|
||||||
lynx) thread_header=config/gthr-lynx.h ;;
|
lynx) thread_header=config/gthr-lynx.h ;;
|
||||||
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
||||||
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
diff --git a/libgcc/crtstuff.c b/libgcc/crtstuff.c
|
||||||
index 5e89445..f234745 100644
|
index 3f769a1c660..e005d8304b7 100644
|
||||||
--- a/libgcc/crtstuff.c
|
--- a/libgcc/crtstuff.c
|
||||||
+++ b/libgcc/crtstuff.c
|
+++ b/libgcc/crtstuff.c
|
||||||
@@ -47,6 +47,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
@@ -325,7 +325,7 @@ register_tm_clones (void)
|
||||||
|
|
||||||
/* Target machine header files require this define. */
|
#ifdef OBJECT_FORMAT_ELF
|
||||||
#define IN_LIBGCC2
|
|
||||||
+#define USED_FOR_TARGET
|
|
||||||
|
|
||||||
/* FIXME: Including auto-host is incorrect, but until we have
|
-#if DEFAULT_USE_CXA_ATEXIT
|
||||||
identified the set of defines that need to go into auto-target.h,
|
+#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/libstdc++-v3/configure b/libstdc++-v3/configure
|
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
||||||
index 5535bfa..9f86d5d 100755
|
index 9f9c5a2419a..c9bb6c548be 100755
|
||||||
--- a/libstdc++-v3/configure
|
--- a/libstdc++-v3/configure
|
||||||
+++ b/libstdc++-v3/configure
|
+++ b/libstdc++-v3/configure
|
||||||
@@ -15180,6 +15180,7 @@ $as_echo "$target_thread_file" >&6; }
|
@@ -15637,6 +15637,7 @@ $as_echo "$target_thread_file" >&6; }
|
||||||
|
|
||||||
case $target_thread_file in
|
case $target_thread_file in
|
||||||
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
aix) thread_header=config/rs6000/gthr-aix.h ;;
|
||||||
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
|
||||||
dce) thread_header=config/pa/gthr-dce.h ;;
|
dce) thread_header=config/pa/gthr-dce.h ;;
|
||||||
|
+ dkp) thread_header=config/rs6000/gthr-dkp.h ;;
|
||||||
|
gcn) thread_header=config/gcn/gthr-gcn.h ;;
|
||||||
lynx) thread_header=config/gthr-lynx.h ;;
|
lynx) thread_header=config/gthr-lynx.h ;;
|
||||||
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
mipssde) thread_header=config/mips/gthr-mipssde.h ;;
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/libgloss/configure b/libgloss/configure
|
diff --git a/libgloss/configure b/libgloss/configure
|
||||||
index 1a4033dce..ba7aea7b0 100755
|
index 0d2918cee..bccfb07b4 100755
|
||||||
--- a/libgloss/configure
|
--- a/libgloss/configure
|
||||||
+++ b/libgloss/configure
|
+++ b/libgloss/configure
|
||||||
@@ -2599,6 +2599,8 @@ if test "${config_libnosys}" = "true"; then
|
@@ -2604,6 +2604,8 @@ if test "${config_libnosys}" = "true"; then
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -12,7 +12,7 @@ index 1a4033dce..ba7aea7b0 100755
|
|||||||
|
|
||||||
ac_config_commands="$ac_config_commands depfiles"
|
ac_config_commands="$ac_config_commands depfiles"
|
||||||
diff --git a/libgloss/configure.in b/libgloss/configure.in
|
diff --git a/libgloss/configure.in b/libgloss/configure.in
|
||||||
index 41843eed1..689e8b3ad 100644
|
index f38d5298e..db6b33ab8 100644
|
||||||
--- a/libgloss/configure.in
|
--- a/libgloss/configure.in
|
||||||
+++ b/libgloss/configure.in
|
+++ b/libgloss/configure.in
|
||||||
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
|
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
|
||||||
@@ -33,7 +33,7 @@ index 41843eed1..689e8b3ad 100644
|
|||||||
case "${target}" in
|
case "${target}" in
|
||||||
aarch64*-*-*)
|
aarch64*-*-*)
|
||||||
AC_CONFIG_SUBDIRS(aarch64)
|
AC_CONFIG_SUBDIRS(aarch64)
|
||||||
@@ -191,6 +195,10 @@ if test "${config_libnosys}" = "true"; then
|
@@ -194,6 +198,10 @@ if test "${config_libnosys}" = "true"; then
|
||||||
AC_CONFIG_SUBDIRS([libnosys])
|
AC_CONFIG_SUBDIRS([libnosys])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@ index 41843eed1..689e8b3ad 100644
|
|||||||
AC_SUBST(AS)
|
AC_SUBST(AS)
|
||||||
diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
|
diff --git a/libgloss/libsysbase/Makefile.in b/libgloss/libsysbase/Makefile.in
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..183f9acc7
|
index 000000000..bd69599a8
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/Makefile.in
|
+++ b/libgloss/libsysbase/Makefile.in
|
||||||
@@ -0,0 +1,148 @@
|
@@ -0,0 +1,148 @@
|
||||||
@@ -121,8 +121,8 @@ index 000000000..183f9acc7
|
|||||||
+ isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
|
+ isatty.o kill.o link.o lseek.o lstat.o nanosleep.o open.o read.o sbrk.o sleep.o stat.o usleep.o times.o \
|
||||||
+ unlink.o wait.o write.o _exit.o malloc_vars.o \
|
+ unlink.o wait.o write.o _exit.o malloc_vars.o \
|
||||||
+ chdir.o mkdir.o rename.o build_argv.o statvfs.o \
|
+ chdir.o mkdir.o rename.o build_argv.o statvfs.o \
|
||||||
+ flock.o syscall_support.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
|
+ flock.o handle_manager.o truncate.o ftruncate.o dirent.o fsync.o \
|
||||||
+ fchmod.o chmod.o rmdir.o utime.o scandir.o
|
+ fchmod.o chmod.o rmdir.o utime.o scandir.o syscall_support.o
|
||||||
+
|
+
|
||||||
+# Object files specific to particular targets.
|
+# Object files specific to particular targets.
|
||||||
+EVALOBJS = ${OBJS}
|
+EVALOBJS = ${OBJS}
|
||||||
@@ -143,10 +143,10 @@ index 000000000..183f9acc7
|
|||||||
+AR_FLAGS = qc
|
+AR_FLAGS = qc
|
||||||
+
|
+
|
||||||
+.c.o:
|
+.c.o:
|
||||||
+ $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
|
+ $(CC) $(CFLAGS_FOR_TARGET) -D_BUILDING_LIBSYSBASE -O2 $(INCLUDES) -c $(CFLAGS) $<
|
||||||
+
|
+
|
||||||
+.C.o:
|
+.C.o:
|
||||||
+ $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
|
+ $(CC) $(CFLAGS_FOR_TARGET) -D_BUILDING_LIBSYSBASE -O2 $(INCLUDES) -c $(CFLAGS) $<
|
||||||
+.s.o:
|
+.s.o:
|
||||||
+ $(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
|
+ $(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
|
||||||
+
|
+
|
||||||
@@ -200,7 +200,7 @@ index 000000000..183f9acc7
|
|||||||
+ $(SHELL) config.status --recheck
|
+ $(SHELL) config.status --recheck
|
||||||
diff --git a/libgloss/libsysbase/_exit.c b/libgloss/libsysbase/_exit.c
|
diff --git a/libgloss/libsysbase/_exit.c b/libgloss/libsysbase/_exit.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..e5cb5a9ed
|
index 000000000..6effb1105
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/_exit.c
|
+++ b/libgloss/libsysbase/_exit.c
|
||||||
@@ -0,0 +1,17 @@
|
@@ -0,0 +1,17 @@
|
||||||
@@ -215,8 +215,8 @@ index 000000000..e5cb5a9ed
|
|||||||
+void _exit(int rc)
|
+void _exit(int rc)
|
||||||
+{
|
+{
|
||||||
+
|
+
|
||||||
+ if ( __syscalls.exit ) {
|
+ if ( __has_syscall(exit) ) {
|
||||||
+ __syscalls.exit(rc);
|
+ __syscall_exit(rc);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ while(1);
|
+ while(1);
|
||||||
@@ -622,10 +622,10 @@ index 000000000..b6cdfaeb8
|
|||||||
+m4_include([../acinclude.m4])
|
+m4_include([../acinclude.m4])
|
||||||
diff --git a/libgloss/libsysbase/build_argv.c b/libgloss/libsysbase/build_argv.c
|
diff --git a/libgloss/libsysbase/build_argv.c b/libgloss/libsysbase/build_argv.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..3ca95d5b6
|
index 000000000..a969a0482
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/build_argv.c
|
+++ b/libgloss/libsysbase/build_argv.c
|
||||||
@@ -0,0 +1,31 @@
|
@@ -0,0 +1,32 @@
|
||||||
+struct __argv {
|
+struct __argv {
|
||||||
+ int argvMagic;
|
+ int argvMagic;
|
||||||
+ char *commandLine;
|
+ char *commandLine;
|
||||||
@@ -652,10 +652,11 @@ index 000000000..3ca95d5b6
|
|||||||
+ } while (data < end);
|
+ } while (data < end);
|
||||||
+
|
+
|
||||||
+ *end = '\0'; // Force NULL terminator for last arg
|
+ *end = '\0'; // Force NULL terminator for last arg
|
||||||
|
+ argv[argCount] = 0; // Force NULL terminator for argv
|
||||||
+
|
+
|
||||||
+ argstruct->argv = argv;
|
+ argstruct->argv = argv;
|
||||||
+ argstruct->argc = argCount;
|
+ argstruct->argc = argCount;
|
||||||
+ argstruct->endARGV = &argv[argCount];
|
+ argstruct->endARGV = &argv[argCount + 1];
|
||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/chdir.c b/libgloss/libsysbase/chdir.c
|
diff --git a/libgloss/libsysbase/chdir.c b/libgloss/libsysbase/chdir.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
@@ -902,7 +903,7 @@ index 000000000..3668b5801
|
|||||||
+
|
+
|
||||||
diff --git a/libgloss/libsysbase/clocks.c b/libgloss/libsysbase/clocks.c
|
diff --git a/libgloss/libsysbase/clocks.c b/libgloss/libsysbase/clocks.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..01cfee469
|
index 000000000..b36b5c079
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/clocks.c
|
+++ b/libgloss/libsysbase/clocks.c
|
||||||
@@ -0,0 +1,34 @@
|
@@ -0,0 +1,34 @@
|
||||||
@@ -912,8 +913,8 @@ index 000000000..01cfee469
|
|||||||
+
|
+
|
||||||
+int clock_gettime(clockid_t clock_id, struct timespec *tp)
|
+int clock_gettime(clockid_t clock_id, struct timespec *tp)
|
||||||
+{
|
+{
|
||||||
+ if ( __syscalls.clock_gettime ) {
|
+ if ( __has_syscall(clock_gettime) ) {
|
||||||
+ return __syscalls.clock_gettime(clock_id, tp);
|
+ return __syscall_clock_gettime(clock_id, tp);
|
||||||
+ } else {
|
+ } else {
|
||||||
+ errno = ENOSYS;
|
+ errno = ENOSYS;
|
||||||
+ return -1;
|
+ return -1;
|
||||||
@@ -922,8 +923,8 @@ index 000000000..01cfee469
|
|||||||
+
|
+
|
||||||
+int clock_settime(clockid_t clock_id, const struct timespec *tp)
|
+int clock_settime(clockid_t clock_id, const struct timespec *tp)
|
||||||
+{
|
+{
|
||||||
+ if ( __syscalls.clock_settime ) {
|
+ if ( __has_syscall(clock_settime) ) {
|
||||||
+ return __syscalls.clock_settime(clock_id, tp);
|
+ return __syscall_clock_settime(clock_id, tp);
|
||||||
+ } else {
|
+ } else {
|
||||||
+ errno = ENOSYS;
|
+ errno = ENOSYS;
|
||||||
+ return -1;
|
+ return -1;
|
||||||
@@ -932,8 +933,8 @@ index 000000000..01cfee469
|
|||||||
+
|
+
|
||||||
+int clock_getres (clockid_t clock_id, struct timespec *res)
|
+int clock_getres (clockid_t clock_id, struct timespec *res)
|
||||||
+{
|
+{
|
||||||
+ if ( __syscalls.clock_getres ) {
|
+ if ( __has_syscall(clock_getres) ) {
|
||||||
+ return __syscalls.clock_getres(clock_id, res);
|
+ return __syscall_clock_getres(clock_id, res);
|
||||||
+ } else {
|
+ } else {
|
||||||
+ errno = ENOSYS;
|
+ errno = ENOSYS;
|
||||||
+ return -1;
|
+ return -1;
|
||||||
@@ -5937,7 +5938,7 @@ index 000000000..ec3b84037
|
|||||||
+
|
+
|
||||||
diff --git a/libgloss/libsysbase/gettod.c b/libgloss/libsysbase/gettod.c
|
diff --git a/libgloss/libsysbase/gettod.c b/libgloss/libsysbase/gettod.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..11dc528fa
|
index 000000000..ee8947f51
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/gettod.c
|
+++ b/libgloss/libsysbase/gettod.c
|
||||||
@@ -0,0 +1,26 @@
|
@@ -0,0 +1,26 @@
|
||||||
@@ -5960,7 +5961,7 @@ index 000000000..11dc528fa
|
|||||||
+ struct _reent *ptr = _REENT;
|
+ struct _reent *ptr = _REENT;
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+ if ( __syscalls.gettod_r ) return __syscalls.gettod_r(ptr, ptimeval, ptimezone);
|
+ if ( __has_syscall(gettod_r) ) return __syscall_gettod_r(ptr, ptimeval, ptimezone);
|
||||||
+
|
+
|
||||||
+ ptr->_errno = ENOSYS;
|
+ ptr->_errno = ENOSYS;
|
||||||
+ return -1;
|
+ return -1;
|
||||||
@@ -6517,7 +6518,7 @@ index 000000000..b4fcbd3d7
|
|||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/nanosleep.c b/libgloss/libsysbase/nanosleep.c
|
diff --git a/libgloss/libsysbase/nanosleep.c b/libgloss/libsysbase/nanosleep.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..3c96fc61b
|
index 000000000..a233b9df6
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/nanosleep.c
|
+++ b/libgloss/libsysbase/nanosleep.c
|
||||||
@@ -0,0 +1,14 @@
|
@@ -0,0 +1,14 @@
|
||||||
@@ -6527,8 +6528,8 @@ index 000000000..3c96fc61b
|
|||||||
+
|
+
|
||||||
+int nanosleep(const struct timespec *req, struct timespec *rem)
|
+int nanosleep(const struct timespec *req, struct timespec *rem)
|
||||||
+{
|
+{
|
||||||
+ if ( __syscalls.nanosleep ) {
|
+ if ( __has_syscall(nanosleep) ) {
|
||||||
+ return __syscalls.nanosleep(req, rem);
|
+ return __syscall_nanosleep(req, rem);
|
||||||
+ } else {
|
+ } else {
|
||||||
+ *rem = *req;
|
+ *rem = *req;
|
||||||
+ errno = ENOSYS;
|
+ errno = ENOSYS;
|
||||||
@@ -6710,7 +6711,7 @@ index 000000000..2692a2997
|
|||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/sbrk.c b/libgloss/libsysbase/sbrk.c
|
diff --git a/libgloss/libsysbase/sbrk.c b/libgloss/libsysbase/sbrk.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..e2bdb9edc
|
index 000000000..83d922d85
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/sbrk.c
|
+++ b/libgloss/libsysbase/sbrk.c
|
||||||
@@ -0,0 +1,26 @@
|
@@ -0,0 +1,26 @@
|
||||||
@@ -6730,8 +6731,8 @@ index 000000000..e2bdb9edc
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
+ if ( __syscalls.sbrk_r ) {
|
+ if ( __has_syscall(sbrk_r) ) {
|
||||||
+ return __syscalls.sbrk_r(ptr, incr);
|
+ return __syscall_sbrk_r(ptr, incr);
|
||||||
+ } else {
|
+ } else {
|
||||||
+
|
+
|
||||||
+ ptr->_errno = ENOMEM;
|
+ ptr->_errno = ENOMEM;
|
||||||
@@ -6921,34 +6922,16 @@ index 000000000..84e221340
|
|||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/syscall_support.c b/libgloss/libsysbase/syscall_support.c
|
diff --git a/libgloss/libsysbase/syscall_support.c b/libgloss/libsysbase/syscall_support.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..f02714764
|
index 000000000..39e75fd0b
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/libgloss/libsysbase/syscall_support.c
|
+++ b/libgloss/libsysbase/syscall_support.c
|
||||||
@@ -0,0 +1,67 @@
|
@@ -0,0 +1,49 @@
|
||||||
+#include <sys/iosupport.h>
|
+#include <sys/iosupport.h>
|
||||||
+
|
+
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+__syscalls_t __syscalls = {
|
|
||||||
+//---------------------------------------------------------------------------------
|
|
||||||
+ NULL, // sbrk
|
|
||||||
+ NULL, // lock_init
|
|
||||||
+ NULL, // lock_close
|
|
||||||
+ NULL, // lock_release
|
|
||||||
+ NULL, // lock_acquire
|
|
||||||
+ NULL, // malloc_lock
|
|
||||||
+ NULL, // malloc_unlock
|
|
||||||
+ NULL, // exit
|
|
||||||
+ NULL, // gettod_r
|
|
||||||
+ NULL, // clock_gettime
|
|
||||||
+ NULL, // clock_settime
|
|
||||||
+ NULL, // clock_getres
|
|
||||||
+ NULL // nanosleep
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+int __libc_lock_init(int *lock,int recursive) {
|
+int __libc_lock_init(int *lock,int recursive) {
|
||||||
+
|
+
|
||||||
+ if ( __syscalls.lock_init ) {
|
+ if ( __has_syscall(lock_init) ) {
|
||||||
+ return __syscalls.lock_init(lock, recursive);
|
+ return __syscall_lock_init(lock, recursive);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return 0;
|
+ return 0;
|
||||||
@@ -6956,8 +6939,8 @@ index 000000000..f02714764
|
|||||||
+
|
+
|
||||||
+int __libc_lock_close( int *lock ) {
|
+int __libc_lock_close( int *lock ) {
|
||||||
+
|
+
|
||||||
+ if ( __syscalls.lock_close) {
|
+ if ( __has_syscall(lock_close)) {
|
||||||
+ return __syscalls.lock_close(lock);
|
+ return __syscall_lock_close(lock);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return 0;
|
+ return 0;
|
||||||
@@ -6965,8 +6948,8 @@ index 000000000..f02714764
|
|||||||
+
|
+
|
||||||
+int __libc_lock_release( int *lock ) {
|
+int __libc_lock_release( int *lock ) {
|
||||||
+
|
+
|
||||||
+ if ( __syscalls.lock_release) {
|
+ if ( __has_syscall(lock_release)) {
|
||||||
+ return __syscalls.lock_release(lock);
|
+ return __syscall_lock_release(lock);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return 0;
|
+ return 0;
|
||||||
@@ -6974,22 +6957,22 @@ index 000000000..f02714764
|
|||||||
+
|
+
|
||||||
+int __libc_lock_acquire( int *lock ) {
|
+int __libc_lock_acquire( int *lock ) {
|
||||||
+
|
+
|
||||||
+ if ( __syscalls.lock_acquire) {
|
+ if ( __has_syscall(lock_acquire)) {
|
||||||
+ return __syscalls.lock_acquire(lock);
|
+ return __syscall_lock_acquire(lock);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return 0;
|
+ return 0;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+void __malloc_lock( struct _reent *ptr ) {
|
+void __malloc_lock( struct _reent *ptr ) {
|
||||||
+ if ( __syscalls.malloc_lock) {
|
+ if ( __has_syscall(malloc_lock) ){
|
||||||
+ __syscalls.malloc_lock(ptr);
|
+ __syscall_malloc_lock(ptr);
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+void __malloc_unlock( struct _reent *ptr ) {
|
+void __malloc_unlock( struct _reent *ptr ) {
|
||||||
+ if ( __syscalls.malloc_unlock) {
|
+ if ( __has_syscall(malloc_unlock)) {
|
||||||
+ __syscalls.malloc_unlock(ptr);
|
+ __syscall_malloc_unlock(ptr);
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/libgloss/libsysbase/times.c b/libgloss/libsysbase/times.c
|
diff --git a/libgloss/libsysbase/times.c b/libgloss/libsysbase/times.c
|
||||||
@@ -7389,10 +7372,10 @@ index 000000000..bd25d775d
|
|||||||
+ exit ( main(__system_argv->argc,__system_argv->argv) );
|
+ exit ( main(__system_argv->argc,__system_argv->argv) );
|
||||||
+}
|
+}
|
||||||
diff --git a/newlib/configure.host b/newlib/configure.host
|
diff --git a/newlib/configure.host b/newlib/configure.host
|
||||||
index 6c49cb750..f30edc1a3 100644
|
index a84c0c80a..0921e00be 100644
|
||||||
--- a/newlib/configure.host
|
--- a/newlib/configure.host
|
||||||
+++ b/newlib/configure.host
|
+++ b/newlib/configure.host
|
||||||
@@ -832,7 +832,12 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
|
@@ -853,7 +853,12 @@ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVID
|
||||||
default_newlib_io_long_long="yes"
|
default_newlib_io_long_long="yes"
|
||||||
newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
|
newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
|
||||||
;;
|
;;
|
||||||
@@ -7470,7 +7453,7 @@ index a3fb5c02c..adb8e1083 100644
|
|||||||
+
|
+
|
||||||
+#endif // _dirent_h_
|
+#endif // _dirent_h_
|
||||||
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
|
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
|
||||||
index f28dd071b..96980676d 100644
|
index 218807178..c9efd7d03 100644
|
||||||
--- a/newlib/libc/include/sys/features.h
|
--- a/newlib/libc/include/sys/features.h
|
||||||
+++ b/newlib/libc/include/sys/features.h
|
+++ b/newlib/libc/include/sys/features.h
|
||||||
@@ -330,6 +330,9 @@ extern "C" {
|
@@ -330,6 +330,9 @@ extern "C" {
|
||||||
@@ -7485,10 +7468,10 @@ index f28dd071b..96980676d 100644
|
|||||||
#ifdef __rtems__
|
#ifdef __rtems__
|
||||||
diff --git a/newlib/libc/include/sys/iosupport.h b/newlib/libc/include/sys/iosupport.h
|
diff --git a/newlib/libc/include/sys/iosupport.h b/newlib/libc/include/sys/iosupport.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..8b6d8da30
|
index 000000000..9bec9e473
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/newlib/libc/include/sys/iosupport.h
|
+++ b/newlib/libc/include/sys/iosupport.h
|
||||||
@@ -0,0 +1,108 @@
|
@@ -0,0 +1,117 @@
|
||||||
+//---------------------------------------------------------------------------------
|
+//---------------------------------------------------------------------------------
|
||||||
+#ifndef __iosupp_h__
|
+#ifndef __iosupp_h__
|
||||||
+#define __iosupp_h__
|
+#define __iosupp_h__
|
||||||
@@ -7523,6 +7506,7 @@ index 000000000..8b6d8da30
|
|||||||
+ void *dirStruct;
|
+ void *dirStruct;
|
||||||
+} DIR_ITER;
|
+} DIR_ITER;
|
||||||
+
|
+
|
||||||
|
+
|
||||||
+typedef struct {
|
+typedef struct {
|
||||||
+ const char *name;
|
+ const char *name;
|
||||||
+ size_t structSize;
|
+ size_t structSize;
|
||||||
@@ -7561,23 +7545,31 @@ index 000000000..8b6d8da30
|
|||||||
+
|
+
|
||||||
+extern const devoptab_t *devoptab_list[];
|
+extern const devoptab_t *devoptab_list[];
|
||||||
+
|
+
|
||||||
+typedef struct {
|
+#ifdef _BUILDING_LIBSYSBASE
|
||||||
+ void *(*sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
|
+#define __SYSCALL(_name) __attribute__((weak)) __syscall_##_name
|
||||||
+ int (*lock_init) (int *lock,int recursive);
|
+#define __has_syscall(_name) (&__syscall_##_name)
|
||||||
+ int (*lock_close) (int *lock);
|
+#else
|
||||||
+ int (*lock_release) (int *lock);
|
+#define __SYSCALL(_name) __syscall_##_name
|
||||||
+ int (*lock_acquire) (int *lock);
|
+#endif
|
||||||
+ void (*malloc_lock) (struct _reent *ptr);
|
|
||||||
+ void (*malloc_unlock) (struct _reent *ptr);
|
|
||||||
+ void (*exit) ( int rc );
|
|
||||||
+ int (*gettod_r) (struct _reent *ptr, struct timeval *tp, struct timezone *tz);
|
|
||||||
+ int (*clock_gettime)(clockid_t clock_id, struct timespec *tp);
|
|
||||||
+ int (*clock_settime)(clockid_t clock_id, const struct timespec *tp);
|
|
||||||
+ int (*clock_getres)(clockid_t clock_id, struct timespec *res);
|
|
||||||
+ int (*nanosleep)(const struct timespec *req, struct timespec *rem);
|
|
||||||
+} __syscalls_t;
|
|
||||||
+
|
+
|
||||||
+extern __syscalls_t __syscalls;
|
+void *__SYSCALL(sbrk_r) (struct _reent *ptr, ptrdiff_t incr);
|
||||||
|
+int __SYSCALL(lock_init) (int *lock,int recursive);
|
||||||
|
+
|
||||||
|
+int __SYSCALL(lock_close) (int *lock);
|
||||||
|
+int __SYSCALL(lock_release) (int *lock);
|
||||||
|
+int __SYSCALL(lock_acquire) (int *lock);
|
||||||
|
+void __SYSCALL(malloc_lock) (struct _reent *ptr);
|
||||||
|
+void __SYSCALL(malloc_unlock) (struct _reent *ptr);
|
||||||
|
+
|
||||||
|
+void __SYSCALL(exit)(int rc);
|
||||||
|
+
|
||||||
|
+int __SYSCALL(gettod_r)(struct _reent *ptr, struct timeval *tp, struct timezone *tz);
|
||||||
|
+int __SYSCALL(clock_gettime)(clockid_t clock_id, struct timespec *tp);
|
||||||
|
+int __SYSCALL(clock_settime)(clockid_t clock_id, const struct timespec *tp);
|
||||||
|
+int __SYSCALL(clock_getres)(clockid_t clock_id, struct timespec *res);
|
||||||
|
+int __SYSCALL(nanosleep)(const struct timespec *req, struct timespec *rem);
|
||||||
|
+
|
||||||
|
+#undef __SYSCALL
|
||||||
+
|
+
|
||||||
+int AddDevice( const devoptab_t* device);
|
+int AddDevice( const devoptab_t* device);
|
||||||
+int FindDevice(const char* name);
|
+int FindDevice(const char* name);
|
||||||
@@ -7598,10 +7590,10 @@ index 000000000..8b6d8da30
|
|||||||
+#endif // __iosupp_h__
|
+#endif // __iosupp_h__
|
||||||
+//---------------------------------------------------------------------------------
|
+//---------------------------------------------------------------------------------
|
||||||
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
|
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
|
||||||
index 6e55e1c1f..6e0c1c9cf 100644
|
index 74b70e9c0..d8c5410ec 100644
|
||||||
--- a/newlib/libc/include/sys/reent.h
|
--- a/newlib/libc/include/sys/reent.h
|
||||||
+++ b/newlib/libc/include/sys/reent.h
|
+++ b/newlib/libc/include/sys/reent.h
|
||||||
@@ -416,6 +416,8 @@ struct _reent
|
@@ -421,6 +421,8 @@ struct _reent
|
||||||
__FILE *__sf; /* file descriptors */
|
__FILE *__sf; /* file descriptors */
|
||||||
struct _misc_reent *_misc; /* strtok, multibyte states */
|
struct _misc_reent *_misc; /* strtok, multibyte states */
|
||||||
char *_signal_buf; /* strsignal */
|
char *_signal_buf; /* strsignal */
|
||||||
@@ -7610,7 +7602,7 @@ index 6e55e1c1f..6e0c1c9cf 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||||
@@ -686,6 +688,7 @@ struct _reent
|
@@ -691,6 +693,7 @@ struct _reent
|
||||||
# ifndef _REENT_GLOBAL_STDIO_STREAMS
|
# ifndef _REENT_GLOBAL_STDIO_STREAMS
|
||||||
__FILE __sf[3]; /* first three file descriptors */
|
__FILE __sf[3]; /* first three file descriptors */
|
||||||
# endif
|
# endif
|
||||||
@@ -7619,10 +7611,10 @@ index 6e55e1c1f..6e0c1c9cf 100644
|
|||||||
|
|
||||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||||
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
|
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
|
||||||
index eee98db64..aed9c1746 100644
|
index 8769112b0..5526e59ee 100644
|
||||||
--- a/newlib/libc/include/sys/stat.h
|
--- a/newlib/libc/include/sys/stat.h
|
||||||
+++ b/newlib/libc/include/sys/stat.h
|
+++ b/newlib/libc/include/sys/stat.h
|
||||||
@@ -152,8 +152,9 @@ int mkfifo (const char *__path, mode_t __mode );
|
@@ -142,8 +142,9 @@ int mkfifo (const char *__path, mode_t __mode );
|
||||||
int stat (const char *__restrict __path, struct stat *__restrict __sbuf );
|
int stat (const char *__restrict __path, struct stat *__restrict __sbuf );
|
||||||
mode_t umask (mode_t __mask );
|
mode_t umask (mode_t __mask );
|
||||||
|
|
||||||
@@ -8104,39 +8096,54 @@ index 022992b8d..bdf4c7bb0 100644
|
|||||||
fp->_flags = flags;
|
fp->_flags = flags;
|
||||||
fp->_cookie = (void *) fp;
|
fp->_cookie = (void *) fp;
|
||||||
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
|
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
|
||||||
index b358d2b4a..9cab2180e 100644
|
index b358d2b4a..78bb0df30 100644
|
||||||
--- a/newlib/libc/stdio/fread.c
|
--- a/newlib/libc/stdio/fread.c
|
||||||
+++ b/newlib/libc/stdio/fread.c
|
+++ b/newlib/libc/stdio/fread.c
|
||||||
@@ -225,7 +225,31 @@ _fread_r (struct _reent * ptr,
|
@@ -187,7 +187,6 @@ _fread_r (struct _reent * ptr,
|
||||||
|
int rc = 0;
|
||||||
|
/* save fp buffering state */
|
||||||
|
void *old_base = fp->_bf._base;
|
||||||
|
- void * old_p = fp->_p;
|
||||||
|
int old_size = fp->_bf._size;
|
||||||
|
/* allow __refill to use user's buffer */
|
||||||
|
fp->_bf._base = (unsigned char *) p;
|
||||||
|
@@ -197,7 +196,7 @@ _fread_r (struct _reent * ptr,
|
||||||
|
/* restore fp buffering back to original state */
|
||||||
|
fp->_bf._base = old_base;
|
||||||
|
fp->_bf._size = old_size;
|
||||||
|
- fp->_p = old_p;
|
||||||
|
+ fp->_p = old_base;
|
||||||
|
resid -= fp->_r;
|
||||||
|
p += fp->_r;
|
||||||
|
fp->_r = 0;
|
||||||
|
@@ -225,7 +224,29 @@ _fread_r (struct _reent * ptr,
|
||||||
/* fp->_r = 0 ... done in __srefill */
|
/* fp->_r = 0 ... done in __srefill */
|
||||||
p += r;
|
p += r;
|
||||||
resid -= r;
|
resid -= r;
|
||||||
- if (__srefill_r (ptr, fp))
|
- if (__srefill_r (ptr, fp))
|
||||||
+ int rc = 0;
|
+ int rc = 0;
|
||||||
+
|
+
|
||||||
+ if (resid>BUFSIZ)
|
+ if (resid>fp->_bf._size)
|
||||||
+ {
|
+ {
|
||||||
+ /* save fp buffering state */
|
+ /* save fp buffering state */
|
||||||
+ void *old_base = fp->_bf._base;
|
+ void *old_base = fp->_bf._base;
|
||||||
+ void * old_p = fp->_p;
|
|
||||||
+ int old_size = fp->_bf._size;
|
+ int old_size = fp->_bf._size;
|
||||||
+ /* allow __refill to use user's buffer */
|
+ /* allow __refill to use user's buffer */
|
||||||
+ fp->_bf._base = (unsigned char *) p;
|
+ fp->_bf._base = (unsigned char *) p;
|
||||||
+ fp->_bf._size = resid;
|
+ fp->_bf._size = resid - old_size;
|
||||||
+ fp->_p = (unsigned char *) p;
|
+ fp->_p = (unsigned char *) p;
|
||||||
+ rc = __srefill_r (ptr, fp);
|
+ rc = __srefill_r (ptr, fp);
|
||||||
+ /* restore fp buffering back to original state */
|
+ /* restore fp buffering back to original state */
|
||||||
+ fp->_bf._base = old_base;
|
+ fp->_bf._base = old_base;
|
||||||
+ fp->_bf._size = old_size;
|
+ fp->_bf._size = old_size;
|
||||||
+ fp->_p = old_p;
|
+ fp->_p = old_base;
|
||||||
+ resid -= fp->_r;
|
+ resid -= fp->_r;
|
||||||
+ p += fp->_r;
|
+ p += fp->_r;
|
||||||
+ fp->_r = 0;
|
+ //fp->_r = 0;
|
||||||
+
|
|
||||||
+ } else {
|
|
||||||
+ rc = __srefill_r (ptr, fp);
|
|
||||||
+ }
|
+ }
|
||||||
+ if (rc)
|
+ rc = __srefill_r (ptr, fp);
|
||||||
|
+
|
||||||
|
+ if (rc)
|
||||||
{
|
{
|
||||||
/* no more input: return partial result */
|
/* no more input: return partial result */
|
||||||
#ifdef __SCLE
|
#ifdef __SCLE
|
||||||
17
dkppc/scripts/build-crtls.sh
Executable file
17
dkppc/scripts/build-crtls.sh
Executable file
@@ -0,0 +1,17 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# set env variables
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
export DEVKITPRO=$TOOLPATH
|
||||||
|
export DEVKITPPC=$DEVKITPRO/devkitPPC
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
# Install the rules files
|
||||||
|
#---------------------------------------------------------------------------------
|
||||||
|
cd $BUILDDIR
|
||||||
|
|
||||||
|
mkdir -p rules
|
||||||
|
cd rules
|
||||||
|
tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
|
||||||
|
make install
|
||||||
@@ -40,6 +40,9 @@ cd $BUILDDIR
|
|||||||
# build and install mn10200 binutils
|
# 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
|
mkdir -p mn10200/binutils
|
||||||
cd mn10200/binutils
|
cd mn10200/binutils
|
||||||
|
|
||||||
@@ -97,7 +100,7 @@ then
|
|||||||
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
|
||||||
--prefix=$prefix\
|
--prefix=$prefix\
|
||||||
--with-system-zlib\
|
--with-system-zlib\
|
||||||
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 35" \
|
--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 38" \
|
||||||
$CROSS_PARAMS \
|
$CROSS_PARAMS \
|
||||||
$CROSS_GCC_PARAMS \
|
$CROSS_GCC_PARAMS \
|
||||||
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
|
||||||
@@ -187,31 +190,3 @@ echo "installing linkscripts ..."
|
|||||||
cp $BUILDSCRIPTDIR/dkppc/crtls/*.ld $prefix/$target/lib/
|
cp $BUILDSCRIPTDIR/dkppc/crtls/*.ld $prefix/$target/lib/
|
||||||
|
|
||||||
cd $BUILDDIR
|
cd $BUILDDIR
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
# build and install the debugger
|
|
||||||
#---------------------------------------------------------------------------------
|
|
||||||
mkdir -p $target/gdb
|
|
||||||
cd $target/gdb
|
|
||||||
|
|
||||||
if [ ! -f configured-gdb ]
|
|
||||||
then
|
|
||||||
CFLAGS="$cflags" LDFLAGS="$ldflags" ../../gdb-$GDB_VER/configure \
|
|
||||||
--disable-nls --prefix=$prefix --target=$target --disable-werror \
|
|
||||||
$CROSS_PARAMS \
|
|
||||||
$CROSS_GCC_PARAMS || { echo "Error configuring gdb"; exit 1; }
|
|
||||||
touch configured-gdb
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f built-gdb ]
|
|
||||||
then
|
|
||||||
$MAKE || { echo "Error building gdb"; exit 1; }
|
|
||||||
touch built-gdb
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f installed-gdb ]
|
|
||||||
then
|
|
||||||
$MAKE install || { echo "Error installing gdb"; exit 1; }
|
|
||||||
touch installed-gdb
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
export DEVKITPPC=$TOOLPATH/devkitPPC
|
|
||||||
export DEVKITPRO=$TOOLPATH
|
|
||||||
|
|
||||||
cd $BUILDDIR
|
|
||||||
mkdir -p rules
|
|
||||||
cd rules
|
|
||||||
tar -xvf $SRCDIR/devkitppc-rules-$DKPPC_RULES_VER.tar.xz
|
|
||||||
make install
|
|
||||||
|
|
||||||
cd $BUILDDIR/libogc-$LIBOGC_VER
|
|
||||||
|
|
||||||
if [ ! -f installed ]; then
|
|
||||||
echo "Building & installing libogc"
|
|
||||||
$MAKE install || { echo "libogc install failed"; exit 1; }
|
|
||||||
touch installed
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd $BUILDDIR/libfat-$LIBFAT_VER
|
|
||||||
|
|
||||||
if [ ! -f installed ]; then
|
|
||||||
echo "Building & installing libfat"
|
|
||||||
$MAKE ogc-install || { echo "libfat install failed"; exit 1; }
|
|
||||||
touch installed
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
cd $BUILDDIR
|
|
||||||
|
|
||||||
for archive in $hostarchives
|
|
||||||
do
|
|
||||||
dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
|
|
||||||
cd $BUILDDIR/$dir
|
|
||||||
if [ ! -f configured ]; then
|
|
||||||
CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix --disable-dependency-tracking $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
|
|
||||||
touch configured
|
|
||||||
fi
|
|
||||||
if [ ! -f built ]; then
|
|
||||||
$MAKE || { echo "error building $archive"; exit 1; }
|
|
||||||
touch built
|
|
||||||
fi
|
|
||||||
if [ ! -f installed ]; then
|
|
||||||
$MAKE install || { echo "error installing $archive"; exit 1; }
|
|
||||||
touch installed
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
@@ -30,31 +30,28 @@ done
|
|||||||
|
|
||||||
case "$VERSION" in
|
case "$VERSION" in
|
||||||
"1" )
|
"1" )
|
||||||
GCC_VER=8.3.0
|
GCC_VER=10.2.0
|
||||||
BINUTILS_VER=2.32
|
BINUTILS_VER=2.34
|
||||||
NEWLIB_VER=3.1.0
|
NEWLIB_VER=3.3.0
|
||||||
GDB_VER=8.2.1
|
|
||||||
basedir='dkarm-eabi'
|
basedir='dkarm-eabi'
|
||||||
package=devkitARM
|
package=devkitARM
|
||||||
target=arm-none-eabi
|
target=arm-none-eabi
|
||||||
toolchain=DEVKITARM
|
toolchain=DEVKITARM
|
||||||
;;
|
;;
|
||||||
"2" )
|
"2" )
|
||||||
GCC_VER=8.3.0
|
GCC_VER=10.2.0
|
||||||
BINUTILS_VER=2.32
|
BINUTILS_VER=2.34
|
||||||
MN_BINUTILS_VER=2.17
|
MN_BINUTILS_VER=2.17
|
||||||
NEWLIB_VER=3.1.0
|
NEWLIB_VER=3.3.0
|
||||||
GDB_VER=8.2.1
|
|
||||||
basedir='dkppc'
|
basedir='dkppc'
|
||||||
package=devkitPPC
|
package=devkitPPC
|
||||||
target=powerpc-eabi
|
target=powerpc-eabi
|
||||||
toolchain=DEVKITPPC
|
toolchain=DEVKITPPC
|
||||||
;;
|
;;
|
||||||
"3" )
|
"3" )
|
||||||
GCC_VER=8.3.0
|
GCC_VER=10.2.0
|
||||||
BINUTILS_VER=2.32
|
BINUTILS_VER=2.32
|
||||||
NEWLIB_VER=3.1.0
|
NEWLIB_VER=3.3.0
|
||||||
GDB_VER=8.2.1
|
|
||||||
basedir='dka64'
|
basedir='dka64'
|
||||||
package=devkitA64
|
package=devkitA64
|
||||||
target=aarch64-none-elf
|
target=aarch64-none-elf
|
||||||
|
|||||||
0
strip_bins.sh
Normal file → Executable file
0
strip_bins.sh
Normal file → Executable file
Reference in New Issue
Block a user