From patchwork Sun Nov 5 07:52:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2010613vqu; Sun, 5 Nov 2023 00:52:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQcYlK8vtgVnHe0Bnwbu4sRXwgLFTjsdmTKL0xw6wPugQJmBIvI0yIEyHuEXNCGlUoXzHH X-Received: by 2002:a05:6358:6f9c:b0:168:e8f8:c5cb with SMTP id s28-20020a0563586f9c00b00168e8f8c5cbmr32039941rwn.0.1699170767616; Sun, 05 Nov 2023 00:52:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699170767; cv=none; d=google.com; s=arc-20160816; b=UkEXsT3yWuKvflwVuoqycPj/el4xmcoL8dQTXZJO/yOKKSg9DWCiF7ehUGJOash5Hi C3Ca+1tyDmEVmK/ndPYc2XBHfOzRYwzXTUAMkWDqa5T52GdUt4P4zFfrjdOaROEL9inR yIfB5i7RgIXom3hABQRUc7oTXUUzJ1onZXhpZM8oj6//ZcYNHqVYK046ik9+oKLJeMRb kXb8hpMzrD95IaEhNaW7SbkQf7PwO7K3dvE9ZipAS+YQhBydSElGqtk9SPUQXQFgMX92 Vg3Kp85vU5IAY5W2+rv3vdvguuCju0ma2FcrSlDXkXjcoxlFwEeLO6SCmkIwdmK1SFGB mfiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=WD7VurdsalH+rFVipUhqh6kSpyvH6wxexmQI+Hj91zo=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=se3Id0i4kr2uR8umgjMWboMSRGT7fK/e355YTeBSj5i3ncIGC7M3XBn41wQ+8+2e1i xlP77JotVUY3eYPOva6OoGpRCFS/6L0D6Lh50W5e9C0jVQ2Nw/L88KBBLH4boBZjep/d GnVpMbCWB04mEKuhsopH5ovoD7BFFFMgsqxBYJKK8vPfgqzxQU396tM/sDc9ekt/AbL2 2Tw9SpCoBLuFYnN/00FADj8q+RnJHYRoGkzSNbxoK/+9m+nmvL30eGROMRicugMNOjsd iQ4mlua+BiTGvYgXbZEugELzSGGOaaK17NTiBTN97OjMnkzDM95yJGzIkpR+Tc1qs76i GO6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=f73iM5AT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id jx13-20020a170903138d00b001c58401354dsi5139452plb.565.2023.11.05.00.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 00:52:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=f73iM5AT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id F2A9B8069348; Sun, 5 Nov 2023 00:52:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229956AbjKEHwb (ORCPT + 35 others); Sun, 5 Nov 2023 02:52:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbjKEHwa (ORCPT ); Sun, 5 Nov 2023 02:52:30 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95224C6; Sun, 5 Nov 2023 00:52:27 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6706C433C8; Sun, 5 Nov 2023 07:52:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699170747; bh=vGB0nDcdTA3XbEVZQznJAI0xImZuzvvObk2/Ib9/Z8s=; h=From:To:Cc:Subject:Date:From; b=f73iM5ATcGVFBCbtFfRSVMNGxmMdawdoxtcoXUTYimpaEd/j84m3utxfu9tfHRbHX Kg3n9qIR14zuaoSG6v4cUCpQWSw/qJIEWYMF7YIG2tSBvcM+fmCWohAE3gZJins7ab T7JlSs4xZm9+Hn+t3nriSjK3sfiUVuMxSDgDGfETws8wwEgKYJTlvyET2EBwfSgUYA SNpCdRTVceHMvbMQf2pL2EGIm8LLlH3MIiuLDI3i4gdImtTUNNb+HFWnqRff4P8V8l 4Fwqj7i2b6T7/5uuMXYusmr9KUPG4AfbAt9t6+SPxrJ0Tg2brjJ4zniZ1g9TzrarWq Dx6jXJ32+/bJg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 1/2] genksyms: remove the remnant of the -s option Date: Sun, 5 Nov 2023 16:52:17 +0900 Message-Id: <20231105075218.61536-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 05 Nov 2023 00:52:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781709686677812299 X-GMAIL-MSGID: 1781709686677812299 Commit 74d931716151 ("genksyms: remove symbol prefix support") removed the -s (--symbol-prefix) option. Clean up the left-over. Signed-off-by: Masahiro Yamada --- scripts/genksyms/genksyms.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c index f5dfdb9d80e9..6636d5b30eba 100644 --- a/scripts/genksyms/genksyms.c +++ b/scripts/genksyms/genksyms.c @@ -719,7 +719,6 @@ static void genksyms_usage(void) { fputs("Usage:\n" "genksyms [-adDTwqhVR] > /path/to/.tmp_obj.ver\n" "\n" #ifdef __GNU_LIBRARY__ - " -s, --symbol-prefix Select symbol prefix\n" " -d, --debug Increment the debug level (repeatable)\n" " -D, --dump Dump expanded symbol defs (for debugging only)\n" " -r, --reference file Read reference symbols from a file\n" @@ -730,7 +729,6 @@ static void genksyms_usage(void) " -h, --help Print this message\n" " -V, --version Print the release version\n" #else /* __GNU_LIBRARY__ */ - " -s Select symbol prefix\n" " -d Increment the debug level (repeatable)\n" " -D Dump expanded symbol defs (for debugging only)\n" " -r file Read reference symbols from a file\n" @@ -763,10 +761,10 @@ int main(int argc, char **argv) {0, 0, 0, 0} }; - while ((o = getopt_long(argc, argv, "s:dwqVDr:T:ph", + while ((o = getopt_long(argc, argv, "dwqVDr:T:ph", &long_opts[0], NULL)) != EOF) #else /* __GNU_LIBRARY__ */ - while ((o = getopt(argc, argv, "s:dwqVDr:T:ph")) != EOF) + while ((o = getopt(argc, argv, "dwqVDr:T:ph")) != EOF) #endif /* __GNU_LIBRARY__ */ switch (o) { case 'd': From patchwork Sun Nov 5 07:52:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161619 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2010705vqu; Sun, 5 Nov 2023 00:53:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFysovMTBiBrJKSvePqQpuOOxpIm1+UriFGcQTPOKMx+1IxEidi17tefY2iM7zOO1MP0mwq X-Received: by 2002:a05:6602:13c4:b0:790:bc17:1c63 with SMTP id o4-20020a05660213c400b00790bc171c63mr33531460iov.1.1699170787945; Sun, 05 Nov 2023 00:53:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699170787; cv=none; d=google.com; s=arc-20160816; b=hnRuDr+tXyvXAbS4l8CY9GGZ+LJ9twhy1DTGie1AF61RAGueM4xy9QSICpiKYegteT LArKG4DDPpvy5uJIH3CY5E+XXAaJQblXwm83FViT3nyhDkgw5K0TiSxluBMjlixuDA/x RdXjvuN/PROkFRwla6Xheuo3TqaD/0EbvZeYyL5TRzghp+4AG20mmA1bk2ATDBL4RysU 5qsSkXr1LGoZduy7yW4x01Cl7Of4wXZrYNasxNJ9geWpZVie7hFe2xkmbmkvfEDAfs1S 8A98fe/33YzCbn6l+adaL0eQu75A1b6Yb+8Wx9UzHGvdgBJPiMCpCfJKfZxbg4iIM58t TQcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NvW990Xgze/J4+05kOp61aTPqEjq/Qz6ND+xf5ro9J0=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=zChiZ0H5Mz+siZceXmDPIh1NMVtLtNYG/vtkxl4ZVakrrkyrFYrsWsJQ9FOaC74K03 KnrYh40MpSbT2bIk7JOY7hf9Rnd2f+vSGsI6CVcgZpyFRv+rkXSrx+tAYng/iN0YFUgP KCBHItpVr7LVTJzZqcihfUlLhTqYxF6z7KX3+2Uzr22ykB2+kayHnqrlztGgjU8S5m8o 1EqFUCM0waAXGcPnZYhWLmDEAF1ugXXba7VETy2PO7uZGYFTpARMvi2WkaQCBKtZ+rea fv+3Nj9EIWa32dVPJt9RDFOMdW/cQMKpGURjKcY+/i4vABVdUuGsVLFBtmQzEfyTZ+wF EUNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D+hHVNKa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id bf7-20020a656d07000000b005648b1d63aasi5918770pgb.553.2023.11.05.00.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 00:53:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D+hHVNKa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id AED9C8098484; Sun, 5 Nov 2023 00:53:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230019AbjKEHwj (ORCPT + 35 others); Sun, 5 Nov 2023 02:52:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229981AbjKEHwd (ORCPT ); Sun, 5 Nov 2023 02:52:33 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4169EE; Sun, 5 Nov 2023 00:52:30 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 471F7C433CA; Sun, 5 Nov 2023 07:52:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699170750; bh=A5a3osThQWoTahhEklksxkVo9fkv0G/I6pPuMuYtcvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D+hHVNKadgFpQQLCPsYUji10tNz0XUlfGUChkvfZ2Nk9NpdCF7KyCrcvNXDALBeM5 vBwhs58zlgDopNAQbyrZ61yiO24fAfyt+LjBenGxC/emG90tF6kDBfoMrT9vSPTcbu 0nF+Mcoy9F8twFx+BzO/viPz/JZ8olYJZTunVMzcsTy/eYqPtHYS1zbTPxpQA6JRHF jJWk3yxuqEwvD0g5iSCOztlkGUO9m8G0zyvXzh4X+EveNGh1W4dnZs1HxLpCYtF2nU okRMCZxGt2UTZMWs5deLKR0IvUrHWmx7/AYsQ+aT9CgMkUfvX/PGeCfuRD/TfVrMRL dRTZEu+ck26MA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 2/2] genksyms: use getopt_long() unconditionally Date: Sun, 5 Nov 2023 16:52:18 +0900 Message-Id: <20231105075218.61536-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231105075218.61536-1-masahiroy@kernel.org> References: <20231105075218.61536-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 05 Nov 2023 00:53:05 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781709708155468866 X-GMAIL-MSGID: 1781709708155468866 getopt_long() is used by various tools in the kernel (e.g. Kconfig). It should be fine to use it all the time. Signed-off-by: Masahiro Yamada --- scripts/genksyms/genksyms.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c index 6636d5b30eba..f3901c55df23 100644 --- a/scripts/genksyms/genksyms.c +++ b/scripts/genksyms/genksyms.c @@ -16,9 +16,7 @@ #include #include #include -#ifdef __GNU_LIBRARY__ #include -#endif /* __GNU_LIBRARY__ */ #include "genksyms.h" /*----------------------------------------------------------------------*/ @@ -718,7 +716,6 @@ void error_with_pos(const char *fmt, ...) static void genksyms_usage(void) { fputs("Usage:\n" "genksyms [-adDTwqhVR] > /path/to/.tmp_obj.ver\n" "\n" -#ifdef __GNU_LIBRARY__ " -d, --debug Increment the debug level (repeatable)\n" " -D, --dump Dump expanded symbol defs (for debugging only)\n" " -r, --reference file Read reference symbols from a file\n" @@ -728,17 +725,6 @@ static void genksyms_usage(void) " -q, --quiet Disable warnings (default)\n" " -h, --help Print this message\n" " -V, --version Print the release version\n" -#else /* __GNU_LIBRARY__ */ - " -d Increment the debug level (repeatable)\n" - " -D Dump expanded symbol defs (for debugging only)\n" - " -r file Read reference symbols from a file\n" - " -T file Dump expanded types into file\n" - " -p Preserve reference modversions or fail\n" - " -w Enable warnings\n" - " -q Disable warnings (default)\n" - " -h Print this message\n" - " -V Print the release version\n" -#endif /* __GNU_LIBRARY__ */ , stderr); } @@ -747,7 +733,6 @@ int main(int argc, char **argv) FILE *dumpfile = NULL, *ref_file = NULL; int o; -#ifdef __GNU_LIBRARY__ struct option long_opts[] = { {"debug", 0, 0, 'd'}, {"warnings", 0, 0, 'w'}, @@ -763,9 +748,6 @@ int main(int argc, char **argv) while ((o = getopt_long(argc, argv, "dwqVDr:T:ph", &long_opts[0], NULL)) != EOF) -#else /* __GNU_LIBRARY__ */ - while ((o = getopt(argc, argv, "dwqVDr:T:ph")) != EOF) -#endif /* __GNU_LIBRARY__ */ switch (o) { case 'd': flag_debug++;