From d7cad89f77c5184a3deb08dfb78acd93224bcf8f Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 8 Sep 2011 16:27:31 +0300 Subject: [PATCH] [ios] Enabled correct armv7 thumb support @TODO use float instead of double for faster computations --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 3 +++ tools/mkspecs/iphonedevice-clang/qmake.conf | 2 +- tools/mkspecs/iphonedevice-g++42/qmake.conf | 8 +++----- tools/mkspecs/iphonedevice-llvm/qmake.conf | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index ebe00e6b08..509aa58c12 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -2674,6 +2674,7 @@ TARGET_OS_IPHONE, ); GCC_THUMB_SUPPORT = NO; + "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ( @@ -2775,6 +2776,7 @@ TARGET_OS_IPHONE, ); GCC_THUMB_SUPPORT = NO; + "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ( ../../3party/protobuf, @@ -2826,6 +2828,7 @@ TARGET_OS_IPHONE, ); GCC_THUMB_SUPPORT = NO; + "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ( diff --git a/tools/mkspecs/iphonedevice-clang/qmake.conf b/tools/mkspecs/iphonedevice-clang/qmake.conf index 83f466814e..8a465b4150 100644 --- a/tools/mkspecs/iphonedevice-clang/qmake.conf +++ b/tools/mkspecs/iphonedevice-clang/qmake.conf @@ -63,7 +63,7 @@ QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH #QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/ -QMAKE_CFLAGS += -fmessage-length=0 -marm +QMAKE_CFLAGS += -fmessage-length=0 QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W diff --git a/tools/mkspecs/iphonedevice-g++42/qmake.conf b/tools/mkspecs/iphonedevice-g++42/qmake.conf index 857fd864c1..e5a574b668 100644 --- a/tools/mkspecs/iphonedevice-g++42/qmake.conf +++ b/tools/mkspecs/iphonedevice-g++42/qmake.conf @@ -7,16 +7,14 @@ # where gcc an all tools are actually resides IPHONE_SDK_PATH = /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk -DEVICE_ARCH = armv6 -DEVICE_ARCH2 = armv7 MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += hide_symbols warn_on dwarf2 app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl QMAKE_INCREMENTAL_STYLE = sublib -QMAKE_CC = gcc-4.2 -arch $$DEVICE_ARCH -arch $$DEVICE_ARCH2 -QMAKE_CXX = g++-4.2 -arch $$DEVICE_ARCH -arch $$DEVICE_ARCH2 +QMAKE_CC = gcc-4.2 -arch armv6 -Xarch_armv6 -mno-thumb -arch armv7 -Xarch_armv7 -mthumb +QMAKE_CXX = g++-4.2 -arch armv6 -Xarch_armv6 -mno-thumb -arch armv7 -Xarch_armv7 -mthumb QMAKE_RESOURCE = @@ -65,7 +63,7 @@ QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH #QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/ -QMAKE_CFLAGS += -fmessage-length=0 -mno-thumb -marm +QMAKE_CFLAGS += -fmessage-length=0 QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 -dead_strip QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W diff --git a/tools/mkspecs/iphonedevice-llvm/qmake.conf b/tools/mkspecs/iphonedevice-llvm/qmake.conf index 057afcb470..ece9c7f969 100644 --- a/tools/mkspecs/iphonedevice-llvm/qmake.conf +++ b/tools/mkspecs/iphonedevice-llvm/qmake.conf @@ -63,7 +63,7 @@ QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH #QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/ -QMAKE_CFLAGS += -fmessage-length=0 -marm +QMAKE_CFLAGS += -fmessage-length=0 QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 -dead_strip QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W