From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 55E8E3858034; Wed, 12 Oct 2022 14:18:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 55E8E3858034 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665584302; bh=FmTfpU0tev3OkREnAts9yX4itg4Ke1DtmYFkjtw+L1M=; h=From:To:Subject:Date:From; b=kk5qiyqDfnKsOof/7iqX6Ud0kOlzKyr39V9QVa7a77qur0QQrGFytbxFDUaHDb6Wh 6nenCbJpUBCt/v/Lv4u180OVuQ96omoef+YxVDIb/KcVz+mUD5dfDl38Tp3QbhsC0P 002cxArR7mSIKuyd0qdP69UkP52Thz5bLEXHqHlA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] aarch64: morello: elf: drop unused load address computation X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 4d7cf069eea6761b9ffceaac6a8be2ad970f4413 X-Git-Newrev: 66e78c5b74e77d85c5d58908949c0d02ff00bf28 Message-Id: <20221012141822.55E8E3858034@sourceware.org> Date: Wed, 12 Oct 2022 14:18:22 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=66e78c5b74e77d85c5d58908949c0d02ff00bf28 commit 66e78c5b74e77d85c5d58908949c0d02ff00bf28 Author: Szabolcs Nagy Date: Thu Sep 8 14:57:20 2022 +0100 aarch64: morello: elf: drop unused load address computation l_addr is no longer a capability so this is not needed. Diff: --- sysdeps/aarch64/morello/dl-machine.h | 41 ------------------------------------ 1 file changed, 41 deletions(-) diff --git a/sysdeps/aarch64/morello/dl-machine.h b/sysdeps/aarch64/morello/dl-machine.h index 5169a48fce..0f681b1925 100644 --- a/sysdeps/aarch64/morello/dl-machine.h +++ b/sysdeps/aarch64/morello/dl-machine.h @@ -173,47 +173,6 @@ elf_machine_rtld_base_setup (struct link_map *map, void *args) } } -/* Load address of the dynamic linker with correct bounds. */ -static uintptr_t __attribute__ ((unused)) -elf_machine_load_address_from_args (void *arg) -{ - uintptr_t *sp; - long argc; - uintptr_t phdr = 0; - size_t phentsize = sizeof (ElfW(Phdr)); - size_t phnum = 0; - - sp = arg; - argc = sp[0]; - /* Skip argv. */ - sp += argc + 2; - /* Skip environ. */ - for (; *sp; sp++); - sp++; - for (; *sp != AT_NULL; sp += 2) - { - long t = sp[0]; - if (t == AT_BASE && sp[1]) - return sp[1]; - else if (t == AT_PHDR) - phdr = sp[1]; - else if (t == AT_PHNUM) - phnum = sp[1]; - else if (t == AT_PHENT) - phentsize = sp[1]; - } - for (size_t i = 0; i < phnum; i++) - { - ElfW(Phdr) *p = (ElfW(Phdr) *)(phdr + i * phentsize); - if (p->p_type == PT_PHDR) - return phdr - p->p_vaddr; - if (p->p_type == PT_DYNAMIC) - return (uintptr_t) elf_machine_runtime_dynamic () - p->p_vaddr; - } - /* Fail. */ - return 0; -} - /* In elf/rtld.c _dl_start should be global so dl-start.S can reference it. */ #define RTLD_START asm (".globl _dl_start");