diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-08-20 06:30:29 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-08-20 06:30:46 -0700 |
| commit | 94e6ba153b80a91e97386594729cd36eab69f507 (patch) | |
| tree | 65eff034c0f6b1e109827654312d633eae2df6de | |
| parent | 7550717ed747c90afe49fcd590c4acc3ccade56a (diff) | |
| download | glibc-94e6ba153b80a91e97386594729cd36eab69f507.tar.gz glibc-94e6ba153b80a91e97386594729cd36eab69f507.tar.xz glibc-94e6ba153b80a91e97386594729cd36eab69f507.zip | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | debug/longjmp_chk.c | 4 | ||||
| -rw-r--r-- | include/setjmp.h | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index c650d03e12..7badd6bb8d 100644 --- 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 1a927f5ac1..1cea6c05ef 100644 --- 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 90f46976e3..e45328b18a 100644 --- 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'. |