a8db42ba53
Upstream commit: 71326f1f2fd09dafb9c34404765fb88129e94237 - nptl: Fix pthread_cancel cancelhandling atomic operations - mips: Fix mips64n32 64 bit time_t stat support (BZ#29069) - hurd: Fix arbitrary error code - nptl: Handle spurious EINTR when thread cancellation is disabled (BZ#29029) - S390: Add new s390 platform z16. - NEWS: Update fixed bug list for LD_AUDIT backports. - hppa: Fix bind-now audit (BZ #28857) - elf: Replace tst-audit24bmod2.so with tst-audit24bmod2 - Fix elf/tst-audit25a with default bind now toolchains - elf: Fix runtime linker auditing on aarch64 (BZ #26643) - elf: Issue la_symbind for bind-now (BZ #23734) - elf: Fix initial-exec TLS access on audit modules (BZ #28096) - elf: Add la_activity during application exit - elf: Do not fail for failed dlmopen on audit modules (BZ #28061) - elf: Issue audit la_objopen for vDSO - elf: Add audit tests for modules with TLSDESC - elf: Avoid unnecessary slowdown from profiling with audit (BZ#15533) - elf: Add _dl_audit_pltexit - elf: Add _dl_audit_pltenter - elf: Add _dl_audit_preinit - elf: Add _dl_audit_symbind_alt and _dl_audit_symbind - elf: Add _dl_audit_objclose - elf: Add _dl_audit_objsearch - elf: Add _dl_audit_activity_map and _dl_audit_activity_nsid - elf: Add _dl_audit_objopen - elf: Move la_activity (LA_ACT_ADD) after _dl_add_to_namespace_list() (BZ #28062) - elf: Move LAV_CURRENT to link_lavcurrent.h - elf: Fix elf_get_dynamic_info() for bootstrap - elf: Fix dynamic-link.h usage on rtld.c - elf: Fix elf_get_dynamic_info definition - elf: Avoid nested functions in the loader [BZ #27220] - powerpc: Delete unneeded ELF_MACHINE_BEFORE_RTLD_RELOC - hppa: Use END instead of PSEUDO_END in swapcontext.S - hppa: Implement swapcontext in assembler (bug 28960) Reviewed-by: Florian Weimer <fweimer at redhat.com>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
commit 4b5b8a1cdf39bed02b8b973717796eccde455ed6
|
|
Author: Fangrui Song <maskray@google.com>
|
|
Date: Mon Sep 27 10:12:50 2021 -0700
|
|
|
|
powerpc: Delete unneeded ELF_MACHINE_BEFORE_RTLD_RELOC
|
|
|
|
Reviewed-by: Raphael M Zinsly <rzinsly@linux.ibm.com>
|
|
(cherry picked from commit 8e2557a2b85b2eb0ed50a9016a4ffc6b859b97e6)
|
|
|
|
diff --git a/sysdeps/powerpc/powerpc32/dl-machine.h b/sysdeps/powerpc/powerpc32/dl-machine.h
|
|
index ced3a7b659cfcff1..b93cf486b6cda5fd 100644
|
|
--- a/sysdeps/powerpc/powerpc32/dl-machine.h
|
|
+++ b/sysdeps/powerpc/powerpc32/dl-machine.h
|
|
@@ -109,8 +109,6 @@ elf_machine_load_address (void)
|
|
return runtime_dynamic - elf_machine_dynamic ();
|
|
}
|
|
|
|
-#define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) /* nothing */
|
|
-
|
|
/* The PLT uses Elf32_Rela relocs. */
|
|
#define elf_machine_relplt elf_machine_rela
|
|
|
|
diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h
|
|
index b90f407119efd431..b3f3352bcf5a52b0 100644
|
|
--- a/sysdeps/powerpc/powerpc64/dl-machine.h
|
|
+++ b/sysdeps/powerpc/powerpc64/dl-machine.h
|
|
@@ -116,8 +116,6 @@ elf_machine_dynamic (void)
|
|
return runtime_dynamic - elf_machine_load_address() ;
|
|
}
|
|
|
|
-#define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) /* nothing */
|
|
-
|
|
/* The PLT uses Elf64_Rela relocs. */
|
|
#define elf_machine_relplt elf_machine_rela
|
|
|