From 932c79bc4c06e324c90ed44cfdb28054816578a9 Mon Sep 17 00:00:00 2001 From: Staffan Larsen Date: Thu, 29 Aug 2013 11:22:44 +0200 Subject: [PATCH] 8023786: (jdk) setjmp/longjmp changes the process signal mask on OS X Reviewed-by: dholmes --- jdk/src/share/back/SDE.c | 6 ++++++ jdk/src/share/native/common/check_code.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/jdk/src/share/back/SDE.c b/jdk/src/share/back/SDE.c index 34a43b07bff..cf7baa47149 100644 --- a/jdk/src/share/back/SDE.c +++ b/jdk/src/share/back/SDE.c @@ -28,6 +28,12 @@ #include "util.h" #include "SDE.h" +#ifdef __APPLE__ +/* use setjmp/longjmp versions that do not save/restore the signal mask */ +#define setjmp _setjmp +#define longjmp _longjmp +#endif + /** * This SourceDebugExtension code does not * allow concurrent translation - due to caching method. diff --git a/jdk/src/share/native/common/check_code.c b/jdk/src/share/native/common/check_code.c index e1170293f07..6a114f1f02b 100644 --- a/jdk/src/share/native/common/check_code.c +++ b/jdk/src/share/native/common/check_code.c @@ -90,6 +90,12 @@ #include "classfile_constants.h" #include "opcodes.in_out" +#ifdef __APPLE__ +/* use setjmp/longjmp versions that do not save/restore the signal mask */ +#define setjmp _setjmp +#define longjmp _longjmp +#endif + #define MAX_ARRAY_DIMENSIONS 255 /* align byte code */ #ifndef ALIGN_UP