diff --git a/ChangeLog b/ChangeLog
index 3dba8b3673..94869bcb3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2015-10-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #19122]
+	* include/setjmp.h (__longjmp): Add attribute_hidden.
+	[IS_IN (rtld)] (__sigsetjmp): Likewise.
+
 	* include/libc-internal.h [IS_IN (rtld)] (__profile_frequency):
 	Add attribute_hidden.
 
diff --git a/include/setjmp.h b/include/setjmp.h
index 622bb319f3..90f46976e3 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -6,7 +6,7 @@
 
 /* Internal machine-dependent function to restore context sans signal mask.  */
 extern void __longjmp (__jmp_buf __env, int __val)
-     __attribute__ ((__noreturn__));
+     __attribute__ ((__noreturn__)) attribute_hidden;
 
 /* Internal function to possibly save the current mask of blocked signals
    in ENV, and always set the flag saying whether or not it was saved.
@@ -24,6 +24,10 @@ libc_hidden_proto (__libc_longjmp)
 
 libc_hidden_proto (_setjmp)
 libc_hidden_proto (__sigsetjmp)
+
+# if IS_IN (rtld)
+extern __typeof (__sigsetjmp) __sigsetjmp attribute_hidden;
+# endif
 #endif
 
 #endif