From ec215346b92fdaef5d8042b5545e16beb7ccc7d1 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 1 Mar 2016 16:58:07 -0800
Subject: [PATCH] Call x86-64 __mcount_internal/__sigjmp_save directly

Since __mcount_internal and __sigjmp_save are internal to x86-64 libc.so:

3532: 0000000000104530   289 FUNC    LOCAL  DEFAULT   13 __mcount_internal
3391: 0000000000034170    38 FUNC    LOCAL  DEFAULT   13 __sigjmp_save

they can be called directly without PLT.

	* sysdeps/x86_64/_mcount.S (C_LABEL(_mcount)): Call
	__mcount_internal directly.
	(C_LABEL(__fentry__)): Likewise.
	* sysdeps/x86_64/setjmp.S __sigsetjmp): Call __sigjmp_save
	directly.
---
 ChangeLog                | 8 ++++++++
 sysdeps/x86_64/_mcount.S | 8 --------
 sysdeps/x86_64/setjmp.S  | 4 ----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28086455d8..787fef118f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-03-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/_mcount.S (C_LABEL(_mcount)): Call
+	__mcount_internal directly.
+	(C_LABEL(__fentry__)): Likewise.
+	* sysdeps/x86_64/setjmp.S __sigsetjmp): Call __sigjmp_save
+	directly.
+
 2016-03-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/__start_context.S
diff --git a/sysdeps/x86_64/_mcount.S b/sysdeps/x86_64/_mcount.S
index 5d7edd2a29..ba13643464 100644
--- a/sysdeps/x86_64/_mcount.S
+++ b/sysdeps/x86_64/_mcount.S
@@ -43,11 +43,7 @@ C_LABEL(_mcount)
 	movq	56(%rsp),%rsi
 	/* Get frompc via the frame pointer.  */
 	movq	8(%rbp),%rdi
-#ifdef PIC
-	call C_SYMBOL_NAME(__mcount_internal)@PLT
-#else
 	call C_SYMBOL_NAME(__mcount_internal)
-#endif
 	/* Pop the saved registers.  Please note that `mcount' has no
 	   return value.  */
 	movq	48(%rsp),%r9
@@ -84,11 +80,7 @@ C_LABEL(__fentry__)
 	movq	64(%rsp),%rsi
 	/* caller is the return address above it */
 	movq	72(%rsp),%rdi
-#ifdef PIC
-	call C_SYMBOL_NAME(__mcount_internal)@PLT
-#else
 	call C_SYMBOL_NAME(__mcount_internal)
-#endif
 	/* Pop the saved registers.  Please note that `__fentry__' has no
 	   return value.  */
 	movq	48(%rsp),%r9
diff --git a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S
index 3e93967c2f..e37c22378b 100644
--- a/sysdeps/x86_64/setjmp.S
+++ b/sysdeps/x86_64/setjmp.S
@@ -60,11 +60,7 @@ ENTRY (__sigsetjmp)
 	retq
 #else
 	/* Make a tail call to __sigjmp_save; it takes the same args.  */
-# ifdef	PIC
-	jmp C_SYMBOL_NAME (__sigjmp_save)@PLT
-# else
 	jmp __sigjmp_save
-# endif
 #endif
 END (__sigsetjmp)
 hidden_def (__sigsetjmp)