Remove hidden __libc_longjmp

Message ID 20180226142051.GA23428@gmail.com
State New
Headers show
Series
  • Remove hidden __libc_longjmp
Related show

Commit Message

H.J. Lu Feb. 26, 2018, 2:20 p.m.
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.

OK for master?

H.J.
---
	* 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.
---
 include/setjmp.h                                | 1 -
 setjmp/longjmp.c                                | 3 ++-
 sysdeps/s390/longjmp.c                          | 1 -
 sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

-- 
2.14.3

Comments

Siddhesh Poyarekar March 10, 2018, 5:08 p.m. | #1
On Monday 26 February 2018 07:50 PM, H.J. Lu wrote:
> 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.

> 

> OK for master?


OK.

Siddhesh

Patch

diff --git a/include/setjmp.h b/include/setjmp.h
index f1b19f5ceb..263bc64b3d 100644
--- 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 6b4737605a..a2a7065a85 100644
--- 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 6343c261b5..e61cdba2a3 100644
--- 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 208c6db3a9..5937396fc7 100644
--- 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)