Merge pull request #23 from andyque/master

don't use mthumb for curl with armeabi

Author: ricardoquesada

build/android.ini

@@ -37,6 +37,10 @@ cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "free
 #whether build fat library, use lipo -S create
 cfg_build_fat_library=no
 
+#whether use mthumb instruction or not
+#format  cfg_${libname}_${archname}_use_mthumb
+cfg_curl_arm_use_mthumb=no
+
 #debug and release mode flag
 cfg_build_release_mode="-O3 -DNDEBUG"
 cfg_build_debug_mode="-O0 -g -DDEBUG"

build/build.sh

@@ -283,6 +283,7 @@ do
         archive_name=$lib
     fi
 
+
     mkdir -p $cfg_platform_name/$archive_name/include/
 
     for arch in "${build_arches[@]}"
@@ -302,6 +303,15 @@ do
         #set build mode flags -- debug or release
         set_build_mode_cflags
 
+        #determine wether use mthumb or not
+        parse_use_mthumb=cfg_${lib}_${arch}_use_mthumb
+        use_mthumb=${!parse_use_mthumb}
+        echo $use_mthumb
+        if [ -z $use_mthumb ];then
+            use_mthumb=yes
+        fi
+
+        export ANDROID_USE_MTHUMB=$use_mthumb
 
         install_library_path="install-${cfg_platform_name}"
         build_library_path=$cfg_platform_name
@@ -331,7 +341,6 @@ do
         if [ $cfg_platform_name = "android" ];then
             export ANDROID_GCC_VERSION=$build_gcc_version
             export ANDROID_API=android-$build_api
-
         fi
 
 

build/main.ini

@@ -28,6 +28,7 @@ png_dependent_archive_list=z
 freetype_dependent_archive_list=z
 websockets_dependent_archive_list=z
 curl_dependent_archive_list=z,ssl,crypto
+openssl_dependent_archive_list=crypto
 
 
 ##ignore arch list for specify libraries

contrib/bootstrap

@@ -247,17 +247,23 @@ check_android_sdk()
             exit 1
         fi
 
+        THUMB_FLAG=""
+        if [ $ANDROID_USE_MTHUMB = "yes" ];then
+            THUMB_FLAG="-mthumb"
+            echo "we are using mthumb for ${ANDROID_ABI}!!"
+        fi
+
 
 	if [ ${ANDROID_ABI} = "armeabi-v7a" ]; then
             add_make_enabled "HAVE_NEON"
             add_make_enabled "HAVE_ARMV7A"
-            add_make "EXTRA_CFLAGS := -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat "
+            add_make "EXTRA_CFLAGS := -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 ${THUMB_FLAG} -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat "
             add_make "EXTRA_LDFLAGS := -march=armv7-a -Wl,--fix-cortex-a8"
         fi
 
 	if [ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ];then
             add_make_enabled "HAVE_ARMV6"
-            add_make "EXTRA_CFLAGS := -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes  -march=armv5te -mtune=xscale -msoft-float -mthumb -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat "
+            add_make "EXTRA_CFLAGS := -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes  -march=armv5te -mtune=xscale -msoft-float ${THUMB_FLAG} -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat "
         fi
 
 	if [ ${ANDROID_ABI} = "armeabi-v8a" ]; then