Date: Fri, 25 Dec 2020 19:28:31 GMT From: Marius Strobl <marius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: b58c853edffc - rtld-elf(1): remove obsolete pre_init() hook Message-ID: <202012251928.0BPJSVwD056445@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=b58c853edffcaedf1a38ea34bd8ae1e8a853e129 commit b58c853edffcaedf1a38ea34bd8ae1e8a853e129 Author: Marius Strobl <marius@FreeBSD.org> AuthorDate: 2020-12-24 20:18:44 +0000 Commit: Marius Strobl <marius@FreeBSD.org> CommitDate: 2020-12-25 18:47:46 +0000 rtld-elf(1): remove obsolete pre_init() hook It's no longer used since 600ee699ed2805894f5972c6ac2c3d17dca7f6ce and r358358 respectively. --- libexec/rtld-elf/aarch64/reloc.c | 6 ------ libexec/rtld-elf/amd64/reloc.c | 6 ------ libexec/rtld-elf/arm/reloc.c | 6 ------ libexec/rtld-elf/i386/reloc.c | 6 ------ libexec/rtld-elf/mips/reloc.c | 6 ------ libexec/rtld-elf/powerpc/reloc.c | 6 ------ libexec/rtld-elf/powerpc64/reloc.c | 6 ------ libexec/rtld-elf/riscv/reloc.c | 6 ------ libexec/rtld-elf/rtld.c | 6 ------ libexec/rtld-elf/rtld.h | 1 - 10 files changed, 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 @@ -488,12 +488,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) } -void -pre_init(void) -{ - -} - void allocate_initial_tls(Obj_Entry *objs) { 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 @@ -502,12 +502,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) } } -void -pre_init(void) -{ - -} - void allocate_initial_tls(Obj_Entry *objs) { 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 @@ -759,12 +759,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) } -void -pre_init(void) -{ - -} - void allocate_initial_tls(Obj_Entry *objs) { 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 @@ -809,12 +809,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) } -void -pre_init(void) -{ - -} - void allocate_initial_tls(Obj_Entry *list) { 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 @@ -706,12 +706,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) } -void -pre_init(void) -{ - -} - void allocate_initial_tls(Obj_Entry *list) { 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 @@ -384,12 +384,6 @@ ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) } -void -pre_init(void) -{ - -} - void allocate_initial_tls(Obj_Entry *objs) { 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 *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012251928.0BPJSVwD056445>