diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2012-03-29 12:48:08 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2012-03-29 05:48:08 -0700 |
| commit | 6401aaf5df140b05a9ff6405cbd180df3c9f620a (patch) | |
| tree | a1dc6b0afc92c80b689c6e6eb91263f1d5ac206e /libgcc | |
| parent | 6bcfb753855b957ad7cc8cf04fd767a1b013979d (diff) | |
| download | gcc-6401aaf5df140b05a9ff6405cbd180df3c9f620a.zip gcc-6401aaf5df140b05a9ff6405cbd180df3c9f620a.tar.gz gcc-6401aaf5df140b05a9ff6405cbd180df3c9f620a.tar.bz2 | |
Define x86_64_fallback_frame_state only for glibc
2012-03-29 H.J. Lu <hongjiu.lu@intel.com>
* config/i386/linux-unwind.h (x86_64_fallback_frame_state): Define
only for glibc.
From-SVN: r185957
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/config/i386/linux-unwind.h | 19 |
2 files changed, 13 insertions, 11 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 5efe950..f44f52e 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2012-03-29 H.J. Lu <hongjiu.lu@intel.com> + + * config/i386/linux-unwind.h (x86_64_fallback_frame_state): Define + only for glibc. + 2012-03-28 Georg-Johann Lay <avr@gjlay.de> PR target/52737 diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h index f17a46c..aef2692 100644 --- a/libgcc/config/i386/linux-unwind.h +++ b/libgcc/config/i386/linux-unwind.h @@ -29,11 +29,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #ifndef inhibit_libc -#ifdef __x86_64__ +/* There's no sys/ucontext.h for glibc 2.0, so no + signal-turned-exceptions for them. There's also no configure-run for + the target, so we can't check on (e.g.) HAVE_SYS_UCONTEXT_H. Using the + target libc version macro should be enough. */ +#if defined __GLIBC__ && !(__GLIBC__ == 2 && __GLIBC_MINOR__ == 0) #include <signal.h> #include <sys/ucontext.h> +#ifdef __x86_64__ + #define MD_FALLBACK_FRAME_STATE_FOR x86_64_fallback_frame_state static _Unwind_Reason_Code @@ -108,15 +114,6 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, #else /* ifdef __x86_64__ */ -/* There's no sys/ucontext.h for glibc 2.0, so no - signal-turned-exceptions for them. There's also no configure-run for - the target, so we can't check on (e.g.) HAVE_SYS_UCONTEXT_H. Using the - target libc version macro should be enough. */ -#if defined __GLIBC__ && !(__GLIBC__ == 2 && __GLIBC_MINOR__ == 0) - -#include <signal.h> -#include <sys/ucontext.h> - #define MD_FALLBACK_FRAME_STATE_FOR x86_fallback_frame_state static _Unwind_Reason_Code @@ -197,6 +194,6 @@ x86_frob_update_context (struct _Unwind_Context *context, _Unwind_SetSignalFrame (context, 1); } -#endif /* not glibc 2.0 */ #endif /* ifdef __x86_64__ */ +#endif /* not glibc 2.0 */ #endif /* ifdef inhibit_libc */ |