svn commit: r343692 - stable/12/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Sun Feb  3 00:39:35 2019
New Revision: 343692
URL: https://svnweb.freebsd.org/changeset/base/343692

Log:
  MFC r343484:
  Remove now redundand ifunc relocation code which should have been
  removed as part of r341441.

Modified:
  stable/12/libexec/rtld-elf/rtld.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/12/libexec/rtld-elf/rtld.c	Sun Feb  3 00:36:12 2019	(r343691)
+++ stable/12/libexec/rtld-elf/rtld.c	Sun Feb  3 00:39:35 2019	(r343692)
@@ -2871,16 +2871,6 @@ relocate_object(Obj_Entry *obj, bool bind_now, Obj_Ent
 	    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);