len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: Undo accidental switch to asm threads.

Browse source 
sigaltstack() is not available (more accurately, not exposed by the
NDK) pre-gingerbread/2.3. However the android-arm target runs on
down to eclair/2.1, where the asm threads still work fine.

Change-Id: I2bb14bc6bb5653c401552189699a676109ac6587
This commit is contained in:
Thomas Martitz 2012-11-07 23:29:54 +01:00
parent 3365a148ce
commit 6242d9f7fc
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/configure vendored
View file

@ -669,7 +669,6 @@ androidcc () {
GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//`
LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog" LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog"
GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack -shared" GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack -shared"
thread_support="HAVE_SIGALTSTACK_THREADS" # force for all archs
ANDROID_ARCH=$1 # for android.make too ANDROID_ARCH=$1 # for android.make too
# arch dependant stuff # arch dependant stuff
case $ANDROID_ARCH in case $ANDROID_ARCH in
@ -677,6 +676,9 @@ androidcc () {
endian="little" endian="little"
gccchoice="4.4.3" gccchoice="4.4.3"
gcctarget="arm-linux-androideabi-" gcctarget="arm-linux-androideabi-"
# sigaltstack is not available in pre-android-9, however asm
# threads work fine so far
thread_support="ASSEMBLER_THREADS"
GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \ GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \
--sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
@ -685,6 +687,7 @@ androidcc () {
endian="little" endian="little"
gccchoice="4.4.3" gccchoice="4.4.3"
gcctarget="mipsel-linux-android-" gcctarget="mipsel-linux-android-"
thread_support="HAVE_SIGALTSTACK_THREADS"
GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \ GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \
--sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips -fPIC" --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips -fPIC"
LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips" LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips"
@ -694,6 +697,7 @@ androidcc () {
gccchoice="4.4.3" gccchoice="4.4.3"
gcctarget="i686-linux-android-" gcctarget="i686-linux-android-"
gccdir=x86-$gccchoice gccdir=x86-$gccchoice
thread_support="HAVE_SIGALTSTACK_THREADS"
GCCOPTS="$GCCOPTS -Wa,--noexecstack -ffunction-sections -fomit-frame-pointer\ GCCOPTS="$GCCOPTS -Wa,--noexecstack -ffunction-sections -fomit-frame-pointer\
--sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86" --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86"
LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86" LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86"