From 102d2bd644da5619da81cf02c6a2ba1b68186ac4 Mon Sep 17 00:00:00 2001 From: kib Date: Sun, 3 Feb 2019 00:44:26 +0000 Subject: [PATCH] MFC r343484: Remove now redundand ifunc relocation code which should have been removed as part of r341441. --- libexec/rtld-elf/rtld.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 3d2ad0a2c4e..f3e399acd86 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2877,16 +2877,6 @@ relocate_object(Obj_Entry *obj, bool bind_now, Obj_Entry *rtldobj, lockstate) == -1) return (-1); - /* - * Process the non-PLT IFUNC relocations. The relocations are - * processed in two phases, because IFUNC resolvers may - * reference other symbols, which must be readily processed - * before resolvers are called. - */ - if (obj->non_plt_gnu_ifunc && - reloc_non_plt(obj, rtldobj, flags | SYMLOOK_IFUNC, lockstate)) - return (-1); - if (!obj->mainprog && obj_enforce_relro(obj) == -1) return (-1); -- 2.45.0