From patchwork Fri Oct 13 09:51:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 115724 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp531047qgn; Fri, 13 Oct 2017 02:54:08 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBilqPaxNZMpZ81+11+k2Awn2d39Z3nlbRmLjiSHb7SjcOQweWfh/w03ElkJfaAhUPLakIa X-Received: by 10.80.205.136 with SMTP id p8mr1422814edi.255.1507888448671; Fri, 13 Oct 2017 02:54:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507888448; cv=none; d=google.com; s=arc-20160816; b=Lv1luax7G1WdeKb2bRJDIInjHDIVyrcedakF817tVZNQH+zfKNH5yVctqqtWhoUmu9 d9YCgPsH7yBv5WnFoDRmO6TtfDFbvVEfJEl20Nz8MaC7fVeKlPLUtv+79vgGQVn3h5K1 6aj9z9TOiRMDuoEzM/2B4hdzgLH5XeBtIXmkzLnAOTaC66JDanyWdCEvUKKrF9H08TCE pnXV06ouLqn3tIvg0vyQUq1by+nbMGVEtsijL5Eot902yyQQECTxIZrzsSt4qcUiaV2t RchuaOwQUURPtEmOv9tAwMJhoLPDtaAP8U/Tdy91i//fOjky/bXhPN73p1v9PzjfMLNf eqGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=lY37Jj/eT7glhCJwoGnCdO73CiKVRxY9usF+X1Q0iNQ=; b=AiSAXraJKenDZBXwURYXqG22/cFPxUkQDKE1fLDh0Ladh4tLQ9YMDPNGQ4hy/Gk1/f +PIFpr4lHh00GjoeTHxWPhGHet0DWbDBFeLkh3fEq9/PBF9kMxswv5387BpHeQrilfQP ndSotl7hxix68bgEZQBC4q+J/o+eIV4kXFol3Sb7wP1j8JOi3ym5kiGt1DXja9AJdkYw 5HNRVGliyAgIYgcpuXehSLVvQBS99LxgE3Zu0x+5iuH3S2vh81xXptgDIU4u69bFKGOY 4R51rOlSO/aBhf5GD3wl4nM0inZQaSQqbECh7zVWOQ9EYiAtsS2rIphuSLpokk25LCZ2 KClQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=DKhdibdi; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id q5si707798edj.502.2017.10.13.02.54.08; Fri, 13 Oct 2017 02:54:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=DKhdibdi; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 4BF2BC21F32; Fri, 13 Oct 2017 09:53:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 16B98C21F32; Fri, 13 Oct 2017 09:52:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E612AC21EEE; Fri, 13 Oct 2017 09:52:14 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id BDB7DC21D82 for ; Fri, 13 Oct 2017 09:52:13 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v9D9plP4031812; Fri, 13 Oct 2017 18:51:48 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v9D9plP4031812 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1507888309; bh=zLHPIUBVf5D46P+KrHugh1yjIGE4p2ellQQdnway5ak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DKhdibdi0/u9rGuvkV1sLah9S/F7YCt3FGOHniS+rQtSNPrBUM1vB0zl5Vr/1eJkl cO/eOR+pJN4Gu+U5Sn/L/eiiHHQdyohhXO0RT0M5GKObfvdVUAcgup9XNDeCyCwI1p ADwRs8IzlsIg66vBjxTnGv5T8WOer9b2pzkMsUHO/pNxywNTfXPP/fHbmx81O0Qcm9 MBkaCt7/xdLsxWLRvK2mijSDZI3iFSX51A9xoHXijcXngYC2jKSD7h88sBKie6mDNz gBI1H6X8n5i+XZ6DMFZROSpAeBdiee/F56kJwXMTY51roZ7hAOh9fdgZ33Uo95yH+4 Quj8H0UOwwNnA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Fri, 13 Oct 2017 18:51:43 +0900 Message-Id: <1507888305-20628-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507888305-20628-1-git-send-email-yamada.masahiro@socionext.com> References: <1507888305-20628-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini , Michal Marek Subject: [U-Boot] [PATCH v2 1/3] kbuild: Get rid of KBUILD_STR X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Michal Marek The compiler can accept -DKBUILD_MODNAME="foo", it's just a matter of quoting. That way, we reduce the gcc command line a bit. Signed-off-by: Michal Marek Signed-off-by: Masahiro Yamada [ Linux commit: b42841b7bb6286da56b4fa79835c27166b7e228b ] --- Changes in v2: None scripts/Makefile.lib | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 0d5c529..8934b2f 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -99,10 +99,10 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs)) # Note: Files that end up in two or more modules are compiled without the # KBUILD_MODNAME definition. The reason is that any made-up name would # differ in different configs. -name-fix = $(subst $(comma),_,$(subst -,_,$1)) -basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))" +name-fix = $(squote)$(quote)$(subst $(comma),_,$(subst -,_,$1))$(quote)$(squote) +basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget)) modname_flags = $(if $(filter 1,$(words $(modname))),\ - -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))") + -DKBUILD_MODNAME=$(call name-fix,$(modname))) orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ $(ccflags-y) $(CFLAGS_$(basetarget).o) @@ -154,7 +154,7 @@ endif # Modified for U-Boot: LINUXINCLUDE -> UBOOTINCLUDE c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ $(__c_flags) $(modkern_cflags) \ - -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags) + $(basename_flags) $(modname_flags) a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ $(__a_flags) $(modkern_aflags)