From patchwork Thu Nov 24 12:23:19 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: 61076 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 003BC38493E2 for ; Thu, 24 Nov 2022 12:23:27 +0000 (GMT) X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 29570384F6FB for ; Thu, 24 Nov 2022 12:23:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 29570384F6FB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=fail 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 636A81F6E6; Thu, 24 Nov 2022 12:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1669292600; 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=SI2IjuVLRdt368hKtRz1i0zXWzyd1yh/Fs5CdH14sG0=; b=quhPGt/sUEtbXhFxRKrtbTokoqaHzVRKg48EtuTCJtLi56RB7UgtakLTgkpOCjejfD1buj adql8+PvhKqOAsJ2A9O6D2M4qz2mIh6lWHTTy9pJtTk4Be8l3EojPvhzgK8sAiSy1sDcDI 9gqKnyWrS8ENriKZJgyFCJ1WU7l7I5M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1669292600; 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=SI2IjuVLRdt368hKtRz1i0zXWzyd1yh/Fs5CdH14sG0=; b=xsShfs+g7pkzTLWNwAavwfJH+FHaHEXSbPrkOFuTZajOxSSpyDYAfcxwcBVP4/qWJUFQ6L IHHeRqulKwtcB7Cg== 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 4477C13488; Thu, 24 Nov 2022 12:23:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id B2O7Dzhif2OZAQAAMHmgww (envelope-from ); Thu, 24 Nov 2022 12:23:20 +0000 Message-ID: <87cbeb0f-a329-ed9f-2d8b-35277cd0e5e6@suse.cz> Date: Thu, 24 Nov 2022 13:23:19 +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] libebl: Do not require EI_OSABI for IFUNC. To: elfutils-devel@sourceware.org Content-Language: en-US Cc: Mark Wielaard X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_STOCKGEN, SPF_HELO_NONE, SPF_SOFTFAIL, 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: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , Errors-To: elfutils-devel-bounces+patchwork=sourceware.org@sourceware.org Sender: "Elfutils-devel" Similar fix to: https://sourceware.org/bugzilla/show_bug.cgi?id=29718 Ready for master? Thanks, Martin PR 29826 libebl/ChangeLog: * eblsymboltypename.c (ebl_symbol_type_name): Do not require EI_OSABI for IFUNC --- libebl/eblsymboltypename.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libebl/eblsymboltypename.c b/libebl/eblsymboltypename.c index 0ff1722a..3b8e7ee9 100644 --- a/libebl/eblsymboltypename.c +++ b/libebl/eblsymboltypename.c @@ -65,9 +65,9 @@ ebl_symbol_type_name (Ebl *ebl, int symbol, char *buf, size_t len) snprintf (buf, len, "LOPROC+%d", symbol - STT_LOPROC); else if (symbol == STT_GNU_IFUNC && ebl != NULL - && (ident = elf_getident (ebl->elf, NULL)) != NULL - && ident[EI_OSABI] == ELFOSABI_LINUX) - return "GNU_IFUNC"; + && (ident = elf_getident (ebl->elf, NULL)) != NULL) + return "GNU_IFUNC"; /* Ignore EI_OSABI + as STT_GNU_IFUNC is a reserved name. */ else if (symbol >= STT_LOOS && symbol <= STT_HIOS) snprintf (buf, len, "LOOS+%d", symbol - STT_LOOS); else