changeset 6583:9251ab32bcc4

Merge
author coffeys
date Mon, 23 Sep 2013 11:08:30 +0100
parents ec0855d5b195 bcea927e7d16
children 7d4324496f13 d89c33d27e86
files
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/back/SDE.c	Tue Sep 03 22:37:07 2013 +0100
+++ b/src/share/back/SDE.c	Mon Sep 23 11:08:30 2013 +0100
@@ -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.
--- a/src/share/native/common/check_code.c	Tue Sep 03 22:37:07 2013 +0100
+++ b/src/share/native/common/check_code.c	Mon Sep 23 11:08:30 2013 +0100
@@ -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