diff options
author | Eric Botcazou <ebotcazou@adacore.com> | 2015-05-13 21:15:31 +0000 |
---|---|---|
committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2015-05-13 21:15:31 +0000 |
commit | 9b92a9f3b66085450297135e51e0810727d59f8c (patch) | |
tree | dc6a0f80d4e52e052312acffbba59b37f142e9ef /libjava/stacktrace.cc | |
parent | 7893307bb20d7e1a6bd2de2fb8b5e779d376439f (diff) | |
download | gcc-9b92a9f3b66085450297135e51e0810727d59f8c.zip gcc-9b92a9f3b66085450297135e51e0810727d59f8c.tar.gz gcc-9b92a9f3b66085450297135e51e0810727d59f8c.tar.bz2 |
sjlj.m4: New file.
config/
* sjlj.m4: New file.
libgcc/
* configure.ac: Include config/sjlj.m4.
Remove manual SJLJ check, add GCC_CHECK_SJLJ_EXCEPTIONS and adjust.
* config.in: Regenerate.
* configure: Likewise.
* config.host: Replace enable_sjlj_exceptions by ac_cv_sjlj_exceptions.
libjava/
* configure.ac: Include config/sjlj.m4.
Remove manual SJLJ check, add GCC_CHECK_SJLJ_EXCEPTIONS and adjust.
* include/config.h.in: Regenerate.
* configure: Likewise.
* exception.cc: Replace SJLJ_EXCEPTIONS by __USING_SJLJ_EXCEPTIONS__.
* stacktrace.cc: Likewise.
* include/default-signal.h: Likewise.
* sysdep/i386/backtrace.h: Likewise.
libobjc/
* configure.ac: Remove manual SJLJ check.
* config.h.in: Regenerate.
* configure: Likewise.
* exception.c: Replace SJLJ_EXCEPTIONS by __USING_SJLJ_EXCEPTIONS__.
libstdc++-v3/
* acinclude.m4 (GLIBCXX_ENABLE_SJLJ_EXCEPTIONS): Delete.
* configure.ac: Remove GLIBCXX_ENABLE_SJLJ_EXCEPTIONS.
* config.h.in: Regenerate.
* configure: Likewise.
* libsupc++/eh_personality.cc: Replace _GLIBCXX_SJLJ_EXCEPTIONS by
__USING_SJLJ_EXCEPTIONS__.
* libsupc++/eh_throw.cc: Likewise.
* libsupc++/eh_ptr.cc: Likewise.
* doc/html/manual/appendix_porting.html: Remove
GLIBCXX_ENABLE_SJLJ_EXCEPTIONS
* doc/xml/manual/build_hacking.xml: Likewise.
* doc/html/manual/configure.html: Remove --enable-sjlj-exceptions.
* doc/xml/manual/configure.xml: Likewise.
From-SVN: r223181
Diffstat (limited to 'libjava/stacktrace.cc')
-rw-r--r-- | libjava/stacktrace.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc index d8d1f38..0fc91c4 100644 --- a/libjava/stacktrace.cc +++ b/libjava/stacktrace.cc @@ -325,7 +325,7 @@ _Jv_StackTrace::GetStackTraceElements (_Jv_StackTrace *trace, { ArrayList *list = new ArrayList (); -#if defined (SJLJ_EXCEPTIONS) && ! defined (WIN32) +#if defined (__USING_SJLJ_EXCEPTIONS__) && ! defined (WIN32) // We can't use the nCodeMap without unwinder support. Instead, // fake the method name by giving the IP in hex - better than nothing. jstring hex = JvNewStringUTF ("0x"); @@ -344,7 +344,7 @@ _Jv_StackTrace::GetStackTraceElements (_Jv_StackTrace *trace, list->add (element); } -#else /* SJLJ_EXCEPTIONS && !WIN32 */ +#else /* __USING_SJLJ_EXCEPTIONS__ && !WIN32 */ //JvSynchronized (ncodeMap); UpdateNCodeMap (); @@ -412,7 +412,7 @@ _Jv_StackTrace::GetStackTraceElements (_Jv_StackTrace *trace, } finder->close(); -#endif /* SJLJ_EXCEPTIONS && !WIN32 */ +#endif /* __USING_SJLJ_EXCEPTIONS__ && !WIN32 */ JArray<Object *> *array = JvNewObjectArray (list->size (), &StackTraceElement::class$, NULL); |