From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 7BA563858D1E for ; Tue, 3 Jan 2023 10:31:59 +0000 (GMT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9906C61241; Tue, 3 Jan 2023 10:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1672741918; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qZALRWql4qj6xjLZX8sKXU2fIEleFhNWkzdDnLVObgw=; b=fkkx9lhGZjYFjeJ51hfXzk8z+BDaSbajk9OsM+NEUX4jmsbL0o70g463rVUXE9fW/fvcdE iNxpp/eWmq4sJXslKpQOi7gkjF+E6ceLQgW5s///IzqPScKZW4h4+uR4pDMqAJ1iKkcv1L q3yYJmIHHQztlBzFcEgFbF5xClA/n4k= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 833351392B; Tue, 3 Jan 2023 10:31:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Lf0NHx4EtGM4RQAAMHmgww (envelope-from ); Tue, 03 Jan 2023 10:31:58 +0000 From: Petr Pavlu To: libabigail@sourceware.org Cc: petr.pavlu@suse.com Subject: [PATCH] abidiff: Fix handling of linux-kernel-mode Date: Tue, 3 Jan 2023 11:28:55 +0100 Message-Id: <20230103102855.21686-1-petr.pavlu@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This fixes 08e76022 ("Support Linux Kernel ABI whitelist files") and 8fd02e0a ("Use the CTF reader by default when applicable"). The first commit removed handling of option --no-linux-kernel-mode. The second one stopped passing opts.linux_kernel_mode down to the library which also caused changing the default linux-kernel-mode of abidiff from true to false. Both changes look unintentional as they are not mentioned in either commit message. Restore handling of the linux-kernel-mode in abidiff to match what is described in doc/manuals/abidiff.rst and make it again consistent with abidw. * tools/abidiff.cc (parse_command_line): Recognize --no-linux-kernel-mode. (main): Pass opts.linux_kernel_mode down to the library. Signed-off-by: Petr Pavlu --- tools/abidiff.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/abidiff.cc b/tools/abidiff.cc index b27d8b08..91a626a9 100644 --- a/tools/abidiff.cc +++ b/tools/abidiff.cc @@ -434,6 +434,8 @@ parse_command_line(int argc, char* argv[], options& opts) opts.exported_interfaces_only = true; else if (!strcmp(argv[i], "--allow-non-exported-interfaces")) opts.exported_interfaces_only = false; + else if (!strcmp(argv[i], "--no-linux-kernel-mode")) + opts.linux_kernel_mode = false; else if (!strcmp(argv[i], "--no-default-suppression")) opts.no_default_supprs = true; else if (!strcmp(argv[i], "--no-architecture")) @@ -1235,7 +1237,8 @@ main(int argc, char* argv[]) create_best_elf_based_reader(opts.file1, opts.prepared_di_root_paths1, env, requested_fe_kind, - opts.show_all_types); + opts.show_all_types, + opts.linux_kernel_mode); ABG_ASSERT(rdr); set_generic_options(*rdr, opts); set_suppressions(*rdr, opts); @@ -1307,7 +1310,8 @@ main(int argc, char* argv[]) create_best_elf_based_reader(opts.file2, opts.prepared_di_root_paths2, env, requested_fe_kind, - opts.show_all_types); + opts.show_all_types, + opts.linux_kernel_mode); ABG_ASSERT(rdr); set_generic_options(*rdr, opts); -- 2.39.0