From d14624825a3eeb7712ffbe6e794cea1c5636de4d Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 1 Mar 2021 15:56:36 +0100 Subject: Move sysdeps/gnu/unwind-resume.c to sysdeps/generic/unwind-resume.c This change allows architecture-specific sysdeps directories to override it. Reviewed-by: Carlos O'Donell --- sysdeps/generic/unwind-resume.c | 83 +++++++++++++++++++++++++++++++++++++++++ sysdeps/gnu/unwind-resume.c | 83 ----------------------------------------- 2 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 sysdeps/generic/unwind-resume.c delete mode 100644 sysdeps/gnu/unwind-resume.c (limited to 'sysdeps') diff --git a/sysdeps/generic/unwind-resume.c b/sysdeps/generic/unwind-resume.c new file mode 100644 index 0000000..09533d6 --- /dev/null +++ b/sysdeps/generic/unwind-resume.c @@ -0,0 +1,83 @@ +/* Copyright (C) 2003-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jakub Jelinek . + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, see . */ + +#include +#include +#include +#include +#include +#include + + +void (*__libgcc_s_resume) (struct _Unwind_Exception *exc) + attribute_hidden __attribute__ ((noreturn)); + +static _Unwind_Reason_Code (*libgcc_s_personality) PERSONALITY_PROTO; + +void attribute_hidden __attribute__ ((cold)) +__libgcc_s_init (void) +{ + void *resume, *personality; + void *handle; + + /* See include/dlfcn.h. Use of __libc_dlopen requires RTLD_NOW. */ + handle = __libc_dlopen (LIBGCC_S_SO); + + if (handle == NULL + || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL + || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL) + __libc_fatal (LIBGCC_S_SO + " must be installed for unwinding to work\n"); + +#ifdef PTR_MANGLE + PTR_MANGLE (resume); +#endif + __libgcc_s_resume = resume; +#ifdef PTR_MANGLE + PTR_MANGLE (personality); +#endif + libgcc_s_personality = personality; +} + +#if !HAVE_ARCH_UNWIND_RESUME +void +_Unwind_Resume (struct _Unwind_Exception *exc) +{ + if (__glibc_unlikely (__libgcc_s_resume == NULL)) + __libgcc_s_init (); + + __typeof (__libgcc_s_resume) resume = __libgcc_s_resume; +#ifdef PTR_DEMANGLE + PTR_DEMANGLE (resume); +#endif + (*resume) (exc); +} +#endif + +_Unwind_Reason_Code +__gcc_personality_v0 PERSONALITY_PROTO +{ + if (__glibc_unlikely (libgcc_s_personality == NULL)) + __libgcc_s_init (); + + __typeof (libgcc_s_personality) personality = libgcc_s_personality; +#ifdef PTR_DEMANGLE + PTR_DEMANGLE (personality); +#endif + return (*personality) PERSONALITY_ARGS; +} diff --git a/sysdeps/gnu/unwind-resume.c b/sysdeps/gnu/unwind-resume.c deleted file mode 100644 index 09533d6..0000000 --- a/sysdeps/gnu/unwind-resume.c +++ /dev/null @@ -1,83 +0,0 @@ -/* Copyright (C) 2003-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek . - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -#include -#include -#include -#include -#include -#include - - -void (*__libgcc_s_resume) (struct _Unwind_Exception *exc) - attribute_hidden __attribute__ ((noreturn)); - -static _Unwind_Reason_Code (*libgcc_s_personality) PERSONALITY_PROTO; - -void attribute_hidden __attribute__ ((cold)) -__libgcc_s_init (void) -{ - void *resume, *personality; - void *handle; - - /* See include/dlfcn.h. Use of __libc_dlopen requires RTLD_NOW. */ - handle = __libc_dlopen (LIBGCC_S_SO); - - if (handle == NULL - || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL - || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL) - __libc_fatal (LIBGCC_S_SO - " must be installed for unwinding to work\n"); - -#ifdef PTR_MANGLE - PTR_MANGLE (resume); -#endif - __libgcc_s_resume = resume; -#ifdef PTR_MANGLE - PTR_MANGLE (personality); -#endif - libgcc_s_personality = personality; -} - -#if !HAVE_ARCH_UNWIND_RESUME -void -_Unwind_Resume (struct _Unwind_Exception *exc) -{ - if (__glibc_unlikely (__libgcc_s_resume == NULL)) - __libgcc_s_init (); - - __typeof (__libgcc_s_resume) resume = __libgcc_s_resume; -#ifdef PTR_DEMANGLE - PTR_DEMANGLE (resume); -#endif - (*resume) (exc); -} -#endif - -_Unwind_Reason_Code -__gcc_personality_v0 PERSONALITY_PROTO -{ - if (__glibc_unlikely (libgcc_s_personality == NULL)) - __libgcc_s_init (); - - __typeof (libgcc_s_personality) personality = libgcc_s_personality; -#ifdef PTR_DEMANGLE - PTR_DEMANGLE (personality); -#endif - return (*personality) PERSONALITY_ARGS; -} -- cgit v1.1