From patchwork Fri May 27 10:01:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12863189 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB2D7C433EF for ; Fri, 27 May 2022 10:04:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350560AbiE0KEL (ORCPT ); Fri, 27 May 2022 06:04:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231489AbiE0KEK (ORCPT ); Fri, 27 May 2022 06:04:10 -0400 Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 746E6F137B; Fri, 27 May 2022 03:04:08 -0700 (PDT) Received: from grover.sesame (133-32-177-133.west.xps.vectant.ne.jp [133.32.177.133]) (authenticated) by conuserg-08.nifty.com with ESMTP id 24RA2hPT029808; Fri, 27 May 2022 19:02:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com 24RA2hPT029808 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1653645767; bh=cTEaVsseOx/T6+9eTNjc+bnIPuNDfidAbsIlj5Z4+nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XpE7bhc4dasDj31nobFoqPZGgWiHTils8FMsJswF8sT3w9ijw0iw3nlSSVTozzRMi 5lR95zCyn+Nb62hZxhVHIqd5ZAWWXF0Ki8UEf5wX/DKFCjachHKy+d4+EMx1QH29X9 oB0Auu2Zn99EC92w3maEIK2Yd/bYMipg/OlwRvvXPBFznVlCCZRQlpjuNIpRGWqhTJ yYD5OJZlt7Nj2wfepXpIJl4EV+2ROJWGCiqydkPK73l7GS0SbhKeNPsVdHn0TyShTS C9wi5Jten3kQqzhIwYCejZtkdGYT2xGN5xyt4Licsl4OkoREvNk0Ini6mrNgcEehAh Jky+sznG4p0wQ== X-Nifty-SrcIP: [133.32.177.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Josh Poimboeuf , llvm@lists.linux.dev, Helge Deller , linux-parisc@vger.kernel.org, Masahiro Yamada , "James E.J. Bottomley" Subject: [PATCH v7 3/8] parisc: fix the exit status of arch/parisc/nm Date: Fri, 27 May 2022 19:01:50 +0900 Message-Id: <20220527100155.1996314-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220527100155.1996314-1-masahiroy@kernel.org> References: <20220527100155.1996314-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org parisc overrides 'nm' with a shell script. I do not know the reason, but anyway it is how it has worked since 2003. [1] A problem is that this script returns the exit code of grep instead of ${CROSS_COMPILE}nm. grep(1) says: Normally the exit status is 0 if a line is selected, 1 if no lines were selected, and 2 if an error occurred. However, if the -q or --quiet or --silent is used and a line is selected, the exit status is 0 even if an error occurred. When the given object has no symbol, grep returns 1, while the true nm returns 0. Hence, build rules using ${NM} fail on ARCH=parisc even if the given object is valid. This commit corrects the exit status of the script. - A pipeline returns the exit status of the last command (here, grep). The exit status of ${CROSS_COMPILE}nm is just ignored. Use bash's pipefail flag to catch errors of ${CROSS_COMPILE}nm. - If grep returns 1, this script should return 0 in order to mimic true nm. If grep returns 2, it is a real and fatal error. Return it as is. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=36eaa6e4c0e0b6950136b956b72fd08155b92ca3 Signed-off-by: Masahiro Yamada --- Changes in v7: - New patch arch/parisc/Makefile | 2 +- arch/parisc/nm | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) mode change 100644 => 100755 arch/parisc/nm diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index aca1710fd658..e7139955367d 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile @@ -18,7 +18,7 @@ boot := arch/parisc/boot KBUILD_IMAGE := $(boot)/bzImage -NM = sh $(srctree)/arch/parisc/nm +NM = $(srctree)/arch/parisc/nm CHECKFLAGS += -D__hppa__=1 ifdef CONFIG_64BIT diff --git a/arch/parisc/nm b/arch/parisc/nm old mode 100644 new mode 100755 index c788308de33f..3e72238a91f3 --- a/arch/parisc/nm +++ b/arch/parisc/nm @@ -1,6 +1,14 @@ -#!/bin/sh +#!/bin/bash ## # Hack to have an nm which removes the local symbols. We also rely # on this nm being hidden out of the ordinarily executable path ## -${CROSS_COMPILE}nm $* | grep -v '.LC*[0-9]*$' + +# use pipefail to catch error of ${CROSS_COMPILE}nm +set -o pipefail + +# grep exits with 1 if no lines were selected. +# If the given object has no symbol, grep returns 1, but it is not an error. + +${CROSS_COMPILE}nm "$@" | +{ grep -v '.LC*[0-9]*$' || { exit_code=$?; test $exit_code -eq 1 || exit $exit_code; } }