summaryrefslogtreecommitdiff
path: root/tools/configure
diff options
context:
space:
mode:
Diffstat (limited to 'tools/configure')
-rwxr-xr-xtools/configure6
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 () {
669 GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` 669 GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//`
670 LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog" 670 LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog"
671 GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack -shared" 671 GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack -shared"
672 thread_support="HAVE_SIGALTSTACK_THREADS" # force for all archs
673 ANDROID_ARCH=$1 # for android.make too 672 ANDROID_ARCH=$1 # for android.make too
674 # arch dependant stuff 673 # arch dependant stuff
675 case $ANDROID_ARCH in 674 case $ANDROID_ARCH in
@@ -677,6 +676,9 @@ androidcc () {
677 endian="little" 676 endian="little"
678 gccchoice="4.4.3" 677 gccchoice="4.4.3"
679 gcctarget="arm-linux-androideabi-" 678 gcctarget="arm-linux-androideabi-"
679 # sigaltstack is not available in pre-android-9, however asm
680 # threads work fine so far
681 thread_support="ASSEMBLER_THREADS"
680 GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \ 682 GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \
681 --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" 683 --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
682 LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" 684 LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
@@ -685,6 +687,7 @@ androidcc () {
685 endian="little" 687 endian="little"
686 gccchoice="4.4.3" 688 gccchoice="4.4.3"
687 gcctarget="mipsel-linux-android-" 689 gcctarget="mipsel-linux-android-"
690 thread_support="HAVE_SIGALTSTACK_THREADS"
688 GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \ 691 GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \
689 --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips -fPIC" 692 --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips -fPIC"
690 LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips" 693 LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips"
@@ -694,6 +697,7 @@ androidcc () {
694 gccchoice="4.4.3" 697 gccchoice="4.4.3"
695 gcctarget="i686-linux-android-" 698 gcctarget="i686-linux-android-"
696 gccdir=x86-$gccchoice 699 gccdir=x86-$gccchoice
700 thread_support="HAVE_SIGALTSTACK_THREADS"
697 GCCOPTS="$GCCOPTS -Wa,--noexecstack -ffunction-sections -fomit-frame-pointer\ 701 GCCOPTS="$GCCOPTS -Wa,--noexecstack -ffunction-sections -fomit-frame-pointer\
698 --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86" 702 --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86"
699 LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86" 703 LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-9/arch-x86"