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)