From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-4.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 27A0D1F487 for ; Mon, 23 Mar 2020 13:17:48 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2A3D8393FC27; Mon, 23 Mar 2020 13:17:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A3D8393FC27 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1584969462; bh=BUt6B0/cb99119ThGD8/6WElTIqkLvIanpp/ofB3PFo=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=WMj2EzzfybkR4G5bJLnkorEIFJdDzUNrZ/YDrIROtKqXRdLvdA8y1FiyWehjzyzQe X/2Stu2gP5mrE0ySdfpUImE87d/UdBZgBfoZZBImRD+mUvdIp8WX5AKpRAB1QQAujU BXpIUqAxZF/ct8TXbu/WdO6bxqNiPglmaLzilJwQ= Received: from mail.efficios.com (mail.efficios.com [167.114.26.124]) by sourceware.org (Postfix) with ESMTPS id EDA5C3898C45 for ; Mon, 23 Mar 2020 13:17:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EDA5C3898C45 Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 865411B7E83; Mon, 23 Mar 2020 09:17:38 -0400 (EDT) Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id sAyl8yFRfNNR; Mon, 23 Mar 2020 09:17:38 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 119111B7C27; Mon, 23 Mar 2020 09:17:38 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 119111B7C27 X-Virus-Scanned: amavisd-new at efficios.com Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ln4VOK6_iQ78; Mon, 23 Mar 2020 09:17:38 -0400 (EDT) Received: from localhost.localdomain (192-222-181-218.qc.cable.ebox.net [192.222.181.218]) by mail.efficios.com (Postfix) with ESMTPSA id D910B1B7D14; Mon, 23 Mar 2020 09:17:37 -0400 (EDT) To: Carlos O'Donell Subject: [RFC PATCH glibc 1/8] Introduce Date: Mon, 23 Mar 2020 09:16:00 -0400 Message-Id: <20200323131607.15185-2-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200323131607.15185-1-mathieu.desnoyers@efficios.com> References: <20200323131607.15185-1-mathieu.desnoyers@efficios.com> X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mathieu Desnoyers via Libc-alpha Reply-To: Mathieu Desnoyers Cc: libc-alpha@sourceware.org, Joseph Myers Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From: Florian Weimer MIPS needs to ignore certain existing symbols during symbol lookup. The old scheme uses the ELF_MACHINE_SYM_NO_MATCH macro, with an inline function, within its own header, with a sysdeps override for MIPS. This allows re-use of the function from another file (without having to include or providing the default definition for ELF_MACHINE_SYM_NO_MATCH). Built with build-many-glibcs.py, with manual verification that sysdeps/mips/elf_machine_sym_no_match.h is picked up on MIPS. Tested on aarch64-linux-gnu, i686-linux-gnu, powerpc64-linux-gnu, s390x-linux-gnu, x86_64-linux-gnu. * elf/elf_machine_sym_no_match.h: New file. * elf/dl-lookip.c (ELF_MACHINE_SYM_NO_MATCH): Do not define. * elf/dl-lookup.c (check_match) Call elf_machine_sym_no_match instead of ELF_MACHINE_SYM_NO_MATCH. * sysdeps/mips/dl-machine.h (ELF_MACHINE_SYM_NO_MATCH): Remove definition. * sysdeps/mips/elf_machine_sym_no_match.h: New file. Extracted from sysdeps/mips/dl-machine.h. --- elf/dl-lookup.c | 10 ++---- elf/elf_machine_sym_no_match.h | 34 +++++++++++++++++++ sysdeps/mips/dl-machine.h | 15 --------- sysdeps/mips/elf_machine_sym_no_match.h | 43 +++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 23 deletions(-) create mode 100644 elf/elf_machine_sym_no_match.h create mode 100644 sysdeps/mips/elf_machine_sym_no_match.h diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 12a229f06c..807f3ea9b6 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -28,18 +28,12 @@ #include #include #include +#include #include -/* Return nonzero if check_match should consider SYM to fail to match a - symbol reference for some machine-specific reason. */ -#ifndef ELF_MACHINE_SYM_NO_MATCH -# define ELF_MACHINE_SYM_NO_MATCH(sym) 0 -#endif - #define VERSTAG(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (tag)) - struct sym_val { const ElfW(Sym) *s; @@ -78,7 +72,7 @@ check_match (const char *const undef_name, if (__glibc_unlikely ((sym->st_value == 0 /* No value. */ && sym->st_shndx != SHN_ABS && stt != STT_TLS) - || ELF_MACHINE_SYM_NO_MATCH (sym) + || elf_machine_sym_no_match (sym) || (type_class & (sym->st_shndx == SHN_UNDEF)))) return NULL; diff --git a/elf/elf_machine_sym_no_match.h b/elf/elf_machine_sym_no_match.h new file mode 100644 index 0000000000..6e299e5ee8 --- /dev/null +++ b/elf/elf_machine_sym_no_match.h @@ -0,0 +1,34 @@ +/* Function to ignore certain symbol matches for machine-specific reasons. + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _ELF_MACHINE_SYM_NO_MATCH_H +#define _ELF_MACHINE_SYM_NO_MATCH_H + +#include +#include + +/* This can be customized to ignore certain symbols during lookup in + case there are machine-specific rules to disregard some + symbols. */ +static inline bool +elf_machine_sym_no_match (const ElfW(Sym) *sym) +{ + return false; +} + +#endif /* _ELF_MACHINE_SYM_NO_MATCH_H */ diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 06021ea9ab..e3b11a4f21 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -467,21 +467,6 @@ elf_machine_plt_value (struct link_map *map, const ElfW(Rel) *reloc, return value; } -/* The semantics of zero/non-zero values of undefined symbols differs - depending on whether the non-PIC ABI is in use. Under the non-PIC - ABI, a non-zero value indicates that there is an address reference - to the symbol and thus it must always be resolved (except when - resolving a jump slot relocation) to the PLT entry whose address is - provided as the symbol's value; a zero value indicates that this - canonical-address behaviour is not required. Yet under the classic - MIPS psABI, a zero value indicates that there is an address - reference to the function and the dynamic linker must resolve the - symbol immediately upon loading. To avoid conflict, symbols for - which the dynamic linker must assume the non-PIC ABI semantics are - marked with the STO_MIPS_PLT flag. */ -#define ELF_MACHINE_SYM_NO_MATCH(sym) \ - ((sym)->st_shndx == SHN_UNDEF && !((sym)->st_other & STO_MIPS_PLT)) - #endif /* !dl_machine_h */ #ifdef RESOLVE_MAP diff --git a/sysdeps/mips/elf_machine_sym_no_match.h b/sysdeps/mips/elf_machine_sym_no_match.h new file mode 100644 index 0000000000..f2be74caaf --- /dev/null +++ b/sysdeps/mips/elf_machine_sym_no_match.h @@ -0,0 +1,43 @@ +/* MIPS-specific handling of undefined symbols. + Copyright (C) 2008-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _ELF_MACHINE_SYM_NO_MATCH_H +#define _ELF_MACHINE_SYM_NO_MATCH_H + +#include +#include + +/* The semantics of zero/non-zero values of undefined symbols differs + depending on whether the non-PIC ABI is in use. Under the non-PIC + ABI, a non-zero value indicates that there is an address reference + to the symbol and thus it must always be resolved (except when + resolving a jump slot relocation) to the PLT entry whose address is + provided as the symbol's value; a zero value indicates that this + canonical-address behaviour is not required. Yet under the classic + MIPS psABI, a zero value indicates that there is an address + reference to the function and the dynamic linker must resolve the + symbol immediately upon loading. To avoid conflict, symbols for + which the dynamic linker must assume the non-PIC ABI semantics are + marked with the STO_MIPS_PLT flag. */ +static inline bool +elf_machine_sym_no_match (const ElfW(Sym) *sym) +{ + return sym->st_shndx == SHN_UNDEF && !(sym->st_other & STO_MIPS_PLT); +} + +#endif /* _ELF_MACHINE_SYM_NO_MATCH_H */ -- 2.17.1