diff options
author | Tom Tromey <tromey@gcc.gnu.org> | 1999-11-19 19:13:42 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-11-19 19:13:42 +0000 |
commit | 3cf88fb4e850d8dc5aafbe280bef674e79326005 (patch) | |
tree | 66d0cd37d209d1f5d9df73c934dc9f25f92bdf03 /libjava/gcj | |
parent | 2395f8059c43b8411090fd4461cbd61d53a55ce9 (diff) | |
download | gcc-3cf88fb4e850d8dc5aafbe280bef674e79326005.zip gcc-3cf88fb4e850d8dc5aafbe280bef674e79326005.tar.gz gcc-3cf88fb4e850d8dc5aafbe280bef674e79326005.tar.bz2 |
sjlj jumbo patch
From-SVN: r30591
Diffstat (limited to 'libjava/gcj')
-rw-r--r-- | libjava/gcj/Makefile.in | 3 | ||||
-rw-r--r-- | libjava/gcj/cni.h | 4 | ||||
-rw-r--r-- | libjava/gcj/javaprims.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index b74bff6..7bbcec4 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -74,6 +74,7 @@ CXXCPP = @CXXCPP@ DIVIDESPEC = @DIVIDESPEC@ DLLTOOL = @DLLTOOL@ EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ +EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ @@ -89,6 +90,7 @@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ +OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ @@ -98,7 +100,6 @@ THREADINCS = @THREADINCS@ THREADLIBS = @THREADLIBS@ THREADOBJS = @THREADOBJS@ THREADSPEC = @THREADSPEC@ -USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@ VERSION = @VERSION@ ZDEPS = @ZDEPS@ ZINCS = @ZINCS@ diff --git a/libjava/gcj/cni.h b/libjava/gcj/cni.h index 2cdd545..4e96f9f 100644 --- a/libjava/gcj/cni.h +++ b/libjava/gcj/cni.h @@ -109,6 +109,10 @@ public: { _Jv_MonitorExit (obj); } }; +#ifdef SJLJ_EXCEPTIONS +#define _Jv_Throw _Jv_Sjlj_Throw +#endif + // Throw some exception. extern void JvThrow (jobject obj) __attribute__ ((__noreturn__)); extern inline void diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h index ee08537..72fbb25 100644 --- a/libjava/gcj/javaprims.h +++ b/libjava/gcj/javaprims.h @@ -269,6 +269,7 @@ extern "C" jsize _Jv_GetStringUTFLength (jstring); extern "C" jsize _Jv_GetStringUTFRegion (jstring, jsize, jsize, char *); extern "C" void _Jv_Throw (void *) __attribute__ ((__noreturn__)); +extern "C" void _Jv_Sjlj_Throw (void *) __attribute__ ((__noreturn__)); extern "C" void* _Jv_Malloc (jsize); extern "C" void _Jv_Free (void*); |