From patchwork Wed May 12 16:58:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43404 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 50C05399C022; Wed, 12 May 2021 16:58:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 50C05399C022 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620838692; bh=HKLfu9RCCFZO/CldF19V0acAs7vJTwgvczs6/QqtvGI=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=kvAnZIIO+QcRiAT8SaVomjN8ep7c0kvGVxwVDrdQXBCvrxA93KzI7JBpv0ZaiIYdD BQPurAvGu261ebX5leuiDpKtE2WqqlhHZYuDPe9HouBMhNOBiBgWVKNW+Om6lakVz1 viXravnrjQHjYt8r7Spi8BBMfIJLWX5C6ETRML/0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 98482399C021 for ; Wed, 12 May 2021 16:58:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 98482399C021 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-457-pSq0-sdSO_-nSPb0ptoZOQ-1; Wed, 12 May 2021 12:58:05 -0400 X-MC-Unique: pSq0-sdSO_-nSPb0ptoZOQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E2CFB80293B for ; Wed, 12 May 2021 16:58:04 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-137.ams2.redhat.com [10.36.112.137]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1422A100164C for ; Wed, 12 May 2021 16:58:03 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 09/23] powerpc: Remove _dl_var_init In-Reply-To: References: X-From-Line: 5c2228caaff4a60c42ad352d40af4d721e7b8e2c Mon Sep 17 00:00:00 2001 Message-Id: <5c2228caaff4a60c42ad352d40af4d721e7b8e2c.1620838411.git.fweimer@redhat.com> Date: Wed, 12 May 2021 18:58:02 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The generic __rtld_static_init code handles GLRO (dl_pagesize), GLRO (dl_auxv), GLRO (dl_hwcap), GLRO (dl_hwcap2). GLRO (dl_cache_line_size) is handled in an __rtld_static_init_arch override. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/powerpc/Makefile | 4 - sysdeps/unix/sysv/linux/powerpc/Versions | 6 -- sysdeps/unix/sysv/linux/powerpc/dl-static.c | 96 ------------------- .../{ldsodefs.h => rtld_static_init.h} | 26 ++--- 4 files changed, 10 insertions(+), 122 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/powerpc/dl-static.c rename sysdeps/unix/sysv/linux/powerpc/{ldsodefs.h => rtld_static_init.h} (59%) diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile index a093cda68b..06f1328fab 100644 --- a/sysdeps/unix/sysv/linux/powerpc/Makefile +++ b/sysdeps/unix/sysv/linux/powerpc/Makefile @@ -13,10 +13,6 @@ gen-as-const-headers += ucontext_i.sym endif ifeq ($(subdir),elf) -ifeq ($(build-shared),yes) -# This is needed for DSO loading from static binaries. -sysdep-dl-routines += dl-static -endif # Otherwise tst-tls-dlinfo fails due to tst-tlsmod2.so using static tls. LDFLAGS-tst-tlsmod2.so += -Wl,--no-tls-get-addr-optimize endif diff --git a/sysdeps/unix/sysv/linux/powerpc/Versions b/sysdeps/unix/sysv/linux/powerpc/Versions index cc28d84744..416272b718 100644 --- a/sysdeps/unix/sysv/linux/powerpc/Versions +++ b/sysdeps/unix/sysv/linux/powerpc/Versions @@ -1,9 +1,3 @@ -ld { - GLIBC_PRIVATE { - # used for loading by static libraries - _dl_var_init; - } -} libc { GLIBC_PRIVATE { __vdso_get_tbfreq; diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-static.c b/sysdeps/unix/sysv/linux/powerpc/dl-static.c deleted file mode 100644 index e35ca4c44b..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/dl-static.c +++ /dev/null @@ -1,96 +0,0 @@ -/* Variable initialization. PowerPC version. - Copyright (C) 2013-2021 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 - . */ - -#include - -#ifdef SHARED - -void -_dl_var_init (void *array[]) -{ - /* It has to match "variables" below. */ - enum - { - DL_PAGESIZE = 0, - DL_AUXV = 1, - DL_HWCAP = 2, - DL_HWCAP2 = 3, - DL_CACHE_LINE_SIZE = 4 - }; - - GLRO(dl_pagesize) = *((size_t *) array[DL_PAGESIZE]); - GLRO(dl_auxv) = (ElfW(auxv_t) *) *((size_t *) array[DL_AUXV]); - GLRO(dl_hwcap) = *((unsigned long int *) array[DL_HWCAP]); - GLRO(dl_hwcap2) = *((unsigned long int *) array[DL_HWCAP2]); - GLRO(dl_cache_line_size) = (int) *((int *) array[DL_CACHE_LINE_SIZE]); -} - -#else - -static void *variables[] = -{ - &GLRO(dl_pagesize), - &GLRO(dl_auxv), - &GLRO(dl_hwcap), - &GLRO(dl_hwcap2), - &GLRO(dl_cache_line_size) -}; - -static void -_dl_unprotect_relro (struct link_map *l) -{ - ElfW(Addr) start = ((l->l_addr + l->l_relro_addr) - & ~(GLRO(dl_pagesize) - 1)); - ElfW(Addr) end = ((l->l_addr + l->l_relro_addr + l->l_relro_size) - & ~(GLRO(dl_pagesize) - 1)); - - if (start != end) - __mprotect ((void *) start, end - start, PROT_READ | PROT_WRITE); -} - -void -_dl_static_init (struct link_map *l) -{ - struct link_map *rtld_map = l; - struct r_scope_elem **scope; - const ElfW(Sym) *ref = NULL; - lookup_t loadbase; - void (*f) (void *[]); - size_t i; - - loadbase = _dl_lookup_symbol_x ("_dl_var_init", l, &ref, l->l_local_scope, - NULL, 0, 1, NULL); - - for (scope = l->l_local_scope; *scope != NULL; scope++) - for (i = 0; i < (*scope)->r_nlist; i++) - if ((*scope)->r_list[i] == loadbase) - { - rtld_map = (*scope)->r_list[i]; - break; - } - - if (ref != NULL) - { - f = (void (*) (void *[])) DL_SYMBOL_ADDRESS (loadbase, ref); - _dl_unprotect_relro (rtld_map); - f (variables); - _dl_protect_relro (rtld_map); - } -} - -#endif diff --git a/sysdeps/unix/sysv/linux/powerpc/ldsodefs.h b/sysdeps/unix/sysv/linux/powerpc/rtld_static_init.h similarity index 59% rename from sysdeps/unix/sysv/linux/powerpc/ldsodefs.h rename to sysdeps/unix/sysv/linux/powerpc/rtld_static_init.h index bb9c262299..730ac19f77 100644 --- a/sysdeps/unix/sysv/linux/powerpc/ldsodefs.h +++ b/sysdeps/unix/sysv/linux/powerpc/rtld_static_init.h @@ -1,6 +1,5 @@ -/* Run-time dynamic linker data structures for loaded ELF shared objects. - PowerPC version. - Copyright (C) 2013-2021 Free Software Foundation, Inc. +/* Partial initialization of ld.so loaded via static dlopen. powerpc helper. + Copyright (C) 2021 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 @@ -17,17 +16,12 @@ License along with the GNU C Library; if not, see . */ -#ifndef _LDSODEFS_H +static inline void +__rtld_static_init_arch (struct link_map *map, struct rtld_global_ro *dl) +{ + /* This field does not exist in the generic _rtld_global_ro version. */ -/* Get the real definitions. */ -#include_next - -/* Now define our stuff. */ - -/* We need special support to initialize DSO loaded for statically linked - binaries. */ -extern void _dl_static_init (struct link_map *map); -#undef DL_STATIC_INIT -#define DL_STATIC_INIT(map) _dl_static_init (map) - -#endif /* ldsodefs.h */ + extern __typeof (dl->_dl_cache_line_size) _dl_cache_line_size + attribute_hidden; + dl->_dl_cache_line_size = _dl_cache_line_size; +}