aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2020-12-24 20:18:44 +0000
committerMarius Strobl <marius@FreeBSD.org>2020-12-25 18:47:46 +0000
commitb58c853edffcaedf1a38ea34bd8ae1e8a853e129 (patch)
tree9299e0f4f69f7e7070cd7ccd87374aac408426f4
parent50d823d5b8b61b96b17dff6f1658774bd438f067 (diff)
downloadsrc-b58c853edffcaedf1a38ea34bd8ae1e8a853e129.tar.gz
src-b58c853edffcaedf1a38ea34bd8ae1e8a853e129.zip
rtld-elf(1): remove obsolete pre_init() hook
It's no longer used since 600ee699ed2805894f5972c6ac2c3d17dca7f6ce and r358358 respectively.
-rw-r--r--libexec/rtld-elf/aarch64/reloc.c6
-rw-r--r--libexec/rtld-elf/amd64/reloc.c6
-rw-r--r--libexec/rtld-elf/arm/reloc.c6
-rw-r--r--libexec/rtld-elf/i386/reloc.c6
-rw-r--r--libexec/rtld-elf/mips/reloc.c6
-rw-r--r--libexec/rtld-elf/powerpc/reloc.c6
-rw-r--r--libexec/rtld-elf/powerpc64/reloc.c6
-rw-r--r--libexec/rtld-elf/riscv/reloc.c6
-rw-r--r--libexec/rtld-elf/rtld.c6
-rw-r--r--libexec/rtld-elf/rtld.h1
10 files changed, 0 insertions, 55 deletions
diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c
index 073c0dfaf1a2..8d9c23a41aa5 100644
--- a/libexec/rtld-elf/aarch64/reloc.c
+++ b/libexec/rtld-elf/aarch64/reloc.c
@@ -360,12 +360,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused)
}
-void
-pre_init(void)
-{
-
-}
-
/*
* Process non-PLT relocations
*/
diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c
index 4bdda929c0c7..00e538d4b647 100644
--- a/libexec/rtld-elf/amd64/reloc.c
+++ b/libexec/rtld-elf/amd64/reloc.c
@@ -516,12 +516,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused)
}
}
-void
-pre_init(void)
-{
-
-}
-
int __getosreldate(void);
void
diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c
index d389bb0f8e87..7779169667be 100644
--- a/libexec/rtld-elf/arm/reloc.c
+++ b/libexec/rtld-elf/arm/reloc.c
@@ -489,12 +489,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused)
}
void
-pre_init(void)
-{
-
-}
-
-void
allocate_initial_tls(Obj_Entry *objs)
{
#ifdef ARM_TP_ADDRESS
diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c
index b4bd09d677b4..7f8ecfa40f8f 100644
--- a/libexec/rtld-elf/i386/reloc.c
+++ b/libexec/rtld-elf/i386/reloc.c
@@ -503,12 +503,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused)
}
void
-pre_init(void)
-{
-
-}
-
-void
allocate_initial_tls(Obj_Entry *objs)
{
void* tls;
diff --git a/libexec/rtld-elf/mips/reloc.c b/libexec/rtld-elf/mips/reloc.c
index b116978114b1..163f9a170872 100644
--- a/libexec/rtld-elf/mips/reloc.c
+++ b/libexec/rtld-elf/mips/reloc.c
@@ -760,12 +760,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused)
}
void
-pre_init(void)
-{
-
-}
-
-void
allocate_initial_tls(Obj_Entry *objs)
{
char *tls;
diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c
index e98252833014..b624599d7df4 100644
--- a/libexec/rtld-elf/powerpc/reloc.c
+++ b/libexec/rtld-elf/powerpc/reloc.c
@@ -810,12 +810,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused)
}
void
-pre_init(void)
-{
-
-}
-
-void
allocate_initial_tls(Obj_Entry *list)
{
Elf_Addr **tp;
diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c
index e2fbb109f632..a7a963a290e8 100644
--- a/libexec/rtld-elf/powerpc64/reloc.c
+++ b/libexec/rtld-elf/powerpc64/reloc.c
@@ -707,12 +707,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused)
}
void
-pre_init(void)
-{
-
-}
-
-void
allocate_initial_tls(Obj_Entry *list)
{
Elf_Addr **tp;
diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c
index 79a045ff0253..1e749206e9b9 100644
--- a/libexec/rtld-elf/riscv/reloc.c
+++ b/libexec/rtld-elf/riscv/reloc.c
@@ -385,12 +385,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused)
}
void
-pre_init(void)
-{
-
-}
-
-void
allocate_initial_tls(Obj_Entry *objs)
{
Elf_Addr **tp;
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index c6cd285c71d0..27262ab9dbc5 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -803,12 +803,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
obj_main->fini_array = (Elf_Addr)NULL;
}
- /*
- * Execute MD initializers required before we call the objects'
- * init functions.
- */
- pre_init();
-
if (direct_exec) {
/* Set osrel for direct-execed binary */
mib[0] = CTL_KERN;
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index 32b4e8d3a3a7..85472826a4ec 100644
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -414,7 +414,6 @@ int reloc_iresolve(Obj_Entry *, struct Struct_RtldLockState *);
int reloc_iresolve_nonplt(Obj_Entry *, struct Struct_RtldLockState *);
int reloc_gnu_ifunc(Obj_Entry *, int flags, struct Struct_RtldLockState *);
void ifunc_init(Elf_Auxinfo[__min_size(AT_COUNT)]);
-void pre_init(void);
void init_pltgot(Obj_Entry *);
void allocate_initial_tls(Obj_Entry *);