Remove hidden __libc_longjmp

Since __libc_longjmp is a private interface for cancellation implementation
in libpthread, there is no need to provide hidden __libc_longjmp in libc.

Tested with build-many-glibcs.py.

	* include/setjmp.h (__libc_longjmp): Remove libc_hidden_proto.
	* setjmp/longjmp.c (__libc_longjmp): Remove libc_hidden_def.
	* sysdeps/s390/longjmp.c (__libc_longjmp): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S (__libc_longjmp):
	Likewise.

diff --git a/ChangeLog b/ChangeLog
index 0f71d41b0aeac68dd2a06e7f3c489be8ac39c3a7..8490083eadf8ce8e9d5c69d397ef4f235a35699e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-03-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * include/setjmp.h (__libc_longjmp): Remove libc_hidden_proto.
+       * setjmp/longjmp.c (__libc_longjmp): Remove libc_hidden_def.
+       * sysdeps/s390/longjmp.c (__libc_longjmp): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S (__libc_longjmp):
+       Likewise.
+
 2018-03-09  Florian Weimer  <fweimer@redhat.com>
 
        * malloc/malloc.c (prev_size, set_prev_size, prev_chunk): Fix typo

diff --git a/include/setjmp.h b/include/setjmp.h
index f1b19f5ceb52df23d03c12e6d9715d1148be1afd..263bc64b3daa1ab252662017539093c1a80e0ea3 100644 (file)
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -23,7 +23,6 @@ extern void __libc_siglongjmp (sigjmp_buf env, int val)
          __attribute__ ((noreturn));
 extern void __libc_longjmp (sigjmp_buf env, int val)
      __attribute__ ((noreturn));
-libc_hidden_proto (__libc_longjmp)
 
 libc_hidden_proto (_setjmp)
 libc_hidden_proto (__sigsetjmp)

diff --git a/setjmp/longjmp.c b/setjmp/longjmp.c
index 6b4737605aef3be5fa26abc774e31a8c4342a5e0..a2a7065a853984dcd3948c6d093f71628b6f5bb8 100644 (file)
--- a/setjmp/longjmp.c
+++ b/setjmp/longjmp.c
@@ -40,8 +40,9 @@ __libc_siglongjmp (sigjmp_buf env, int val)
 }
 
 #ifndef __libc_siglongjmp
+/* __libc_longjmp is a private interface for cancellation implementation
+   in libpthread.  */
 strong_alias (__libc_siglongjmp, __libc_longjmp)
-libc_hidden_def (__libc_longjmp)
 weak_alias (__libc_siglongjmp, _longjmp)
 weak_alias (__libc_siglongjmp, longjmp)
 weak_alias (__libc_siglongjmp, siglongjmp)

diff --git a/sysdeps/s390/longjmp.c b/sysdeps/s390/longjmp.c
index 6343c261b54467463ddbc3ca849f0fe26799d580..e61cdba2a33de0f50a1d112e906fd2afa469fa73 100644 (file)
--- a/sysdeps/s390/longjmp.c
+++ b/sysdeps/s390/longjmp.c
@@ -33,7 +33,6 @@
    but were reverted before 2.20. Thus both versions are the same function.  */
 
 strong_alias (__libc_siglongjmp, __libc_longjmp)
-libc_hidden_def (__libc_longjmp)
 
 weak_alias (__libc_siglongjmp, __v1_longjmp)
 weak_alias (__libc_siglongjmp, __v2_longjmp)

diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S b/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S
index 208c6db3a910f5d3941993db69cb32761dc9f4a3..5937396fc7a5a7f242616bab80b803aee50e4c95 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S
@@ -45,7 +45,6 @@ END(__libc_siglongjmp)
 
 strong_alias(__libc_siglongjmp, __longjmp)
 strong_alias(__libc_siglongjmp, __libc_longjmp)
-libc_hidden_def (__libc_longjmp)
 weak_alias (__libc_siglongjmp, longjmp)
 weak_alias (__libc_siglongjmp, _longjmp)
 weak_alias (__libc_siglongjmp, siglongjmp)