From patchwork Thu Oct 12 23:24:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Borowski X-Patchwork-Id: 825158 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yCn4Y0XWMz9sMN for ; Fri, 13 Oct 2017 10:24:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753451AbdJLXYn (ORCPT ); Thu, 12 Oct 2017 19:24:43 -0400 Received: from tartarus.angband.pl ([89.206.35.136]:36731 "EHLO tartarus.angband.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752804AbdJLXYm (ORCPT ); Thu, 12 Oct 2017 19:24:42 -0400 Received: from 89-71-161-30.dynamic.chello.pl ([89.71.161.30] helo=umbar.angband.pl) by tartarus.angband.pl with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1e2mqD-0007kt-6N; Fri, 13 Oct 2017 01:24:40 +0200 Received: from kilobyte by umbar.angband.pl with local (Exim 4.89) (envelope-from ) id 1e2mqC-0006nd-CV; Fri, 13 Oct 2017 01:24:36 +0200 From: Adam Borowski To: Krzysztof Halasa , netdev@vger.kernel.org Cc: Adam Borowski Date: Fri, 13 Oct 2017 01:24:34 +0200 Message-Id: <20171012232434.15890-1-kilobyte@angband.pl> X-Mailer: git-send-email 2.15.0.rc0 X-SA-Exim-Connect-IP: 89.71.161.30 X-SA-Exim-Mail-From: kilobyte@angband.pl X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tartarus X-Spam-Level: X-Spam-Status: No, score=-2.9 required=8.0 tests=ALL_TRUSTED=-1, BAYES_00=-1.9, TVD_RCVD_IP=0.001 autolearn=ham autolearn_force=no languages=en Subject: [PATCH] wanxl: use m68k-linux-gnu-as if available X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on tartarus.angband.pl) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This fixes build failure on Debian based systems: GNU as is the only m68k assembler available in the archive (package binutils-m68k-linux-gnu). Signed-off-by: Adam Borowski --- I have no relevant hardware, thus I can't check whether the built firmware actually works. Some opcodes are translated differently, thus it might be possible that some extra options are required. Or possibly the assembler has long since changed -- the prebuilt copy hasn't been updated anywhere within recorded history. In any case, I admit I don't really care about this driver -- it's merely a notorious cause of randconfig failures. drivers/net/wan/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index 73c2326603fc..fa17b18765b0 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile @@ -38,14 +38,20 @@ obj-$(CONFIG_SLIC_DS26522) += slic_ds26522.o clean-files := wanxlfw.inc $(obj)/wanxl.o: $(obj)/wanxlfw.inc +HAVE_GNU_M68K_AS := $(shell command -v m68k-linux-gnu-as 2> /dev/null) ifeq ($(CONFIG_WANXL_BUILD_FIRMWARE),y) ifeq ($(ARCH),m68k) AS68K = $(AS) LD68K = $(LD) +else +ifdef HAVE_GNU_M68K_AS + AS68K = m68k-linux-gnu-as + LD68K = m68k-linux-gnu-ld else AS68K = as68k LD68K = ld68k endif +endif quiet_cmd_build_wanxlfw = BLD FW $@ cmd_build_wanxlfw = \