Add "_setjmp" to the list of names to try to work around the

"setjmp" macro (needed for Win32).

diff --git a/ChangeLog b/ChangeLog
index 4288959dee7f5a9b970d0d1b873e124c3c585ddf..b972eb5daa5ce2605d2d28a79e5e92473a59a412 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 
+2004-06-07  Thong Nguyen  <tim@veridicus.com>
+
+       * configure.in, jit/jit-insn.c: add "_setjmp" to the list of
+       names to try to work around the "setjmp" macro (needed for Win32).
+
 2004-06-07  Rhys Weatherley  <rweather@southern-storm.com.au>
 
        * tools/gen-apply.c: gen-apply fixes for Alpha platforms.

diff --git a/configure.in b/configure.in
index d5c50ec1c1fbf0613f2135243d709937b53b8642..497996d78a233344d5e7267d368cd9e2a626667c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -419,7 +419,7 @@ AC_CHECK_FUNCS(isnanl isinfl finitel fmodl remainderl dreml ceill floorl)
 AC_CHECK_FUNCS(acosl asinl atanl atan2l cosl coshl expl logl log10l powl)
 AC_CHECK_FUNCS(sinl sinhl sqrtl tanl tanhl)
 AC_CHECK_FUNCS(dlopen cygwin_conv_to_win32_path mmap munmap mprotect)
-AC_CHECK_FUNCS(sigsetjmp __sigsetjmp)
+AC_CHECK_FUNCS(sigsetjmp __sigsetjmp _setjmp)
 AC_FUNC_ALLOCA
 
 AC_OUTPUT([

diff --git a/jit/jit-insn.c b/jit/jit-insn.c
index 994b1a4a055c3639fa1ba802c28c8ff4f30829ca..878177ec270ffd3a0e48d8b79caaed1b50eea1f9 100644 (file)
--- a/jit/jit-insn.c
+++ b/jit/jit-insn.c
@@ -6482,8 +6482,16 @@ static int initialize_setjmp_block(jit_function_t func)
                return 0;
        }
        args[0] = jit_insn_address_of(func, func->builder->setjmp_value);
+
+#if defined(HAVE__SETJMP)
+       value = jit_insn_call_native
+               (func, "_setjmp", (void *)_setjmp, type, args, 1, JIT_CALL_NOTHROW);
+
+#else
        value = jit_insn_call_native
                (func, "setjmp", (void *)setjmp, type, args, 1, JIT_CALL_NOTHROW);
+#endif
+
        jit_type_free(type);
        if(!value)
        {