From patchwork Wed Jun 8 09:18:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 99385 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 15924B7007 for ; Wed, 8 Jun 2011 19:18:39 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QUEu6-0003MZ-4t; Wed, 08 Jun 2011 09:18:22 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QUEu3-0003MQ-Rx for kernel-team@lists.ubuntu.com; Wed, 08 Jun 2011 09:18:19 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QUEu3-0001lc-Pz for ; Wed, 08 Jun 2011 09:18:19 +0000 Received: from dynamic-adsl-94-36-101-6.clienti.tiscali.it ([94.36.101.6] helo=[192.168.0.32]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QUEu3-0002KX-Jj for kernel-team@lists.ubuntu.com; Wed, 08 Jun 2011 09:18:19 +0000 Message-ID: <4DEF3E5A.1050503@canonical.com> Date: Wed, 08 Jun 2011 11:18:18 +0200 From: Paolo Pisati User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20110602 Thunderbird/5.0b1 MIME-Version: 1.0 To: kernel-team@lists.ubuntu.com Subject: [maverick/ti-omap4][SRU] [PATCH] UBUNTU: [Config] Fix FTBS caused by new binutils X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com SRU Justification: BugLink: http://bugs.launchpad.net/bugs/669912 Impact: since natty the default toolchain for arm went from 4.4 to 4.5, and the switch broke maverick/ti-omap4 compilation Fix: cherry-picked from natty - 1ebe13dea156358f1044a7a755f02945ad3890e4 Test case: try to compile maverick/ti-omap4 on a natty box and you will get: arch/arm/mach-omap2/omap-headsmp.S: Assembler messages: arch/arm/mach-omap2/omap-headsmp.S:36: Error: selected processor does not support ARM mode `smc #0' make[3]: *** [arch/arm/mach-omap2/omap-headsmp.o] Error 1 make[2]: *** [arch/arm/mach-omap2] Error 2 make[2]: *** Waiting for unfinished jobs.... From d1aff9273c1e3e4f0163b96548df2c83aa52db07 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Thu, 9 Dec 2010 08:16:52 -0700 Subject: [PATCH] UBUNTU: [Config] Fix FTBS caused by new binutils BugLink: http://bugs.launchpad.net/bugs/669912 New assemblers need -march=armv7-a+sec on command line or .arch_extension sec inline to enable use of the smc instruction. This patch uses as-instr to check the latter to conditionally enable the former in AFLAGS for files that use smc. Checked on both old and new binutils to verify that it does not break old versions. Signed-off-by: John Rigby Signed-off-by: Tim Gardner Signed-off-by: Paolo Pisati --- arch/arm/mach-omap2/Makefile | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 6047329..2a84f34 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -29,7 +29,9 @@ obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o omap4-common.o \ omap4-wakeupgen.o -AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a +plus_sec := $(call as-instr,.arch_extension sec,+sec) +AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec) +AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a$(plus_sec) # Functions loaded to SRAM obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o -- 1.7.5.3