diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-02-21 09:08:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-02-21 09:08:04 +0000 |
| commit | d7cc1c9fe36a1c29ddeda94042ffc2477afdc31d (patch) | |
| tree | 189e233fafa7d0bfe1e8e5acba8d1a5d15709767 | |
| parent | 97f94fff438576a6ece7c116d46325fdce4c25db (diff) | |
| download | glibc-d7cc1c9fe36a1c29ddeda94042ffc2477afdc31d.tar.gz glibc-d7cc1c9fe36a1c29ddeda94042ffc2477afdc31d.tar.xz glibc-d7cc1c9fe36a1c29ddeda94042ffc2477afdc31d.zip | |
Update.
2004-02-19 Carlos O'Donell <carlos@baldric.uwo.ca> * sysdeps/generic/framestate.c [__USING_SJLJ_EXCEPTIONS__] (__frame_state_for): Set frame_State_for to abort if the compiler is using sjlj. * sysdeps/generic/unwind-dw2.c: Allow sjlj enabled compilers to build the code by removing __USING_SJLJ_EXCEPTIONS__ wrapper.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/generic/framestate.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/unwind-dw2.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d04410c59f..bea3492e3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-02-19 Carlos O'Donell <carlos@baldric.uwo.ca> + + * sysdeps/generic/framestate.c [__USING_SJLJ_EXCEPTIONS__] + (__frame_state_for): Set frame_State_for to abort if the compiler + is using sjlj. + * sysdeps/generic/unwind-dw2.c: Allow sjlj enabled compilers to + build the code by removing __USING_SJLJ_EXCEPTIONS__ wrapper. + 2004-02-20 Alexandre Oliva <aoliva@redhat.com> * resolv/Versions: Remove semicolon from the end of libresolv's diff --git a/sysdeps/generic/framestate.c b/sysdeps/generic/framestate.c index 20d9d4596e..a912a8c375 100644 --- a/sysdeps/generic/framestate.c +++ b/sysdeps/generic/framestate.c @@ -41,7 +41,11 @@ __frame_state_for (void *pc, struct frame_state *frame_state) if (handle == NULL || (frame_state_for = (framesf) __libc_dlsym (handle, "__frame_state_for")) == NULL) +#ifndef __USING_SJLJ_EXCEPTIONS__ frame_state_for = fallback_frame_state_for; +#else + frame_state_for = abort; +#endif } return frame_state_for (pc, frame_state); diff --git a/sysdeps/generic/unwind-dw2.c b/sysdeps/generic/unwind-dw2.c index 2e013cb2e1..a2d690cf76 100644 --- a/sysdeps/generic/unwind-dw2.c +++ b/sysdeps/generic/unwind-dw2.c @@ -39,7 +39,6 @@ #endif -#ifndef __USING_SJLJ_EXCEPTIONS__ #ifndef STACK_GROWS_DOWNWARD #define STACK_GROWS_DOWNWARD 0 @@ -1287,4 +1286,3 @@ uw_identify_context (struct _Unwind_Context *context) #include "unwind.inc" #endif /* _LIBC */ -#endif /* !USING_SJLJ_EXCEPTIONS */ |