From patchwork Fri Dec 23 12:25:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Werner X-Patchwork-Id: 5959 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 28F7123E07 for ; Fri, 23 Dec 2011 12:25:58 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 19DF7A182AC for ; Fri, 23 Dec 2011 12:25:58 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id c11so6828983eaa.11 for ; Fri, 23 Dec 2011 04:25:58 -0800 (PST) Received: by 10.204.133.207 with SMTP id g15mr4010638bkt.17.1324643157694; Fri, 23 Dec 2011 04:25:57 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs89298bkc; Fri, 23 Dec 2011 04:25:57 -0800 (PST) Received: by 10.14.99.132 with SMTP id x4mr6007577eef.74.1324643156303; Fri, 23 Dec 2011 04:25:56 -0800 (PST) Received: from e06smtp16.uk.ibm.com (e06smtp16.uk.ibm.com. [195.75.94.112]) by mx.google.com with ESMTPS id 64si7909072eej.120.2011.12.23.04.25.56 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Dec 2011 04:25:56 -0800 (PST) Received-SPF: neutral (google.com: 195.75.94.112 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) client-ip=195.75.94.112; Authentication-Results: mx.google.com; spf=neutral (google.com: 195.75.94.112 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) smtp.mail=ken.werner@linaro.org Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 23 Dec 2011 12:25:55 -0000 Received: from d06nrmr1407.portsmouth.uk.ibm.com ([9.149.38.185]) by e06smtp16.uk.ibm.com ([192.168.101.146]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 23 Dec 2011 12:25:50 -0000 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pBNCPnp22351218 for ; Fri, 23 Dec 2011 12:25:49 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pBNCPnjh024245 for ; Fri, 23 Dec 2011 05:25:49 -0700 Received: from bolide.boeblingen.de.ibm.com (dyn-9-152-224-84.boeblingen.de.ibm.com [9.152.224.84]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pBNCPnef024230; Fri, 23 Dec 2011 05:25:49 -0700 From: Ken Werner To: openembedded-core@lists.openembedded.org Subject: [PATCH] Change -mno-thumb to -marm Date: Fri, 23 Dec 2011 13:25:42 +0100 Message-Id: <1324643142-29474-2-git-send-email-ken.werner@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1324643142-29474-1-git-send-email-ken.werner@linaro.org> References: <1324643142-29474-1-git-send-email-ken.werner@linaro.org> x-cbid: 11122312-3548-0000-0000-0000007F48BB Recent versions of the GCC reject the -mno-thumb option. In order to prevent the compiler from generating code for the Thumb instruction set the -marm switch should be used instead. For details see GNU bug #47930. Signed-off-by: Ken Werner --- .../conf/machine/include/arm/feature-arm-thumb.inc | 4 ++-- meta/conf/machine/include/tune-thumb.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc index cd34199..b7d6061 100644 --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc @@ -5,7 +5,7 @@ # but requires more instructions (140% for 70% smaller code) so may be # slower. TUNEVALID[thumb] = "Use thumb instructions instead of ARM" -ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', 1) == 'thumb']}" +ARM_THUMB_M_OPT = "${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', 1) == 'thumb']}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "", d)}" OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}" @@ -23,4 +23,4 @@ TUNEVALID[no-thumb-interwork] = "Disable mixing of thumb and ARM functions" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "no-thumb-interwork", "-mno-thumb-interwork", "-mthumb-interwork", d)}" OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "no-thumb-interwork", ":thumb-interwork", "", d)}" -TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -mno-thumb" +TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -marm" diff --git a/meta/conf/machine/include/tune-thumb.inc b/meta/conf/machine/include/tune-thumb.inc index 85473ce..214e3b6 100644 --- a/meta/conf/machine/include/tune-thumb.inc +++ b/meta/conf/machine/include/tune-thumb.inc @@ -24,9 +24,9 @@ OVERRIDES .= "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}" # options ensure that the compiler has the correct settings for the selected # instruction set and interworking. ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][d.getVar('THUMB_INTERWORK', 1) == 'yes']}" -ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', 1) == 'thumb']}" +ARM_THUMB_M_OPT = "${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', 1) == 'thumb']}" # TUNE_CCARGS += "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" -TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -mno-thumb" +TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -marm"