From patchwork Fri Apr 14 05:50:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 97422 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp152975qgf; Thu, 13 Apr 2017 22:51:16 -0700 (PDT) X-Received: by 10.84.236.68 with SMTP id h4mr6722631pln.163.1492149076088; Thu, 13 Apr 2017 22:51:16 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o5si815224pgk.339.2017.04.13.22.51.15; Thu, 13 Apr 2017 22:51:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753412AbdDNFvF (ORCPT + 14 others); Fri, 14 Apr 2017 01:51:05 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:57361 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752568AbdDNFvE (ORCPT ); Fri, 14 Apr 2017 01:51:04 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v3E5oFK7000463; Fri, 14 Apr 2017 14:50:16 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v3E5oFK7000463 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1492149017; bh=EeFJQc6ygm57+DBgsAMWbnLADmTUEJCgEFSFAKjxacE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lm/CbQKnohBMo4IwYINl83RNvHcm2cjSgvkdBpiImYfIa8tltReVsJfu0n5Nakph8 tfM1yGCVOmB593EnaQQ4EA0u+XtVcZyJh3heEuCbwwGNLlx7Gl0z1ydmcVMPhx7b8z Crjo6efxzag5BcXjK+u/1naNu4a6cku6cZRDAMM71CxLdi55Ou5qqDdCyhR5U+Lmon ygKGbeK2oTBtW8Kz9bFD45nyCfppRNNbiGEXFyAHA0II3/IPWaNmX6l9GM+UXsFjS8 jywd/h4vHR8A9oC0U2iQTUAUx69CVMavnGFJ2xuS3XYzd5ygruPsSRpYirA90+Y8Uo XE/U3P20cCGZg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Matthias Kaehlcke , David Howells , Michael Davidson , Michal Marek , Jan Beulich , Alexander van Heukelum , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] kbuild: consolidate redundant sed script ASM offset generation Date: Fri, 14 Apr 2017 14:50:02 +0900 Message-Id: <1492149003-19136-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492149003-19136-1-git-send-email-yamada.masahiro@socionext.com> References: <1492149003-19136-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This part ended up in redundant code after touched by multiple people. [1] Commit 3234282f33b2 ("x86, asm: Fix CFI macro invocations to deal with shortcomings in gas") added parentheses for defined expressions to support old gas for x86. [2] Commit a22dcdb0032c ("x86, asm: Fix ancient-GAS workaround") split the pattern into two to avoid parentheses for non-numeric expressions. [3] Commit 95a2f6f72d37 ("Partially revert patch that encloses asm-offset.h numbers in brackets") removed parentheses from numeric expressions as well because parentheses in MN10300 assembly have a special meaning (pointer access). Apparently, there is a conflict between [1] and [3]. After all, [3] took precedence, and a long time has passed since then. Now, merge the two patterns again because the first one is covered by the other. Signed-off-by: Masahiro Yamada --- scripts/Makefile.lib | 1 - 1 file changed, 1 deletion(-) -- 2.7.4 Reviewed-by: Matthias Kaehlcke diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index e36427a..9c20690 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -415,7 +415,6 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ # Default sed regexp - multiline due to syntax constraints define sed-offsets "/^->/{s:->#\(.*\):/* \1 */:; \ - s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \ s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ s:->::; p;}" endef From patchwork Fri Apr 14 05:50:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 97424 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp153031qgf; Thu, 13 Apr 2017 22:51:32 -0700 (PDT) X-Received: by 10.84.148.203 with SMTP id y11mr6889648plg.10.1492149092700; Thu, 13 Apr 2017 22:51:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v21si820086pgi.239.2017.04.13.22.51.32; Thu, 13 Apr 2017 22:51:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753915AbdDNFvZ (ORCPT + 14 others); Fri, 14 Apr 2017 01:51:25 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:57796 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751787AbdDNFvV (ORCPT ); Fri, 14 Apr 2017 01:51:21 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v3E5oFK8000463; Fri, 14 Apr 2017 14:50:17 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v3E5oFK8000463 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1492149017; bh=0/6zS/UBntAvA+QHTnwRtw0nRSlYYB2QDykgdQKgALo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yRxj4Ln9hqHBGgcec8DuHWxJCoC03Y00zOJalLSrAN+1nZaiuTmLTMJc+QxODu0Oq 1DBIA1wOBLZMsUzgzDJoFUTl3uKPBoRIjSSl2P+NejI39Sgdhrl/lt9lDfFn42i0f/ KV7OWyy5wDn1Yz0bwM+ThETG+wzXdhu6bvl0P8kkRvqIYPaW9ujycRIIdxKJ1woIsT nIOHNaofqIgr+NEzX43gaV+7GA3HyoJRMIrAdfrtHz328TAay+TYMMtVNLwHSIdIN2 GT94Vf7nRoOkstNv5n3uPozbs0MrO7K8zZhyTY16JQQvA+dkLFnt5xeM1FGf4G5wgl tu1QUeJ4vjbhA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Matthias Kaehlcke , David Howells , Michael Davidson , Michal Marek , Jan Beulich , Alexander van Heukelum , Jeroen Hofstee , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] kbuild: fix asm-offset generation to work with clang Date: Fri, 14 Apr 2017 14:50:03 +0900 Message-Id: <1492149003-19136-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492149003-19136-1-git-send-email-yamada.masahiro@socionext.com> References: <1492149003-19136-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeroen Hofstee KBuild abuses the asm statement to write to a file and clang chokes about these invalid asm statements. Hack it even more by fooling this is actual valid asm code. Signed-off-by: Jeroen Hofstee [masahiro: Import Jeroen's work for U-Boot: http://patchwork.ozlabs.org/patch/375026/ Tweak sed script a little to drop garbage '#' for GCC case, like #define NR_PAGEFLAGS 23 /* __NR_PAGEFLAGS # */ ] Signed-off-by: Masahiro Yamada --- include/linux/kbuild.h | 6 +++--- scripts/Makefile.lib | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) -- 2.7.4 Reviewed-by: Matthias Kaehlcke Tested-by: Matthias Kaehlcke diff --git a/include/linux/kbuild.h b/include/linux/kbuild.h index 22a7219..4e80f3a 100644 --- a/include/linux/kbuild.h +++ b/include/linux/kbuild.h @@ -2,14 +2,14 @@ #define __LINUX_KBUILD_H #define DEFINE(sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val)) + asm volatile("\n.ascii \"->" #sym " %0 " #val "\"" : : "i" (val)) -#define BLANK() asm volatile("\n->" : : ) +#define BLANK() asm volatile("\n.ascii \"->\"" : : ) #define OFFSET(sym, str, mem) \ DEFINE(sym, offsetof(struct str, mem)) #define COMMENT(x) \ - asm volatile("\n->#" x) + asm volatile("\n.ascii \"->#" x "\"") #endif diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 9c20690..a050859 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -414,9 +414,10 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ # Default sed regexp - multiline due to syntax constraints define sed-offsets - "/^->/{s:->#\(.*\):/* \1 */:; \ + 's:^\.ascii *"\(.*\)".*:\1:; \ + /^->/{s:->#\(.*\):/* \1 */:; \ s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:->::; p;}" + s:->::; p;}' endef # Use filechk to avoid rebuilds when a header changes, but the resulting file