Move ____longjmp_chk prototype to include/setjmp.h

Move ____longjmp_chk prototype to include/setjmp.h and add
attribute_hidden.

	* debug/longjmp_chk.c (____longjmp_chk): Moved to ...
	* include/setjmp.h (____longjmp_chk): Here.  Add
	attribute_hidden.

diff --git a/ChangeLog b/ChangeLog
index c650d03..7badd6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * debug/longjmp_chk.c (____longjmp_chk): Moved to ...
+       * include/setjmp.h (____longjmp_chk): Here.  Add
+       attribute_hidden.
+
 2017-08-19  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #18822]

diff --git a/debug/longjmp_chk.c b/debug/longjmp_chk.c
index 1a927f5..1cea6c0 100644 (file)
--- a/debug/longjmp_chk.c
+++ b/debug/longjmp_chk.c
@@ -17,10 +17,6 @@
 
 #include <setjmp.h>
 
-// XXX Should move to include/setjmp.h
-extern void ____longjmp_chk (__jmp_buf __env, int __val)
-     __attribute__ ((__noreturn__));
-
 #define __longjmp ____longjmp_chk
 #define __libc_siglongjmp __longjmp_chk
 

diff --git a/include/setjmp.h b/include/setjmp.h
index 90f4697..e45328b 100644 (file)
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -8,6 +8,9 @@
 extern void __longjmp (__jmp_buf __env, int __val)
      __attribute__ ((__noreturn__)) attribute_hidden;
 
+extern void ____longjmp_chk (__jmp_buf __env, int __val)
+     __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.
    This is used by the machine-dependent definition of `__sigsetjmp'.