Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorjprovino
Mon, 24 Oct 2016 16:27:13 +0000
changeset 42049 2577785d980a
parent 42048 c1f066b53dd7 (current diff)
parent 42047 72bc0277f889 (diff)
child 42050 77c41d9c4253
Merge
--- a/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk	Mon Oct 24 10:10:30 2016 -0400
+++ b/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk	Mon Oct 24 16:27:13 2016 +0000
@@ -74,7 +74,7 @@
       -mstack-alignment=16 -fPIC
   SA_LDFLAGS := $(LDFLAGS_JDKLIB)
   SA_LIBS := -framework Foundation -framework JavaNativeFoundation \
-      -framework Security -framework CoreFoundation
+      -framework JavaRuntimeSupport -framework Security -framework CoreFoundation
 
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   SA_NAME := sawindbg
--- a/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/MacosxDebuggerLocal.m	Mon Oct 24 10:10:30 2016 -0400
+++ b/hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc/MacosxDebuggerLocal.m	Mon Oct 24 16:27:13 2016 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include <objc/objc-runtime.h>
 #import <Foundation/Foundation.h>
 #import <JavaNativeFoundation/JavaNativeFoundation.h>
+#import <JavaRuntimeSupport/JavaRuntimeSupport.h>
 
 #include <jni.h>
 
--- a/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java	Mon Oct 24 10:10:30 2016 -0400
+++ b/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java	Mon Oct 24 16:27:13 2016 +0000
@@ -24,9 +24,6 @@
 /*
  * @test SASymbolTableTest
  * @summary Walk symbol table using SA, with and without CDS.
- * Started failing on 2016.06.24 due to 8160376 on MacOS X so quarantine
- * it on that platform:
- * @requires os.family != "mac"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot.oops
--- a/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Mon Oct 24 10:10:30 2016 -0400
+++ b/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java	Mon Oct 24 16:27:13 2016 +0000
@@ -42,9 +42,6 @@
  * @bug 6313383
  * @key regression
  * @summary Regression test for hprof export issue due to large heaps (>2G)
- * Started failing on 2016.06.24 due to 8160376 on MacOS X so quarantine
- * it on that platform:
- * @requires os.family != "mac"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.compiler
jdk-sandbox