From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qIokJrTgvGZhGQcAWB0awg (envelope-from ) for ; Wed, 14 Aug 2024 12:52:04 -0400 Received: by simark.ca (Postfix, from userid 112) id 9965E1E0D0; Wed, 14 Aug 2024 12:52:04 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 863F61E08C for ; Wed, 14 Aug 2024 12:52:02 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 15952385840A for ; Wed, 14 Aug 2024 16:52:02 +0000 (GMT) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id 090CD3858D20 for ; Wed, 14 Aug 2024 16:51:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 090CD3858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nefkom.net ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 090CD3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=212.18.0.9 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723654307; cv=none; b=TM+dB6mzVU05EH7hCUFtxQmxJp5++MvOIKkX56B0HcEdBczNHe+fZP9dW5UwrkR4MxPG+dQ8uAoPNgz9KF8jmnXXueJsCWS9duowRvQwjPrqKu3T7g2aSpkvIlg95iojI4h2ne1IPh+jPLmSNHnltFR9slR2crkzjs/cHHqy9Fc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723654307; c=relaxed/simple; bh=1Xh/YSNC3uDmrRoR3Ufaig4S2esU50Lxi5o0tsKjBsA=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=cmu09BzxQln0YsOPrtLY2Ff0mMC97jmqMMXztSJ1RhDX7L+HX/BATrLGbCdZ+gzI6ZDDFwEP++3rs8J8zuQXfWXtEiIhyrhPXCOuyeKnr3jsQQ7kSvOfGtEBaDfW+hor9Yn+q2k6jOxAHtz9MKlP7oYpQXJ/voYY365uPJk1Nss= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4WkZ6644bnz1qsPD; Wed, 14 Aug 2024 18:51:42 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 4WkZ663pZMz1qqlY; Wed, 14 Aug 2024 18:51:42 +0200 (CEST) X-Virus-Scanned: amavis at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavis, port 10024) with ESMTP id VotCcma6GSu1; Wed, 14 Aug 2024 18:51:41 +0200 (CEST) X-Auth-Info: KfSmCzB5HvoYlYcsPHV+D4kq6xlykD82lfUFYvAzG872Ly8IF2H78+eEeaUDcTaX Received: from igel.home (aftr-82-135-83-212.dynamic.mnet-online.de [82.135.83.212]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Wed, 14 Aug 2024 18:51:41 +0200 (CEST) Received: by igel.home (Postfix, from userid 1000) id EFCF82C1A9A; Wed, 14 Aug 2024 18:51:40 +0200 (CEST) From: Andreas Schwab To: gdb-patches@sourceware.org Subject: [PATCH] Fix m68k OS ABI sniffer CC: Tom Tromey X-Yow: Do you have exactly what I want in a plaid poindexter bar bat?? Date: Wed, 14 Aug 2024 18:51:40 +0200 Message-ID: <871q2r6o9v.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Do not override the generic OS ABI sniffer. Fixes: 3eba3a011a8 ("Various m68k fixes for gdb") --- gdb/m68k-tdep.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 439ebd241e8..0d268aa947b 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -1353,11 +1353,19 @@ static enum gdb_osabi m68k_osabi_sniffer (bfd *abfd) { unsigned int elfosabi = elf_elfheader (abfd)->e_ident[EI_OSABI]; + enum gdb_osabi osabi = GDB_OSABI_UNKNOWN; if (elfosabi == ELFOSABI_NONE) - return GDB_OSABI_SVR4; + { + /* Check note sections. */ + for (asection *sect : gdb_bfd_sections (abfd)) + generic_elf_osabi_sniff_abi_tag_sections (abfd, sect, &osabi); + + if (osabi == GDB_OSABI_UNKNOWN) + osabi = GDB_OSABI_SVR4; + } - return GDB_OSABI_UNKNOWN; + return osabi; } void _initialize_m68k_tdep (); -- 2.46.0 -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."