diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-11-07 23:29:54 +0100 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-11-07 23:32:58 +0100 |
| commit | 6242d9f7fc650796f526939870ffcd0bb2ed3d8f (patch) | |
| tree | bca6a6a3e09d6cbffe26b52929159811da7d3aeb /tools | |
| parent | 3365a148ce93884aee9a9d070a17b759346eec6c (diff) | |
android: Undo accidental switch to asm threads.
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/configure | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/configure b/tools/configure index 0b2a04bd52..442b23899b 100755 --- a/tools/configure +++ b/tools/configure @@ -669,7 +669,6 @@ androidcc () { GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog" 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 # arch dependant stuff case $ANDROID_ARCH in @@ -677,6 +676,9 @@ androidcc () { endian="little" gccchoice="4.4.3" 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 \ --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" gccchoice="4.4.3" gcctarget="mipsel-linux-android-" + thread_support="HAVE_SIGALTSTACK_THREADS" GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \ --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips -fPIC" LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips" @@ -694,6 +697,7 @@ androidcc () { gccchoice="4.4.3" gcctarget="i686-linux-android-" gccdir=x86-$gccchoice + thread_support="HAVE_SIGALTSTACK_THREADS" GCCOPTS="$GCCOPTS -Wa,--noexecstack -ffunction-sections -fomit-frame-pointer\ --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86" LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86" |