Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2016551imm; Thu, 14 Jun 2018 07:30:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKBhvjZuR9qmQBgvAo46QwT2vCJfT8Y7tgKutWjN31setO5l9zmM6BbeF7P7oDNTEtfcw1m X-Received: by 2002:a65:6008:: with SMTP id m8-v6mr2565178pgu.134.1528986643878; Thu, 14 Jun 2018 07:30:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528986643; cv=none; d=google.com; s=arc-20160816; b=062RXWGWN06G57olWZHMsGOpr8yo93DOVY2OmOrqyUwWFkueJIhyCegJ4WCbKKzt8c oba2mpr4gyR8Ho9d4pQkvewaJkDy7D9TQWTbbvKHa4d0dFOW5c4huEhZv7IdOFVIx3MG mMYhL929Mdz6wSqnnOQF4t0Qi3PnynIOY2wpDAEKa1GRIf7h58LGECyC/SHpc1mCDIFy 6Bu6RPh4XuM0axCpVdr93uW68N7k0WBzRabtlCPqfitvmdXPfrBtXY751QBySYg0B2uc 7ZS7GAU7ohcBMc2HC1FxPpgDh2414XvKHBYmX3UX+NJNwpu9BL8A0h7JifiBMhRcIalP N5Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=pfipyzSY0U6XQqVVKlsNWlbgpndnkJpG2YJxbUxkRc4=; b=Lq7qDxRfeKUm1mRxgCv6IfdZhFbWBWb7GTtA9k+OMHk/yuJUKtUUauAz2xnzHanLY4 n714P/Rb1RWyH+ScB0c3wCrjirHrVTQTM/2nHMRMH1Ww2tApZCmZFN02577BWxjAYSvh 18RjjOEE2hPvhv2Y6ZhoXcyYML0zJgvjsQHjOy/BQfAov+J8JHbkpW4Xa/mlrhczDKI9 xKA0Ewpv9eUaScaGMJc49ihNtuQJP9dcgFqmTYyoY/VJWK+3w60uMiYM+ZcRrVOLTpL0 0ZauhhWYMccE3ox5d0jyg7dgFnO/bTWlYrOnZxeixkUwuk1B5KGZDk6wpiE7P+cESTir dZxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MQ2Cgjck; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e12-v6si4472158pgn.171.2018.06.14.07.30.29; Thu, 14 Jun 2018 07:30:43 -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=@kernel.org header.s=default header.b=MQ2Cgjck; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965887AbeFNO3m (ORCPT + 99 others); Thu, 14 Jun 2018 10:29:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:33186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965496AbeFNO3j (ORCPT ); Thu, 14 Jun 2018 10:29:39 -0400 Received: from localhost.localdomain (jahogan.plus.com [212.159.75.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9CE9F20020; Thu, 14 Jun 2018 14:29:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1528986579; bh=/djgnUFtlbOU+jAQGdbmm7Ws7pU/hVoCUZ4P8g+Mn/A=; h=From:To:Cc:Subject:Date:From; b=MQ2CgjckXGZXk3Wg+gNzvOeSabxUcxjho7ziIMUbrYgTkcQfKlSc99562OZGaaWWz M2JeijENsdRDlzSfxrXxofj6klTmjE7DPyV3UVS+tA/FWtPp+KvW72ERTIScbj1UPR bbdrN6shD3YXLWpVDjkq3kjLZxcBqZ860MNtSW3s= From: James Hogan To: Greentime Hu , Vincent Chen Cc: linux-kernel@vger.kernel.org, Guenter Roeck , James Hogan , Matt Redfearn , Palmer Dabbelt Subject: [PATCH v2] nds32: Fix build error caused by configuration flag rename Date: Thu, 14 Jun 2018 15:28:52 +0100 Message-Id: <20180614142852.22226-1-jhogan@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck Fix build error on nds32 due to the merge of commit e3d5980568f ("lib: Rename compiler intrinsic selects to GENERIC_LIB_*") during the 4.18 merge window which renames Kconfig symbols. This had raced with commit aeaa7af744fa ("nds32: lib: To use generic lib instead of libgcc to prevent the symbol undefined issue.") merged late in the 4.17 cycle, which added selects to nds32 using the original Kconfig symbol names. When they came together in merge commit 763f96944c95 ("Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux") this resulted in the following build errors: nds32le-linux-ld: kernel/time/timekeeping.o: in function `timekeeping_init': timekeeping.c:(.init.text+0x140): undefined reference to `__ashldi3' nds32le-linux-ld: timekeeping.c:(.init.text+0x144): undefined reference to `__ashldi3' nds32le-linux-ld: timekeeping.c:(.init.text+0x17e): undefined reference to `__lshrdi3' nds32le-linux-ld: timekeeping.c:(.init.text+0x182): undefined reference to `__lshrdi3' nds32le-linux-ld: drivers/clocksource/mmio.o: in function `clocksource_mmio_init': mmio.c:(.init.text+0x54): undefined reference to `__lshrdi3' nds32le-linux-ld: mmio.c:(.init.text+0x58): undefined reference to `__lshrdi3' Rename all 6 selects in nds32 and adjust the ordering accordingly to be alphabetical. Fixes: 763f96944c95 ("Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux") Signed-off-by: Guenter Roeck [jhogan@kernel.org: Rename all 6 symbols, sort, update commit message] Signed-off-by: James Hogan Cc: Greentime Hu Cc: Vincent Chen Cc: Matt Redfearn Cc: Palmer Dabbelt --- Changes in v2: - Rename all 6 symbols, not just the 3 that caused build failures. - Sort selects. - Update commit message. --- arch/nds32/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig index 6aed974276d8..34f7222c5efe 100644 --- a/arch/nds32/Kconfig +++ b/arch/nds32/Kconfig @@ -12,17 +12,17 @@ config NDS32 select CLONE_BACKWARDS select COMMON_CLK select DMA_NONCOHERENT_OPS - select GENERIC_ASHLDI3 - select GENERIC_ASHRDI3 - select GENERIC_LSHRDI3 - select GENERIC_CMPDI2 - select GENERIC_MULDI3 - select GENERIC_UCMPDI2 select GENERIC_ATOMIC64 select GENERIC_CPU_DEVICES select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select GENERIC_IRQ_SHOW + select GENERIC_LIB_ASHLDI3 + select GENERIC_LIB_ASHRDI3 + select GENERIC_LIB_CMPDI2 + select GENERIC_LIB_LSHRDI3 + select GENERIC_LIB_MULDI3 + select GENERIC_LIB_UCMPDI2 select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER select GENERIC_TIME_VSYSCALL -- 2.17.1