From patchwork Tue Aug 2 14:59:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 56502 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 73F23384B0D6 for ; Tue, 2 Aug 2022 15:00:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 73F23384B0D6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1659452413; bh=Yw3I0a+kV+bZu+tHa1xIvFd6H98qx5M5tf68SeXll10=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=yD4/fe5Tj5M+5fYqXhUEVic+PuDgaU0ondb8U8Ok8u9wZMrekOJsUUGvUSrq97AS9 H40r1mtK13neuqTAQAgxecmkYIuH6qCdCq8yRSfRD/xoGkLBjdkRNFI0CREINaOMFB oJ/4A01+aKh49scoqBwmbV7KiqDDDvSN9IUj4tbM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-vs1-xe2e.google.com (mail-vs1-xe2e.google.com [IPv6:2607:f8b0:4864:20::e2e]) by sourceware.org (Postfix) with ESMTPS id 33FE53852752 for ; Tue, 2 Aug 2022 14:59:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 33FE53852752 Received: by mail-vs1-xe2e.google.com with SMTP id c3so14825797vsc.6 for ; Tue, 02 Aug 2022 07:59:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yw3I0a+kV+bZu+tHa1xIvFd6H98qx5M5tf68SeXll10=; b=5h2yXyiaiWGbUDSM6XNGVxOUYO4FEAzqGRbY5duCza6taH03ZOeA8GI5RMuMZGwIzQ rq70HIUloZDLynj3ZEbd5GySuammB9pdcipIq1RCUIHHsZ8qFAVdKwX/hr5CtHlec/Fc 5vPBQEs6c2DETDRKn1Ysd9qCZAVq5CCYiZQbfnjKFhQMw2U8I0zlUgJESL9usKJGFx3R ohGQjN7GssNcIbBP3K0v0zcjK+Bc/CnMA/toJ5Td139GQBFH1R2LUnSF90p8kuAAe2Mx sAX+AqBVdXgyKHHn3ikesAaebgXe/FFGZ0KrLOcHJU094bfhETHgXLuzdNzhJr9s5z+5 nLMw== X-Gm-Message-State: ACgBeo0vKOHyWHETqTip7MJ//HJL1qpISyE77QxhH000BccdZwZ3ygOc lSye9cT4sGAV4cachCjomdv8PUr30+biBw== X-Google-Smtp-Source: AA6agR4nwTE8J86cVAleQbs83gRHFvsqrHmGGMKWQxYKbXcEgDj5hWlfEWlJQn0PAIHyHLUh2VRKrA== X-Received: by 2002:a05:6102:3a54:b0:388:47e0:c002 with SMTP id c20-20020a0561023a5400b0038847e0c002mr624246vsu.4.1659452355256; Tue, 02 Aug 2022 07:59:15 -0700 (PDT) Received: from mandiga.. ([2804:431:c7cb:1e34:2331:a60b:db1e:6436]) by smtp.gmail.com with ESMTPSA id v145-20020a1f2f97000000b003762e090ed8sm8000982vkv.49.2022.08.02.07.59.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Aug 2022 07:59:15 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 4/5] arm: Remove RELA support Date: Tue, 2 Aug 2022 11:59:04 -0300 Message-Id: <20220802145905.2789733-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220802145905.2789733-1-adhemerval.zanella@linaro.org> References: <20220802145905.2789733-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, 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: 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Now that prelink is not support, there is no need to keep supporting rela for non bootstrap. --- sysdeps/arm/dl-machine-rel.h | 7 +-- sysdeps/arm/dl-machine.h | 100 ----------------------------------- 2 files changed, 1 insertion(+), 106 deletions(-) diff --git a/sysdeps/arm/dl-machine-rel.h b/sysdeps/arm/dl-machine-rel.h index 999967931b..9dfaf718f2 100644 --- a/sysdeps/arm/dl-machine-rel.h +++ b/sysdeps/arm/dl-machine-rel.h @@ -19,13 +19,8 @@ #ifndef _DL_MACHINE_REL_H #define _DL_MACHINE_REL_H -/* ARM never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ -#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP +#define ELF_MACHINE_NO_RELA 1 #define ELF_MACHINE_NO_REL 0 - -/* ARM never uses Elf32_Rela relocations for the dynamic linker. - Prelinked libraries may use Elf32_Rela though. */ #define ELF_MACHINE_PLT_REL 1 #define PLTREL ElfW(Rel) diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 6a422713bd..4e78d8fb0e 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -447,96 +447,6 @@ elf_machine_rel (struct link_map *map, struct r_scope_elem *scope[], } } -# ifndef RTLD_BOOTSTRAP -static inline void -__attribute__ ((always_inline)) -elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], - const Elf32_Rela *reloc, const Elf32_Sym *sym, - const struct r_found_version *version, - void *const reloc_addr_arg, int skip_ifunc) -{ - Elf32_Addr *const reloc_addr = reloc_addr_arg; - const unsigned int r_type = ELF32_R_TYPE (reloc->r_info); - - if (__builtin_expect (r_type == R_ARM_RELATIVE, 0)) - *reloc_addr = map->l_addr + reloc->r_addend; - else if (__builtin_expect (r_type == R_ARM_NONE, 0)) - return; - else - { - const Elf32_Sym *const refsym = sym; - struct link_map *sym_map = RESOLVE_MAP (map, scope, &sym, version, r_type); - Elf32_Addr value = SYMBOL_ADDRESS (sym_map, sym, true); - - if (sym != NULL - && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0) - && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1) - && __builtin_expect (!skip_ifunc, 1)) - value = elf_ifunc_invoke (value); - - switch (r_type) - { - /* Not needed for dl-conflict.c. */ - case R_ARM_COPY: - if (sym == NULL) - /* This can happen in trace mode if an object could not be - found. */ - break; - if (sym->st_size > refsym->st_size - || (GLRO(dl_verbose) && sym->st_size < refsym->st_size)) - { - const char *strtab; - - strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]); - _dl_error_printf ("\ -%s: Symbol `%s' has different size in shared object, consider re-linking\n", - RTLD_PROGNAME, strtab + refsym->st_name); - } - memcpy (reloc_addr_arg, (void *) value, - MIN (sym->st_size, refsym->st_size)); - break; - case R_ARM_GLOB_DAT: - case R_ARM_JUMP_SLOT: - case R_ARM_ABS32: - *reloc_addr = value + reloc->r_addend; - break; - case R_ARM_PC24: - relocate_pc24 (map, value, reloc_addr, reloc->r_addend); - break; -#if !defined RTLD_BOOTSTRAP - case R_ARM_TLS_DTPMOD32: - /* Get the information from the link map returned by the - resolv function. */ - if (sym_map != NULL) - *reloc_addr = sym_map->l_tls_modid; - break; - - case R_ARM_TLS_DTPOFF32: - *reloc_addr = (sym == NULL ? 0 : sym->st_value) + reloc->r_addend; - break; - - case R_ARM_TLS_TPOFF32: - if (sym != NULL) - { - CHECK_STATIC_TLS (map, sym_map); - *reloc_addr = (sym->st_value + sym_map->l_tls_offset - + reloc->r_addend); - } - break; - case R_ARM_IRELATIVE: - value = map->l_addr + reloc->r_addend; - if (__glibc_likely (!skip_ifunc)) - value = ((Elf32_Addr (*) (int)) value) (GLRO(dl_hwcap)); - *reloc_addr = value; - break; -#endif - default: - _dl_reloc_bad_type (map, r_type, 0); - break; - } - } -} -# endif static inline void __attribute__ ((always_inline)) @@ -547,16 +457,6 @@ elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc, *reloc_addr += l_addr; } -# ifndef RTLD_BOOTSTRAP -static inline void -__attribute__ ((always_inline)) -elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc, - void *const reloc_addr_arg) -{ - Elf32_Addr *const reloc_addr = reloc_addr_arg; - *reloc_addr = l_addr + reloc->r_addend; -} -# endif static inline void __attribute__ ((always_inline))