[patch] Revert bind now change

0001-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch (text/plain), 2.56 KB, created by Jory A. Pratt on 2017-01-17 22:01:48 UTC

From c903d7992134802ada495c137a4f1a2ac85af86e Mon Sep 17 00:00:00 2001
From: Allan McRae <[e-mail]>
Date: Mon, 31 Oct 2016 15:10:23 +1000
Subject: [PATCH] Revert "Avoid an extra branch to PLT for -z now"

This reverts commit 6901def689b5c77465d34f07822989ec67e80c1e.
---
 ChangeLog               | 8 --------
 config.h.in             | 3 ---
 configure               | 4 ----
 configure.ac            | 3 ---
 sysdeps/x86_64/sysdep.h | 8 ++------
 5 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2f6372..e2119a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2806,14 +2806,6 @@
 	(huge): Remove variable.
 	(__ceill): Do not force "inexact" exception.
 
-2016-05-24  H.J. Lu  <[e-mail]>
-
-	* config.h.in (BIND_NOW): New.
-	* configure.ac (BIND_NOW): New.  Defined for --enable-bind-now.
-	* configure: Regenerated.
-	* sysdeps/x86_64/sysdep.h (JUMPTARGET)[BIND_NOW]: Defined to
-	indirect branch via the GOT slot.
-
 2016-05-24  Stefan Liebler  <[e-mail]>
 
 	[BZ #19765]
diff --git a/config.h.in b/config.h.in
index 856ef6a..b96a4ce 100644
--- a/config.h.in
+++ b/config.h.in
@@ -91,9 +91,6 @@
    include/libc-symbols.h that avoid PLT slots in the shared objects.  */
 #undef	NO_HIDDEN
 
-/* Define this to disable lazy relocations in DSOs.  */
-#undef	BIND_NOW
-
 /* AArch64 big endian ABI */
 #undef HAVE_AARCH64_BE
 
diff --git a/configure b/configure
index 17625e1..5cad071 100755
--- a/configure
+++ b/configure
@@ -3417,10 +3417,6 @@ else
 fi
 
 
-if test "x$bindnow" = xyes; then
-  $as_echo "#define BIND_NOW 1" >>confdefs.h
-
-fi
 
 # Check whether --enable-static-nss was given.
 if test "${enable_static_nss+set}" = set; then :
diff --git a/configure.ac b/configure.ac
index 33bcd62..33701fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,9 +231,6 @@ AC_ARG_ENABLE([bind-now],
 	      [bindnow=$enableval],
 	      [bindnow=no])
 AC_SUBST(bindnow)
-if test "x$bindnow" = xyes; then
-  AC_DEFINE(BIND_NOW)
-fi
 
 dnl On some platforms we cannot use dynamic loading.  We must provide
 dnl static NSS modules.
diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h
index 75ac747..fbe3560 100644
--- a/sysdeps/x86_64/sysdep.h
+++ b/sysdeps/x86_64/sysdep.h
@@ -90,13 +90,9 @@ lose:									      \
 
 #undef JUMPTARGET
 #ifdef PIC
-# ifdef BIND_NOW
-#  define JUMPTARGET(name)	*name##@GOTPCREL(%rip)
-# else
-#  define JUMPTARGET(name)	name##@PLT
-# endif
+#define JUMPTARGET(name)	name##@PLT
 #else
-# define JUMPTARGET(name)	name
+#define JUMPTARGET(name)	name
 #endif
 
 /* Local label name for asm code. */
-- 
2.10.1