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: 9680709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 71B04601E7 for ; Fri, 14 Apr 2017 05:51:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 640A9285D3 for ; Fri, 14 Apr 2017 05:51:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 586DD28698; Fri, 14 Apr 2017 05:51:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03D8F285D3 for ; Fri, 14 Apr 2017 05:51:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753822AbdDNFvY (ORCPT ); Fri, 14 Apr 2017 01:51:24 -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-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Matthias Kaehlcke Tested-by: Matthias Kaehlcke --- include/linux/kbuild.h | 6 +++--- scripts/Makefile.lib | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) 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