changeset 10389:1af0e347a76e

Merge
author jwilhelm
date Mon, 29 Feb 2016 15:42:34 +0000
parents 36aaa9ceed16 b1f8f786bf0d
children 4766e03eaf19 f146301c971f 62d355fd1283
files
diffstat 4 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Feb 26 16:28:42 2016 +0100
+++ b/.hgtags	Mon Feb 29 15:42:34 2016 +0000
@@ -509,3 +509,4 @@
 534c50395957c6025fb6627e93b35756f8d48a08 jdk-9+104
 266fa9bb5297bf02cb2a7b038b10a109817d2b48 jdk-9+105
 7232de4c17c37f60aecec4f3191090bd3d41d334 jdk-9+106
+c5146d4da417f76edfc43097d2e2ced042a65b4e jdk-9+107
--- a/make/bsd/makefiles/arm.make	Fri Feb 26 16:28:42 2016 +0100
+++ b/make/bsd/makefiles/arm.make	Mon Feb 29 15:42:34 2016 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 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
@@ -24,8 +24,4 @@
 
 Obj_Files += bsd_arm.o
 
-ifneq ($(EXT_LIBS_PATH),)
-  LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 
-endif
-
 CFLAGS += -DVM_LITTLE_ENDIAN
--- a/test/gc/g1/plab/TestPLABResize.java	Fri Feb 26 16:28:42 2016 +0100
+++ b/test/gc/g1/plab/TestPLABResize.java	Mon Feb 29 15:42:34 2016 +0000
@@ -35,6 +35,7 @@
  *        gc.g1.plab.lib.MemoryConsumer
  *        gc.g1.plab.lib.PLABUtils
  *        gc.g1.plab.lib.AppPLABResize
+ * @ignore 8150183
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main gc.g1.plab.TestPLABResize
--- a/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	Fri Feb 26 16:28:42 2016 +0100
+++ b/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	Mon Feb 29 15:42:34 2016 +0000
@@ -38,6 +38,7 @@
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
  * @build ClassFileInstaller jdk.test.lib.* SimpleJvmtiAgent
+ * @ignore 8150318
  * @run main ClassFileInstaller SimpleJvmtiAgent
  * @run testng LoadAgentDcmdTest
  */