qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ulrich Drepper 2004-02-21 09:08:04 +00:00
parent 97f94fff43
commit d7cc1c9fe3
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2004-02-20 Alexandre Oliva <aoliva@redhat.com>
* resolv/Versions: Remove semicolon from the end of libresolv's * resolv/Versions: Remove semicolon from the end of libresolv's

4
sysdeps/generic/framestate.c
View File

@ -41,7 +41,11 @@ __frame_state_for (void *pc, struct frame_state *frame_state)
if (handle == NULL if (handle == NULL
|| (frame_state_for || (frame_state_for
= (framesf) __libc_dlsym (handle, "__frame_state_for")) == NULL) = (framesf) __libc_dlsym (handle, "__frame_state_for")) == NULL)
#ifndef __USING_SJLJ_EXCEPTIONS__
frame_state_for = fallback_frame_state_for; frame_state_for = fallback_frame_state_for;
#else
frame_state_for = abort;
#endif
} }
return frame_state_for (pc, frame_state); return frame_state_for (pc, frame_state);

2
sysdeps/generic/unwind-dw2.c
View File

@ -39,7 +39,6 @@
#endif #endif
#ifndef __USING_SJLJ_EXCEPTIONS__
#ifndef STACK_GROWS_DOWNWARD #ifndef STACK_GROWS_DOWNWARD
#define STACK_GROWS_DOWNWARD 0 #define STACK_GROWS_DOWNWARD 0
@ -1287,4 +1286,3 @@ uw_identify_context (struct _Unwind_Context *context)
#include "unwind.inc" #include "unwind.inc"
#endif /* _LIBC */ #endif /* _LIBC */
#endif /* !USING_SJLJ_EXCEPTIONS */