From patchwork Fri Apr 21 06:21:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 97871 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp177074qgf; Thu, 20 Apr 2017 23:22:28 -0700 (PDT) X-Received: by 10.84.140.5 with SMTP id 5mr1957896pls.113.1492755748849; Thu, 20 Apr 2017 23:22:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q10si9211860pge.311.2017.04.20.23.22.28; Thu, 20 Apr 2017 23:22:28 -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 S1035749AbdDUGWQ (ORCPT + 14 others); Fri, 21 Apr 2017 02:22:16 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:58489 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1033632AbdDUGWO (ORCPT ); Fri, 21 Apr 2017 02:22:14 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v3L6LGaR028192; Fri, 21 Apr 2017 15:21:17 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v3L6LGaR028192 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1492755678; bh=v2PRL/zEp+LyYgTdjafjOutvTHKQ2tV4LDr4xXS/mT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fOwn2nDMIlT7/7fw60GEKB8F+0u3AgnkYXs+PArKGQsZ7KK3gRccAaaq4AWnmke/L f6jBVr6AVSPr7QNXT0mQ5n4eqZIT3sllQKtqUjnl9YWaqgQB/ouSAg18tEt2BSh+9L n25T6xiJRPY2bZr+KGdjiig8vzrgJtcyjAFVGWSKT75rB9Xgf91dkf5FIxG2Ol9GRl 4sU/P6wrDHG2nLVfMLQiRArQS/m0RIrx/59zYDDZS40Y0SlhDks5Bk/JoCb6Zdkrnw RzkIfqgt1s9ZBjhXX0LN5sWopYOG1GPDfT9VPqrLS4G7smk+c5Gxx2AbysQ4y/nf+R gVOz2CPUhYl9A== 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 v2 1/2] kbuild: consolidate redundant sed script ASM offset generation Date: Fri, 21 Apr 2017 15:21:10 +0900 Message-Id: <1492755671-19005-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492755671-19005-1-git-send-email-yamada.masahiro@socionext.com> References: <1492755671-19005-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 Reviewed-by: Matthias Kaehlcke --- Changes in v2: None scripts/Makefile.lib | 1 - 1 file changed, 1 deletion(-) -- 2.7.4 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 21 06:21:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 97873 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp177089qgf; Thu, 20 Apr 2017 23:22:30 -0700 (PDT) X-Received: by 10.84.197.1 with SMTP id m1mr14188220pld.183.1492755750608; Thu, 20 Apr 2017 23:22:30 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q10si9211860pge.311.2017.04.20.23.22.30; Thu, 20 Apr 2017 23:22:30 -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 S1035782AbdDUGW1 (ORCPT + 14 others); Fri, 21 Apr 2017 02:22:27 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:58666 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1033632AbdDUGWT (ORCPT ); Fri, 21 Apr 2017 02:22:19 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v3L6LGaS028192; Fri, 21 Apr 2017 15:21:18 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v3L6LGaS028192 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1492755678; bh=d0a2OpoDn//lvwVomeM86WTHgT09GXRgoJ3YJK8D7sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a3pW+9mFpipHagbUof3+2I/pZP6Bia48yzK/KzUKQTIOO2wfQyddMaaFu3zBSdVgE hKVj6L7VjozOYcOqoNwX75aG2L5YgmrhSxfjYYs/hgouiEGsxjCpXm4XlBVv+zD3iI 7Gaxt+YlfvA0jv7eG6ZBXV9CNR5Qxg03iShNJVAmltaXFaGfAa6td1nB+SjrUzDlS5 Te1nlx4XsLKtNd8+dx7+5VoDzvy98m1oPor+2si1hRFyaXek2fLvq92+2VNKETMHVd JKE11ffbbCsjDiGgFzR6L70F2H2/xJNGq0oljfDoXtGd0GWsQeYKrJZmMuqkJZBtVJ NaLUJW++YHcEQ== 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 v2 2/2] kbuild: fix asm-offset generation to work with clang Date: Fri, 21 Apr 2017 15:21:11 +0900 Message-Id: <1492755671-19005-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492755671-19005-1-git-send-email-yamada.masahiro@socionext.com> References: <1492755671-19005-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. [masahiro: Import Jeroen's work for U-Boot: http://patchwork.ozlabs.org/patch/375026/ Tweak sed script a little to avoid garbage '#' for GCC case, like #define NR_PAGEFLAGS 23 /* __NR_PAGEFLAGS # */ ] Signed-off-by: Jeroen Hofstee Signed-off-by: Masahiro Yamada Reviewed-by: Matthias Kaehlcke Tested-by: Matthias Kaehlcke --- Changes in v2: - V1 did not work with LLVM's integrated assembler because it uses instead of around the .ascii string. Restore [:space:]. include/linux/kbuild.h | 6 +++--- scripts/Makefile.lib | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) -- 2.7.4 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..9e70196 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -413,10 +413,14 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ # --------------------------------------------------------------------------- # Default sed regexp - multiline due to syntax constraints +# +# Use [:space:] because LLVM's integrated assembler inserts around +# the .ascii directive whereas GCC keeps the as-is. define sed-offsets - "/^->/{s:->#\(.*\):/* \1 */:; \ + 's:^[[:space:]]*\.ascii[[:space:]]*"\(.*\)".*:\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