From patchwork Thu Mar 26 05:57:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11459329 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8BBA14B4 for ; Thu, 26 Mar 2020 05:58:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 895E420719 for ; Thu, 26 Mar 2020 05:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585202320; bh=o3C43cCmxhVVIujfOfkksVDSV83ihuHzzL8LeVgYIJo=; h=From:To:Cc:Subject:Date:List-ID:From; b=bW+XkfgoTCuKM04IibXWV7ES7pVO9il0W6x6pbSPyJfUO7SL9WmMj3oUKy4axNz+7 ggEHJOGldtY/VU8bbPYQxAWU1FO4SsNaxp4FEGdF1t9yrtAxvFdMEb9qOPOAHgJa0h kU4BV12GY2E2bQvXbVYAkGrFksxK7RfW5yMoMYag= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727695AbgCZF61 (ORCPT ); Thu, 26 Mar 2020 01:58:27 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:47768 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727575AbgCZF61 (ORCPT ); Thu, 26 Mar 2020 01:58:27 -0400 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 02Q5ve94008573; Thu, 26 Mar 2020 14:57:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 02Q5ve94008573 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1585202260; bh=dX+mdRt8kcID48UqORTUMY5bdsGeWZDwRFh1lk4J+OY=; h=From:To:Cc:Subject:Date:From; b=F+31nJQ4Cgf4gt9L3lAD0yTyZM6taU0HcwCkPUB81lu7qxiTtqk/tHtzkh/wAtjZ4 CF28DzVLBwEyskREvoR6rtnBx8mXTZBWq+C9GQPOET0lsVnrdIJzYYc7Mwy+J3+vPo sAe7ySOYigImr3dYkXpLC7r2oa/fL48HjVwRCcUpTzCz38C5MBUGNEXpnrPl3LwCC/ wL+xhmfmA5VZEaIah5/GJP6AKqawr2QSCcnmWc7MOcELsG4uxWzU6MWRniddWyukwu X8J5qiPn7XDM2rl5fMOAHkZSs1ow+LvVLFtQl7+EVuosUu0MJqcGIPwcOFq9Xax6en epHo20x8scgLw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: clang-built-linux@googlegroups.com, Geert Uytterhoeven , Masahiro Yamada , "David S. Miller" , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 1/4] net: wan: wanxl: use allow to pass CROSS_COMPILE_M68k for rebuilding firmware Date: Thu, 26 Mar 2020 14:57:15 +0900 Message-Id: <20200326055719.16755-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org As far as I understood from the Kconfig help text, this build rule is used to rebuild the driver firmware, which runs on an old m68k-based chip. So, you need m68k tools for the firmware rebuild. wanxl.c is a PCI driver, but CONFIG_M68K does not select CONFIG_HAVE_PCI. So, you cannot enable CONFIG_WANXL_BUILD_FIRMWARE for ARCH=m68k. In other words, ifeq ($(ARCH),m68k) is false here. I am keeping the dead code for now, but rebuilding the firmware requires 'as68k' and 'ld68k', which I do not have in hand. Instead, the kernel.org m68k GCC [1] successfully built it. Allowing a user to pass in CROSS_COMPILE_M68K= is handier. [1] https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/x86_64-gcc-9.2.0-nolibc-m68k-linux.tar.xz Suggested-by: Geert Uytterhoeven Signed-off-by: Masahiro Yamada --- Changes in v2: - New patch drivers/net/wan/Kconfig | 2 +- drivers/net/wan/Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig index 4530840e15ef..dbc0e3f7a3e2 100644 --- a/drivers/net/wan/Kconfig +++ b/drivers/net/wan/Kconfig @@ -200,7 +200,7 @@ config WANXL_BUILD_FIRMWARE depends on WANXL && !PREVENT_FIRMWARE_BUILD help Allows you to rebuild firmware run by the QUICC processor. - It requires as68k, ld68k and hexdump programs. + It requires m68k toolchains and hexdump programs. You should never need this option, say N. diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index 701f5d2fe3b6..995277c657a1 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile @@ -40,17 +40,17 @@ $(obj)/wanxl.o: $(obj)/wanxlfw.inc ifeq ($(CONFIG_WANXL_BUILD_FIRMWARE),y) ifeq ($(ARCH),m68k) - AS68K = $(AS) - LD68K = $(LD) + M68KAS = $(AS) + M68KLD = $(LD) else - AS68K = as68k - LD68K = ld68k + M68KAS = $(CROSS_COMPILE_M68K)as + M68KLD = $(CROSS_COMPILE_M68K)ld endif quiet_cmd_build_wanxlfw = BLD FW $@ cmd_build_wanxlfw = \ - $(CPP) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(AS68K) -m68360 -o $(obj)/wanxlfw.o; \ - $(LD68K) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \ + $(CPP) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(M68KAS) -m68360 -o $(obj)/wanxlfw.o; \ + $(M68KLD) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \ hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x ,//g;1s/^/static const u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \ rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o From patchwork Thu Mar 26 05:57:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11459331 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE6D81668 for ; Thu, 26 Mar 2020 05:58:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8539D20719 for ; Thu, 26 Mar 2020 05:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585202321; bh=SuB13v9qw0bOVHUEysrishkrOj7EvFqUYcaVmhYjerw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jFlHoSiVm6LhcINvp7zsqwK0najuQt12EQHEX4tq4ZUtd/Wq+/yMzuALN6ORMj9ig uOWi/7tBTFSvoYfguSjq66sdEHPXAAzIYjPog5DNs5OTzcvPZld16TGK/WzZpAVEGP KMUV+JlDWW3guuFvYAQPdJCzbOUr3ShHzAv4+NWw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727688AbgCZF61 (ORCPT ); Thu, 26 Mar 2020 01:58:27 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:47767 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727560AbgCZF61 (ORCPT ); Thu, 26 Mar 2020 01:58:27 -0400 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 02Q5ve95008573; Thu, 26 Mar 2020 14:57:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 02Q5ve95008573 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1585202261; bh=2uTOiFNH4QFbkxz4iV+NRyMxIQi1X//IkZ1ebTA/LHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s6p2A1sH/cOcvVT/1JsRsQgwZEZoGisPwlm7JAHSbQSW+JPUEEw+aDGk9u2hFkQVQ mK1WV49gdetPYWbd9qKYAW7o97Hu+5ngzn8Bqb5Hbui5lN8WuXRGTdV0DU/BPCYlBj Fvuv4LEJTkyHKftCZj5WoJWy0G6q1TOsiSkwSf3zqPl4E1dnRrBWlEDUSTE0fT3xP/ al+ATvhSjduBLqWePdFthUvmRSxUudD6IS9hDemffxVTz6ZfYEwGb5Mso3Oficmwkj 1Aelk8H+LqMyKnNMIaSS3O51iDRn2hsPubTX2SaphOVqaVaB3R7a9CjBLQ87yQu+oV Nxa78ly4HUaEQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: clang-built-linux@googlegroups.com, Geert Uytterhoeven , Masahiro Yamada , "David S. Miller" , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 2/4] net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware Date: Thu, 26 Mar 2020 14:57:16 +0900 Message-Id: <20200326055719.16755-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200326055719.16755-1-masahiroy@kernel.org> References: <20200326055719.16755-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The firmware source, wanxlfw.S, is currently compiled by the combo of $(CPP) and $(M68KAS). This is not what we usually do for compiling *.S files. In fact, this Makefile is the only user of $(AS) in the kernel build. Instead of combining $(CPP) and (AS) from different tool sets, using $(M68KCC) as an assembler driver is simpler, and saner. Signed-off-by: Masahiro Yamada --- Changes in v2: None drivers/net/wan/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index 995277c657a1..cf7a0a65aae8 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile @@ -40,16 +40,16 @@ $(obj)/wanxl.o: $(obj)/wanxlfw.inc ifeq ($(CONFIG_WANXL_BUILD_FIRMWARE),y) ifeq ($(ARCH),m68k) - M68KAS = $(AS) + M68KCC = $(CC) M68KLD = $(LD) else - M68KAS = $(CROSS_COMPILE_M68K)as + M68KCC = $(CROSS_COMPILE_M68K)gcc M68KLD = $(CROSS_COMPILE_M68K)ld endif quiet_cmd_build_wanxlfw = BLD FW $@ cmd_build_wanxlfw = \ - $(CPP) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(M68KAS) -m68360 -o $(obj)/wanxlfw.o; \ + $(M68KCC) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi -c -o $(obj)/wanxlfw.o $<; \ $(M68KLD) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \ hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x ,//g;1s/^/static const u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \ rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o From patchwork Thu Mar 26 05:57:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11459327 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3281F1668 for ; Thu, 26 Mar 2020 05:58:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1265420772 for ; Thu, 26 Mar 2020 05:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585202307; bh=OhekPoJuC9vwRp78NfmnSRFuigvA7fJX+5w6f1PSSFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vGDRhUCk7JS31nLcopUp82gIRp501Y0ZOzW8ai3fj6nqA5D3cbQpHFiXIGVOz4lH3 sUkOE9ckqVat7R0cI+BN+IQxnC2i4gX/vNXItzBRQpEAtUh+WSrLrOiB4cf/KDxKea GmZjxgFJE10PSEvYyOoh4/vHPNvXOjAC8SXV8z54= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726259AbgCZF60 (ORCPT ); Thu, 26 Mar 2020 01:58:26 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:47754 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725854AbgCZF60 (ORCPT ); Thu, 26 Mar 2020 01:58:26 -0400 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 02Q5ve96008573; Thu, 26 Mar 2020 14:57:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 02Q5ve96008573 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1585202262; bh=RjmAIJifJD5EjYLBPngifFMr8SyoOw1VRH4zJbCaW44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0npEybbV/z2lQiHwEs9TcPf5+poHUosRxXgwWfTNlY0D593Lc5sxgg3TW8bgnxjmY 7hX43Es4EaTmdEOf4fzkcusWx/1+rz6MrwYd6v+Sgx5BafCADuzRTM9ELLBUC7o/V0 p0CChm95KUAbSKBF8tUVnBi2vopRnHPeWX6kc4ikco8XHPW2fuRYfqS5ef6B5L67yx l82dEkMArUHtg2RAAgAAkB68/UWwxidScmcuTX1Jrgch3QVGFzcj0jzOKZLW6EaLJB DWXLqcaQCOUX5TqMRC+xe0gQ8t3tlF3zs+s5tPdGhdAB4j9vo6qHcv2R1J7YOvSgkh mP0gwu3qrBwjA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: clang-built-linux@googlegroups.com, Geert Uytterhoeven , Masahiro Yamada , "David S. Miller" , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 3/4] net: wan: wanxl: refactor the firmware rebuild rule Date: Thu, 26 Mar 2020 14:57:17 +0900 Message-Id: <20200326055719.16755-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200326055719.16755-1-masahiroy@kernel.org> References: <20200326055719.16755-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Split the big recipe into 3 stages, compile, link, and hexdump. After this commit, the build log with CONFIG_WANXL_BUILD_FIRMWARE will look like this: M68KAS drivers/net/wan/wanxlfw.o M68KLD drivers/net/wan/wanxlfw.bin BLDFW drivers/net/wan/wanxlfw.inc CC [M] drivers/net/wan/wanxl.o Signed-off-by: Masahiro Yamada --- Changes in v2: None drivers/net/wan/Makefile | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index cf7a0a65aae8..380271a011e4 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile @@ -47,14 +47,23 @@ else M68KLD = $(CROSS_COMPILE_M68K)ld endif -quiet_cmd_build_wanxlfw = BLD FW $@ - cmd_build_wanxlfw = \ - $(M68KCC) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi -c -o $(obj)/wanxlfw.o $<; \ - $(M68KLD) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \ - hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x ,//g;1s/^/static const u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \ - rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o - -$(obj)/wanxlfw.inc: $(src)/wanxlfw.S - $(call if_changed_dep,build_wanxlfw) -targets += wanxlfw.inc +quiet_cmd_build_wanxlfw = BLDFW $@ + cmd_build_wanxlfw = hexdump -ve '"\n" 16/1 "0x%02X,"' $< | \ + sed 's/0x ,//g;1s/^/static const u8 firmware[]={/;$$s/,$$/\n};\n/' > $@ + +$(obj)/wanxlfw.inc: $(obj)/wanxlfw.bin FORCE + $(call if_changed,build_wanxlfw) + +quiet_cmd_m68kld_bin_o = M68KLD $@ + cmd_m68kld_bin_o = $(M68KLD) --oformat binary -Ttext 0x1000 $< -o $@ + +$(obj)/wanxlfw.bin: $(obj)/wanxlfw.o FORCE + $(call if_changed,m68kld_bin_o) + +quiet_cmd_m68kas_o_S = M68KAS $@ + cmd_m68kas_o_S = $(M68KCC) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi -c -o $@ $< + +$(obj)/wanxlfw.o: $(src)/wanxlfw.S FORCE + $(call if_changed_dep,m68kas_o_S) endif +targets += wanxlfw.inc wanxlfw.bin wanxlfw.o From patchwork Thu Mar 26 05:57:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11459325 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C70DB1668 for ; Thu, 26 Mar 2020 05:58:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A614F20714 for ; Thu, 26 Mar 2020 05:58:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585202293; bh=0b/FijuPiTaZFY7x4QwdXh21Yb/+YkugNeLcmOGm5Bk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ioueU7NWu5Xm6KxTUZG8D8wgvgMy5zC3KVvKQSrECuLXJRgOtUyrB3fCjyW9cd8el Pqkg0G5K7465vMTsX7wAn5NMQnSU/XKVEvcKMNxafa/t64tfggmtfZ3QqqpY8cOcLv K8SWt5h8Srvk+H2jsAIhGPJ1BtuExgkQ6I5POEQQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726259AbgCZF6N (ORCPT ); Thu, 26 Mar 2020 01:58:13 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:47422 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725854AbgCZF6N (ORCPT ); Thu, 26 Mar 2020 01:58:13 -0400 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 02Q5ve97008573; Thu, 26 Mar 2020 14:57:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 02Q5ve97008573 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1585202263; bh=C9kzZXmIKqsEqPxkq+FbEJxlP3ux1NGhl1py0BoTGlk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AHhLn/XRtP8sD0q07kdk58SES4vmIs1eXRovc6LDLMQ5MO562Uc5dbWRykxdNbghp bURcmlECASN65vcqh8B3E0hWQJk8OFtulL9qrnRlAUGFb+m81eBADDxE5p7phXMGyp C2+60u4hm5nNijZVoWOjwdgtJeeRw4vOg14ZQy0wG+fFFup3mmbf2tm/ujQ/11RMnY I6P+9XOLRd2uY0j4v4kVH6OmyoPWk793sJTagWTxgdQ57/K41ciEbhh4mgDvKF+gAP wBfpfTAfVvoCQjDqUEZ/XrJhfRVGqMbCBpuP0wS2rSfqS5+4EbjYaX+lmAt70YzLnO jdDVmeEl1pUog== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: clang-built-linux@googlegroups.com, Geert Uytterhoeven , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] kbuild: remove AS variable Date: Thu, 26 Mar 2020 14:57:18 +0900 Message-Id: <20200326055719.16755-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200326055719.16755-1-masahiroy@kernel.org> References: <20200326055719.16755-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org As commit 5ef872636ca7 ("kbuild: get rid of misleading $(AS) from documents") noted, we rarely use $(AS) directly in the kernel build. Now that the only/last user of $(AS) in drivers/net/wan/Makefile was converted to $(CC), $(AS) is no longer used in the build process. You can still pass in AS=clang, which is just a switch to turn on the LLVM integrated assembler. Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers Reviewed-by: Nathan Chancellor --- Changes in v2: - Fix breakage of CC=clang build Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fcec84681e4e..2e12fa1cc8f3 100644 --- a/Makefile +++ b/Makefile @@ -405,7 +405,6 @@ KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) $(HOSTLDFLAGS) KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS) $(HOSTLDLIBS) # Make variables (CC, etc...) -AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld CC = $(CROSS_COMPILE)gcc CPP = $(CC) -E @@ -535,7 +534,7 @@ endif ifneq ($(GCC_TOOLCHAIN),) CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN) endif -ifeq ($(shell $(AS) --version 2>&1 | head -n 1 | grep clang),) +ifeq ($(if $(AS),$(shell $(AS) --version 2>&1 | head -n 1 | grep clang)),) CLANG_FLAGS += -no-integrated-as endif CLANG_FLAGS += -Werror=unknown-warning-option