From 6628c742b2c16e785d3c884d9deeda5adb30ca12 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 13 Jan 2022 17:58:00 -0300 Subject: elf: Remove prelink support Prelinked binaries and libraries still work, the dynamic tags DT_GNU_PRELINKED, DT_GNU_LIBLIST, DT_GNU_CONFLICT just ignored (meaning the process is reallocated as default). The loader environment variable TRACE_PRELINKING is also removed, since it used solely on prelink. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Siddhesh Poyarekar --- sysdeps/or1k/dl-machine.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'sysdeps/or1k/dl-machine.h') diff --git a/sysdeps/or1k/dl-machine.h b/sysdeps/or1k/dl-machine.h index 35329a60f6..849763a36e 100644 --- a/sysdeps/or1k/dl-machine.h +++ b/sysdeps/or1k/dl-machine.h @@ -189,9 +189,7 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], return; else { -# ifndef RESOLVE_CONFLICT_FIND_MAP const Elf32_Sym *const refsym = sym; -# endif struct link_map *sym_map = RESOLVE_MAP (map, scope, &sym, version, r_type); Elf32_Addr value = SYMBOL_ADDRESS (sym_map, sym, true); @@ -204,7 +202,6 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], switch (r_type) { -# ifndef RESOLVE_CONFLICT_FIND_MAP case R_OR1K_COPY: if (sym == NULL) /* This can happen in trace mode if an object could not be @@ -225,7 +222,6 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], memcpy (reloc_addr_arg, (void *) value, MIN (sym->st_size, refsym->st_size)); break; -# endif /* !RESOLVE_CONFLICT_FIND_MAP */ case R_OR1K_32: /* Support relocations on mis-aligned offsets. */ value += reloc->r_addend; -- cgit 1.4.1