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.

diff --git a/ChangeLog b/ChangeLog
index d04410c..bea3492 100644 (file)
--- 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 20d9d45..a912a8c 100644 (file)
--- 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 2e013cb..a2d690c 100644 (file)
--- 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 */