# HG changeset patch
# User chegar
# Date 1458666160 0
# Node ID 67e12a9fe95db5c225ed010b56aba07995aac0d0
# Parent  5a025732e16946835af1b1e1e78b577643e96626# Parent  bba2e82b305b8a283cadac2b5a9aff5f9c92ab5f
Merge

diff -r 5a025732e169 -r 67e12a9fe95d make/devkit/Tools.gmk
--- a/make/devkit/Tools.gmk	Tue Mar 22 10:44:28 2016 +0000
+++ b/make/devkit/Tools.gmk	Tue Mar 22 17:02:40 2016 +0000
@@ -83,8 +83,9 @@
     libXdmcp libXdmcp-devel \
     libXau libXau-devel \
     libgcc \
-    elfutils elfutils-devel \
-    elfutils-libelf elfutils-libelf-devel
+    elfutils elfutils-libs elfutils-devel \
+    elfutils-libelf elfutils-libelf-devel \
+    zlib zlib-devel
 
 
 ifeq ($(ARCH),x86_64)
diff -r 5a025732e169 -r 67e12a9fe95d test/lib/sun/hotspot/WhiteBox.java
--- a/test/lib/sun/hotspot/WhiteBox.java	Tue Mar 22 10:44:28 2016 +0000
+++ b/test/lib/sun/hotspot/WhiteBox.java	Tue Mar 22 17:02:40 2016 +0000
@@ -465,4 +465,8 @@
   public native boolean isShared(Object o);
   public native boolean isSharedClass(Class<?> c);
   public native boolean areSharedStringsIgnored();
+
+  // Compiler Directive
+  public native int addCompilerDirective(String compDirect);
+  public native void removeCompilerDirective(int count);
 }