From patchwork Thu Nov 24 12:18:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 25492 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3361315wrr; Thu, 24 Nov 2022 04:18:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf6dveO9g8CDZGCG8luDDZThWBD7X38ZFEgx0KYhzpJF6xdr73OWWbrLlf+4T5cgtuz/aB1S X-Received: by 2002:a17:906:5ad1:b0:7b2:b15e:3242 with SMTP id x17-20020a1709065ad100b007b2b15e3242mr24837165ejs.672.1669292322623; Thu, 24 Nov 2022 04:18:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669292322; cv=none; d=google.com; s=arc-20160816; b=sMEO6HwG7ulRLYhBSX7NSo7E8Wxh7v/dyUfobQLtPpANNqzEqw/WVM4+vJGuWvjUtp 9WXUL22dDiPXt6DLI8YF3DrvdiT3oCpGten9e/Jk5caNnl75Vb206OEXgnmyrvNgOp5a YhrphlFJiGT2d8lZaUAp9rwQgnnCP2f+5ZVFmx8G7bzi9317thESt7TYJfSfTYWZaF18 Ths9lASMIdof9wXPReozxSChZ1IZDJld7Tq3vy6a7opPTLNbB1tLkgv6ouWHtf7FYvl+ Xanwg8CJdqIKvPusrISir7qd89WZJKP32SPXeqo467dZpUj8mR7L+eODAoMKGviz0kk2 VerA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding:cc :content-language:to:subject:from:user-agent:mime-version:date :message-id:dkim-signature:dkim-signature:dmarc-filter:delivered-to; bh=1Ee0XTEozFCXwGqFLjCV+pDYAZwiwNo5PsXSmQ4F/qQ=; b=tJs1PBkYk/b1S2rZdEYb618wpFOaawCdWUpBTgUK6m8V9xsEpQkmolJNvInXRLzLX/ n63lY+nwRkulyIFefrrSvKRRKLnTv7XJtnxMgaZa8qwHnsoKWcx2LpleWoa9xDK6E7kb Ed/Pfvw+yAN99Z6u16vcPNPbzcDOB+nvqQR8t8cPJ3dOlyGQxVHhHacTPRBgkZWWnq/J dl80GZZhcSSebb9VdbM4czhsrFZh9lTdExU4lVBktHakp/NwtvSHZul/WVjnuTP6YVsk 8zU5Bq4csqMCvX2iD5to/TFlPb2tpBbydtpTz8Nk3oGbIR3V3w+5nNhjb+de9t9Geqjg nrxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=Ojk+FsHX; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id d24-20020a056402401800b0045d4b7ad162si791952eda.546.2022.11.24.04.18.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 04:18:42 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=Ojk+FsHX; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 33CE8384F6FB for ; Thu, 24 Nov 2022 12:18:41 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 7B29F384F6D7 for ; Thu, 24 Nov 2022 12:18:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7B29F384F6D7 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz 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 814711F6E6; Thu, 24 Nov 2022 12:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1669292313; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ee0XTEozFCXwGqFLjCV+pDYAZwiwNo5PsXSmQ4F/qQ=; b=Ojk+FsHXKlc6zGbIrq8nvg1DFhm63NqAgKxTY5uHtvwdEDcXnclr/LWwsQhRJNKfb2FlD8 sb+mmTFHONGtQNzyzl7HnR5C1//AKi3fcsd3LxxS9ovID0y64MKGljrP5ENtsp83jOUmpO biXLJ11ADU6cX9lLQdrewypIhcRSFHc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1669292313; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Ee0XTEozFCXwGqFLjCV+pDYAZwiwNo5PsXSmQ4F/qQ=; b=V/V5yCq34pw0QaAwFHbEYgMLTOGncrKbslnkjgniirBlwMy3UHmof+E6L00TUCS4JA4BzN ISVlymKai+W+88AA== 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 6E4E313488; Thu, 24 Nov 2022 12:18:33 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OWPvGRlhf2PQfQAAMHmgww (envelope-from ); Thu, 24 Nov 2022 12:18:33 +0000 Message-ID: <9790982d-5a3d-f711-b588-184edd41a0dd@suse.cz> Date: Thu, 24 Nov 2022 13:18:33 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH][PUSHED] readelf: Do not require EI_OSABI for IFUNC. To: binutils@sourceware.org Content-Language: en-US Cc: Nick Clifton X-Spam-Status: No, score=-11.9 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750379866383216481?= X-GMAIL-MSGID: =?utf-8?q?1750379866383216481?= Pushed as it's pre-approved by Nick. Cheers, Martin PR29718 binutils/ChangeLog: * readelf.c (get_symbol_type): Consider STT_GNU_IFUNC as reserved name. --- binutils/readelf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/binutils/readelf.c b/binutils/readelf.c index 1bd6df9448a..365c1ede0a1 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -12724,6 +12724,9 @@ get_symbol_type (Filedata * filedata, unsigned int type) case STT_TLS: return "TLS"; case STT_RELC: return "RELC"; case STT_SRELC: return "SRELC"; + case STT_GNU_IFUNC: return "IFUNC"; /* As mentioned in PR29718, do not + require EI_OSABI as IFUNC is + a reseved name. */ default: if (type >= STT_LOPROC && type <= STT_HIPROC) { @@ -12748,11 +12751,6 @@ get_symbol_type (Filedata * filedata, unsigned int type) return "HP_STUB"; } - if (type == STT_GNU_IFUNC - && (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_GNU - || filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_FREEBSD)) - return "IFUNC"; - snprintf (buff, sizeof (buff), _(": %d"), type); } else