From 73f43216653f0431fbb5e043c837ccca48609d6b Mon Sep 17 00:00:00 2001 From: Yury Melnichek Date: Sat, 19 Mar 2011 13:11:07 +0100 Subject: [PATCH] [iPhone] Revert to not using thumb. --- 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 e25e6db1b4..05f97d7e25 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -647,8 +647,7 @@ _DEBUG, TARGET_OS_IPHONE, ); - "GCC_THUMB_SUPPORT[arch=armv6]" = NO; - "GCC_THUMB_SUPPORT[arch=armv7]" = YES; + GCC_THUMB_SUPPORT = NO; GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ( ../../3party/protobuf, @@ -702,8 +701,7 @@ _RELEASE, TARGET_OS_IPHONE, ); - "GCC_THUMB_SUPPORT[arch=armv6]" = NO; - "GCC_THUMB_SUPPORT[arch=armv7]" = YES; + GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = YES; GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ( diff --git a/tools/mkspecs/iphonedevice-g++42/qmake.conf b/tools/mkspecs/iphonedevice-g++42/qmake.conf index ea6d4044c1..42eedddf13 100644 --- a/tools/mkspecs/iphonedevice-g++42/qmake.conf +++ b/tools/mkspecs/iphonedevice-g++42/qmake.conf @@ -7,14 +7,16 @@ # 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 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_CC = gcc-4.2 -std=c99 -arch $$DEVICE_ARCH -arch $$DEVICE_ARCH2 +QMAKE_CXX = g++-4.2 -arch $$DEVICE_ARCH -arch $$DEVICE_ARCH2 QMAKE_RESOURCE = @@ -63,7 +65,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 -mno-thumb -marm QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 -dead_strip QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W