From fd55847b4b631435f34c566c5bf621a3755ef3fd Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 16 Mar 2011 19:51:06 +0000 Subject: [PATCH] [iPhone] Enabled thumb for armv7 arch --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 6 ++++-- tools/mkspecs/iphonedevice-g++42/qmake.conf | 8 +++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 881036e84c..3af30d9110 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -641,7 +641,8 @@ _DEBUG, TARGET_OS_IPHONE, ); - GCC_THUMB_SUPPORT = NO; + "GCC_THUMB_SUPPORT[arch=armv6]" = NO; + "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( ../../3party/protobuf, @@ -697,7 +698,8 @@ _RELEASE, TARGET_OS_IPHONE, ); - GCC_THUMB_SUPPORT = NO; + "GCC_THUMB_SUPPORT[arch=armv6]" = NO; + "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( diff --git a/tools/mkspecs/iphonedevice-g++42/qmake.conf b/tools/mkspecs/iphonedevice-g++42/qmake.conf index c13a625d3c..bea8f8b6a4 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 -std=c99 -arch $$DEVICE_ARCH -arch $$DEVICE_ARCH2 -QMAKE_CXX = g++-4.2 -arch $$DEVICE_ARCH -arch $$DEVICE_ARCH2 +QMAKE_CC = gcc-4.2 -std=c99 -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 -marm QMAKE_CFLAGS += -pipe -miphoneos-version-min=3.1 -dead_strip QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W