From d4ed08f59ef0e3e8acd3045982ede27343234f48 Mon Sep 17 00:00:00 2001 From: Jamil Nimeh Date: Fri, 8 Jul 2016 14:42:50 -0700 Subject: [PATCH 001/111] 8129972: Clarify the javadoc of java.security.CodeSource as to the nullability of 'location' Improves clarity of the CodeSource javadoc, specifically regarding the ability of the URL parameter in the constructors being null. Reviewed-by: mullan --- .../classes/java/security/CodeSource.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/security/CodeSource.java b/jdk/src/java.base/share/classes/java/security/CodeSource.java index 6c922aad441..f710fe31fc9 100644 --- a/jdk/src/java.base/share/classes/java/security/CodeSource.java +++ b/jdk/src/java.base/share/classes/java/security/CodeSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -86,10 +86,9 @@ public class CodeSource implements java.io.Serializable { * Constructs a CodeSource and associates it with the specified * location and set of certificates. * - * @param url the location (URL). - * - * @param certs the certificate(s). It may be null. The contents of the - * array are copied to protect against subsequent modification. + * @param url the location (URL). It may be {@code null}. + * @param certs the certificate(s). It may be {@code null}. The contents + * of the array are copied to protect against subsequent modification. */ public CodeSource(URL url, java.security.cert.Certificate[] certs) { this.location = url; @@ -107,9 +106,9 @@ public class CodeSource implements java.io.Serializable { * Constructs a CodeSource and associates it with the specified * location and set of code signers. * - * @param url the location (URL). - * @param signers the code signers. It may be null. The contents of the - * array are copied to protect against subsequent modification. + * @param url the location (URL). It may be {@code null}. + * @param signers the code signers. It may be {@code null}. The contents + * of the array are copied to protect against subsequent modification. * * @since 1.5 */ @@ -176,7 +175,8 @@ public class CodeSource implements java.io.Serializable { /** * Returns the location associated with this CodeSource. * - * @return the location (URL). + * @return the location (URL), or {@code null} if no URL was supplied + * during construction. */ public final URL getLocation() { /* since URL is practically immutable, returning itself is not @@ -203,7 +203,8 @@ public class CodeSource implements java.io.Serializable { * bottom-to-top (i.e., with the signer certificate first and the (root) * certificate authority last). * - * @return A copy of the certificates array, or null if there is none. + * @return a copy of the certificate array, or {@code null} if there + * is none. */ public final java.security.cert.Certificate[] getCertificates() { if (certs != null) { @@ -235,7 +236,8 @@ public class CodeSource implements java.io.Serializable { * create an array of CodeSigner objects. Note that only X.509 certificates * are examined - all other certificate types are ignored. * - * @return A copy of the code signer array, or null if there is none. + * @return a copy of the code signer array, or {@code null} if there + * is none. * * @since 1.5 */ @@ -322,7 +324,6 @@ public class CodeSource implements java.io.Serializable { * @return true if the specified codesource is implied by this codesource, * false if not. */ - public boolean implies(CodeSource codesource) { if (codesource == null) @@ -336,7 +337,7 @@ public class CodeSource implements java.io.Serializable { * CodeSource are also in that. * * @param that the CodeSource to check against. - * @param strict If true then a strict equality match is performed. + * @param strict if true then a strict equality match is performed. * Otherwise a subset match is performed. */ boolean matchCerts(CodeSource that, boolean strict) @@ -622,7 +623,7 @@ public class CodeSource implements java.io.Serializable { * The array of certificates is a concatenation of certificate chains * where the initial certificate in each chain is the end-entity cert. * - * @return An array of code signers or null if none are generated. + * @return an array of code signers or null if none are generated. */ private CodeSigner[] convertCertArrayToSignerArray( java.security.cert.Certificate[] certs) { From 465af0b962119df2ff9a774f6d6c18cc347fe8bf Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Fri, 8 Jul 2016 16:16:45 -0700 Subject: [PATCH 002/111] 8157287: java/nio/file/FileStore/Basic.java failed with "java.nio.file.AccessDeniedException : /zones/zoneone/root " Ignore AccessDeniedException when testing space attributes. Reviewed-by: alanb --- jdk/test/java/nio/file/FileStore/Basic.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jdk/test/java/nio/file/FileStore/Basic.java b/jdk/test/java/nio/file/FileStore/Basic.java index f81d3d95a8b..14479e3cc9b 100644 --- a/jdk/test/java/nio/file/FileStore/Basic.java +++ b/jdk/test/java/nio/file/FileStore/Basic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2015, 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 @@ -124,6 +124,12 @@ public class Basic { // ignore exception as the store could have been // deleted since the iterator was instantiated System.err.format("%s was not found\n", store); + } catch (AccessDeniedException ade) { + // ignore exception as the lack of ability to access the + // store due to lack of file permission or similar does not + // reflect whether the space attributes would be accessible + // were access to be permitted + System.err.format("%s is inaccessible\n", store); } // two distinct FileStores should not be equal From 67ca9fc9b430e3287d6678dbedc155cac5aa2828 Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Sat, 9 Jul 2016 05:48:16 +0000 Subject: [PATCH 003/111] 8157712: Deprecate the javax.security.cert and com.sun.net.ssl APIs with forRemoval=true Reviewed-by: weijun --- .../share/classes/com/sun/net/ssl/HostnameVerifier.java | 5 +++-- .../share/classes/com/sun/net/ssl/HttpsURLConnection.java | 5 +++-- .../java.base/share/classes/com/sun/net/ssl/KeyManager.java | 5 +++-- .../share/classes/com/sun/net/ssl/KeyManagerFactory.java | 5 +++-- .../share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java | 5 +++-- .../java.base/share/classes/com/sun/net/ssl/SSLContext.java | 5 +++-- .../share/classes/com/sun/net/ssl/SSLContextSpi.java | 5 +++-- .../share/classes/com/sun/net/ssl/SSLPermission.java | 5 +++-- .../share/classes/com/sun/net/ssl/TrustManager.java | 5 +++-- .../share/classes/com/sun/net/ssl/TrustManagerFactory.java | 5 +++-- .../classes/com/sun/net/ssl/TrustManagerFactorySpi.java | 5 +++-- .../share/classes/com/sun/net/ssl/X509KeyManager.java | 5 +++-- .../share/classes/com/sun/net/ssl/X509TrustManager.java | 5 +++-- .../share/classes/com/sun/net/ssl/internal/ssl/Provider.java | 5 ++++- .../sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java | 4 +++- .../www/protocol/https/DelegateHttpsURLConnection.java | 4 +++- .../com/sun/net/ssl/internal/www/protocol/https/Handler.java | 4 +++- .../www/protocol/https/HttpsURLConnectionOldImpl.java | 4 +++- .../share/classes/javax/security/cert/Certificate.java | 5 +++-- .../javax/security/cert/CertificateEncodingException.java | 5 +++-- .../classes/javax/security/cert/CertificateException.java | 5 +++-- .../javax/security/cert/CertificateExpiredException.java | 5 +++-- .../javax/security/cert/CertificateNotYetValidException.java | 5 +++-- .../javax/security/cert/CertificateParsingException.java | 5 +++-- .../share/classes/javax/security/cert/X509Certificate.java | 5 +++-- .../share/classes/sun/security/jca/ProviderConfig.java | 2 ++ .../java.base/share/classes/sun/security/ssl/SunJSSE.java | 4 +++- 27 files changed, 81 insertions(+), 46 deletions(-) diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java index 828c30a8bd6..1a78995ec01 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -38,8 +38,9 @@ package com.sun.net.ssl; * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.HostnameVerifier} and * {@link javax.net.ssl.CertificateHostnameVerifier}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public interface HostnameVerifier { /** * Verify that the hostname from the URL is an acceptable diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java index 0ddaa794efc..d376fc395fe 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -44,8 +44,9 @@ import javax.net.ssl.SSLPeerUnverifiedException; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.HttpsURLConnection}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public abstract class HttpsURLConnection extends HttpURLConnection { diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java index fb0b28f29c4..814d619db8d 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -36,7 +36,8 @@ package com.sun.net.ssl; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.KeyManager}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public interface KeyManager { } diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java index 620de110be2..8c0caed6b0e 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -39,8 +39,9 @@ import java.security.*; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.KeyManagerFactory}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class KeyManagerFactory { // The provider private Provider provider; diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java index 917522fb491..19b2a68b6f5 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -41,8 +41,9 @@ import java.security.*; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.KeyManagerFactorySpi}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public abstract class KeyManagerFactorySpi { /** * Initializes this factory with a source of key material. The diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java index d917c056f98..6f0cbf9fd9b 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -44,8 +44,9 @@ import sun.security.ssl.SSLServerSocketFactoryImpl; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.SSLContext}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class SSLContext { private Provider provider; diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java index 3f2e74e8236..0a663b8ff3f 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -43,8 +43,9 @@ import javax.net.ssl.*; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.SSLContextSpi}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public abstract class SSLContextSpi { /** * Initializes this context. diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java index 8f8c249d007..9fd480b93f3 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -97,8 +97,9 @@ import java.lang.SecurityManager; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.SSLPermission}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public final class SSLPermission extends BasicPermission { private static final long serialVersionUID = -2583684302506167542L; diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java index c7396b61b8d..2856e30be40 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -36,7 +36,8 @@ package com.sun.net.ssl; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.TrustManager}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public interface TrustManager { } diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java index 14c54d29a8b..934210c618b 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -39,8 +39,9 @@ import java.security.*; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.TrustManagerFactory}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public class TrustManagerFactory { // The provider private Provider provider; diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java index 627c97fd747..62698a42d32 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -41,8 +41,9 @@ import java.security.*; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.TrustManagerFactorySpi}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public abstract class TrustManagerFactorySpi { /** * Initializes this factory with a source of certificate diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java index 9bad0154019..cb4903171a7 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -41,8 +41,9 @@ import java.security.cert.X509Certificate; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.X509KeyManager}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public interface X509KeyManager extends KeyManager { /** * Get the matching aliases for authenticating the client side of a secure diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java index d1775a9df7f..024d33a16f5 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -40,8 +40,9 @@ import java.security.cert.X509Certificate; * * @deprecated As of JDK 1.4, this implementation-specific class was * replaced by {@link javax.net.ssl.X509TrustManager}. + * This class is subject to removal in a future version of JDK. */ -@Deprecated +@Deprecated(since="1.4", forRemoval=true) public interface X509TrustManager extends TrustManager { /** * Given the partial or complete certificate chain diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java index 2f1d2b42ce9..f438e6401fd 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -31,7 +31,10 @@ import sun.security.ssl.SunJSSE; * Main class for the SunJSSE provider. The actual code was moved to the * class sun.security.ssl.SunJSSE, but for backward compatibility we * continue to use this class as the main Provider class. + * + * @deprecated This class is subject to removal in a future version of JDK. */ +@Deprecated(since="9", forRemoval=true) public final class Provider extends SunJSSE { private static final long serialVersionUID = 3231825739635378733L; diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java index 9859f488a64..3db161b83e4 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -54,7 +54,9 @@ import java.security.cert.CertificateException; * * @since 1.6 * @author Xuelei Fan + * @deprecated This class is subject to removal in a future version of JDK. */ +@Deprecated(since="9", forRemoval=true) public abstract class X509ExtendedTrustManager implements X509TrustManager { /** * Constructor used by subclasses only. diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java index 3c05c37a037..8cb1de2b22c 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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 @@ -52,7 +52,9 @@ import sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection; * of protocol implementation (this one) * com.sun.net.ssl.HttpURLConnection is used in the com.sun version. * + * @deprecated This class is subject to removal in a future version of JDK. */ +@Deprecated(since="9", forRemoval=true) @SuppressWarnings("deprecation") // HttpsURLConnection is deprecated public class DelegateHttpsURLConnection extends AbstractDelegateHttpsURLConnection { diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java index 43cf166ddc2..d52e972646e 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 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 @@ -34,7 +34,9 @@ import java.net.Proxy; * only. The HTTPS implementation can now be found in * sun.net.www.protocol.https. * + * @deprecated This class is subject to removal in a future version of JDK. */ +@Deprecated(since="9", forRemoval=true) public class Handler extends sun.net.www.protocol.https.Handler { public Handler() { diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java index 07ff87ba85a..09b1060eab0 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 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 @@ -59,11 +59,13 @@ import sun.net.www.http.HttpClient; * needs to implement all public methods in it's super class and all * the way to Object. * + * @deprecated This class is subject to removal in a future version of JDK. */ // For both copies of the file, uncomment one line and comment the other // public class HttpsURLConnectionImpl // extends javax.net.ssl.HttpsURLConnection { +@Deprecated(since="9", forRemoval=true) @SuppressWarnings("deprecation") // HttpsURLConnection is deprecated public class HttpsURLConnectionOldImpl extends com.sun.net.ssl.HttpsURLConnection { diff --git a/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java b/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java index 84fdefde609..9021a6244cb 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/Certificate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -58,10 +58,11 @@ import java.security.SignatureException; * @since 1.4 * @see X509Certificate * @deprecated Use the classes in {@code java.security.cert} instead. + * This class is subject to removal in a future version of Java SE. * * @author Hemma Prafullchandra */ -@Deprecated +@Deprecated(since="9", forRemoval=true) public abstract class Certificate { /** diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java index 95fbcfbeb1e..dfbf56bfcfa 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -39,8 +39,9 @@ package javax.security.cert; * @since 1.4 * @author Hemma Prafullchandra * @deprecated Use the classes in {@code java.security.cert} instead. + * This class is subject to removal in a future version of Java SE. */ -@Deprecated +@Deprecated(since="9", forRemoval=true) public class CertificateEncodingException extends CertificateException { private static final long serialVersionUID = -8187642723048403470L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java index 144bb97fe6a..f26efb87172 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 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 @@ -39,8 +39,9 @@ package javax.security.cert; * @since 1.4 * @see Certificate * @deprecated Use the classes in {@code java.security.cert} instead. + * This class is subject to removal in a future version of Java SE. */ -@Deprecated +@Deprecated(since="9", forRemoval=true) public class CertificateException extends Exception { private static final long serialVersionUID = -5757213374030785290L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java index 9f4eb7d4aed..c3303009c8f 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -41,8 +41,9 @@ package javax.security.cert; * @since 1.4 * @author Hemma Prafullchandra * @deprecated Use the classes in {@code java.security.cert} instead. + * This class is subject to removal in a future version of Java SE. */ -@Deprecated +@Deprecated(since="9", forRemoval=true) public class CertificateExpiredException extends CertificateException { private static final long serialVersionUID = 5091601212177261883L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java index c5c67c7f61e..be076e09c86 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -41,8 +41,9 @@ package javax.security.cert; * @since 1.4 * @author Hemma Prafullchandra * @deprecated Use the classes in {@code java.security.cert} instead. + * This class is subject to removal in a future version of Java SE. */ -@Deprecated +@Deprecated(since="9", forRemoval=true) public class CertificateNotYetValidException extends CertificateException { private static final long serialVersionUID = -8976172474266822818L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java b/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java index cd1f6ac507c..b099673277a 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -40,8 +40,9 @@ package javax.security.cert; * @since 1.4 * @author Hemma Prafullchandra * @deprecated Use the classes in {@code java.security.cert} instead. + * This class is subject to removal in a future version of Java SE. */ -@Deprecated +@Deprecated(since="9", forRemoval=true) public class CertificateParsingException extends CertificateException { private static final long serialVersionUID = -8449352422951136229L; diff --git a/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java b/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java index 511d6ef601b..83587e233b6 100644 --- a/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java +++ b/jdk/src/java.base/share/classes/javax/security/cert/X509Certificate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -125,8 +125,9 @@ import java.util.Date; * @see java.security.cert.X509Extension * @see java.security.Security security properties * @deprecated Use the classes in {@code java.security.cert} instead. + * This class is subject to removal in a future version of Java SE. */ -@Deprecated +@Deprecated(since="9", forRemoval=true) public abstract class X509Certificate extends Certificate { /* diff --git a/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java b/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java index c12f7f3bc5f..2f52c8b2ca8 100644 --- a/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java +++ b/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java @@ -159,6 +159,8 @@ final class ProviderConfig { /** * Get the provider object. Loads the provider if it is not already loaded. */ + // com.sun.net.ssl.internal.ssl.Provider has been deprecated since JDK 9 + @SuppressWarnings("deprecation") synchronized Provider getProvider() { // volatile variable load Provider p = provider; diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java b/jdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java index 6e4a1a76f82..6e66c00e2af 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/SunJSSE.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -237,6 +237,8 @@ public abstract class SunJSSE extends java.security.Provider { "sun.security.pkcs12.PKCS12KeyStore"); } + // com.sun.net.ssl.internal.ssl.Provider has been deprecated since JDK 9 + @SuppressWarnings("deprecation") private void subclassCheck() { if (getClass() != com.sun.net.ssl.internal.ssl.Provider.class) { throw new AssertionError("Illegal subclass: " + getClass()); From e78fd8d72e9b1d9305d2682983e2f1926140e299 Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Sat, 9 Jul 2016 05:56:18 +0000 Subject: [PATCH 004/111] 8148516: Improve the default strength of EC in JDK Reviewed-by: valeriep --- .../classes/sun/security/ssl/CipherSuite.java | 40 +- .../sun/security/ssl/CipherSuiteList.java | 13 +- .../sun/security/ssl/ClientHandshaker.java | 66 +-- .../classes/sun/security/ssl/ECDHCrypt.java | 7 +- .../security/ssl/EllipticCurvesExtension.java | 359 +++++++++++---- .../sun/security/ssl/HandshakeMessage.java | 5 - .../classes/sun/security/ssl/Handshaker.java | 68 ++- .../classes/sun/security/ssl/JsseJce.java | 12 +- .../sun/security/ssl/ServerHandshaker.java | 42 +- .../share/conf/security/java.security | 5 +- .../ssl/ciphersuites/ECCurvesconstraints.java | 408 ++++++++++++++++++ jdk/test/sun/security/ec/TestEC.java | 2 +- .../pkcs11/sslecc/ClientJSSEServerJSSE.java | 6 +- 13 files changed, 835 insertions(+), 198 deletions(-) create mode 100644 jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java index fa6c5ad34bb..2ffb5f32b4b 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, 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 @@ -376,36 +376,38 @@ final class CipherSuite implements Comparable { static enum KeyExchange { // key exchange algorithms - K_NULL ("NULL", false), - K_RSA ("RSA", true), - K_RSA_EXPORT ("RSA_EXPORT", true), - K_DH_RSA ("DH_RSA", false), - K_DH_DSS ("DH_DSS", false), - K_DHE_DSS ("DHE_DSS", true), - K_DHE_RSA ("DHE_RSA", true), - K_DH_ANON ("DH_anon", true), + K_NULL ("NULL", false, false), + K_RSA ("RSA", true, false), + K_RSA_EXPORT ("RSA_EXPORT", true, false), + K_DH_RSA ("DH_RSA", false, false), + K_DH_DSS ("DH_DSS", false, false), + K_DHE_DSS ("DHE_DSS", true, false), + K_DHE_RSA ("DHE_RSA", true, false), + K_DH_ANON ("DH_anon", true, false), - K_ECDH_ECDSA ("ECDH_ECDSA", ALLOW_ECC), - K_ECDH_RSA ("ECDH_RSA", ALLOW_ECC), - K_ECDHE_ECDSA("ECDHE_ECDSA", ALLOW_ECC), - K_ECDHE_RSA ("ECDHE_RSA", ALLOW_ECC), - K_ECDH_ANON ("ECDH_anon", ALLOW_ECC), + K_ECDH_ECDSA ("ECDH_ECDSA", ALLOW_ECC, true), + K_ECDH_RSA ("ECDH_RSA", ALLOW_ECC, true), + K_ECDHE_ECDSA("ECDHE_ECDSA", ALLOW_ECC, true), + K_ECDHE_RSA ("ECDHE_RSA", ALLOW_ECC, true), + K_ECDH_ANON ("ECDH_anon", ALLOW_ECC, true), // Kerberos cipher suites - K_KRB5 ("KRB5", true), - K_KRB5_EXPORT("KRB5_EXPORT", true), + K_KRB5 ("KRB5", true, false), + K_KRB5_EXPORT("KRB5_EXPORT", true, false), // renegotiation protection request signaling cipher suite - K_SCSV ("SCSV", true); + K_SCSV ("SCSV", true, false); // name of the key exchange algorithm, e.g. DHE_DSS final String name; final boolean allowed; + final boolean isEC; private final boolean alwaysAvailable; - KeyExchange(String name, boolean allowed) { + KeyExchange(String name, boolean allowed, boolean isEC) { this.name = name; this.allowed = allowed; + this.isEC = isEC; this.alwaysAvailable = allowed && (!name.startsWith("EC")) && (!name.startsWith("KRB")); } @@ -415,7 +417,7 @@ final class CipherSuite implements Comparable { return true; } - if (name.startsWith("EC")) { + if (isEC) { return (allowed && JsseJce.isEcAvailable()); } else if (name.startsWith("KRB")) { return (allowed && JsseJce.isKerberosAvailable()); diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java index 491bffa85ba..a114f4acb83 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, 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 @@ -112,20 +112,15 @@ final class CipherSuiteList { boolean containsEC() { if (containsEC == null) { for (CipherSuite c : cipherSuites) { - switch (c.keyExchange) { - case K_ECDH_ECDSA: - case K_ECDH_RSA: - case K_ECDHE_ECDSA: - case K_ECDHE_RSA: - case K_ECDH_ANON: + if (c.keyExchange.isEC) { containsEC = true; return true; - default: - break; } } + containsEC = false; } + return containsEC; } diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java index 649bfd7be2b..6119be94727 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java @@ -877,30 +877,33 @@ final class ClientHandshaker extends Handshaker { String typeName; switch (certRequest.types[i]) { - case CertificateRequest.cct_rsa_sign: - typeName = "RSA"; - break; + case CertificateRequest.cct_rsa_sign: + typeName = "RSA"; + break; - case CertificateRequest.cct_dss_sign: - typeName = "DSA"; - break; + case CertificateRequest.cct_dss_sign: + typeName = "DSA"; + break; - case CertificateRequest.cct_ecdsa_sign: - // ignore if we do not have EC crypto available - typeName = JsseJce.isEcAvailable() ? "EC" : null; - break; + case CertificateRequest.cct_ecdsa_sign: + // ignore if we do not have EC crypto available + typeName = JsseJce.isEcAvailable() ? "EC" : null; + break; - // Fixed DH/ECDH client authentication not supported - case CertificateRequest.cct_rsa_fixed_dh: - case CertificateRequest.cct_dss_fixed_dh: - case CertificateRequest.cct_rsa_fixed_ecdh: - case CertificateRequest.cct_ecdsa_fixed_ecdh: - // Any other values (currently not used in TLS) - case CertificateRequest.cct_rsa_ephemeral_dh: - case CertificateRequest.cct_dss_ephemeral_dh: - default: - typeName = null; - break; + // Fixed DH/ECDH client authentication not supported + // + // case CertificateRequest.cct_rsa_fixed_dh: + // case CertificateRequest.cct_dss_fixed_dh: + // case CertificateRequest.cct_rsa_fixed_ecdh: + // case CertificateRequest.cct_ecdsa_fixed_ecdh: + // + // Any other values (currently not used in TLS) + // + // case CertificateRequest.cct_rsa_ephemeral_dh: + // case CertificateRequest.cct_dss_ephemeral_dh: + default: + typeName = null; + break; } if ((typeName != null) && (!keytypesTmp.contains(typeName))) { @@ -928,16 +931,6 @@ final class ClientHandshaker extends Handshaker { X509Certificate[] certs = km.getCertificateChain(alias); if ((certs != null) && (certs.length != 0)) { PublicKey publicKey = certs[0].getPublicKey(); - // for EC, make sure we use a supported named curve - if (publicKey instanceof ECPublicKey) { - ECParameterSpec params = - ((ECPublicKey)publicKey).getParams(); - int index = - EllipticCurvesExtension.getCurveIndex(params); - if (!EllipticCurvesExtension.isSupported(index)) { - publicKey = null; - } - } if (publicKey != null) { m1 = new CertificateMsg(certs); signingKey = km.getPrivateKey(alias); @@ -1499,6 +1492,17 @@ final class ClientHandshaker extends Handshaker { sslContext.getSecureRandom(), maxProtocolVersion, sessionId, cipherSuites, isDTLS); + // add elliptic curves and point format extensions + if (cipherSuites.containsEC()) { + EllipticCurvesExtension ece = + EllipticCurvesExtension.createExtension(algorithmConstraints); + if (ece != null) { + clientHelloMessage.extensions.add(ece); + clientHelloMessage.extensions.add( + EllipticPointFormatsExtension.DEFAULT); + } + } + // add signature_algorithm extension if (maxProtocolVersion.useTLS12PlusSpec()) { // we will always send the signature_algorithm extension diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java b/jdk/src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java index b85c4c5dfae..929c592d698 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 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 @@ -56,10 +56,11 @@ final class ECDHCrypt { } // Called by ServerHandshaker for ephemeral ECDH - ECDHCrypt(String curveName, SecureRandom random) { + ECDHCrypt(int curveId, SecureRandom random) { try { KeyPairGenerator kpg = JsseJce.getKeyPairGenerator("EC"); - ECGenParameterSpec params = new ECGenParameterSpec(curveName); + ECGenParameterSpec params = + EllipticCurvesExtension.getECGenParamSpec(curveId); kpg.initialize(params, random); KeyPair kp = kpg.generateKeyPair(); privateKey = kp.getPrivate(); diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/EllipticCurvesExtension.java index 1e38fb6bd94..632d0da18f1 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/EllipticCurvesExtension.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/EllipticCurvesExtension.java @@ -27,58 +27,271 @@ package sun.security.ssl; import java.io.IOException; import java.security.spec.ECParameterSpec; +import java.security.spec.ECGenParameterSpec; +import java.security.spec.InvalidParameterSpecException; +import java.security.AlgorithmParameters; +import java.security.AlgorithmConstraints; +import java.security.CryptoPrimitive; +import java.security.AccessController; +import java.util.EnumSet; import java.util.HashMap; import java.util.Map; - +import java.util.ArrayList; import javax.net.ssl.SSLProtocolException; +import sun.security.action.GetPropertyAction; + final class EllipticCurvesExtension extends HelloExtension { - // the extension value to send in the ClientHello message - static final EllipticCurvesExtension DEFAULT; + private static final int ARBITRARY_PRIME = 0xff01; + private static final int ARBITRARY_CHAR2 = 0xff02; - private static final boolean fips; + // speed up the searching + private static final Map oidToIdMap = new HashMap<>(); + private static final Map idToOidMap = new HashMap<>(); - static { - int[] ids; - fips = SunJSSE.isFIPS(); - if (fips == false) { - ids = new int[] { - // NIST curves first - // prefer NIST P-256, rest in order of increasing key length - 23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14, - // non-NIST curves - 15, 16, 17, 2, 18, 4, 5, 20, 8, 22, - }; - } else { - ids = new int[] { - // same as above, but allow only NIST curves in FIPS mode - 23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14, - }; + // speed up the parameters construction + private static final Map idToParams = new HashMap<>(); + + // the supported elliptic curves + private static final int[] supportedCurveIds; + + // the curves of the extension + private final int[] curveIds; + + // See sun.security.util.CurveDB for the OIDs + private static enum NamedEllipticCurve { + T163_K1(1, "sect163k1", "1.3.132.0.1", true), // NIST K-163 + T163_R1(2, "sect163r1", "1.3.132.0.2", false), + T163_R2(3, "sect163r2", "1.3.132.0.15", true), // NIST B-163 + T193_R1(4, "sect193r1", "1.3.132.0.24", false), + T193_R2(5, "sect193r2", "1.3.132.0.25", false), + T233_K1(6, "sect233k1", "1.3.132.0.26", true), // NIST K-233 + T233_R1(7, "sect233r1", "1.3.132.0.27", true), // NIST B-233 + T239_K1(8, "sect239k1", "1.3.132.0.3", false), + T283_K1(9, "sect283k1", "1.3.132.0.16", true), // NIST K-283 + T283_R1(10, "sect283r1", "1.3.132.0.17", true), // NIST B-283 + T409_K1(11, "sect409k1", "1.3.132.0.36", true), // NIST K-409 + T409_R1(12, "sect409r1", "1.3.132.0.37", true), // NIST B-409 + T571_K1(13, "sect571k1", "1.3.132.0.38", true), // NIST K-571 + T571_R1(14, "sect571r1", "1.3.132.0.39", true), // NIST B-571 + + P160_K1(15, "secp160k1", "1.3.132.0.9", false), + P160_R1(16, "secp160r1", "1.3.132.0.8", false), + P160_R2(17, "secp160r2", "1.3.132.0.30", false), + P192_K1(18, "secp192k1", "1.3.132.0.31", false), + P192_R1(19, "secp192r1", "1.2.840.10045.3.1.1", true), // NIST P-192 + P224_K1(20, "secp224k1", "1.3.132.0.32", false), + P224_R1(21, "secp224r1", "1.3.132.0.33", true), // NIST P-224 + P256_K1(22, "secp256k1", "1.3.132.0.10", false), + P256_R1(23, "secp256r1", "1.2.840.10045.3.1.7", true), // NIST P-256 + P384_R1(24, "secp384r1", "1.3.132.0.34", true), // NIST P-384 + P521_R1(25, "secp521r1", "1.3.132.0.35", true); // NIST P-521 + + int id; + String name; + String oid; + boolean isFips; + + NamedEllipticCurve(int id, String name, String oid, boolean isFips) { + this.id = id; + this.name = name; + this.oid = oid; + this.isFips = isFips; + + if (oidToIdMap.put(oid, id) != null || + idToOidMap.put(id, oid) != null) { + + throw new RuntimeException( + "Duplicate named elliptic curve definition: " + name); + } + } + + static NamedEllipticCurve getCurve(String name, boolean requireFips) { + for (NamedEllipticCurve curve : NamedEllipticCurve.values()) { + if (curve.name.equals(name) && (!requireFips || curve.isFips)) { + return curve; + } + } + + return null; } - DEFAULT = new EllipticCurvesExtension(ids); } - private final int[] curveIds; + static { + boolean requireFips = SunJSSE.isFIPS(); + + // hack code to initialize NamedEllipticCurve + NamedEllipticCurve nec = + NamedEllipticCurve.getCurve("secp256r1", false); + + // The value of the System Property defines a list of enabled named + // curves in preference order, separated with comma. For example: + // + // jdk.tls.namedGroups="secp521r1, secp256r1, secp384r1" + // + // If the System Property is not defined or the value is empty, the + // default curves and preferences will be used. + String property = AccessController.doPrivileged( + new GetPropertyAction("jdk.tls.namedGroups")); + if (property != null && property.length() != 0) { + // remove double quote marks from beginning/end of the property + if (property.length() > 1 && property.charAt(0) == '"' && + property.charAt(property.length() - 1) == '"') { + property = property.substring(1, property.length() - 1); + } + } + + ArrayList idList; + if (property != null && property.length() != 0) { // customized curves + String[] curves = property.split(","); + idList = new ArrayList<>(curves.length); + for (String curve : curves) { + curve = curve.trim(); + if (!curve.isEmpty()) { + NamedEllipticCurve namedCurve = + NamedEllipticCurve.getCurve(curve, requireFips); + if (namedCurve != null) { + if (isAvailableCurve(namedCurve.id)) { + idList.add(namedCurve.id); + } + } // ignore unknown curves + } + } + } else { // default curves + int[] ids; + if (requireFips) { + ids = new int[] { + // only NIST curves in FIPS mode + 23, 24, 25, 9, 10, 11, 12, 13, 14, + }; + } else { + ids = new int[] { + // NIST curves first + 23, 24, 25, 9, 10, 11, 12, 13, 14, + // non-NIST curves + 22, + }; + } + + idList = new ArrayList<>(ids.length); + for (int curveId : ids) { + if (isAvailableCurve(curveId)) { + idList.add(curveId); + } + } + } + + if (idList.isEmpty()) { + throw new IllegalArgumentException( + "System property jdk.tls.namedGroups(" + property + ") " + + "contains no supported elliptic curves"); + } else { + supportedCurveIds = new int[idList.size()]; + int i = 0; + for (Integer id : idList) { + supportedCurveIds[i++] = id; + } + } + } + + // check whether the curve is supported by the underlying providers + private static boolean isAvailableCurve(int curveId) { + String oid = idToOidMap.get(curveId); + if (oid != null) { + AlgorithmParameters params = null; + try { + params = JsseJce.getAlgorithmParameters("EC"); + params.init(new ECGenParameterSpec(oid)); + } catch (Exception e) { + return false; + } + + // cache the parameters + idToParams.put(curveId, params); + + return true; + } + + return false; + } private EllipticCurvesExtension(int[] curveIds) { super(ExtensionType.EXT_ELLIPTIC_CURVES); + this.curveIds = curveIds; } EllipticCurvesExtension(HandshakeInStream s, int len) throws IOException { super(ExtensionType.EXT_ELLIPTIC_CURVES); + int k = s.getInt16(); if (((len & 1) != 0) || (k + 2 != len)) { throw new SSLProtocolException("Invalid " + type + " extension"); } + + // Note: unknown curves will be ignored later. curveIds = new int[k >> 1]; for (int i = 0; i < curveIds.length; i++) { curveIds[i] = s.getInt16(); } } + // get the preferred active curve + static int getActiveCurves(AlgorithmConstraints constraints) { + return getPreferredCurve(supportedCurveIds, constraints); + } + + static boolean hasActiveCurves(AlgorithmConstraints constraints) { + return getActiveCurves(constraints) >= 0; + } + + static EllipticCurvesExtension createExtension( + AlgorithmConstraints constraints) { + + ArrayList idList = new ArrayList<>(supportedCurveIds.length); + for (int curveId : supportedCurveIds) { + if (constraints.permits( + EnumSet.of(CryptoPrimitive.KEY_AGREEMENT), + "EC", idToParams.get(curveId))) { + idList.add(curveId); + } + } + + if (!idList.isEmpty()) { + int[] ids = new int[idList.size()]; + int i = 0; + for (Integer id : idList) { + ids[i++] = id; + } + + return new EllipticCurvesExtension(ids); + } + + return null; + } + + // get the preferred activated curve + int getPreferredCurve(AlgorithmConstraints constraints) { + return getPreferredCurve(curveIds, constraints); + } + + // get a preferred activated curve + private static int getPreferredCurve(int[] curves, + AlgorithmConstraints constraints) { + for (int curveId : curves) { + if (constraints.permits( + EnumSet.of(CryptoPrimitive.KEY_AGREEMENT), + "EC", idToParams.get(curveId))) { + return curveId; + } + } + + return -1; + } + boolean contains(int index) { for (int curveId : curveIds) { if (index == curveId) { @@ -88,12 +301,6 @@ final class EllipticCurvesExtension extends HelloExtension { return false; } - // Return a reference to the internal curveIds array. - // The caller must NOT modify the contents. - int[] curveIds() { - return curveIds; - } - @Override int length() { return 6 + (curveIds.length << 1); @@ -122,17 +329,9 @@ final class EllipticCurvesExtension extends HelloExtension { sb.append(", "); } // first check if it is a known named curve, then try other cases. - String oid = getCurveOid(curveId); - if (oid != null) { - ECParameterSpec spec = JsseJce.getECParameterSpec(oid); - // this toString() output will look nice for the current - // implementation of the ECParameterSpec class in the Sun - // provider, but may not look good for other implementations. - if (spec != null) { - sb.append(spec.toString().split(" ")[0]); - } else { - sb.append(oid); - } + String curveName = getCurveName(curveId); + if (curveName != null) { + sb.append(curveName); } else if (curveId == ARBITRARY_PRIME) { sb.append("arbitrary_explicit_prime_curves"); } else if (curveId == ARBITRARY_CHAR2) { @@ -145,16 +344,15 @@ final class EllipticCurvesExtension extends HelloExtension { return sb.toString(); } - // Test whether we support the curve with the given index. + // Test whether the given curve is supported. static boolean isSupported(int index) { - if ((index <= 0) || (index >= NAMED_CURVE_OID_TABLE.length)) { - return false; + for (int curveId : supportedCurveIds) { + if (index == curveId) { + return true; + } } - if (fips == false) { - // in non-FIPS mode, we support all valid indices - return true; - } - return DEFAULT.contains(index); + + return false; } static int getCurveIndex(ECParameterSpec params) { @@ -162,57 +360,32 @@ final class EllipticCurvesExtension extends HelloExtension { if (oid == null) { return -1; } - Integer n = curveIndices.get(oid); + Integer n = oidToIdMap.get(oid); return (n == null) ? -1 : n; } static String getCurveOid(int index) { - if ((index > 0) && (index < NAMED_CURVE_OID_TABLE.length)) { - return NAMED_CURVE_OID_TABLE[index]; + return idToOidMap.get(index); + } + + static ECGenParameterSpec getECGenParamSpec(int index) { + AlgorithmParameters params = idToParams.get(index); + try { + return params.getParameterSpec(ECGenParameterSpec.class); + } catch (InvalidParameterSpecException ipse) { + // should be unlikely + String curveOid = getCurveOid(index); + return new ECGenParameterSpec(curveOid); } + } + + private static String getCurveName(int index) { + for (NamedEllipticCurve namedCurve : NamedEllipticCurve.values()) { + if (namedCurve.id == index) { + return namedCurve.name; + } + } + return null; } - - private static final int ARBITRARY_PRIME = 0xff01; - private static final int ARBITRARY_CHAR2 = 0xff02; - - // See sun.security.util.NamedCurve for the OIDs - private static final String[] NAMED_CURVE_OID_TABLE = new String[] { - null, // (0) unused - "1.3.132.0.1", // (1) sect163k1, NIST K-163 - "1.3.132.0.2", // (2) sect163r1 - "1.3.132.0.15", // (3) sect163r2, NIST B-163 - "1.3.132.0.24", // (4) sect193r1 - "1.3.132.0.25", // (5) sect193r2 - "1.3.132.0.26", // (6) sect233k1, NIST K-233 - "1.3.132.0.27", // (7) sect233r1, NIST B-233 - "1.3.132.0.3", // (8) sect239k1 - "1.3.132.0.16", // (9) sect283k1, NIST K-283 - "1.3.132.0.17", // (10) sect283r1, NIST B-283 - "1.3.132.0.36", // (11) sect409k1, NIST K-409 - "1.3.132.0.37", // (12) sect409r1, NIST B-409 - "1.3.132.0.38", // (13) sect571k1, NIST K-571 - "1.3.132.0.39", // (14) sect571r1, NIST B-571 - "1.3.132.0.9", // (15) secp160k1 - "1.3.132.0.8", // (16) secp160r1 - "1.3.132.0.30", // (17) secp160r2 - "1.3.132.0.31", // (18) secp192k1 - "1.2.840.10045.3.1.1", // (19) secp192r1, NIST P-192 - "1.3.132.0.32", // (20) secp224k1 - "1.3.132.0.33", // (21) secp224r1, NIST P-224 - "1.3.132.0.10", // (22) secp256k1 - "1.2.840.10045.3.1.7", // (23) secp256r1, NIST P-256 - "1.3.132.0.34", // (24) secp384r1, NIST P-384 - "1.3.132.0.35", // (25) secp521r1, NIST P-521 - }; - - private static final Map curveIndices; - - static { - curveIndices = new HashMap(); - for (int i = 1; i < NAMED_CURVE_OID_TABLE.length; i++) { - curveIndices.put(NAMED_CURVE_OID_TABLE[i], i); - } - } - } diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java index 2ef416964ef..b3740cfcd86 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java @@ -313,11 +313,6 @@ static final class ClientHello extends HandshakeMessage { this.cookie = null; } - if (cipherSuites.containsEC()) { - extensions.add(EllipticCurvesExtension.DEFAULT); - extensions.add(EllipticPointFormatsExtension.DEFAULT); - } - clnt_random = new RandomCookie(generator); compression_methods = NULL_COMPRESSION; } diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java index d9441526400..2e309dc8bb5 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 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 @@ -660,13 +660,42 @@ abstract class Handshaker { ArrayList suites = new ArrayList<>(); if (!(activeProtocols.collection().isEmpty()) && activeProtocols.min.v != ProtocolVersion.NONE.v) { + boolean checkedCurves = false; + boolean hasCurves = false; for (CipherSuite suite : enabledCipherSuites.collection()) { if (!activeProtocols.min.obsoletes(suite) && activeProtocols.max.supports(suite)) { if (algorithmConstraints.permits( EnumSet.of(CryptoPrimitive.KEY_AGREEMENT), suite.name, null)) { - suites.add(suite); + + boolean available = true; + if (suite.keyExchange.isEC) { + if (!checkedCurves) { + hasCurves = EllipticCurvesExtension + .hasActiveCurves(algorithmConstraints); + checkedCurves = true; + + if (!hasCurves && debug != null && + Debug.isOn("verbose")) { + System.out.println( + "No available elliptic curves"); + } + } + + available = hasCurves; + + if (!available && debug != null && + Debug.isOn("verbose")) { + System.out.println( + "No active elliptic curves, ignore " + + suite); + } + } + + if (available) { + suites.add(suite); + } } } else if (debug != null && Debug.isOn("verbose")) { if (activeProtocols.min.obsoletes(suite)) { @@ -703,6 +732,8 @@ abstract class Handshaker { ProtocolList getActiveProtocols() { if (activeProtocols == null) { boolean enabledSSL20Hello = false; + boolean checkedCurves = false; + boolean hasCurves = false; ArrayList protocols = new ArrayList<>(4); for (ProtocolVersion protocol : enabledProtocols.collection()) { // Need not to check the SSL20Hello protocol. @@ -729,9 +760,36 @@ abstract class Handshaker { if (algorithmConstraints.permits( EnumSet.of(CryptoPrimitive.KEY_AGREEMENT), suite.name, null)) { - protocols.add(protocol); - found = true; - break; + + boolean available = true; + if (suite.keyExchange.isEC) { + if (!checkedCurves) { + hasCurves = EllipticCurvesExtension + .hasActiveCurves(algorithmConstraints); + checkedCurves = true; + + if (!hasCurves && debug != null && + Debug.isOn("verbose")) { + System.out.println( + "No activated elliptic curves"); + } + } + + available = hasCurves; + + if (!available && debug != null && + Debug.isOn("verbose")) { + System.out.println( + "No active elliptic curves, ignore " + + suite + " for " + protocol); + } + } + + if (available) { + protocols.add(protocol); + found = true; + break; + } } else if (debug != null && Debug.isOn("verbose")) { System.out.println( "Ignoring disabled cipher suite: " + suite + diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java b/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java index aebc7c09c08..76b9da5973c 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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 @@ -275,6 +275,15 @@ final class JsseJce { } } + static AlgorithmParameters getAlgorithmParameters(String algorithm) + throws NoSuchAlgorithmException { + if (cryptoProvider == null) { + return AlgorithmParameters.getInstance(algorithm); + } else { + return AlgorithmParameters.getInstance(algorithm, cryptoProvider); + } + } + static SecureRandom getSecureRandom() throws KeyManagementException { if (cryptoProvider == null) { return new SecureRandom(); @@ -394,6 +403,7 @@ final class JsseJce { JsseJce.getKeyAgreement("ECDH"); JsseJce.getKeyFactory("EC"); JsseJce.getKeyPairGenerator("EC"); + JsseJce.getAlgorithmParameters("EC"); } catch (Exception e) { mediator = false; } diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java index 72fc39cf24f..10df67d2eaa 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java @@ -94,7 +94,8 @@ final class ServerHandshaker extends Handshaker { // we remember it for the RSA premaster secret version check private ProtocolVersion clientRequestedVersion; - private EllipticCurvesExtension supportedCurves; + // client supported elliptic curves + private EllipticCurvesExtension requestedCurves; // the preferable signature algorithm used by ServerKeyExchange message SignatureAndHashAlgorithm preferableSignatureAlgorithm; @@ -741,7 +742,7 @@ final class ServerHandshaker extends Handshaker { throw new SSLException("Client did not resume a session"); } - supportedCurves = (EllipticCurvesExtension) + requestedCurves = (EllipticCurvesExtension) mesg.extensions.get(ExtensionType.EXT_ELLIPTIC_CURVES); // We only need to handle the "signature_algorithm" extension @@ -1572,26 +1573,15 @@ final class ServerHandshaker extends Handshaker { // If we cannot continue because we do not support any of the curves that // the client requested, return false. Otherwise (all is well), return true. private boolean setupEphemeralECDHKeys() { - int index = -1; - if (supportedCurves != null) { - // if the client sent the supported curves extension, pick the - // first one that we support; - for (int curveId : supportedCurves.curveIds()) { - if (EllipticCurvesExtension.isSupported(curveId)) { - index = curveId; - break; - } - } - if (index < 0) { - // no match found, cannot use this ciphersuite - return false; - } - } else { - // pick our preference - index = EllipticCurvesExtension.DEFAULT.curveIds()[0]; + int index = (requestedCurves != null) ? + requestedCurves.getPreferredCurve(algorithmConstraints) : + EllipticCurvesExtension.getActiveCurves(algorithmConstraints); + if (index < 0) { + // no match found, cannot use this ciphersuite + return false; } - String oid = EllipticCurvesExtension.getCurveOid(index); - ecdh = new ECDHCrypt(oid, sslContext.getSecureRandom()); + + ecdh = new ECDHCrypt(index, sslContext.getSecureRandom()); return true; } @@ -1633,18 +1623,16 @@ final class ServerHandshaker extends Handshaker { return false; } // For ECC certs, check whether we support the EC domain parameters. - // If the client sent a EllipticCurves ClientHello extension, + // If the client sent a SupportedEllipticCurves ClientHello extension, // check against that too. if (keyAlgorithm.equals("EC")) { if (publicKey instanceof ECPublicKey == false) { return false; } ECParameterSpec params = ((ECPublicKey)publicKey).getParams(); - int index = EllipticCurvesExtension.getCurveIndex(params); - if (!EllipticCurvesExtension.isSupported(index)) { - return false; - } - if ((supportedCurves != null) && !supportedCurves.contains(index)) { + int id = EllipticCurvesExtension.getCurveIndex(params); + if ((id <= 0) || !EllipticCurvesExtension.isSupported(id) || + ((requestedCurves != null) && !requestedCurves.contains(id))) { return false; } } diff --git a/jdk/src/java.base/share/conf/security/java.security b/jdk/src/java.base/share/conf/security/java.security index 269a8cb0198..4f2628cc04c 100644 --- a/jdk/src/java.base/share/conf/security/java.security +++ b/jdk/src/java.base/share/conf/security/java.security @@ -653,7 +653,7 @@ krb5.kdc.bad.policy = tryLast # # jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \ - DSA keySize < 1024 + DSA keySize < 1024, EC keySize < 224 # Algorithm restrictions for Secure Socket Layer/Transport Layer Security # (SSL/TLS/DTLS) processing @@ -681,7 +681,8 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \ # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024, \ + EC keySize < 224 # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. diff --git a/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java b/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java new file mode 100644 index 00000000000..9e7e692455a --- /dev/null +++ b/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java @@ -0,0 +1,408 @@ +/* + * Copyright (c) 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// +// SunJSSE does not support dynamic system properties, no way to re-use +// system properties in samevm/agentvm mode. +// + +/* + * @test + * @bug 8148516 + * @summary Improve the default strength of EC in JDK + * @run main/othervm ECCurvesconstraints PKIX + * @run main/othervm ECCurvesconstraints SunX509 + */ + +import java.net.*; +import java.util.*; +import java.io.*; +import javax.net.ssl.*; +import java.security.Security; +import java.security.KeyStore; +import java.security.KeyFactory; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; +import java.security.cert.CertificateFactory; +import java.security.spec.*; +import java.security.interfaces.*; +import java.util.Base64; + + +public class ECCurvesconstraints { + + /* + * ============================================================= + * Set the various variables needed for the tests, then + * specify what tests to run on each side. + */ + + /* + * Should we run the client or server in a separate thread? + * Both sides can throw exceptions, but do you have a preference + * as to which side should be the main thread. + */ + static boolean separateServerThread = false; + + /* + * Where do we find the keystores? + */ + // Certificates and key used in the test. + // + // EC curve: secp224k1 + static String trustedCertStr = + "-----BEGIN CERTIFICATE-----\n" + + "MIIBCzCBugIEVz2lcjAKBggqhkjOPQQDAjAaMRgwFgYDVQQDDA93d3cuZXhhbXBs\n" + + "ZS5vcmcwHhcNMTYwNTE5MTEzNzM5WhcNMTcwNTE5MTEzNzM5WjAaMRgwFgYDVQQD\n" + + "DA93d3cuZXhhbXBsZS5vcmcwTjAQBgcqhkjOPQIBBgUrgQQAIAM6AAT68uovMZ8f\n" + + "KARn5NOjvieJaq6h8zHYkM9w5DuN0kkOo4KBhke06EkQj0nvQQcSvppTV6RoDLY4\n" + + "djAKBggqhkjOPQQDAgNAADA9AhwMNIujM0R0llpPH6d89d1S3VRGH/78ovc+zw51\n" + + "Ah0AuZ1YlQkUbrJIzkuPSICxz5UfCWPe+7w4as+wiA==\n" + + "-----END CERTIFICATE-----"; + + // Private key in the format of PKCS#8 + static String targetPrivateKey = + "MIGCAgEAMBAGByqGSM49AgEGBSuBBAAgBGswaQIBAQQdAPbckc86mgW/zexB1Ajq\n" + + "38HntWOjdxL6XSoiAsWgBwYFK4EEACChPAM6AAT68uovMZ8fKARn5NOjvieJaq6h\n" + + "8zHYkM9w5DuN0kkOo4KBhke06EkQj0nvQQcSvppTV6RoDLY4dg=="; + + static String[] serverCerts = {trustedCertStr}; + static String[] serverKeys = {targetPrivateKey}; + static String[] clientCerts = {trustedCertStr}; + static String[] clientKeys = {targetPrivateKey}; + + static char passphrase[] = "passphrase".toCharArray(); + + /* + * Is the server ready to serve? + */ + volatile static boolean serverReady = false; + + /* + * Turn on SSL debugging? + */ + static boolean debug = false; + + /* + * Define the server side of the test. + * + * If the server prematurely exits, serverReady will be set to true + * to avoid infinite hangs. + */ + void doServerSide() throws Exception { + SSLContext context = generateSSLContext(false); + SSLServerSocketFactory sslssf = context.getServerSocketFactory(); + SSLServerSocket sslServerSocket = + (SSLServerSocket)sslssf.createServerSocket(serverPort); + serverPort = sslServerSocket.getLocalPort(); + + /* + * Signal Client, we're ready for his connect. + */ + serverReady = true; + + SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept(); + try { + sslSocket.setSoTimeout(5000); + sslSocket.setSoLinger(true, 5); + + InputStream sslIS = sslSocket.getInputStream(); + OutputStream sslOS = sslSocket.getOutputStream(); + + sslIS.read(); + sslOS.write('A'); + sslOS.flush(); + + throw new Exception("EC curve secp224k1 should be disabled"); + } catch (SSLHandshakeException she) { + // expected exception: no cipher suites in common + System.out.println("Expected exception: " + she); + } finally { + sslSocket.close(); + sslServerSocket.close(); + } + } + + /* + * Define the client side of the test. + * + * If the server prematurely exits, serverReady will be set to true + * to avoid infinite hangs. + */ + void doClientSide() throws Exception { + + /* + * Wait for server to get started. + */ + while (!serverReady) { + Thread.sleep(50); + } + + SSLContext context = generateSSLContext(true); + SSLSocketFactory sslsf = context.getSocketFactory(); + + SSLSocket sslSocket = + (SSLSocket)sslsf.createSocket("localhost", serverPort); + + try { + sslSocket.setSoTimeout(5000); + sslSocket.setSoLinger(true, 5); + + InputStream sslIS = sslSocket.getInputStream(); + OutputStream sslOS = sslSocket.getOutputStream(); + + sslOS.write('B'); + sslOS.flush(); + sslIS.read(); + + throw new Exception("EC curve secp224k1 should be disabled"); + } catch (SSLHandshakeException she) { + // expected exception: Received fatal alert + System.out.println("Expected exception: " + she); + } finally { + sslSocket.close(); + } + } + + /* + * ============================================================= + * The remainder is just support stuff + */ + private static String tmAlgorithm; // trust manager + + private static void parseArguments(String[] args) { + tmAlgorithm = args[0]; + } + + private static SSLContext generateSSLContext(boolean isClient) + throws Exception { + + // generate certificate from cert string + CertificateFactory cf = CertificateFactory.getInstance("X.509"); + + // create a key store + KeyStore ks = KeyStore.getInstance("JKS"); + ks.load(null, null); + + // import the trused cert + ByteArrayInputStream is = + new ByteArrayInputStream(trustedCertStr.getBytes()); + Certificate trusedCert = cf.generateCertificate(is); + is.close(); + + ks.setCertificateEntry("Export Signer", trusedCert); + + String[] certStrs = null; + String[] keyStrs = null; + if (isClient) { + certStrs = clientCerts; + keyStrs = clientKeys; + } else { + certStrs = serverCerts; + keyStrs = serverKeys; + } + + for (int i = 0; i < certStrs.length; i++) { + // generate the private key. + String keySpecStr = keyStrs[i]; + PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec( + Base64.getMimeDecoder().decode(keySpecStr)); + KeyFactory kf = KeyFactory.getInstance("EC"); + ECPrivateKey priKey = + (ECPrivateKey)kf.generatePrivate(priKeySpec); + + // generate certificate chain + String keyCertStr = certStrs[i]; + is = new ByteArrayInputStream(keyCertStr.getBytes()); + Certificate keyCert = cf.generateCertificate(is); + is.close(); + + Certificate[] chain = new Certificate[2]; + chain[0] = keyCert; + chain[1] = trusedCert; + + // import the key entry. + ks.setKeyEntry("key-entry-" + i, priKey, passphrase, chain); + } + + // create SSL context + TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmAlgorithm); + tmf.init(ks); + + SSLContext ctx = SSLContext.getInstance("TLS"); + KeyManagerFactory kmf = KeyManagerFactory.getInstance("NewSunX509"); + kmf.init(ks, passphrase); + + ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); + ks = null; + + return ctx; + } + + // use any free port by default + volatile int serverPort = 0; + + volatile Exception serverException = null; + volatile Exception clientException = null; + + public static void main(String[] args) throws Exception { + if (debug) { + System.setProperty("javax.net.debug", "all"); + } + + /* + * Get the customized arguments. + */ + parseArguments(args); + + /* + * Start the tests. + */ + new ECCurvesconstraints(); + } + + Thread clientThread = null; + Thread serverThread = null; + + /* + * Primary constructor, used to drive remainder of the test. + * + * Fork off the other side, then do your work. + */ + ECCurvesconstraints() throws Exception { + try { + if (separateServerThread) { + startServer(true); + startClient(false); + } else { + startClient(true); + startServer(false); + } + } catch (Exception e) { + // swallow for now. Show later + } + + /* + * Wait for other side to close down. + */ + if (separateServerThread) { + serverThread.join(); + } else { + clientThread.join(); + } + + /* + * When we get here, the test is pretty much over. + * Which side threw the error? + */ + Exception local; + Exception remote; + String whichRemote; + + if (separateServerThread) { + remote = serverException; + local = clientException; + whichRemote = "server"; + } else { + remote = clientException; + local = serverException; + whichRemote = "client"; + } + + /* + * If both failed, return the curthread's exception, but also + * print the remote side Exception + */ + if ((local != null) && (remote != null)) { + System.out.println(whichRemote + " also threw:"); + remote.printStackTrace(); + System.out.println(); + throw local; + } + + if (remote != null) { + throw remote; + } + + if (local != null) { + throw local; + } + } + + void startServer(boolean newThread) throws Exception { + if (newThread) { + serverThread = new Thread() { + public void run() { + try { + doServerSide(); + } catch (Exception e) { + /* + * Our server thread just died. + * + * Release the client, if not active already... + */ + System.err.println("Server died, because of " + e); + serverReady = true; + serverException = e; + } + } + }; + serverThread.start(); + } else { + try { + doServerSide(); + } catch (Exception e) { + serverException = e; + } finally { + serverReady = true; + } + } + } + + void startClient(boolean newThread) throws Exception { + if (newThread) { + clientThread = new Thread() { + public void run() { + try { + doClientSide(); + } catch (Exception e) { + /* + * Our client thread just died. + */ + System.err.println("Client died, because of " + e); + clientException = e; + } + } + }; + clientThread.start(); + } else { + try { + doClientSide(); + } catch (Exception e) { + clientException = e; + } + } + } +} diff --git a/jdk/test/sun/security/ec/TestEC.java b/jdk/test/sun/security/ec/TestEC.java index 43599ab5af4..4b055706b19 100644 --- a/jdk/test/sun/security/ec/TestEC.java +++ b/jdk/test/sun/security/ec/TestEC.java @@ -36,7 +36,7 @@ * @library ../../../java/security/testlibrary * @modules jdk.crypto.pkcs11/sun.security.pkcs11.wrapper * @compile -XDignore.symbol.file TestEC.java - * @run main/othervm TestEC + * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC */ import java.security.NoSuchProviderException; diff --git a/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java b/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java index 4a31b67c296..1fab350dc9d 100644 --- a/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java +++ b/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java @@ -33,8 +33,10 @@ * @author Andreas Sterbenz * @library .. * @library ../../../../java/security/testlibrary - * @run main/othervm ClientJSSEServerJSSE - * @run main/othervm ClientJSSEServerJSSE sm policy + * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" + * ClientJSSEServerJSSE + * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" + * ClientJSSEServerJSSE sm policy */ import java.security.Provider; From d992f9b518cc3764bdacbeca0e547d82384fe21b Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Sat, 9 Jul 2016 06:04:57 +0000 Subject: [PATCH 005/111] 8159009: Remove ExemptionMechanism.finalize() implementation Reviewed-by: mullan, weijun --- .../share/classes/javax/crypto/ExemptionMechanism.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanism.java b/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanism.java index e6bbf825fa2..45d14027200 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanism.java +++ b/jdk/src/java.base/share/classes/javax/crypto/ExemptionMechanism.java @@ -482,13 +482,4 @@ public class ExemptionMechanism { done = true; return n; } - - /** - * Ensures that the key stored away by this ExemptionMechanism - * object will be wiped out when there are no more references to it. - */ - protected void finalize() { - keyStored = null; - // Are there anything else we could do? - } } From cd974a0fefe5f4683f6155da94b3ae80ebc90320 Mon Sep 17 00:00:00 2001 From: Aleksei Efimov Date: Mon, 11 Jul 2016 00:24:46 +0300 Subject: [PATCH 006/111] 8154553: Incorrect GPL header in package-info.java reported Reviewed-by: igerasim --- .../classes/com/sun/java/accessibility/util/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/package-info.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/package-info.java index f3b0a62dd36..92ed3e627b3 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/package-info.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, 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 From 1aceedb6a95a2e6b18ca4c552c8ff60aae97271f Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Mon, 11 Jul 2016 11:32:40 +0100 Subject: [PATCH 007/111] 8056285: java/util/logging/CheckLockLocationTest.java java.lang.RuntimeException: Test failed: should have been able to create FileHandler for %t/writable-dir/log.log in writable directory Added some instrumentation to the test to help a better diagnosis Reviewed-by: mchung --- .../util/logging/CheckLockLocationTest.java | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/jdk/test/java/util/logging/CheckLockLocationTest.java b/jdk/test/java/util/logging/CheckLockLocationTest.java index e482d3ef2f7..dc854aa5d4d 100644 --- a/jdk/test/java/util/logging/CheckLockLocationTest.java +++ b/jdk/test/java/util/logging/CheckLockLocationTest.java @@ -30,13 +30,16 @@ * @run main/othervm CheckLockLocationTest */ import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.nio.file.AccessDeniedException; import java.nio.file.FileSystemException; import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.nio.file.attribute.UserPrincipal; +import java.util.UUID; import java.util.logging.FileHandler; public class CheckLockLocationTest { @@ -78,7 +81,11 @@ public class CheckLockLocationTest { } catch (IOException ex) { throw new RuntimeException("Test failed: should have been able" + " to create FileHandler for " + "%t/" + WRITABLE_DIR - + "/log.log in writable directory.", ex); + + "/log.log in writable directory" + + (!writableDir.canRead() // concurrent tests running or user conf issue? + ? ": directory not readable.\n\tPlease check your " + + "environment and machine configuration." + : "."), ex); } finally { // the above test leaves files in the directory. Get rid of the // files created and the directory @@ -149,8 +156,41 @@ public class CheckLockLocationTest { + " writable working directory " + writableDir.getAbsolutePath() ); } + + if (!writableDir.canRead()) { + throw new RuntimeException("Test setup failed: can't read " + + " writable working directory " + + writableDir.getAbsolutePath() ); + } + // writableDirectory and its contents will be deleted after the test - // that uses it + // that uses it. + + // check that we can write in the new writable dir. + File dummyFile = new File(writableDir, UUID.randomUUID().toString() + ".txt" ); + try { + if (!dummyFile.createNewFile()) { + throw new RuntimeException("Test setup failed: can't create " + + " dummy file in writable working directory " + + dummyFile.getAbsolutePath() ); + } + try (OutputStream os = new FileOutputStream(dummyFile)) { + os.write('A'); + } finally { + dummyFile.delete(); + } + if (dummyFile.canRead()) { + throw new RuntimeException("Test setup failed: can't delete " + + " dummy file in writable working directory " + + dummyFile.getAbsolutePath() ); + } + System.out.println("Successfully created and deleted dummy file: " + + dummyFile.getAbsolutePath()); + } catch(IOException x) { + throw new RuntimeException("Test setup failed: can't write " + + " or delete dummy file in writable working directory " + + dummyFile.getAbsolutePath(), x); + } // Create a plain file which we will attempt to use as a directory // (%t/not-a-dir) From c21c81a8582d493e1a32d5c23707368db0ba32c6 Mon Sep 17 00:00:00 2001 From: Michael McMahon Date: Mon, 11 Jul 2016 14:32:51 +0100 Subject: [PATCH 008/111] 8160786: No CCC for public class java.net.http.AsyncSSlDelegate Reviewed-by: chegar --- .../share/classes/java/net/http/AsyncSSLDelegate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java index f11b8ed16e3..6d500285f4b 100644 --- a/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java +++ b/jdk/src/java.httpclient/share/classes/java/net/http/AsyncSSLDelegate.java @@ -81,7 +81,7 @@ import static javax.net.ssl.SSLEngineResult.HandshakeStatus.*; * the channel to be closed, and the error is reported to the user's * Consumer */ -public class AsyncSSLDelegate implements Closeable, AsyncConnection { +class AsyncSSLDelegate implements Closeable, AsyncConnection { // outgoing buffers put in this queue first and may remain here // while SSL handshaking happening. From c5ef4d69b962668d57cce50e699a66b4e0f110cf Mon Sep 17 00:00:00 2001 From: Hiroshi Ito Date: Mon, 23 May 2016 23:12:05 +0800 Subject: [PATCH 009/111] 8158365: List.spliterator should optimize for RandomAccess lists Reviewed-by: psandoz --- .../share/classes/java/util/AbstractList.java | 111 +++++++++++++ .../share/classes/java/util/List.java | 25 ++- .../SpliteratorLateBindingFailFastTest.java | 43 ++++++ ...SpliteratorTraversingAndSplittingTest.java | 146 ++++++++++++++++++ 4 files changed, 321 insertions(+), 4 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/util/AbstractList.java b/jdk/src/java.base/share/classes/java/util/AbstractList.java index 3168a738acc..c8c160de6a4 100644 --- a/jdk/src/java.base/share/classes/java/util/AbstractList.java +++ b/jdk/src/java.base/share/classes/java/util/AbstractList.java @@ -25,6 +25,8 @@ package java.util; +import java.util.function.Consumer; + /** * This class provides a skeletal implementation of the {@link List} * interface to minimize the effort required to implement this interface @@ -634,6 +636,115 @@ public abstract class AbstractList extends AbstractCollection implements L return "Index: "+index+", Size: "+size(); } + /** + * An index-based split-by-two, lazily initialized Spliterator covering + * a List that access elements via {@link List#get}. + * + * If access results in an IndexOutOfBoundsException then a + * ConcurrentModificationException is thrown instead (since the list has + * been structurally modified while traversing). + * + * If the List is an instance of AbstractList then concurrent modification + * checking is performed using the AbstractList's modCount field. + */ + static final class RandomAccessSpliterator implements Spliterator { + + private final List list; + private int index; // current index, modified on advance/split + private int fence; // -1 until used; then one past last index + + // The following fields are valid if covering an AbstractList + private final AbstractList alist; + private int expectedModCount; // initialized when fence set + + RandomAccessSpliterator(List list) { + assert list instanceof RandomAccess; + + this.list = list; + this.index = 0; + this.fence = -1; + + this.alist = list instanceof AbstractList ? (AbstractList) list : null; + this.expectedModCount = alist != null ? alist.modCount : 0; + } + + /** Create new spliterator covering the given range */ + private RandomAccessSpliterator(RandomAccessSpliterator parent, + int origin, int fence) { + this.list = parent.list; + this.index = origin; + this.fence = fence; + + this.alist = parent.alist; + this.expectedModCount = parent.expectedModCount; + } + + private int getFence() { // initialize fence to size on first use + int hi; + List lst = list; + if ((hi = fence) < 0) { + if (alist != null) { + expectedModCount = alist.modCount; + } + hi = fence = lst.size(); + } + return hi; + } + + public Spliterator trySplit() { + int hi = getFence(), lo = index, mid = (lo + hi) >>> 1; + return (lo >= mid) ? null : // divide range in half unless too small + new RandomAccessSpliterator<>(this, lo, index = mid); + } + + public boolean tryAdvance(Consumer action) { + if (action == null) + throw new NullPointerException(); + int hi = getFence(), i = index; + if (i < hi) { + index = i + 1; + action.accept(get(list, i)); + checkAbstractListModCount(alist, expectedModCount); + return true; + } + return false; + } + + public void forEachRemaining(Consumer action) { + Objects.requireNonNull(action); + List lst = list; + int hi = getFence(); + int i = index; + index = hi; + for (; i < hi; i++) { + action.accept(get(lst, i)); + } + checkAbstractListModCount(alist, expectedModCount); + } + + public long estimateSize() { + return (long) (getFence() - index); + } + + public int characteristics() { + return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED; + } + + private static E get(List list, int i) { + try { + return list.get(i); + } catch (IndexOutOfBoundsException ex) { + throw new ConcurrentModificationException(); + } + } + + static void checkAbstractListModCount(AbstractList alist, int expectedModCount) { + if (alist != null && alist.modCount != expectedModCount) { + throw new ConcurrentModificationException(); + } + } + } + private static class SubList extends AbstractList { private final AbstractList root; private final SubList parent; diff --git a/jdk/src/java.base/share/classes/java/util/List.java b/jdk/src/java.base/share/classes/java/util/List.java index d4af1a31d49..3819d94e831 100644 --- a/jdk/src/java.base/share/classes/java/util/List.java +++ b/jdk/src/java.base/share/classes/java/util/List.java @@ -741,9 +741,22 @@ public interface List extends Collection { * * @implSpec * The default implementation creates a - * late-binding spliterator - * from the list's {@code Iterator}. The spliterator inherits the - * fail-fast properties of the list's iterator. + * late-binding + * spliterator as follows: + *
    + *
  • If the list is an instance of {@link RandomAccess} then the default + * implementation creates a spliterator that traverses elements by + * invoking the method {@link List#get}. If such invocation results or + * would result in an {@code IndexOutOfBoundsException} then the + * spliterator will fail-fast and throw a + * {@code ConcurrentModificationException}. + * If the list is also an instance of {@link AbstractList} then the + * spliterator will use the list's {@link AbstractList#modCount modCount} + * field to provide additional fail-fast behavior. + *
  • Otherwise, the default implementation creates a spliterator from the + * list's {@code Iterator}. The spliterator inherits the + * fail-fast of the list's iterator. + *
* * @implNote * The created {@code Spliterator} additionally reports @@ -754,7 +767,11 @@ public interface List extends Collection { */ @Override default Spliterator spliterator() { - return Spliterators.spliterator(this, Spliterator.ORDERED); + if (this instanceof RandomAccess) { + return new AbstractList.RandomAccessSpliterator<>(this); + } else { + return Spliterators.spliterator(this, Spliterator.ORDERED); + } } /** diff --git a/jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastTest.java b/jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastTest.java index dc961b15e5a..0aecca604bd 100644 --- a/jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastTest.java +++ b/jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastTest.java @@ -24,11 +24,13 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.util.AbstractList; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.ConcurrentModificationException; +import java.util.Iterator; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; @@ -37,6 +39,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.PriorityQueue; +import java.util.RandomAccess; import java.util.Set; import java.util.Spliterator; import java.util.Stack; @@ -191,6 +194,46 @@ public class SpliteratorLateBindingFailFastTest { db.addList(Vector::new); + class AbstractRandomAccessListImpl extends AbstractList implements RandomAccess { + List l; + + AbstractRandomAccessListImpl(Collection c) { + this.l = new ArrayList<>(c); + } + + @Override + public boolean add(Integer integer) { + modCount++; + return l.add(integer); + } + + @Override + public Iterator iterator() { + return l.iterator(); + } + + @Override + public Integer get(int index) { + return l.get(index); + } + + @Override + public boolean remove(Object o) { + modCount++; + return l.remove(o); + } + + @Override + public int size() { + return l.size(); + } + + @Override + public List subList(int fromIndex, int toIndex) { + return l.subList(fromIndex, toIndex); + } + } + db.addList(AbstractRandomAccessListImpl::new); db.addCollection(HashSet::new); diff --git a/jdk/test/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java b/jdk/test/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java index a823ac04833..a8d6a9c6471 100644 --- a/jdk/test/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java +++ b/jdk/test/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java @@ -49,8 +49,10 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; +import java.util.ListIterator; import java.util.Map; import java.util.PriorityQueue; +import java.util.RandomAccess; import java.util.Set; import java.util.SortedSet; import java.util.Spliterator; @@ -379,6 +381,150 @@ public class SpliteratorTraversingAndSplittingTest { db.addList(Vector::new); + class AbstractRandomAccessListImpl extends AbstractList implements RandomAccess { + Integer[] ia; + + AbstractRandomAccessListImpl(Collection c) { + this.ia = c.toArray(new Integer[c.size()]); + } + + @Override + public Integer get(int index) { + return ia[index]; + } + + @Override + public int size() { + return ia.length; + } + } + db.addList(AbstractRandomAccessListImpl::new); + + class RandomAccessListImpl implements List, RandomAccess { + Integer[] ia; + List l; + + RandomAccessListImpl(Collection c) { + this.ia = c.toArray(new Integer[c.size()]); + this.l = Arrays.asList(ia); + } + + @Override + public Integer get(int index) { + return ia[index]; + } + + @Override + public Integer set(int index, Integer element) { + throw new UnsupportedOperationException(); + } + + @Override + public void add(int index, Integer element) { + throw new UnsupportedOperationException(); + } + + @Override + public Integer remove(int index) { + throw new UnsupportedOperationException(); + } + + @Override + public int indexOf(Object o) { + return l.indexOf(o); + } + + @Override + public int lastIndexOf(Object o) { + return Arrays.asList(ia).lastIndexOf(o); + } + + @Override + public ListIterator listIterator() { + return l.listIterator(); + } + + @Override + public ListIterator listIterator(int index) { + return l.listIterator(index); + } + + @Override + public List subList(int fromIndex, int toIndex) { + return l.subList(fromIndex, toIndex); + } + + @Override + public int size() { + return ia.length; + } + + @Override + public boolean isEmpty() { + return size() != 0; + } + + @Override + public boolean contains(Object o) { + return l.contains(o); + } + + @Override + public Iterator iterator() { + return l.iterator(); + } + + @Override + public Object[] toArray() { + return l.toArray(); + } + + @Override + public T[] toArray(T[] a) { + return l.toArray(a); + } + + @Override + public boolean add(Integer integer) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean remove(Object o) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean containsAll(Collection c) { + return l.containsAll(c); + } + + @Override + public boolean addAll(Collection c) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean addAll(int index, Collection c) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean removeAll(Collection c) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean retainAll(Collection c) { + throw new UnsupportedOperationException(); + } + + @Override + public void clear() { + throw new UnsupportedOperationException(); + } + } + db.addList(RandomAccessListImpl::new); db.addCollection(HashSet::new); From 7846b3a26c0160f3a323041b69c3802da1d04272 Mon Sep 17 00:00:00 2001 From: Dean Long Date: Tue, 14 Jun 2016 15:10:05 -0700 Subject: [PATCH 010/111] 8159282: quarantine compiler/jvmci/compilerToVM/ReprofileTest.java Reviewed-by: iignatyev --- hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java b/hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java index 371af37813d..de429fdf81c 100644 --- a/hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java +++ b/hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java @@ -34,6 +34,7 @@ * jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.meta + * @ignore 8157861 * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper * @build sun.hotspot.WhiteBox * @build compiler.jvmci.compilerToVM.ReprofileTest From 467a5400d205811ca546d7f98776a109d3c2341e Mon Sep 17 00:00:00 2001 From: Dean Long Date: Tue, 14 Jun 2016 18:07:41 -0700 Subject: [PATCH 011/111] 8158360: C1: SEGV in generated code Update test to store Object fields Reviewed-by: kvn --- hotspot/test/compiler/c1/7103261/Test7103261.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hotspot/test/compiler/c1/7103261/Test7103261.java b/hotspot/test/compiler/c1/7103261/Test7103261.java index 3abdb875e15..afb3064ff68 100644 --- a/hotspot/test/compiler/c1/7103261/Test7103261.java +++ b/hotspot/test/compiler/c1/7103261/Test7103261.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 @@ -44,6 +44,7 @@ public class Test7103261 { char c; short s; boolean z; + Object o; public static void main(String[] args) { constantStore(); @@ -51,7 +52,7 @@ public class Test7103261 { valueTest(true); } static void constantStore() { - for (int field = 0; field < 8; field++) { + for (int field = 0; field < 9; field++) { try { Test7103261 o = nonnull_value; for (int i = 0; i < 100000; i++) { @@ -64,6 +65,7 @@ public class Test7103261 { case 5: o.c = 0; break; case 6: o.s = 0; break; case 7: o.z = false; break; + case 8: o.o = null; break; default: throw new InternalError(); } if (i == 90000) { @@ -76,7 +78,7 @@ public class Test7103261 { } } static void valueTest(boolean store) { - for (int field = 0; field < 8; field++) { + for (int field = 0; field < 9; field++) { try { Test7103261 o = nonnull_value; Test7103261 o2 = nonnull_value2; @@ -90,6 +92,7 @@ public class Test7103261 { case 5: o.c = o2.c; break; case 6: o.s = o2.s; break; case 7: o.z = o2.z; break; + case 8: o.o = o2.o; break; default: throw new InternalError(); } if (i == 90000) { From 3fddb3692419fc230a06d47113a5ae16bfddd8f7 Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Wed, 15 Jun 2016 07:58:56 +0200 Subject: [PATCH 012/111] 8159244: Partially initialized string object created by C2's string concat optimization may escape Emit release barrier after String creation to prevent partially initialized object from escaping. Reviewed-by: kvn --- hotspot/src/share/vm/opto/stringopts.cpp | 8 +- .../TestStringObjectInitialization.java | 78 +++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 hotspot/test/compiler/stringopts/TestStringObjectInitialization.java diff --git a/hotspot/src/share/vm/opto/stringopts.cpp b/hotspot/src/share/vm/opto/stringopts.cpp index 4ec1419250b..85151b0b99e 100644 --- a/hotspot/src/share/vm/opto/stringopts.cpp +++ b/hotspot/src/share/vm/opto/stringopts.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -1958,6 +1958,12 @@ void PhaseStringOpts::replace_string_concat(StringConcat* sc) { // Initialize the string kit.store_String_value(kit.control(), result, dst_array); kit.store_String_coder(kit.control(), result, coder); + + // The value field is final. Emit a barrier here to ensure that the effect + // of the initialization is committed to memory before any code publishes + // a reference to the newly constructed object (see Parse::do_exits()). + assert(AllocateNode::Ideal_allocation(result, _gvn) != NULL, "should be newly allocated"); + kit.insert_mem_bar(Op_MemBarRelease, result); } else { result = C->top(); } diff --git a/hotspot/test/compiler/stringopts/TestStringObjectInitialization.java b/hotspot/test/compiler/stringopts/TestStringObjectInitialization.java new file mode 100644 index 00000000000..2d09be12714 --- /dev/null +++ b/hotspot/test/compiler/stringopts/TestStringObjectInitialization.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +import java.util.Arrays; + +/* + * @test + * @bug 8159244 + * @requires vm.gc == "Parallel" | vm.gc == "null" + * @summary Verifies that no partially initialized String object escapes from + * C2's String concat optimization in a highly concurrent setting. + * This test triggers the bug in about 1 out of 10 runs. + * @compile -XDstringConcat=inline TestStringObjectInitialization.java + * @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-CompactStrings + * -XX:-UseG1GC -XX:+UseParallelGC TestStringObjectInitialization + */ +public class TestStringObjectInitialization { + + String myString; + + public static void main(String[] args) throws Exception { + TestStringObjectInitialization t = new TestStringObjectInitialization(); + // Create some threads that concurrently update 'myString' + for (int i = 0; i < 100; ++i) { + (new Thread(new Runner(t))).start(); + } + Thread last = new Thread(new Runner(t)); + last.start(); + last.join(); + } + + private void add(String message) { + // String escapes to other threads here + myString += message; + } + + public void run(String s, String[] sArray) { + // Trigger C2's string concatenation optimization + add(s + Arrays.toString(sArray) + " const "); + } +} + +class Runner implements Runnable { + private TestStringObjectInitialization test; + + public Runner(TestStringObjectInitialization t) { + test = t; + } + + public void run(){ + String[] array = {"a", "b", "c"}; + for (int i = 0; i < 10000; ++i) { + test.run("a", array); + } + } +} + From c6c73deca4a4ace0db0f6336277d50516bac0011 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Wed, 15 Jun 2016 11:21:36 +0300 Subject: [PATCH 013/111] 8157726: VarHandles/Unsafe should support sub-word atomic ops Reviewed-by: psandoz, vlivanov, lagergren --- hotspot/src/cpu/x86/vm/assembler_x86.cpp | 49 ++++++ hotspot/src/cpu/x86/vm/assembler_x86.hpp | 8 +- hotspot/src/cpu/x86/vm/x86_32.ad | 135 ++++++++++++++++ hotspot/src/cpu/x86/vm/x86_64.ad | 151 ++++++++++++++++++ hotspot/src/share/vm/adlc/formssel.cpp | 10 +- hotspot/src/share/vm/classfile/vmSymbols.hpp | 52 +++++- hotspot/src/share/vm/opto/c2compiler.cpp | 52 ++++++ hotspot/src/share/vm/opto/classes.hpp | 10 ++ hotspot/src/share/vm/opto/compile.cpp | 10 ++ hotspot/src/share/vm/opto/library_call.cpp | 63 ++++++++ hotspot/src/share/vm/opto/loopTransform.cpp | 6 + hotspot/src/share/vm/opto/matcher.cpp | 12 ++ hotspot/src/share/vm/opto/memnode.hpp | 81 +++++++++- hotspot/src/share/vm/runtime/vmStructs.cpp | 6 + ...dkInternalMiscUnsafeAccessTestBoolean.java | 109 +++++++++++++ .../JdkInternalMiscUnsafeAccessTestByte.java | 138 ++++++++++++++-- .../JdkInternalMiscUnsafeAccessTestChar.java | 150 +++++++++++++++-- .../JdkInternalMiscUnsafeAccessTestInt.java | 110 ++++++------- .../JdkInternalMiscUnsafeAccessTestLong.java | 110 ++++++------- .../JdkInternalMiscUnsafeAccessTestShort.java | 150 +++++++++++++++-- .../unsafe/SunMiscUnsafeAccessTestByte.java | 12 +- .../unsafe/SunMiscUnsafeAccessTestChar.java | 12 +- .../unsafe/SunMiscUnsafeAccessTestInt.java | 42 ++--- .../unsafe/SunMiscUnsafeAccessTestLong.java | 42 ++--- .../unsafe/SunMiscUnsafeAccessTestShort.java | 12 +- .../unsafe/X-UnsafeAccessTest.java.template | 2 +- .../unsafe/generate-unsafe-access-tests.sh | 43 +++-- 27 files changed, 1333 insertions(+), 244 deletions(-) diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/hotspot/src/cpu/x86/vm/assembler_x86.cpp index d65577ffca5..94f37e4d4b4 100644 --- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp @@ -1173,6 +1173,23 @@ void Assembler::addl(Address dst, int32_t imm32) { emit_arith_operand(0x81, rax, dst, imm32); } +void Assembler::addb(Address dst, int imm8) { + InstructionMark im(this); + prefix(dst); + emit_int8((unsigned char)0x80); + emit_operand(rax, dst, 1); + emit_int8(imm8); +} + +void Assembler::addw(Address dst, int imm16) { + InstructionMark im(this); + emit_int8(0x66); + prefix(dst); + emit_int8((unsigned char)0x81); + emit_operand(rax, dst, 2); + emit_int16(imm16); +} + void Assembler::addl(Address dst, Register src) { InstructionMark im(this); prefix(dst, src); @@ -4567,6 +4584,23 @@ void Assembler::xabort(int8_t imm8) { emit_int8((unsigned char)(imm8 & 0xFF)); } +void Assembler::xaddb(Address dst, Register src) { + InstructionMark im(this); + prefix(dst, src, true); + emit_int8(0x0F); + emit_int8((unsigned char)0xC0); + emit_operand(src, dst); +} + +void Assembler::xaddw(Address dst, Register src) { + InstructionMark im(this); + emit_int8(0x66); + prefix(dst, src); + emit_int8(0x0F); + emit_int8((unsigned char)0xC1); + emit_operand(src, dst); +} + void Assembler::xaddl(Address dst, Register src) { InstructionMark im(this); prefix(dst, src); @@ -4593,6 +4627,21 @@ void Assembler::xbegin(Label& abort, relocInfo::relocType rtype) { } } +void Assembler::xchgb(Register dst, Address src) { // xchg + InstructionMark im(this); + prefix(src, dst, true); + emit_int8((unsigned char)0x86); + emit_operand(dst, src); +} + +void Assembler::xchgw(Register dst, Address src) { // xchg + InstructionMark im(this); + emit_int8(0x66); + prefix(src, dst); + emit_int8((unsigned char)0x87); + emit_operand(dst, src); +} + void Assembler::xchgl(Register dst, Address src) { // xchg InstructionMark im(this); prefix(src, dst); diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.hpp b/hotspot/src/cpu/x86/vm/assembler_x86.hpp index 56165382936..5911b8368c2 100644 --- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp +++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp @@ -881,6 +881,9 @@ private: void adcq(Register dst, Address src); void adcq(Register dst, Register src); + void addb(Address dst, int imm8); + void addw(Address dst, int imm16); + void addl(Address dst, int32_t imm32); void addl(Address dst, Register src); void addl(Register dst, int32_t imm32); @@ -1816,12 +1819,15 @@ private: void xabort(int8_t imm8); + void xaddb(Address dst, Register src); + void xaddw(Address dst, Register src); void xaddl(Address dst, Register src); - void xaddq(Address dst, Register src); void xbegin(Label& abort, relocInfo::relocType rtype = relocInfo::none); + void xchgb(Register reg, Address adr); + void xchgw(Register reg, Address adr); void xchgl(Register reg, Address adr); void xchgl(Register dst, Register src); diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad index a45cb554e3c..4f7d3aacfd9 100644 --- a/hotspot/src/cpu/x86/vm/x86_32.ad +++ b/hotspot/src/cpu/x86/vm/x86_32.ad @@ -2127,6 +2127,31 @@ encode %{ emit_rm( cbuf, 0x0, 1, $mem_ptr$$reg ); %} + enc_class enc_cmpxchgb(eSIRegP mem_ptr) %{ + // [Lock] + if( os::is_MP() ) + emit_opcode(cbuf,0xF0); + + // CMPXCHGB [Eptr] + emit_opcode(cbuf,0x0F); + emit_opcode(cbuf,0xB0); + emit_rm( cbuf, 0x0, 1, $mem_ptr$$reg ); + %} + + enc_class enc_cmpxchgw(eSIRegP mem_ptr) %{ + // [Lock] + if( os::is_MP() ) + emit_opcode(cbuf,0xF0); + + // 16-bit mode + emit_opcode(cbuf, 0x66); + + // CMPXCHGW [Eptr] + emit_opcode(cbuf,0x0F); + emit_opcode(cbuf,0xB1); + emit_rm( cbuf, 0x0, 1, $mem_ptr$$reg ); + %} + enc_class enc_flags_ne_to_boolean( iRegI res ) %{ int res_encoding = $res$$reg; @@ -7262,6 +7287,34 @@ instruct compareAndSwapP( rRegI res, pRegP mem_ptr, eAXRegP oldval, eCXRegP new ins_pipe( pipe_cmpxchg ); %} +instruct compareAndSwapB( rRegI res, pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr ) %{ + match(Set res (CompareAndSwapB mem_ptr (Binary oldval newval))); + match(Set res (WeakCompareAndSwapB mem_ptr (Binary oldval newval))); + effect(KILL cr, KILL oldval); + format %{ "CMPXCHGB [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t" + "MOV $res,0\n\t" + "JNE,s fail\n\t" + "MOV $res,1\n" + "fail:" %} + ins_encode( enc_cmpxchgb(mem_ptr), + enc_flags_ne_to_boolean(res) ); + ins_pipe( pipe_cmpxchg ); +%} + +instruct compareAndSwapS( rRegI res, pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr ) %{ + match(Set res (CompareAndSwapS mem_ptr (Binary oldval newval))); + match(Set res (WeakCompareAndSwapS mem_ptr (Binary oldval newval))); + effect(KILL cr, KILL oldval); + format %{ "CMPXCHGW [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t" + "MOV $res,0\n\t" + "JNE,s fail\n\t" + "MOV $res,1\n" + "fail:" %} + ins_encode( enc_cmpxchgw(mem_ptr), + enc_flags_ne_to_boolean(res) ); + ins_pipe( pipe_cmpxchg ); +%} + instruct compareAndSwapI( rRegI res, pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr) %{ match(Set res (CompareAndSwapI mem_ptr (Binary oldval newval))); match(Set res (WeakCompareAndSwapI mem_ptr (Binary oldval newval))); @@ -7292,6 +7345,22 @@ instruct compareAndExchangeP( pRegP mem_ptr, eAXRegP oldval, eCXRegP newval, eFl ins_pipe( pipe_cmpxchg ); %} +instruct compareAndExchangeB( pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr) %{ + match(Set oldval (CompareAndExchangeB mem_ptr (Binary oldval newval))); + effect(KILL cr); + format %{ "CMPXCHGB [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t" %} + ins_encode( enc_cmpxchgb(mem_ptr) ); + ins_pipe( pipe_cmpxchg ); +%} + +instruct compareAndExchangeS( pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr) %{ + match(Set oldval (CompareAndExchangeS mem_ptr (Binary oldval newval))); + effect(KILL cr); + format %{ "CMPXCHGW [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t" %} + ins_encode( enc_cmpxchgw(mem_ptr) ); + ins_pipe( pipe_cmpxchg ); +%} + instruct compareAndExchangeI( pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr) %{ match(Set oldval (CompareAndExchangeI mem_ptr (Binary oldval newval))); effect(KILL cr); @@ -7300,6 +7369,53 @@ instruct compareAndExchangeI( pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFl ins_pipe( pipe_cmpxchg ); %} +instruct xaddB_no_res( memory mem, Universe dummy, immI add, eFlagsReg cr) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddB mem add)); + effect(KILL cr); + format %{ "ADDB [$mem],$add" %} + ins_encode %{ + if (os::is_MP()) { __ lock(); } + __ addb($mem$$Address, $add$$constant); + %} + ins_pipe( pipe_cmpxchg ); +%} + +// Important to match to xRegI: only 8-bit regs. +instruct xaddB( memory mem, xRegI newval, eFlagsReg cr) %{ + match(Set newval (GetAndAddB mem newval)); + effect(KILL cr); + format %{ "XADDB [$mem],$newval" %} + ins_encode %{ + if (os::is_MP()) { __ lock(); } + __ xaddb($mem$$Address, $newval$$Register); + %} + ins_pipe( pipe_cmpxchg ); +%} + +instruct xaddS_no_res( memory mem, Universe dummy, immI add, eFlagsReg cr) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddS mem add)); + effect(KILL cr); + format %{ "ADDS [$mem],$add" %} + ins_encode %{ + if (os::is_MP()) { __ lock(); } + __ addw($mem$$Address, $add$$constant); + %} + ins_pipe( pipe_cmpxchg ); +%} + +instruct xaddS( memory mem, rRegI newval, eFlagsReg cr) %{ + match(Set newval (GetAndAddS mem newval)); + effect(KILL cr); + format %{ "XADDS [$mem],$newval" %} + ins_encode %{ + if (os::is_MP()) { __ lock(); } + __ xaddw($mem$$Address, $newval$$Register); + %} + ins_pipe( pipe_cmpxchg ); +%} + instruct xaddI_no_res( memory mem, Universe dummy, immI add, eFlagsReg cr) %{ predicate(n->as_LoadStore()->result_not_used()); match(Set dummy (GetAndAddI mem add)); @@ -7323,6 +7439,25 @@ instruct xaddI( memory mem, rRegI newval, eFlagsReg cr) %{ ins_pipe( pipe_cmpxchg ); %} +// Important to match to xRegI: only 8-bit regs. +instruct xchgB( memory mem, xRegI newval) %{ + match(Set newval (GetAndSetB mem newval)); + format %{ "XCHGB $newval,[$mem]" %} + ins_encode %{ + __ xchgb($newval$$Register, $mem$$Address); + %} + ins_pipe( pipe_cmpxchg ); +%} + +instruct xchgS( memory mem, rRegI newval) %{ + match(Set newval (GetAndSetS mem newval)); + format %{ "XCHGW $newval,[$mem]" %} + ins_encode %{ + __ xchgw($newval$$Register, $mem$$Address); + %} + ins_pipe( pipe_cmpxchg ); +%} + instruct xchgI( memory mem, rRegI newval) %{ match(Set newval (GetAndSetI mem newval)); format %{ "XCHGL $newval,[$mem]" %} diff --git a/hotspot/src/cpu/x86/vm/x86_64.ad b/hotspot/src/cpu/x86/vm/x86_64.ad index a680d60e994..52b58ec0281 100644 --- a/hotspot/src/cpu/x86/vm/x86_64.ad +++ b/hotspot/src/cpu/x86/vm/x86_64.ad @@ -7340,6 +7340,54 @@ instruct compareAndSwapI(rRegI res, ins_pipe( pipe_cmpxchg ); %} +instruct compareAndSwapB(rRegI res, + memory mem_ptr, + rax_RegI oldval, rRegI newval, + rFlagsReg cr) +%{ + match(Set res (CompareAndSwapB mem_ptr (Binary oldval newval))); + match(Set res (WeakCompareAndSwapB mem_ptr (Binary oldval newval))); + effect(KILL cr, KILL oldval); + + format %{ "cmpxchgb $mem_ptr,$newval\t# " + "If rax == $mem_ptr then store $newval into $mem_ptr\n\t" + "sete $res\n\t" + "movzbl $res, $res" %} + opcode(0x0F, 0xB0); + ins_encode(lock_prefix, + REX_reg_mem(newval, mem_ptr), + OpcP, OpcS, + reg_mem(newval, mem_ptr), + REX_breg(res), Opcode(0x0F), Opcode(0x94), reg(res), // sete + REX_reg_breg(res, res), // movzbl + Opcode(0xF), Opcode(0xB6), reg_reg(res, res)); + ins_pipe( pipe_cmpxchg ); +%} + +instruct compareAndSwapS(rRegI res, + memory mem_ptr, + rax_RegI oldval, rRegI newval, + rFlagsReg cr) +%{ + match(Set res (CompareAndSwapS mem_ptr (Binary oldval newval))); + match(Set res (WeakCompareAndSwapS mem_ptr (Binary oldval newval))); + effect(KILL cr, KILL oldval); + + format %{ "cmpxchgw $mem_ptr,$newval\t# " + "If rax == $mem_ptr then store $newval into $mem_ptr\n\t" + "sete $res\n\t" + "movzbl $res, $res" %} + opcode(0x0F, 0xB1); + ins_encode(lock_prefix, + SizePrefix, + REX_reg_mem(newval, mem_ptr), + OpcP, OpcS, + reg_mem(newval, mem_ptr), + REX_breg(res), Opcode(0x0F), Opcode(0x94), reg(res), // sete + REX_reg_breg(res, res), // movzbl + Opcode(0xF), Opcode(0xB6), reg_reg(res, res)); + ins_pipe( pipe_cmpxchg ); +%} instruct compareAndSwapN(rRegI res, memory mem_ptr, @@ -7364,6 +7412,45 @@ instruct compareAndSwapN(rRegI res, ins_pipe( pipe_cmpxchg ); %} +instruct compareAndExchangeB( + memory mem_ptr, + rax_RegI oldval, rRegI newval, + rFlagsReg cr) +%{ + match(Set oldval (CompareAndExchangeB mem_ptr (Binary oldval newval))); + effect(KILL cr); + + format %{ "cmpxchgb $mem_ptr,$newval\t# " + "If rax == $mem_ptr then store $newval into $mem_ptr\n\t" %} + opcode(0x0F, 0xB0); + ins_encode(lock_prefix, + REX_reg_mem(newval, mem_ptr), + OpcP, OpcS, + reg_mem(newval, mem_ptr) // lock cmpxchg + ); + ins_pipe( pipe_cmpxchg ); +%} + +instruct compareAndExchangeS( + memory mem_ptr, + rax_RegI oldval, rRegI newval, + rFlagsReg cr) +%{ + match(Set oldval (CompareAndExchangeS mem_ptr (Binary oldval newval))); + effect(KILL cr); + + format %{ "cmpxchgw $mem_ptr,$newval\t# " + "If rax == $mem_ptr then store $newval into $mem_ptr\n\t" %} + opcode(0x0F, 0xB1); + ins_encode(lock_prefix, + SizePrefix, + REX_reg_mem(newval, mem_ptr), + OpcP, OpcS, + reg_mem(newval, mem_ptr) // lock cmpxchg + ); + ins_pipe( pipe_cmpxchg ); +%} + instruct compareAndExchangeI( memory mem_ptr, rax_RegI oldval, rRegI newval, @@ -7441,6 +7528,52 @@ instruct compareAndExchangeP( ins_pipe( pipe_cmpxchg ); %} +instruct xaddB_no_res( memory mem, Universe dummy, immI add, rFlagsReg cr) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddB mem add)); + effect(KILL cr); + format %{ "ADDB [$mem],$add" %} + ins_encode %{ + if (os::is_MP()) { __ lock(); } + __ addb($mem$$Address, $add$$constant); + %} + ins_pipe( pipe_cmpxchg ); +%} + +instruct xaddB( memory mem, rRegI newval, rFlagsReg cr) %{ + match(Set newval (GetAndAddB mem newval)); + effect(KILL cr); + format %{ "XADDB [$mem],$newval" %} + ins_encode %{ + if (os::is_MP()) { __ lock(); } + __ xaddb($mem$$Address, $newval$$Register); + %} + ins_pipe( pipe_cmpxchg ); +%} + +instruct xaddS_no_res( memory mem, Universe dummy, immI add, rFlagsReg cr) %{ + predicate(n->as_LoadStore()->result_not_used()); + match(Set dummy (GetAndAddS mem add)); + effect(KILL cr); + format %{ "ADDW [$mem],$add" %} + ins_encode %{ + if (os::is_MP()) { __ lock(); } + __ addw($mem$$Address, $add$$constant); + %} + ins_pipe( pipe_cmpxchg ); +%} + +instruct xaddS( memory mem, rRegI newval, rFlagsReg cr) %{ + match(Set newval (GetAndAddS mem newval)); + effect(KILL cr); + format %{ "XADDW [$mem],$newval" %} + ins_encode %{ + if (os::is_MP()) { __ lock(); } + __ xaddw($mem$$Address, $newval$$Register); + %} + ins_pipe( pipe_cmpxchg ); +%} + instruct xaddI_no_res( memory mem, Universe dummy, immI add, rFlagsReg cr) %{ predicate(n->as_LoadStore()->result_not_used()); match(Set dummy (GetAndAddI mem add)); @@ -7487,6 +7620,24 @@ instruct xaddL( memory mem, rRegL newval, rFlagsReg cr) %{ ins_pipe( pipe_cmpxchg ); %} +instruct xchgB( memory mem, rRegI newval) %{ + match(Set newval (GetAndSetB mem newval)); + format %{ "XCHGB $newval,[$mem]" %} + ins_encode %{ + __ xchgb($newval$$Register, $mem$$Address); + %} + ins_pipe( pipe_cmpxchg ); +%} + +instruct xchgS( memory mem, rRegI newval) %{ + match(Set newval (GetAndSetS mem newval)); + format %{ "XCHGW $newval,[$mem]" %} + ins_encode %{ + __ xchgw($newval$$Register, $mem$$Address); + %} + ins_pipe( pipe_cmpxchg ); +%} + instruct xchgI( memory mem, rRegI newval) %{ match(Set newval (GetAndSetI mem newval)); format %{ "XCHGL $newval,[$mem]" %} diff --git a/hotspot/src/share/vm/adlc/formssel.cpp b/hotspot/src/share/vm/adlc/formssel.cpp index aaef59a9441..c9904c7da15 100644 --- a/hotspot/src/share/vm/adlc/formssel.cpp +++ b/hotspot/src/share/vm/adlc/formssel.cpp @@ -3491,13 +3491,13 @@ int MatchNode::needs_ideal_memory_edge(FormDict &globals) const { "LoadRange", "LoadKlass", "LoadNKlass", "LoadL_unaligned", "LoadD_unaligned", "LoadPLocked", "StorePConditional", "StoreIConditional", "StoreLConditional", - "CompareAndSwapI", "CompareAndSwapL", "CompareAndSwapP", "CompareAndSwapN", - "WeakCompareAndSwapI", "WeakCompareAndSwapL", "WeakCompareAndSwapP", "WeakCompareAndSwapN", - "CompareAndExchangeI", "CompareAndExchangeL", "CompareAndExchangeP", "CompareAndExchangeN", + "CompareAndSwapB", "CompareAndSwapS", "CompareAndSwapI", "CompareAndSwapL", "CompareAndSwapP", "CompareAndSwapN", + "WeakCompareAndSwapB", "WeakCompareAndSwapS", "WeakCompareAndSwapI", "WeakCompareAndSwapL", "WeakCompareAndSwapP", "WeakCompareAndSwapN", + "CompareAndExchangeB", "CompareAndExchangeS", "CompareAndExchangeI", "CompareAndExchangeL", "CompareAndExchangeP", "CompareAndExchangeN", "StoreCM", "ClearArray", - "GetAndAddI", "GetAndSetI", "GetAndSetP", - "GetAndAddL", "GetAndSetL", "GetAndSetN", + "GetAndSetB", "GetAndSetS", "GetAndAddI", "GetAndSetI", "GetAndSetP", + "GetAndAddB", "GetAndAddS", "GetAndAddL", "GetAndSetL", "GetAndSetN", }; int cnt = sizeof(needs_ideal_memory_list)/sizeof(char*); if( strcmp(_opType,"PrefetchAllocation")==0 ) diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp index 585c8b5382e..29b15c34ee7 100644 --- a/hotspot/src/share/vm/classfile/vmSymbols.hpp +++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp @@ -1239,6 +1239,10 @@ do_signature(compareAndExchangeLong_signature, "(Ljava/lang/Object;JJJ)J") \ do_signature(compareAndSwapInt_signature, "(Ljava/lang/Object;JII)Z") \ do_signature(compareAndExchangeInt_signature, "(Ljava/lang/Object;JII)I") \ + do_signature(compareAndSwapByte_signature, "(Ljava/lang/Object;JBB)Z") \ + do_signature(compareAndExchangeByte_signature, "(Ljava/lang/Object;JBB)B") \ + do_signature(compareAndSwapShort_signature, "(Ljava/lang/Object;JSS)Z") \ + do_signature(compareAndExchangeShort_signature, "(Ljava/lang/Object;JSS)S") \ \ do_name(compareAndSwapObject_name, "compareAndSwapObject") \ do_name(compareAndExchangeObjectVolatile_name, "compareAndExchangeObjectVolatile") \ @@ -1252,6 +1256,14 @@ do_name(compareAndExchangeIntVolatile_name, "compareAndExchangeIntVolatile") \ do_name(compareAndExchangeIntAcquire_name, "compareAndExchangeIntAcquire") \ do_name(compareAndExchangeIntRelease_name, "compareAndExchangeIntRelease") \ + do_name(compareAndSwapByte_name, "compareAndSwapByte") \ + do_name(compareAndExchangeByteVolatile_name, "compareAndExchangeByteVolatile") \ + do_name(compareAndExchangeByteAcquire_name, "compareAndExchangeByteAcquire") \ + do_name(compareAndExchangeByteRelease_name, "compareAndExchangeByteRelease") \ + do_name(compareAndSwapShort_name, "compareAndSwapShort") \ + do_name(compareAndExchangeShortVolatile_name, "compareAndExchangeShortVolatile") \ + do_name(compareAndExchangeShortAcquire_name, "compareAndExchangeShortAcquire") \ + do_name(compareAndExchangeShortRelease_name, "compareAndExchangeShortRelease") \ \ do_name(weakCompareAndSwapObject_name, "weakCompareAndSwapObject") \ do_name(weakCompareAndSwapObjectAcquire_name, "weakCompareAndSwapObjectAcquire") \ @@ -1265,6 +1277,14 @@ do_name(weakCompareAndSwapIntAcquire_name, "weakCompareAndSwapIntAcquire") \ do_name(weakCompareAndSwapIntRelease_name, "weakCompareAndSwapIntRelease") \ do_name(weakCompareAndSwapIntVolatile_name, "weakCompareAndSwapIntVolatile") \ + do_name(weakCompareAndSwapByte_name, "weakCompareAndSwapByte") \ + do_name(weakCompareAndSwapByteAcquire_name, "weakCompareAndSwapByteAcquire") \ + do_name(weakCompareAndSwapByteRelease_name, "weakCompareAndSwapByteRelease") \ + do_name(weakCompareAndSwapByteVolatile_name, "weakCompareAndSwapByteVolatile") \ + do_name(weakCompareAndSwapShort_name, "weakCompareAndSwapShort") \ + do_name(weakCompareAndSwapShortAcquire_name, "weakCompareAndSwapShortAcquire") \ + do_name(weakCompareAndSwapShortRelease_name, "weakCompareAndSwapShortRelease") \ + do_name(weakCompareAndSwapShortVolatile_name, "weakCompareAndSwapShortVolatile") \ \ do_intrinsic(_compareAndSwapObject, jdk_internal_misc_Unsafe, compareAndSwapObject_name, compareAndSwapObject_signature, F_RN) \ do_intrinsic(_compareAndExchangeObjectVolatile, jdk_internal_misc_Unsafe, compareAndExchangeObjectVolatile_name, compareAndExchangeObject_signature, F_RN) \ @@ -1278,7 +1298,15 @@ do_intrinsic(_compareAndExchangeIntVolatile, jdk_internal_misc_Unsafe, compareAndExchangeIntVolatile_name, compareAndExchangeInt_signature, F_RN) \ do_intrinsic(_compareAndExchangeIntAcquire, jdk_internal_misc_Unsafe, compareAndExchangeIntAcquire_name, compareAndExchangeInt_signature, F_R) \ do_intrinsic(_compareAndExchangeIntRelease, jdk_internal_misc_Unsafe, compareAndExchangeIntRelease_name, compareAndExchangeInt_signature, F_R) \ - \ + do_intrinsic(_compareAndSwapByte, jdk_internal_misc_Unsafe, compareAndSwapByte_name, compareAndSwapByte_signature, F_R) \ + do_intrinsic(_compareAndExchangeByteVolatile, jdk_internal_misc_Unsafe, compareAndExchangeByteVolatile_name, compareAndExchangeByte_signature, F_R) \ + do_intrinsic(_compareAndExchangeByteAcquire, jdk_internal_misc_Unsafe, compareAndExchangeByteAcquire_name, compareAndExchangeByte_signature, F_R) \ + do_intrinsic(_compareAndExchangeByteRelease, jdk_internal_misc_Unsafe, compareAndExchangeByteRelease_name, compareAndExchangeByte_signature, F_R) \ + do_intrinsic(_compareAndSwapShort, jdk_internal_misc_Unsafe, compareAndSwapShort_name, compareAndSwapShort_signature, F_R) \ + do_intrinsic(_compareAndExchangeShortVolatile, jdk_internal_misc_Unsafe, compareAndExchangeShortVolatile_name, compareAndExchangeShort_signature, F_R) \ + do_intrinsic(_compareAndExchangeShortAcquire, jdk_internal_misc_Unsafe, compareAndExchangeShortAcquire_name, compareAndExchangeShort_signature, F_R) \ + do_intrinsic(_compareAndExchangeShortRelease, jdk_internal_misc_Unsafe, compareAndExchangeShortRelease_name, compareAndExchangeShort_signature, F_R) \ + \ do_intrinsic(_weakCompareAndSwapObject, jdk_internal_misc_Unsafe, weakCompareAndSwapObject_name, compareAndSwapObject_signature, F_R) \ do_intrinsic(_weakCompareAndSwapObjectAcquire, jdk_internal_misc_Unsafe, weakCompareAndSwapObjectAcquire_name, compareAndSwapObject_signature, F_R) \ do_intrinsic(_weakCompareAndSwapObjectRelease, jdk_internal_misc_Unsafe, weakCompareAndSwapObjectRelease_name, compareAndSwapObject_signature, F_R) \ @@ -1291,19 +1319,39 @@ do_intrinsic(_weakCompareAndSwapIntAcquire, jdk_internal_misc_Unsafe, weakCompareAndSwapIntAcquire_name, compareAndSwapInt_signature, F_R) \ do_intrinsic(_weakCompareAndSwapIntRelease, jdk_internal_misc_Unsafe, weakCompareAndSwapIntRelease_name, compareAndSwapInt_signature, F_R) \ do_intrinsic(_weakCompareAndSwapIntVolatile, jdk_internal_misc_Unsafe, weakCompareAndSwapIntVolatile_name, compareAndSwapInt_signature, F_R) \ - \ + do_intrinsic(_weakCompareAndSwapByte, jdk_internal_misc_Unsafe, weakCompareAndSwapByte_name, compareAndSwapByte_signature, F_R) \ + do_intrinsic(_weakCompareAndSwapByteAcquire, jdk_internal_misc_Unsafe, weakCompareAndSwapByteAcquire_name, compareAndSwapByte_signature, F_R) \ + do_intrinsic(_weakCompareAndSwapByteRelease, jdk_internal_misc_Unsafe, weakCompareAndSwapByteRelease_name, compareAndSwapByte_signature, F_R) \ + do_intrinsic(_weakCompareAndSwapByteVolatile, jdk_internal_misc_Unsafe, weakCompareAndSwapByteVolatile_name, compareAndSwapByte_signature, F_R) \ + do_intrinsic(_weakCompareAndSwapShort, jdk_internal_misc_Unsafe, weakCompareAndSwapShort_name, compareAndSwapShort_signature, F_R) \ + do_intrinsic(_weakCompareAndSwapShortAcquire, jdk_internal_misc_Unsafe, weakCompareAndSwapShortAcquire_name, compareAndSwapShort_signature, F_R) \ + do_intrinsic(_weakCompareAndSwapShortRelease, jdk_internal_misc_Unsafe, weakCompareAndSwapShortRelease_name, compareAndSwapShort_signature, F_R) \ + do_intrinsic(_weakCompareAndSwapShortVolatile, jdk_internal_misc_Unsafe, weakCompareAndSwapShortVolatile_name, compareAndSwapShort_signature, F_R) \ + \ do_intrinsic(_getAndAddInt, jdk_internal_misc_Unsafe, getAndAddInt_name, getAndAddInt_signature, F_R) \ do_name( getAndAddInt_name, "getAndAddInt") \ do_signature(getAndAddInt_signature, "(Ljava/lang/Object;JI)I" ) \ do_intrinsic(_getAndAddLong, jdk_internal_misc_Unsafe, getAndAddLong_name, getAndAddLong_signature, F_R) \ do_name( getAndAddLong_name, "getAndAddLong") \ do_signature(getAndAddLong_signature, "(Ljava/lang/Object;JJ)J" ) \ + do_intrinsic(_getAndAddByte, jdk_internal_misc_Unsafe, getAndAddByte_name, getAndAddByte_signature, F_R) \ + do_name( getAndAddByte_name, "getAndAddByte") \ + do_signature(getAndAddByte_signature, "(Ljava/lang/Object;JB)B" ) \ + do_intrinsic(_getAndAddShort, jdk_internal_misc_Unsafe, getAndAddShort_name, getAndAddShort_signature, F_R) \ + do_name( getAndAddShort_name, "getAndAddShort") \ + do_signature(getAndAddShort_signature, "(Ljava/lang/Object;JS)S" ) \ do_intrinsic(_getAndSetInt, jdk_internal_misc_Unsafe, getAndSetInt_name, getAndSetInt_signature, F_R) \ do_name( getAndSetInt_name, "getAndSetInt") \ do_alias( getAndSetInt_signature, /*"(Ljava/lang/Object;JI)I"*/ getAndAddInt_signature) \ do_intrinsic(_getAndSetLong, jdk_internal_misc_Unsafe, getAndSetLong_name, getAndSetLong_signature, F_R) \ do_name( getAndSetLong_name, "getAndSetLong") \ do_alias( getAndSetLong_signature, /*"(Ljava/lang/Object;JJ)J"*/ getAndAddLong_signature) \ + do_intrinsic(_getAndSetByte, jdk_internal_misc_Unsafe, getAndSetByte_name, getAndSetByte_signature, F_R) \ + do_name( getAndSetByte_name, "getAndSetByte") \ + do_alias( getAndSetByte_signature, /*"(Ljava/lang/Object;JB)B"*/ getAndAddByte_signature) \ + do_intrinsic(_getAndSetShort, jdk_internal_misc_Unsafe, getAndSetShort_name, getAndSetShort_signature, F_R) \ + do_name( getAndSetShort_name, "getAndSetShort") \ + do_alias( getAndSetShort_signature, /*"(Ljava/lang/Object;JS)S"*/ getAndAddShort_signature) \ do_intrinsic(_getAndSetObject, jdk_internal_misc_Unsafe, getAndSetObject_name, getAndSetObject_signature, F_R)\ do_name( getAndSetObject_name, "getAndSetObject") \ do_signature(getAndSetObject_signature, "(Ljava/lang/Object;JLjava/lang/Object;)Ljava/lang/Object;" ) \ diff --git a/hotspot/src/share/vm/opto/c2compiler.cpp b/hotspot/src/share/vm/opto/c2compiler.cpp index a91b1c2f6e0..c80ca6eaa8c 100644 --- a/hotspot/src/share/vm/opto/c2compiler.cpp +++ b/hotspot/src/share/vm/opto/c2compiler.cpp @@ -256,6 +256,7 @@ bool C2Compiler::is_intrinsic_supported(const methodHandle& method, bool is_virt case vmIntrinsics::_weakCompareAndSwapObject: case vmIntrinsics::_weakCompareAndSwapObjectAcquire: case vmIntrinsics::_weakCompareAndSwapObjectRelease: + case vmIntrinsics::_weakCompareAndSwapObjectVolatile: #ifdef _LP64 if ( UseCompressedOops && !Matcher::match_rule_supported(Op_WeakCompareAndSwapN)) return false; if (!UseCompressedOops && !Matcher::match_rule_supported(Op_WeakCompareAndSwapP)) return false; @@ -270,6 +271,7 @@ bool C2Compiler::is_intrinsic_supported(const methodHandle& method, bool is_virt case vmIntrinsics::_weakCompareAndSwapLong: case vmIntrinsics::_weakCompareAndSwapLongAcquire: case vmIntrinsics::_weakCompareAndSwapLongRelease: + case vmIntrinsics::_weakCompareAndSwapLongVolatile: if (!Matcher::match_rule_supported(Op_WeakCompareAndSwapL)) return false; break; @@ -280,9 +282,32 @@ bool C2Compiler::is_intrinsic_supported(const methodHandle& method, bool is_virt case vmIntrinsics::_weakCompareAndSwapInt: case vmIntrinsics::_weakCompareAndSwapIntAcquire: case vmIntrinsics::_weakCompareAndSwapIntRelease: + case vmIntrinsics::_weakCompareAndSwapIntVolatile: if (!Matcher::match_rule_supported(Op_WeakCompareAndSwapL)) return false; break; + /* CompareAndSwap, Byte: */ + case vmIntrinsics::_compareAndSwapByte: + if (!Matcher::match_rule_supported(Op_CompareAndSwapB)) return false; + break; + case vmIntrinsics::_weakCompareAndSwapByte: + case vmIntrinsics::_weakCompareAndSwapByteAcquire: + case vmIntrinsics::_weakCompareAndSwapByteRelease: + case vmIntrinsics::_weakCompareAndSwapByteVolatile: + if (!Matcher::match_rule_supported(Op_WeakCompareAndSwapB)) return false; + break; + + /* CompareAndSwap, Short: */ + case vmIntrinsics::_compareAndSwapShort: + if (!Matcher::match_rule_supported(Op_CompareAndSwapS)) return false; + break; + case vmIntrinsics::_weakCompareAndSwapShort: + case vmIntrinsics::_weakCompareAndSwapShortAcquire: + case vmIntrinsics::_weakCompareAndSwapShortRelease: + case vmIntrinsics::_weakCompareAndSwapShortVolatile: + if (!Matcher::match_rule_supported(Op_WeakCompareAndSwapS)) return false; + break; + /* CompareAndExchange, Object: */ case vmIntrinsics::_compareAndExchangeObjectVolatile: case vmIntrinsics::_compareAndExchangeObjectAcquire: @@ -309,12 +334,39 @@ bool C2Compiler::is_intrinsic_supported(const methodHandle& method, bool is_virt if (!Matcher::match_rule_supported(Op_CompareAndExchangeI)) return false; break; + /* CompareAndExchange, Byte: */ + case vmIntrinsics::_compareAndExchangeByteVolatile: + case vmIntrinsics::_compareAndExchangeByteAcquire: + case vmIntrinsics::_compareAndExchangeByteRelease: + if (!Matcher::match_rule_supported(Op_CompareAndExchangeB)) return false; + break; + + /* CompareAndExchange, Short: */ + case vmIntrinsics::_compareAndExchangeShortVolatile: + case vmIntrinsics::_compareAndExchangeShortAcquire: + case vmIntrinsics::_compareAndExchangeShortRelease: + if (!Matcher::match_rule_supported(Op_CompareAndExchangeS)) return false; + break; + + case vmIntrinsics::_getAndAddByte: + if (!Matcher::match_rule_supported(Op_GetAndAddB)) return false; + break; + case vmIntrinsics::_getAndAddShort: + if (!Matcher::match_rule_supported(Op_GetAndAddS)) return false; + break; case vmIntrinsics::_getAndAddInt: if (!Matcher::match_rule_supported(Op_GetAndAddI)) return false; break; case vmIntrinsics::_getAndAddLong: if (!Matcher::match_rule_supported(Op_GetAndAddL)) return false; break; + + case vmIntrinsics::_getAndSetByte: + if (!Matcher::match_rule_supported(Op_GetAndSetB)) return false; + break; + case vmIntrinsics::_getAndSetShort: + if (!Matcher::match_rule_supported(Op_GetAndSetS)) return false; + break; case vmIntrinsics::_getAndSetInt: if (!Matcher::match_rule_supported(Op_GetAndSetI)) return false; break; diff --git a/hotspot/src/share/vm/opto/classes.hpp b/hotspot/src/share/vm/opto/classes.hpp index 790f4f499be..eab270ee399 100644 --- a/hotspot/src/share/vm/opto/classes.hpp +++ b/hotspot/src/share/vm/opto/classes.hpp @@ -81,20 +81,30 @@ macro(CmpL3) macro(CmpLTMask) macro(CmpP) macro(CmpU) +macro(CompareAndSwapB) +macro(CompareAndSwapS) macro(CompareAndSwapI) macro(CompareAndSwapL) macro(CompareAndSwapP) macro(CompareAndSwapN) +macro(WeakCompareAndSwapB) +macro(WeakCompareAndSwapS) macro(WeakCompareAndSwapI) macro(WeakCompareAndSwapL) macro(WeakCompareAndSwapP) macro(WeakCompareAndSwapN) +macro(CompareAndExchangeB) +macro(CompareAndExchangeS) macro(CompareAndExchangeI) macro(CompareAndExchangeL) macro(CompareAndExchangeP) macro(CompareAndExchangeN) +macro(GetAndAddB) +macro(GetAndAddS) macro(GetAndAddI) macro(GetAndAddL) +macro(GetAndSetB) +macro(GetAndSetS) macro(GetAndSetI) macro(GetAndSetL) macro(GetAndSetP) diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp index 5e1e50ef6af..0b73fe56736 100644 --- a/hotspot/src/share/vm/opto/compile.cpp +++ b/hotspot/src/share/vm/opto/compile.cpp @@ -2794,20 +2794,30 @@ void Compile::final_graph_reshaping_impl( Node *n, Final_Reshape_Counts &frc) { case Op_StoreL: case Op_StoreIConditional: case Op_StoreLConditional: + case Op_CompareAndSwapB: + case Op_CompareAndSwapS: case Op_CompareAndSwapI: case Op_CompareAndSwapL: case Op_CompareAndSwapP: case Op_CompareAndSwapN: + case Op_WeakCompareAndSwapB: + case Op_WeakCompareAndSwapS: case Op_WeakCompareAndSwapI: case Op_WeakCompareAndSwapL: case Op_WeakCompareAndSwapP: case Op_WeakCompareAndSwapN: + case Op_CompareAndExchangeB: + case Op_CompareAndExchangeS: case Op_CompareAndExchangeI: case Op_CompareAndExchangeL: case Op_CompareAndExchangeP: case Op_CompareAndExchangeN: + case Op_GetAndAddS: + case Op_GetAndAddB: case Op_GetAndAddI: case Op_GetAndAddL: + case Op_GetAndSetS: + case Op_GetAndSetB: case Op_GetAndSetI: case Op_GetAndSetL: case Op_GetAndSetP: diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp index 12c59133a7d..cf1e506cf58 100644 --- a/hotspot/src/share/vm/opto/library_call.cpp +++ b/hotspot/src/share/vm/opto/library_call.cpp @@ -645,6 +645,8 @@ bool LibraryCallKit::try_to_inline(int predicate) { case vmIntrinsics::_putDoubleOpaque: return inline_unsafe_access( is_store, T_DOUBLE, Opaque, false); case vmIntrinsics::_compareAndSwapObject: return inline_unsafe_load_store(T_OBJECT, LS_cmp_swap, Volatile); + case vmIntrinsics::_compareAndSwapByte: return inline_unsafe_load_store(T_BYTE, LS_cmp_swap, Volatile); + case vmIntrinsics::_compareAndSwapShort: return inline_unsafe_load_store(T_SHORT, LS_cmp_swap, Volatile); case vmIntrinsics::_compareAndSwapInt: return inline_unsafe_load_store(T_INT, LS_cmp_swap, Volatile); case vmIntrinsics::_compareAndSwapLong: return inline_unsafe_load_store(T_LONG, LS_cmp_swap, Volatile); @@ -652,6 +654,14 @@ bool LibraryCallKit::try_to_inline(int predicate) { case vmIntrinsics::_weakCompareAndSwapObjectAcquire: return inline_unsafe_load_store(T_OBJECT, LS_cmp_swap_weak, Acquire); case vmIntrinsics::_weakCompareAndSwapObjectRelease: return inline_unsafe_load_store(T_OBJECT, LS_cmp_swap_weak, Release); case vmIntrinsics::_weakCompareAndSwapObjectVolatile: return inline_unsafe_load_store(T_OBJECT, LS_cmp_swap_weak, Volatile); + case vmIntrinsics::_weakCompareAndSwapByte: return inline_unsafe_load_store(T_BYTE, LS_cmp_swap_weak, Relaxed); + case vmIntrinsics::_weakCompareAndSwapByteAcquire: return inline_unsafe_load_store(T_BYTE, LS_cmp_swap_weak, Acquire); + case vmIntrinsics::_weakCompareAndSwapByteRelease: return inline_unsafe_load_store(T_BYTE, LS_cmp_swap_weak, Release); + case vmIntrinsics::_weakCompareAndSwapByteVolatile: return inline_unsafe_load_store(T_BYTE, LS_cmp_swap_weak, Volatile); + case vmIntrinsics::_weakCompareAndSwapShort: return inline_unsafe_load_store(T_SHORT, LS_cmp_swap_weak, Relaxed); + case vmIntrinsics::_weakCompareAndSwapShortAcquire: return inline_unsafe_load_store(T_SHORT, LS_cmp_swap_weak, Acquire); + case vmIntrinsics::_weakCompareAndSwapShortRelease: return inline_unsafe_load_store(T_SHORT, LS_cmp_swap_weak, Release); + case vmIntrinsics::_weakCompareAndSwapShortVolatile: return inline_unsafe_load_store(T_SHORT, LS_cmp_swap_weak, Volatile); case vmIntrinsics::_weakCompareAndSwapInt: return inline_unsafe_load_store(T_INT, LS_cmp_swap_weak, Relaxed); case vmIntrinsics::_weakCompareAndSwapIntAcquire: return inline_unsafe_load_store(T_INT, LS_cmp_swap_weak, Acquire); case vmIntrinsics::_weakCompareAndSwapIntRelease: return inline_unsafe_load_store(T_INT, LS_cmp_swap_weak, Release); @@ -664,6 +674,12 @@ bool LibraryCallKit::try_to_inline(int predicate) { case vmIntrinsics::_compareAndExchangeObjectVolatile: return inline_unsafe_load_store(T_OBJECT, LS_cmp_exchange, Volatile); case vmIntrinsics::_compareAndExchangeObjectAcquire: return inline_unsafe_load_store(T_OBJECT, LS_cmp_exchange, Acquire); case vmIntrinsics::_compareAndExchangeObjectRelease: return inline_unsafe_load_store(T_OBJECT, LS_cmp_exchange, Release); + case vmIntrinsics::_compareAndExchangeByteVolatile: return inline_unsafe_load_store(T_BYTE, LS_cmp_exchange, Volatile); + case vmIntrinsics::_compareAndExchangeByteAcquire: return inline_unsafe_load_store(T_BYTE, LS_cmp_exchange, Acquire); + case vmIntrinsics::_compareAndExchangeByteRelease: return inline_unsafe_load_store(T_BYTE, LS_cmp_exchange, Release); + case vmIntrinsics::_compareAndExchangeShortVolatile: return inline_unsafe_load_store(T_SHORT, LS_cmp_exchange, Volatile); + case vmIntrinsics::_compareAndExchangeShortAcquire: return inline_unsafe_load_store(T_SHORT, LS_cmp_exchange, Acquire); + case vmIntrinsics::_compareAndExchangeShortRelease: return inline_unsafe_load_store(T_SHORT, LS_cmp_exchange, Release); case vmIntrinsics::_compareAndExchangeIntVolatile: return inline_unsafe_load_store(T_INT, LS_cmp_exchange, Volatile); case vmIntrinsics::_compareAndExchangeIntAcquire: return inline_unsafe_load_store(T_INT, LS_cmp_exchange, Acquire); case vmIntrinsics::_compareAndExchangeIntRelease: return inline_unsafe_load_store(T_INT, LS_cmp_exchange, Release); @@ -671,8 +687,13 @@ bool LibraryCallKit::try_to_inline(int predicate) { case vmIntrinsics::_compareAndExchangeLongAcquire: return inline_unsafe_load_store(T_LONG, LS_cmp_exchange, Acquire); case vmIntrinsics::_compareAndExchangeLongRelease: return inline_unsafe_load_store(T_LONG, LS_cmp_exchange, Release); + case vmIntrinsics::_getAndAddByte: return inline_unsafe_load_store(T_BYTE, LS_get_add, Volatile); + case vmIntrinsics::_getAndAddShort: return inline_unsafe_load_store(T_SHORT, LS_get_add, Volatile); case vmIntrinsics::_getAndAddInt: return inline_unsafe_load_store(T_INT, LS_get_add, Volatile); case vmIntrinsics::_getAndAddLong: return inline_unsafe_load_store(T_LONG, LS_get_add, Volatile); + + case vmIntrinsics::_getAndSetByte: return inline_unsafe_load_store(T_BYTE, LS_get_set, Volatile); + case vmIntrinsics::_getAndSetShort: return inline_unsafe_load_store(T_SHORT, LS_get_set, Volatile); case vmIntrinsics::_getAndSetInt: return inline_unsafe_load_store(T_INT, LS_get_set, Volatile); case vmIntrinsics::_getAndSetLong: return inline_unsafe_load_store(T_LONG, LS_get_set, Volatile); case vmIntrinsics::_getAndSetObject: return inline_unsafe_load_store(T_OBJECT, LS_get_set, Volatile); @@ -2849,6 +2870,48 @@ bool LibraryCallKit::inline_unsafe_load_store(const BasicType type, const LoadSt // longs, and Object. Adding others should be straightforward. Node* load_store = NULL; switch(type) { + case T_BYTE: + switch(kind) { + case LS_get_add: + load_store = _gvn.transform(new GetAndAddBNode(control(), mem, adr, newval, adr_type)); + break; + case LS_get_set: + load_store = _gvn.transform(new GetAndSetBNode(control(), mem, adr, newval, adr_type)); + break; + case LS_cmp_swap_weak: + load_store = _gvn.transform(new WeakCompareAndSwapBNode(control(), mem, adr, newval, oldval, mo)); + break; + case LS_cmp_swap: + load_store = _gvn.transform(new CompareAndSwapBNode(control(), mem, adr, newval, oldval, mo)); + break; + case LS_cmp_exchange: + load_store = _gvn.transform(new CompareAndExchangeBNode(control(), mem, adr, newval, oldval, adr_type, mo)); + break; + default: + ShouldNotReachHere(); + } + break; + case T_SHORT: + switch(kind) { + case LS_get_add: + load_store = _gvn.transform(new GetAndAddSNode(control(), mem, adr, newval, adr_type)); + break; + case LS_get_set: + load_store = _gvn.transform(new GetAndSetSNode(control(), mem, adr, newval, adr_type)); + break; + case LS_cmp_swap_weak: + load_store = _gvn.transform(new WeakCompareAndSwapSNode(control(), mem, adr, newval, oldval, mo)); + break; + case LS_cmp_swap: + load_store = _gvn.transform(new CompareAndSwapSNode(control(), mem, adr, newval, oldval, mo)); + break; + case LS_cmp_exchange: + load_store = _gvn.transform(new CompareAndExchangeSNode(control(), mem, adr, newval, oldval, adr_type, mo)); + break; + default: + ShouldNotReachHere(); + } + break; case T_INT: switch(kind) { case LS_get_add: diff --git a/hotspot/src/share/vm/opto/loopTransform.cpp b/hotspot/src/share/vm/opto/loopTransform.cpp index 7e33dc3dd84..27b9ee63933 100644 --- a/hotspot/src/share/vm/opto/loopTransform.cpp +++ b/hotspot/src/share/vm/opto/loopTransform.cpp @@ -2484,14 +2484,20 @@ void IdealLoopTree::adjust_loop_exit_prob( PhaseIdealLoop *phase ) { ((bol->in(1)->Opcode() == Op_StorePConditional ) || (bol->in(1)->Opcode() == Op_StoreIConditional ) || (bol->in(1)->Opcode() == Op_StoreLConditional ) || + (bol->in(1)->Opcode() == Op_CompareAndExchangeB ) || + (bol->in(1)->Opcode() == Op_CompareAndExchangeS ) || (bol->in(1)->Opcode() == Op_CompareAndExchangeI ) || (bol->in(1)->Opcode() == Op_CompareAndExchangeL ) || (bol->in(1)->Opcode() == Op_CompareAndExchangeP ) || (bol->in(1)->Opcode() == Op_CompareAndExchangeN ) || + (bol->in(1)->Opcode() == Op_WeakCompareAndSwapB ) || + (bol->in(1)->Opcode() == Op_WeakCompareAndSwapS ) || (bol->in(1)->Opcode() == Op_WeakCompareAndSwapI ) || (bol->in(1)->Opcode() == Op_WeakCompareAndSwapL ) || (bol->in(1)->Opcode() == Op_WeakCompareAndSwapP ) || (bol->in(1)->Opcode() == Op_WeakCompareAndSwapN ) || + (bol->in(1)->Opcode() == Op_CompareAndSwapB ) || + (bol->in(1)->Opcode() == Op_CompareAndSwapS ) || (bol->in(1)->Opcode() == Op_CompareAndSwapI ) || (bol->in(1)->Opcode() == Op_CompareAndSwapL ) || (bol->in(1)->Opcode() == Op_CompareAndSwapP ) || diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/hotspot/src/share/vm/opto/matcher.cpp index ed06b1e7459..e2651559e3b 100644 --- a/hotspot/src/share/vm/opto/matcher.cpp +++ b/hotspot/src/share/vm/opto/matcher.cpp @@ -2228,14 +2228,20 @@ void Matcher::find_shared( Node *n ) { case Op_StorePConditional: case Op_StoreIConditional: case Op_StoreLConditional: + case Op_CompareAndExchangeB: + case Op_CompareAndExchangeS: case Op_CompareAndExchangeI: case Op_CompareAndExchangeL: case Op_CompareAndExchangeP: case Op_CompareAndExchangeN: + case Op_WeakCompareAndSwapB: + case Op_WeakCompareAndSwapS: case Op_WeakCompareAndSwapI: case Op_WeakCompareAndSwapL: case Op_WeakCompareAndSwapP: case Op_WeakCompareAndSwapN: + case Op_CompareAndSwapB: + case Op_CompareAndSwapS: case Op_CompareAndSwapI: case Op_CompareAndSwapL: case Op_CompareAndSwapP: @@ -2453,14 +2459,20 @@ bool Matcher::post_store_load_barrier(const Node* vmb) { // that a monitor exit operation contains a serializing instruction. if (xop == Op_MemBarVolatile || + xop == Op_CompareAndExchangeB || + xop == Op_CompareAndExchangeS || xop == Op_CompareAndExchangeI || xop == Op_CompareAndExchangeL || xop == Op_CompareAndExchangeP || xop == Op_CompareAndExchangeN || + xop == Op_WeakCompareAndSwapB || + xop == Op_WeakCompareAndSwapS || xop == Op_WeakCompareAndSwapL || xop == Op_WeakCompareAndSwapP || xop == Op_WeakCompareAndSwapN || xop == Op_WeakCompareAndSwapI || + xop == Op_CompareAndSwapB || + xop == Op_CompareAndSwapS || xop == Op_CompareAndSwapL || xop == Op_CompareAndSwapP || xop == Op_CompareAndSwapN || diff --git a/hotspot/src/share/vm/opto/memnode.hpp b/hotspot/src/share/vm/opto/memnode.hpp index 438fc7476e6..f0608bc752d 100644 --- a/hotspot/src/share/vm/opto/memnode.hpp +++ b/hotspot/src/share/vm/opto/memnode.hpp @@ -885,13 +885,19 @@ public: } }; -//------------------------------CompareAndSwapLNode--------------------------- -class CompareAndSwapLNode : public CompareAndSwapNode { +//------------------------------CompareAndSwapBNode--------------------------- +class CompareAndSwapBNode : public CompareAndSwapNode { public: - CompareAndSwapLNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, MemNode::MemOrd mem_ord) : CompareAndSwapNode(c, mem, adr, val, ex, mem_ord) { } + CompareAndSwapBNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, MemNode::MemOrd mem_ord) : CompareAndSwapNode(c, mem, adr, val, ex, mem_ord) { } virtual int Opcode() const; }; +//------------------------------CompareAndSwapSNode--------------------------- +class CompareAndSwapSNode : public CompareAndSwapNode { +public: + CompareAndSwapSNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, MemNode::MemOrd mem_ord) : CompareAndSwapNode(c, mem, adr, val, ex, mem_ord) { } + virtual int Opcode() const; +}; //------------------------------CompareAndSwapINode--------------------------- class CompareAndSwapINode : public CompareAndSwapNode { @@ -900,6 +906,12 @@ public: virtual int Opcode() const; }; +//------------------------------CompareAndSwapLNode--------------------------- +class CompareAndSwapLNode : public CompareAndSwapNode { +public: + CompareAndSwapLNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, MemNode::MemOrd mem_ord) : CompareAndSwapNode(c, mem, adr, val, ex, mem_ord) { } + virtual int Opcode() const; +}; //------------------------------CompareAndSwapPNode--------------------------- class CompareAndSwapPNode : public CompareAndSwapNode { @@ -915,14 +927,19 @@ public: virtual int Opcode() const; }; - -//------------------------------WeakCompareAndSwapLNode--------------------------- -class WeakCompareAndSwapLNode : public CompareAndSwapNode { +//------------------------------WeakCompareAndSwapBNode--------------------------- +class WeakCompareAndSwapBNode : public CompareAndSwapNode { public: - WeakCompareAndSwapLNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, MemNode::MemOrd mem_ord) : CompareAndSwapNode(c, mem, adr, val, ex, mem_ord) { } + WeakCompareAndSwapBNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, MemNode::MemOrd mem_ord) : CompareAndSwapNode(c, mem, adr, val, ex, mem_ord) { } virtual int Opcode() const; }; +//------------------------------WeakCompareAndSwapSNode--------------------------- +class WeakCompareAndSwapSNode : public CompareAndSwapNode { +public: + WeakCompareAndSwapSNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, MemNode::MemOrd mem_ord) : CompareAndSwapNode(c, mem, adr, val, ex, mem_ord) { } + virtual int Opcode() const; +}; //------------------------------WeakCompareAndSwapINode--------------------------- class WeakCompareAndSwapINode : public CompareAndSwapNode { @@ -931,6 +948,12 @@ public: virtual int Opcode() const; }; +//------------------------------WeakCompareAndSwapLNode--------------------------- +class WeakCompareAndSwapLNode : public CompareAndSwapNode { +public: + WeakCompareAndSwapLNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, MemNode::MemOrd mem_ord) : CompareAndSwapNode(c, mem, adr, val, ex, mem_ord) { } + virtual int Opcode() const; +}; //------------------------------WeakCompareAndSwapPNode--------------------------- class WeakCompareAndSwapPNode : public CompareAndSwapNode { @@ -946,6 +969,21 @@ public: virtual int Opcode() const; }; +//------------------------------CompareAndExchangeBNode--------------------------- +class CompareAndExchangeBNode : public CompareAndExchangeNode { +public: + CompareAndExchangeBNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, const TypePtr* at, MemNode::MemOrd mem_ord) : CompareAndExchangeNode(c, mem, adr, val, ex, mem_ord, at, TypeInt::BYTE) { } + virtual int Opcode() const; +}; + + +//------------------------------CompareAndExchangeSNode--------------------------- +class CompareAndExchangeSNode : public CompareAndExchangeNode { +public: + CompareAndExchangeSNode( Node *c, Node *mem, Node *adr, Node *val, Node *ex, const TypePtr* at, MemNode::MemOrd mem_ord) : CompareAndExchangeNode(c, mem, adr, val, ex, mem_ord, at, TypeInt::SHORT) { } + virtual int Opcode() const; +}; + //------------------------------CompareAndExchangeLNode--------------------------- class CompareAndExchangeLNode : public CompareAndExchangeNode { public: @@ -976,6 +1014,20 @@ public: virtual int Opcode() const; }; +//------------------------------GetAndAddBNode--------------------------- +class GetAndAddBNode : public LoadStoreNode { +public: + GetAndAddBNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at ) : LoadStoreNode(c, mem, adr, val, at, TypeInt::BYTE, 4) { } + virtual int Opcode() const; +}; + +//------------------------------GetAndAddSNode--------------------------- +class GetAndAddSNode : public LoadStoreNode { +public: + GetAndAddSNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at ) : LoadStoreNode(c, mem, adr, val, at, TypeInt::SHORT, 4) { } + virtual int Opcode() const; +}; + //------------------------------GetAndAddINode--------------------------- class GetAndAddINode : public LoadStoreNode { public: @@ -990,6 +1042,19 @@ public: virtual int Opcode() const; }; +//------------------------------GetAndSetBNode--------------------------- +class GetAndSetBNode : public LoadStoreNode { +public: + GetAndSetBNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at ) : LoadStoreNode(c, mem, adr, val, at, TypeInt::BYTE, 4) { } + virtual int Opcode() const; +}; + +//------------------------------GetAndSetSNode--------------------------- +class GetAndSetSNode : public LoadStoreNode { +public: + GetAndSetSNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at ) : LoadStoreNode(c, mem, adr, val, at, TypeInt::SHORT, 4) { } + virtual int Opcode() const; +}; //------------------------------GetAndSetINode--------------------------- class GetAndSetINode : public LoadStoreNode { @@ -998,7 +1063,7 @@ public: virtual int Opcode() const; }; -//------------------------------GetAndSetINode--------------------------- +//------------------------------GetAndSetLNode--------------------------- class GetAndSetLNode : public LoadStoreNode { public: GetAndSetLNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at ) : LoadStoreNode(c, mem, adr, val, at, TypeLong::LONG, 4) { } diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp index dab3dbbd629..610dc13c227 100644 --- a/hotspot/src/share/vm/runtime/vmStructs.cpp +++ b/hotspot/src/share/vm/runtime/vmStructs.cpp @@ -2024,15 +2024,21 @@ typedef CompactHashtable SymbolCompactHashTable; declare_c2_type(StorePConditionalNode, LoadStoreNode) \ declare_c2_type(StoreLConditionalNode, LoadStoreNode) \ declare_c2_type(CompareAndSwapNode, LoadStoreConditionalNode) \ + declare_c2_type(CompareAndSwapBNode, CompareAndSwapNode) \ + declare_c2_type(CompareAndSwapSNode, CompareAndSwapNode) \ declare_c2_type(CompareAndSwapLNode, CompareAndSwapNode) \ declare_c2_type(CompareAndSwapINode, CompareAndSwapNode) \ declare_c2_type(CompareAndSwapPNode, CompareAndSwapNode) \ declare_c2_type(CompareAndSwapNNode, CompareAndSwapNode) \ + declare_c2_type(WeakCompareAndSwapBNode, CompareAndSwapNode) \ + declare_c2_type(WeakCompareAndSwapSNode, CompareAndSwapNode) \ declare_c2_type(WeakCompareAndSwapLNode, CompareAndSwapNode) \ declare_c2_type(WeakCompareAndSwapINode, CompareAndSwapNode) \ declare_c2_type(WeakCompareAndSwapPNode, CompareAndSwapNode) \ declare_c2_type(WeakCompareAndSwapNNode, CompareAndSwapNode) \ declare_c2_type(CompareAndExchangeNode, LoadStoreNode) \ + declare_c2_type(CompareAndExchangeBNode, CompareAndExchangeNode) \ + declare_c2_type(CompareAndExchangeSNode, CompareAndExchangeNode) \ declare_c2_type(CompareAndExchangeLNode, CompareAndExchangeNode) \ declare_c2_type(CompareAndExchangeINode, CompareAndExchangeNode) \ declare_c2_type(CompareAndExchangePNode, CompareAndExchangeNode) \ diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java index 96c1a82b971..816977dfb53 100644 --- a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java +++ b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestBoolean.java @@ -144,6 +144,115 @@ public class JdkInternalMiscUnsafeAccessTestBoolean { } + UNSAFE.putBoolean(base, offset, true); + + // Compare + { + boolean r = UNSAFE.compareAndSwapBoolean(base, offset, true, false); + assertEquals(r, true, "success compareAndSwap boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, false, "success compareAndSwap boolean value"); + } + + { + boolean r = UNSAFE.compareAndSwapBoolean(base, offset, true, false); + assertEquals(r, false, "failing compareAndSwap boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, false, "failing compareAndSwap boolean value"); + } + + // Advanced compare + { + boolean r = UNSAFE.compareAndExchangeBooleanVolatile(base, offset, false, true); + assertEquals(r, false, "success compareAndExchangeVolatile boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, true, "success compareAndExchangeVolatile boolean value"); + } + + { + boolean r = UNSAFE.compareAndExchangeBooleanVolatile(base, offset, false, false); + assertEquals(r, true, "failing compareAndExchangeVolatile boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, true, "failing compareAndExchangeVolatile boolean value"); + } + + { + boolean r = UNSAFE.compareAndExchangeBooleanAcquire(base, offset, true, false); + assertEquals(r, true, "success compareAndExchangeAcquire boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, false, "success compareAndExchangeAcquire boolean value"); + } + + { + boolean r = UNSAFE.compareAndExchangeBooleanAcquire(base, offset, true, false); + assertEquals(r, false, "failing compareAndExchangeAcquire boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, false, "failing compareAndExchangeAcquire boolean value"); + } + + { + boolean r = UNSAFE.compareAndExchangeBooleanRelease(base, offset, false, true); + assertEquals(r, false, "success compareAndExchangeRelease boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, true, "success compareAndExchangeRelease boolean value"); + } + + { + boolean r = UNSAFE.compareAndExchangeBooleanRelease(base, offset, false, false); + assertEquals(r, true, "failing compareAndExchangeRelease boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, true, "failing compareAndExchangeRelease boolean value"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapBoolean(base, offset, true, false); + } + assertEquals(success, true, "weakCompareAndSwap boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, false, "weakCompareAndSwap boolean value"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapBooleanAcquire(base, offset, false, true); + } + assertEquals(success, true, "weakCompareAndSwapAcquire boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, true, "weakCompareAndSwapAcquire boolean"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapBooleanRelease(base, offset, true, false); + } + assertEquals(success, true, "weakCompareAndSwapRelease boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, false, "weakCompareAndSwapRelease boolean"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapBooleanVolatile(base, offset, false, true); + } + assertEquals(success, true, "weakCompareAndSwapVolatile boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, true, "weakCompareAndSwapVolatile boolean"); + } + + UNSAFE.putBoolean(base, offset, false); + + // Compare set and get + { + boolean o = UNSAFE.getAndSetBoolean(base, offset, true); + assertEquals(o, false, "getAndSet boolean"); + boolean x = UNSAFE.getBoolean(base, offset); + assertEquals(x, true, "getAndSet boolean value"); + } } diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java index 2b5438e7c30..9ce6f053fda 100644 --- a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java +++ b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestByte.java @@ -145,43 +145,161 @@ public class JdkInternalMiscUnsafeAccessTestByte { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putByte(base, offset, (byte)1); + UNSAFE.putByte(base, offset, (byte)0x01); byte x = UNSAFE.getByte(base, offset); - assertEquals(x, (byte)1, "set byte value"); + assertEquals(x, (byte)0x01, "set byte value"); } // Volatile { - UNSAFE.putByteVolatile(base, offset, (byte)2); + UNSAFE.putByteVolatile(base, offset, (byte)0x23); byte x = UNSAFE.getByteVolatile(base, offset); - assertEquals(x, (byte)2, "putVolatile byte value"); + assertEquals(x, (byte)0x23, "putVolatile byte value"); } // Lazy { - UNSAFE.putByteRelease(base, offset, (byte)1); + UNSAFE.putByteRelease(base, offset, (byte)0x01); byte x = UNSAFE.getByteAcquire(base, offset); - assertEquals(x, (byte)1, "putRelease byte value"); + assertEquals(x, (byte)0x01, "putRelease byte value"); } // Opaque { - UNSAFE.putByteOpaque(base, offset, (byte)2); + UNSAFE.putByteOpaque(base, offset, (byte)0x23); byte x = UNSAFE.getByteOpaque(base, offset); - assertEquals(x, (byte)2, "putOpaque byte value"); + assertEquals(x, (byte)0x23, "putOpaque byte value"); } + UNSAFE.putByte(base, offset, (byte)0x01); + // Compare + { + boolean r = UNSAFE.compareAndSwapByte(base, offset, (byte)0x01, (byte)0x23); + assertEquals(r, true, "success compareAndSwap byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x23, "success compareAndSwap byte value"); + } + + { + boolean r = UNSAFE.compareAndSwapByte(base, offset, (byte)0x01, (byte)0x45); + assertEquals(r, false, "failing compareAndSwap byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x23, "failing compareAndSwap byte value"); + } + + // Advanced compare + { + byte r = UNSAFE.compareAndExchangeByteVolatile(base, offset, (byte)0x23, (byte)0x01); + assertEquals(r, (byte)0x23, "success compareAndExchangeVolatile byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x01, "success compareAndExchangeVolatile byte value"); + } + + { + byte r = UNSAFE.compareAndExchangeByteVolatile(base, offset, (byte)0x23, (byte)0x45); + assertEquals(r, (byte)0x01, "failing compareAndExchangeVolatile byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x01, "failing compareAndExchangeVolatile byte value"); + } + + { + byte r = UNSAFE.compareAndExchangeByteAcquire(base, offset, (byte)0x01, (byte)0x23); + assertEquals(r, (byte)0x01, "success compareAndExchangeAcquire byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x23, "success compareAndExchangeAcquire byte value"); + } + + { + byte r = UNSAFE.compareAndExchangeByteAcquire(base, offset, (byte)0x01, (byte)0x45); + assertEquals(r, (byte)0x23, "failing compareAndExchangeAcquire byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x23, "failing compareAndExchangeAcquire byte value"); + } + + { + byte r = UNSAFE.compareAndExchangeByteRelease(base, offset, (byte)0x23, (byte)0x01); + assertEquals(r, (byte)0x23, "success compareAndExchangeRelease byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x01, "success compareAndExchangeRelease byte value"); + } + + { + byte r = UNSAFE.compareAndExchangeByteRelease(base, offset, (byte)0x23, (byte)0x45); + assertEquals(r, (byte)0x01, "failing compareAndExchangeRelease byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x01, "failing compareAndExchangeRelease byte value"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapByte(base, offset, (byte)0x01, (byte)0x23); + } + assertEquals(success, true, "weakCompareAndSwap byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x23, "weakCompareAndSwap byte value"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapByteAcquire(base, offset, (byte)0x23, (byte)0x01); + } + assertEquals(success, true, "weakCompareAndSwapAcquire byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x01, "weakCompareAndSwapAcquire byte"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapByteRelease(base, offset, (byte)0x01, (byte)0x23); + } + assertEquals(success, true, "weakCompareAndSwapRelease byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x23, "weakCompareAndSwapRelease byte"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapByteVolatile(base, offset, (byte)0x23, (byte)0x01); + } + assertEquals(success, true, "weakCompareAndSwapVolatile byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x01, "weakCompareAndSwapVolatile byte"); + } + + UNSAFE.putByte(base, offset, (byte)0x23); + + // Compare set and get + { + byte o = UNSAFE.getAndSetByte(base, offset, (byte)0x01); + assertEquals(o, (byte)0x23, "getAndSet byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)0x01, "getAndSet byte value"); + } + + UNSAFE.putByte(base, offset, (byte)0x01); + + // get and add, add and get + { + byte o = UNSAFE.getAndAddByte(base, offset, (byte)0x23); + assertEquals(o, (byte)0x01, "getAndAdd byte"); + byte x = UNSAFE.getByte(base, offset); + assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAdd byte"); + } } static void testAccess(long address) { // Plain { - UNSAFE.putByte(address, (byte)1); + UNSAFE.putByte(address, (byte)0x01); byte x = UNSAFE.getByte(address); - assertEquals(x, (byte)1, "set byte value"); + assertEquals(x, (byte)0x01, "set byte value"); } } } diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java index 67f425826d3..df81a2fe941 100644 --- a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java +++ b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestChar.java @@ -145,61 +145,179 @@ public class JdkInternalMiscUnsafeAccessTestChar { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putChar(base, offset, 'a'); + UNSAFE.putChar(base, offset, '\u0123'); char x = UNSAFE.getChar(base, offset); - assertEquals(x, 'a', "set char value"); + assertEquals(x, '\u0123', "set char value"); } // Volatile { - UNSAFE.putCharVolatile(base, offset, 'b'); + UNSAFE.putCharVolatile(base, offset, '\u4567'); char x = UNSAFE.getCharVolatile(base, offset); - assertEquals(x, 'b', "putVolatile char value"); + assertEquals(x, '\u4567', "putVolatile char value"); } // Lazy { - UNSAFE.putCharRelease(base, offset, 'a'); + UNSAFE.putCharRelease(base, offset, '\u0123'); char x = UNSAFE.getCharAcquire(base, offset); - assertEquals(x, 'a', "putRelease char value"); + assertEquals(x, '\u0123', "putRelease char value"); } // Opaque { - UNSAFE.putCharOpaque(base, offset, 'b'); + UNSAFE.putCharOpaque(base, offset, '\u4567'); char x = UNSAFE.getCharOpaque(base, offset); - assertEquals(x, 'b', "putOpaque char value"); + assertEquals(x, '\u4567', "putOpaque char value"); } // Unaligned { - UNSAFE.putCharUnaligned(base, offset, 'b'); + UNSAFE.putCharUnaligned(base, offset, '\u4567'); char x = UNSAFE.getCharUnaligned(base, offset); - assertEquals(x, 'b', "putUnaligned char value"); + assertEquals(x, '\u4567', "putUnaligned char value"); } { - UNSAFE.putCharUnaligned(base, offset, 'a', true); + UNSAFE.putCharUnaligned(base, offset, '\u0123', true); char x = UNSAFE.getCharUnaligned(base, offset, true); - assertEquals(x, 'a', "putUnaligned big endian char value"); + assertEquals(x, '\u0123', "putUnaligned big endian char value"); } { - UNSAFE.putCharUnaligned(base, offset, 'b', false); + UNSAFE.putCharUnaligned(base, offset, '\u4567', false); char x = UNSAFE.getCharUnaligned(base, offset, false); - assertEquals(x, 'b', "putUnaligned little endian char value"); + assertEquals(x, '\u4567', "putUnaligned little endian char value"); } + UNSAFE.putChar(base, offset, '\u0123'); + // Compare + { + boolean r = UNSAFE.compareAndSwapChar(base, offset, '\u0123', '\u4567'); + assertEquals(r, true, "success compareAndSwap char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u4567', "success compareAndSwap char value"); + } + + { + boolean r = UNSAFE.compareAndSwapChar(base, offset, '\u0123', '\u89AB'); + assertEquals(r, false, "failing compareAndSwap char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u4567', "failing compareAndSwap char value"); + } + + // Advanced compare + { + char r = UNSAFE.compareAndExchangeCharVolatile(base, offset, '\u4567', '\u0123'); + assertEquals(r, '\u4567', "success compareAndExchangeVolatile char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u0123', "success compareAndExchangeVolatile char value"); + } + + { + char r = UNSAFE.compareAndExchangeCharVolatile(base, offset, '\u4567', '\u89AB'); + assertEquals(r, '\u0123', "failing compareAndExchangeVolatile char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u0123', "failing compareAndExchangeVolatile char value"); + } + + { + char r = UNSAFE.compareAndExchangeCharAcquire(base, offset, '\u0123', '\u4567'); + assertEquals(r, '\u0123', "success compareAndExchangeAcquire char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u4567', "success compareAndExchangeAcquire char value"); + } + + { + char r = UNSAFE.compareAndExchangeCharAcquire(base, offset, '\u0123', '\u89AB'); + assertEquals(r, '\u4567', "failing compareAndExchangeAcquire char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u4567', "failing compareAndExchangeAcquire char value"); + } + + { + char r = UNSAFE.compareAndExchangeCharRelease(base, offset, '\u4567', '\u0123'); + assertEquals(r, '\u4567', "success compareAndExchangeRelease char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u0123', "success compareAndExchangeRelease char value"); + } + + { + char r = UNSAFE.compareAndExchangeCharRelease(base, offset, '\u4567', '\u89AB'); + assertEquals(r, '\u0123', "failing compareAndExchangeRelease char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u0123', "failing compareAndExchangeRelease char value"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapChar(base, offset, '\u0123', '\u4567'); + } + assertEquals(success, true, "weakCompareAndSwap char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u4567', "weakCompareAndSwap char value"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapCharAcquire(base, offset, '\u4567', '\u0123'); + } + assertEquals(success, true, "weakCompareAndSwapAcquire char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u0123', "weakCompareAndSwapAcquire char"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapCharRelease(base, offset, '\u0123', '\u4567'); + } + assertEquals(success, true, "weakCompareAndSwapRelease char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u4567', "weakCompareAndSwapRelease char"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapCharVolatile(base, offset, '\u4567', '\u0123'); + } + assertEquals(success, true, "weakCompareAndSwapVolatile char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u0123', "weakCompareAndSwapVolatile char"); + } + + UNSAFE.putChar(base, offset, '\u4567'); + + // Compare set and get + { + char o = UNSAFE.getAndSetChar(base, offset, '\u0123'); + assertEquals(o, '\u4567', "getAndSet char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, '\u0123', "getAndSet char value"); + } + + UNSAFE.putChar(base, offset, '\u0123'); + + // get and add, add and get + { + char o = UNSAFE.getAndAddChar(base, offset, '\u4567'); + assertEquals(o, '\u0123', "getAndAdd char"); + char x = UNSAFE.getChar(base, offset); + assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAdd char"); + } } static void testAccess(long address) { // Plain { - UNSAFE.putChar(address, 'a'); + UNSAFE.putChar(address, '\u0123'); char x = UNSAFE.getChar(address); - assertEquals(x, 'a', "set char value"); + assertEquals(x, '\u0123', "set char value"); } } } diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java index 817e78da0bd..6428c0d55e4 100644 --- a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java +++ b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestInt.java @@ -145,179 +145,179 @@ public class JdkInternalMiscUnsafeAccessTestInt { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putInt(base, offset, 1); + UNSAFE.putInt(base, offset, 0x01234567); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "set int value"); + assertEquals(x, 0x01234567, "set int value"); } // Volatile { - UNSAFE.putIntVolatile(base, offset, 2); + UNSAFE.putIntVolatile(base, offset, 0x89ABCDEF); int x = UNSAFE.getIntVolatile(base, offset); - assertEquals(x, 2, "putVolatile int value"); + assertEquals(x, 0x89ABCDEF, "putVolatile int value"); } // Lazy { - UNSAFE.putIntRelease(base, offset, 1); + UNSAFE.putIntRelease(base, offset, 0x01234567); int x = UNSAFE.getIntAcquire(base, offset); - assertEquals(x, 1, "putRelease int value"); + assertEquals(x, 0x01234567, "putRelease int value"); } // Opaque { - UNSAFE.putIntOpaque(base, offset, 2); + UNSAFE.putIntOpaque(base, offset, 0x89ABCDEF); int x = UNSAFE.getIntOpaque(base, offset); - assertEquals(x, 2, "putOpaque int value"); + assertEquals(x, 0x89ABCDEF, "putOpaque int value"); } // Unaligned { - UNSAFE.putIntUnaligned(base, offset, 2); + UNSAFE.putIntUnaligned(base, offset, 0x89ABCDEF); int x = UNSAFE.getIntUnaligned(base, offset); - assertEquals(x, 2, "putUnaligned int value"); + assertEquals(x, 0x89ABCDEF, "putUnaligned int value"); } { - UNSAFE.putIntUnaligned(base, offset, 1, true); + UNSAFE.putIntUnaligned(base, offset, 0x01234567, true); int x = UNSAFE.getIntUnaligned(base, offset, true); - assertEquals(x, 1, "putUnaligned big endian int value"); + assertEquals(x, 0x01234567, "putUnaligned big endian int value"); } { - UNSAFE.putIntUnaligned(base, offset, 2, false); + UNSAFE.putIntUnaligned(base, offset, 0x89ABCDEF, false); int x = UNSAFE.getIntUnaligned(base, offset, false); - assertEquals(x, 2, "putUnaligned little endian int value"); + assertEquals(x, 0x89ABCDEF, "putUnaligned little endian int value"); } - UNSAFE.putInt(base, offset, 1); + UNSAFE.putInt(base, offset, 0x01234567); // Compare { - boolean r = UNSAFE.compareAndSwapInt(base, offset, 1, 2); + boolean r = UNSAFE.compareAndSwapInt(base, offset, 0x01234567, 0x89ABCDEF); assertEquals(r, true, "success compareAndSwap int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 2, "success compareAndSwap int value"); + assertEquals(x, 0x89ABCDEF, "success compareAndSwap int value"); } { - boolean r = UNSAFE.compareAndSwapInt(base, offset, 1, 3); + boolean r = UNSAFE.compareAndSwapInt(base, offset, 0x01234567, 0xCAFEBABE); assertEquals(r, false, "failing compareAndSwap int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 2, "failing compareAndSwap int value"); + assertEquals(x, 0x89ABCDEF, "failing compareAndSwap int value"); } // Advanced compare { - int r = UNSAFE.compareAndExchangeIntVolatile(base, offset, 2, 1); - assertEquals(r, 2, "success compareAndExchangeVolatile int"); + int r = UNSAFE.compareAndExchangeIntVolatile(base, offset, 0x89ABCDEF, 0x01234567); + assertEquals(r, 0x89ABCDEF, "success compareAndExchangeVolatile int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "success compareAndExchangeVolatile int value"); + assertEquals(x, 0x01234567, "success compareAndExchangeVolatile int value"); } { - int r = UNSAFE.compareAndExchangeIntVolatile(base, offset, 2, 3); - assertEquals(r, 1, "failing compareAndExchangeVolatile int"); + int r = UNSAFE.compareAndExchangeIntVolatile(base, offset, 0x89ABCDEF, 0xCAFEBABE); + assertEquals(r, 0x01234567, "failing compareAndExchangeVolatile int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "failing compareAndExchangeVolatile int value"); + assertEquals(x, 0x01234567, "failing compareAndExchangeVolatile int value"); } { - int r = UNSAFE.compareAndExchangeIntAcquire(base, offset, 1, 2); - assertEquals(r, 1, "success compareAndExchangeAcquire int"); + int r = UNSAFE.compareAndExchangeIntAcquire(base, offset, 0x01234567, 0x89ABCDEF); + assertEquals(r, 0x01234567, "success compareAndExchangeAcquire int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 2, "success compareAndExchangeAcquire int value"); + assertEquals(x, 0x89ABCDEF, "success compareAndExchangeAcquire int value"); } { - int r = UNSAFE.compareAndExchangeIntAcquire(base, offset, 1, 3); - assertEquals(r, 2, "failing compareAndExchangeAcquire int"); + int r = UNSAFE.compareAndExchangeIntAcquire(base, offset, 0x01234567, 0xCAFEBABE); + assertEquals(r, 0x89ABCDEF, "failing compareAndExchangeAcquire int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 2, "failing compareAndExchangeAcquire int value"); + assertEquals(x, 0x89ABCDEF, "failing compareAndExchangeAcquire int value"); } { - int r = UNSAFE.compareAndExchangeIntRelease(base, offset, 2, 1); - assertEquals(r, 2, "success compareAndExchangeRelease int"); + int r = UNSAFE.compareAndExchangeIntRelease(base, offset, 0x89ABCDEF, 0x01234567); + assertEquals(r, 0x89ABCDEF, "success compareAndExchangeRelease int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "success compareAndExchangeRelease int value"); + assertEquals(x, 0x01234567, "success compareAndExchangeRelease int value"); } { - int r = UNSAFE.compareAndExchangeIntRelease(base, offset, 2, 3); - assertEquals(r, 1, "failing compareAndExchangeRelease int"); + int r = UNSAFE.compareAndExchangeIntRelease(base, offset, 0x89ABCDEF, 0xCAFEBABE); + assertEquals(r, 0x01234567, "failing compareAndExchangeRelease int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "failing compareAndExchangeRelease int value"); + assertEquals(x, 0x01234567, "failing compareAndExchangeRelease int value"); } { boolean success = false; for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { - success = UNSAFE.weakCompareAndSwapInt(base, offset, 1, 2); + success = UNSAFE.weakCompareAndSwapInt(base, offset, 0x01234567, 0x89ABCDEF); } assertEquals(success, true, "weakCompareAndSwap int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 2, "weakCompareAndSwap int value"); + assertEquals(x, 0x89ABCDEF, "weakCompareAndSwap int value"); } { boolean success = false; for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { - success = UNSAFE.weakCompareAndSwapIntAcquire(base, offset, 2, 1); + success = UNSAFE.weakCompareAndSwapIntAcquire(base, offset, 0x89ABCDEF, 0x01234567); } assertEquals(success, true, "weakCompareAndSwapAcquire int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "weakCompareAndSwapAcquire int"); + assertEquals(x, 0x01234567, "weakCompareAndSwapAcquire int"); } { boolean success = false; for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { - success = UNSAFE.weakCompareAndSwapIntRelease(base, offset, 1, 2); + success = UNSAFE.weakCompareAndSwapIntRelease(base, offset, 0x01234567, 0x89ABCDEF); } assertEquals(success, true, "weakCompareAndSwapRelease int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 2, "weakCompareAndSwapRelease int"); + assertEquals(x, 0x89ABCDEF, "weakCompareAndSwapRelease int"); } { boolean success = false; for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { - success = UNSAFE.weakCompareAndSwapIntVolatile(base, offset, 2, 1); + success = UNSAFE.weakCompareAndSwapIntVolatile(base, offset, 0x89ABCDEF, 0x01234567); } assertEquals(success, true, "weakCompareAndSwapVolatile int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "weakCompareAndSwapVolatile int"); + assertEquals(x, 0x01234567, "weakCompareAndSwapVolatile int"); } - UNSAFE.putInt(base, offset, 2); + UNSAFE.putInt(base, offset, 0x89ABCDEF); // Compare set and get { - int o = UNSAFE.getAndSetInt(base, offset, 1); - assertEquals(o, 2, "getAndSet int"); + int o = UNSAFE.getAndSetInt(base, offset, 0x01234567); + assertEquals(o, 0x89ABCDEF, "getAndSet int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "getAndSet int value"); + assertEquals(x, 0x01234567, "getAndSet int value"); } - UNSAFE.putInt(base, offset, 1); + UNSAFE.putInt(base, offset, 0x01234567); // get and add, add and get { - int o = UNSAFE.getAndAddInt(base, offset, 2); - assertEquals(o, 1, "getAndAdd int"); + int o = UNSAFE.getAndAddInt(base, offset, 0x89ABCDEF); + assertEquals(o, 0x01234567, "getAndAdd int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1 + 2, "getAndAdd int"); + assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAdd int"); } } static void testAccess(long address) { // Plain { - UNSAFE.putInt(address, 1); + UNSAFE.putInt(address, 0x01234567); int x = UNSAFE.getInt(address); - assertEquals(x, 1, "set int value"); + assertEquals(x, 0x01234567, "set int value"); } } } diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java index d4b88370a65..505681a43af 100644 --- a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java +++ b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestLong.java @@ -145,179 +145,179 @@ public class JdkInternalMiscUnsafeAccessTestLong { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putLong(base, offset, 1L); + UNSAFE.putLong(base, offset, 0x0123456789ABCDEFL); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "set long value"); + assertEquals(x, 0x0123456789ABCDEFL, "set long value"); } // Volatile { - UNSAFE.putLongVolatile(base, offset, 2L); + UNSAFE.putLongVolatile(base, offset, 0xCAFEBABECAFEBABEL); long x = UNSAFE.getLongVolatile(base, offset); - assertEquals(x, 2L, "putVolatile long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "putVolatile long value"); } // Lazy { - UNSAFE.putLongRelease(base, offset, 1L); + UNSAFE.putLongRelease(base, offset, 0x0123456789ABCDEFL); long x = UNSAFE.getLongAcquire(base, offset); - assertEquals(x, 1L, "putRelease long value"); + assertEquals(x, 0x0123456789ABCDEFL, "putRelease long value"); } // Opaque { - UNSAFE.putLongOpaque(base, offset, 2L); + UNSAFE.putLongOpaque(base, offset, 0xCAFEBABECAFEBABEL); long x = UNSAFE.getLongOpaque(base, offset); - assertEquals(x, 2L, "putOpaque long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "putOpaque long value"); } // Unaligned { - UNSAFE.putLongUnaligned(base, offset, 2L); + UNSAFE.putLongUnaligned(base, offset, 0xCAFEBABECAFEBABEL); long x = UNSAFE.getLongUnaligned(base, offset); - assertEquals(x, 2L, "putUnaligned long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "putUnaligned long value"); } { - UNSAFE.putLongUnaligned(base, offset, 1L, true); + UNSAFE.putLongUnaligned(base, offset, 0x0123456789ABCDEFL, true); long x = UNSAFE.getLongUnaligned(base, offset, true); - assertEquals(x, 1L, "putUnaligned big endian long value"); + assertEquals(x, 0x0123456789ABCDEFL, "putUnaligned big endian long value"); } { - UNSAFE.putLongUnaligned(base, offset, 2L, false); + UNSAFE.putLongUnaligned(base, offset, 0xCAFEBABECAFEBABEL, false); long x = UNSAFE.getLongUnaligned(base, offset, false); - assertEquals(x, 2L, "putUnaligned little endian long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "putUnaligned little endian long value"); } - UNSAFE.putLong(base, offset, 1L); + UNSAFE.putLong(base, offset, 0x0123456789ABCDEFL); // Compare { - boolean r = UNSAFE.compareAndSwapLong(base, offset, 1L, 2L); + boolean r = UNSAFE.compareAndSwapLong(base, offset, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL); assertEquals(r, true, "success compareAndSwap long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 2L, "success compareAndSwap long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndSwap long value"); } { - boolean r = UNSAFE.compareAndSwapLong(base, offset, 1L, 3L); + boolean r = UNSAFE.compareAndSwapLong(base, offset, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL); assertEquals(r, false, "failing compareAndSwap long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 2L, "failing compareAndSwap long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndSwap long value"); } // Advanced compare { - long r = UNSAFE.compareAndExchangeLongVolatile(base, offset, 2L, 1L); - assertEquals(r, 2L, "success compareAndExchangeVolatile long"); + long r = UNSAFE.compareAndExchangeLongVolatile(base, offset, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL); + assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchangeVolatile long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "success compareAndExchangeVolatile long value"); + assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchangeVolatile long value"); } { - long r = UNSAFE.compareAndExchangeLongVolatile(base, offset, 2L, 3L); - assertEquals(r, 1L, "failing compareAndExchangeVolatile long"); + long r = UNSAFE.compareAndExchangeLongVolatile(base, offset, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL); + assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchangeVolatile long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "failing compareAndExchangeVolatile long value"); + assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchangeVolatile long value"); } { - long r = UNSAFE.compareAndExchangeLongAcquire(base, offset, 1L, 2L); - assertEquals(r, 1L, "success compareAndExchangeAcquire long"); + long r = UNSAFE.compareAndExchangeLongAcquire(base, offset, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL); + assertEquals(r, 0x0123456789ABCDEFL, "success compareAndExchangeAcquire long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 2L, "success compareAndExchangeAcquire long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndExchangeAcquire long value"); } { - long r = UNSAFE.compareAndExchangeLongAcquire(base, offset, 1L, 3L); - assertEquals(r, 2L, "failing compareAndExchangeAcquire long"); + long r = UNSAFE.compareAndExchangeLongAcquire(base, offset, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL); + assertEquals(r, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 2L, "failing compareAndExchangeAcquire long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long value"); } { - long r = UNSAFE.compareAndExchangeLongRelease(base, offset, 2L, 1L); - assertEquals(r, 2L, "success compareAndExchangeRelease long"); + long r = UNSAFE.compareAndExchangeLongRelease(base, offset, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL); + assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchangeRelease long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "success compareAndExchangeRelease long value"); + assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchangeRelease long value"); } { - long r = UNSAFE.compareAndExchangeLongRelease(base, offset, 2L, 3L); - assertEquals(r, 1L, "failing compareAndExchangeRelease long"); + long r = UNSAFE.compareAndExchangeLongRelease(base, offset, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL); + assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "failing compareAndExchangeRelease long value"); + assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long value"); } { boolean success = false; for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { - success = UNSAFE.weakCompareAndSwapLong(base, offset, 1L, 2L); + success = UNSAFE.weakCompareAndSwapLong(base, offset, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL); } assertEquals(success, true, "weakCompareAndSwap long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 2L, "weakCompareAndSwap long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "weakCompareAndSwap long value"); } { boolean success = false; for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { - success = UNSAFE.weakCompareAndSwapLongAcquire(base, offset, 2L, 1L); + success = UNSAFE.weakCompareAndSwapLongAcquire(base, offset, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL); } assertEquals(success, true, "weakCompareAndSwapAcquire long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "weakCompareAndSwapAcquire long"); + assertEquals(x, 0x0123456789ABCDEFL, "weakCompareAndSwapAcquire long"); } { boolean success = false; for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { - success = UNSAFE.weakCompareAndSwapLongRelease(base, offset, 1L, 2L); + success = UNSAFE.weakCompareAndSwapLongRelease(base, offset, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL); } assertEquals(success, true, "weakCompareAndSwapRelease long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 2L, "weakCompareAndSwapRelease long"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "weakCompareAndSwapRelease long"); } { boolean success = false; for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { - success = UNSAFE.weakCompareAndSwapLongVolatile(base, offset, 2L, 1L); + success = UNSAFE.weakCompareAndSwapLongVolatile(base, offset, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL); } assertEquals(success, true, "weakCompareAndSwapVolatile long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "weakCompareAndSwapVolatile long"); + assertEquals(x, 0x0123456789ABCDEFL, "weakCompareAndSwapVolatile long"); } - UNSAFE.putLong(base, offset, 2L); + UNSAFE.putLong(base, offset, 0xCAFEBABECAFEBABEL); // Compare set and get { - long o = UNSAFE.getAndSetLong(base, offset, 1L); - assertEquals(o, 2L, "getAndSet long"); + long o = UNSAFE.getAndSetLong(base, offset, 0x0123456789ABCDEFL); + assertEquals(o, 0xCAFEBABECAFEBABEL, "getAndSet long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "getAndSet long value"); + assertEquals(x, 0x0123456789ABCDEFL, "getAndSet long value"); } - UNSAFE.putLong(base, offset, 1L); + UNSAFE.putLong(base, offset, 0x0123456789ABCDEFL); // get and add, add and get { - long o = UNSAFE.getAndAddLong(base, offset, 2L); - assertEquals(o, 1L, "getAndAdd long"); + long o = UNSAFE.getAndAddLong(base, offset, 0xCAFEBABECAFEBABEL); + assertEquals(o, 0x0123456789ABCDEFL, "getAndAdd long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L + 2L, "getAndAdd long"); + assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAdd long"); } } static void testAccess(long address) { // Plain { - UNSAFE.putLong(address, 1L); + UNSAFE.putLong(address, 0x0123456789ABCDEFL); long x = UNSAFE.getLong(address); - assertEquals(x, 1L, "set long value"); + assertEquals(x, 0x0123456789ABCDEFL, "set long value"); } } } diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java index a9fab93740b..12ab68cfed7 100644 --- a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java +++ b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestShort.java @@ -145,61 +145,179 @@ public class JdkInternalMiscUnsafeAccessTestShort { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putShort(base, offset, (short)1); + UNSAFE.putShort(base, offset, (short)0x0123); short x = UNSAFE.getShort(base, offset); - assertEquals(x, (short)1, "set short value"); + assertEquals(x, (short)0x0123, "set short value"); } // Volatile { - UNSAFE.putShortVolatile(base, offset, (short)2); + UNSAFE.putShortVolatile(base, offset, (short)0x4567); short x = UNSAFE.getShortVolatile(base, offset); - assertEquals(x, (short)2, "putVolatile short value"); + assertEquals(x, (short)0x4567, "putVolatile short value"); } // Lazy { - UNSAFE.putShortRelease(base, offset, (short)1); + UNSAFE.putShortRelease(base, offset, (short)0x0123); short x = UNSAFE.getShortAcquire(base, offset); - assertEquals(x, (short)1, "putRelease short value"); + assertEquals(x, (short)0x0123, "putRelease short value"); } // Opaque { - UNSAFE.putShortOpaque(base, offset, (short)2); + UNSAFE.putShortOpaque(base, offset, (short)0x4567); short x = UNSAFE.getShortOpaque(base, offset); - assertEquals(x, (short)2, "putOpaque short value"); + assertEquals(x, (short)0x4567, "putOpaque short value"); } // Unaligned { - UNSAFE.putShortUnaligned(base, offset, (short)2); + UNSAFE.putShortUnaligned(base, offset, (short)0x4567); short x = UNSAFE.getShortUnaligned(base, offset); - assertEquals(x, (short)2, "putUnaligned short value"); + assertEquals(x, (short)0x4567, "putUnaligned short value"); } { - UNSAFE.putShortUnaligned(base, offset, (short)1, true); + UNSAFE.putShortUnaligned(base, offset, (short)0x0123, true); short x = UNSAFE.getShortUnaligned(base, offset, true); - assertEquals(x, (short)1, "putUnaligned big endian short value"); + assertEquals(x, (short)0x0123, "putUnaligned big endian short value"); } { - UNSAFE.putShortUnaligned(base, offset, (short)2, false); + UNSAFE.putShortUnaligned(base, offset, (short)0x4567, false); short x = UNSAFE.getShortUnaligned(base, offset, false); - assertEquals(x, (short)2, "putUnaligned little endian short value"); + assertEquals(x, (short)0x4567, "putUnaligned little endian short value"); } + UNSAFE.putShort(base, offset, (short)0x0123); + // Compare + { + boolean r = UNSAFE.compareAndSwapShort(base, offset, (short)0x0123, (short)0x4567); + assertEquals(r, true, "success compareAndSwap short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x4567, "success compareAndSwap short value"); + } + + { + boolean r = UNSAFE.compareAndSwapShort(base, offset, (short)0x0123, (short)0x89AB); + assertEquals(r, false, "failing compareAndSwap short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x4567, "failing compareAndSwap short value"); + } + + // Advanced compare + { + short r = UNSAFE.compareAndExchangeShortVolatile(base, offset, (short)0x4567, (short)0x0123); + assertEquals(r, (short)0x4567, "success compareAndExchangeVolatile short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x0123, "success compareAndExchangeVolatile short value"); + } + + { + short r = UNSAFE.compareAndExchangeShortVolatile(base, offset, (short)0x4567, (short)0x89AB); + assertEquals(r, (short)0x0123, "failing compareAndExchangeVolatile short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x0123, "failing compareAndExchangeVolatile short value"); + } + + { + short r = UNSAFE.compareAndExchangeShortAcquire(base, offset, (short)0x0123, (short)0x4567); + assertEquals(r, (short)0x0123, "success compareAndExchangeAcquire short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x4567, "success compareAndExchangeAcquire short value"); + } + + { + short r = UNSAFE.compareAndExchangeShortAcquire(base, offset, (short)0x0123, (short)0x89AB); + assertEquals(r, (short)0x4567, "failing compareAndExchangeAcquire short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x4567, "failing compareAndExchangeAcquire short value"); + } + + { + short r = UNSAFE.compareAndExchangeShortRelease(base, offset, (short)0x4567, (short)0x0123); + assertEquals(r, (short)0x4567, "success compareAndExchangeRelease short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x0123, "success compareAndExchangeRelease short value"); + } + + { + short r = UNSAFE.compareAndExchangeShortRelease(base, offset, (short)0x4567, (short)0x89AB); + assertEquals(r, (short)0x0123, "failing compareAndExchangeRelease short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x0123, "failing compareAndExchangeRelease short value"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapShort(base, offset, (short)0x0123, (short)0x4567); + } + assertEquals(success, true, "weakCompareAndSwap short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x4567, "weakCompareAndSwap short value"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapShortAcquire(base, offset, (short)0x4567, (short)0x0123); + } + assertEquals(success, true, "weakCompareAndSwapAcquire short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x0123, "weakCompareAndSwapAcquire short"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapShortRelease(base, offset, (short)0x0123, (short)0x4567); + } + assertEquals(success, true, "weakCompareAndSwapRelease short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x4567, "weakCompareAndSwapRelease short"); + } + + { + boolean success = false; + for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) { + success = UNSAFE.weakCompareAndSwapShortVolatile(base, offset, (short)0x4567, (short)0x0123); + } + assertEquals(success, true, "weakCompareAndSwapVolatile short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x0123, "weakCompareAndSwapVolatile short"); + } + + UNSAFE.putShort(base, offset, (short)0x4567); + + // Compare set and get + { + short o = UNSAFE.getAndSetShort(base, offset, (short)0x0123); + assertEquals(o, (short)0x4567, "getAndSet short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)0x0123, "getAndSet short value"); + } + + UNSAFE.putShort(base, offset, (short)0x0123); + + // get and add, add and get + { + short o = UNSAFE.getAndAddShort(base, offset, (short)0x4567); + assertEquals(o, (short)0x0123, "getAndAdd short"); + short x = UNSAFE.getShort(base, offset); + assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAdd short"); + } } static void testAccess(long address) { // Plain { - UNSAFE.putShort(address, (short)1); + UNSAFE.putShort(address, (short)0x0123); short x = UNSAFE.getShort(address); - assertEquals(x, (short)1, "set short value"); + assertEquals(x, (short)0x0123, "set short value"); } } } diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java index 24ab3f86ff9..e15bd64089d 100644 --- a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java +++ b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestByte.java @@ -145,16 +145,16 @@ public class SunMiscUnsafeAccessTestByte { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putByte(base, offset, (byte)1); + UNSAFE.putByte(base, offset, (byte)0x01); byte x = UNSAFE.getByte(base, offset); - assertEquals(x, (byte)1, "set byte value"); + assertEquals(x, (byte)0x01, "set byte value"); } // Volatile { - UNSAFE.putByteVolatile(base, offset, (byte)2); + UNSAFE.putByteVolatile(base, offset, (byte)0x23); byte x = UNSAFE.getByteVolatile(base, offset); - assertEquals(x, (byte)2, "putVolatile byte value"); + assertEquals(x, (byte)0x23, "putVolatile byte value"); } @@ -166,9 +166,9 @@ public class SunMiscUnsafeAccessTestByte { static void testAccess(long address) { // Plain { - UNSAFE.putByte(address, (byte)1); + UNSAFE.putByte(address, (byte)0x01); byte x = UNSAFE.getByte(address); - assertEquals(x, (byte)1, "set byte value"); + assertEquals(x, (byte)0x01, "set byte value"); } } } diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java index 70004792886..3c349085127 100644 --- a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java +++ b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestChar.java @@ -145,16 +145,16 @@ public class SunMiscUnsafeAccessTestChar { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putChar(base, offset, 'a'); + UNSAFE.putChar(base, offset, '\u0123'); char x = UNSAFE.getChar(base, offset); - assertEquals(x, 'a', "set char value"); + assertEquals(x, '\u0123', "set char value"); } // Volatile { - UNSAFE.putCharVolatile(base, offset, 'b'); + UNSAFE.putCharVolatile(base, offset, '\u4567'); char x = UNSAFE.getCharVolatile(base, offset); - assertEquals(x, 'b', "putVolatile char value"); + assertEquals(x, '\u4567', "putVolatile char value"); } @@ -166,9 +166,9 @@ public class SunMiscUnsafeAccessTestChar { static void testAccess(long address) { // Plain { - UNSAFE.putChar(address, 'a'); + UNSAFE.putChar(address, '\u0123'); char x = UNSAFE.getChar(address); - assertEquals(x, 'a', "set char value"); + assertEquals(x, '\u0123', "set char value"); } } } diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java index 4310a6e49ec..5b505ad3d05 100644 --- a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java +++ b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestInt.java @@ -145,71 +145,71 @@ public class SunMiscUnsafeAccessTestInt { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putInt(base, offset, 1); + UNSAFE.putInt(base, offset, 0x01234567); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "set int value"); + assertEquals(x, 0x01234567, "set int value"); } // Volatile { - UNSAFE.putIntVolatile(base, offset, 2); + UNSAFE.putIntVolatile(base, offset, 0x89ABCDEF); int x = UNSAFE.getIntVolatile(base, offset); - assertEquals(x, 2, "putVolatile int value"); + assertEquals(x, 0x89ABCDEF, "putVolatile int value"); } // Lazy { - UNSAFE.putOrderedInt(base, offset, 1); + UNSAFE.putOrderedInt(base, offset, 0x01234567); int x = UNSAFE.getIntVolatile(base, offset); - assertEquals(x, 1, "putRelease int value"); + assertEquals(x, 0x01234567, "putRelease int value"); } - UNSAFE.putInt(base, offset, 1); + UNSAFE.putInt(base, offset, 0x01234567); // Compare { - boolean r = UNSAFE.compareAndSwapInt(base, offset, 1, 2); + boolean r = UNSAFE.compareAndSwapInt(base, offset, 0x01234567, 0x89ABCDEF); assertEquals(r, true, "success compareAndSwap int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 2, "success compareAndSwap int value"); + assertEquals(x, 0x89ABCDEF, "success compareAndSwap int value"); } { - boolean r = UNSAFE.compareAndSwapInt(base, offset, 1, 3); + boolean r = UNSAFE.compareAndSwapInt(base, offset, 0x01234567, 0xCAFEBABE); assertEquals(r, false, "failing compareAndSwap int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 2, "failing compareAndSwap int value"); + assertEquals(x, 0x89ABCDEF, "failing compareAndSwap int value"); } - UNSAFE.putInt(base, offset, 2); + UNSAFE.putInt(base, offset, 0x89ABCDEF); // Compare set and get { - int o = UNSAFE.getAndSetInt(base, offset, 1); - assertEquals(o, 2, "getAndSet int"); + int o = UNSAFE.getAndSetInt(base, offset, 0x01234567); + assertEquals(o, 0x89ABCDEF, "getAndSet int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1, "getAndSet int value"); + assertEquals(x, 0x01234567, "getAndSet int value"); } - UNSAFE.putInt(base, offset, 1); + UNSAFE.putInt(base, offset, 0x01234567); // get and add, add and get { - int o = UNSAFE.getAndAddInt(base, offset, 2); - assertEquals(o, 1, "getAndAdd int"); + int o = UNSAFE.getAndAddInt(base, offset, 0x89ABCDEF); + assertEquals(o, 0x01234567, "getAndAdd int"); int x = UNSAFE.getInt(base, offset); - assertEquals(x, 1 + 2, "getAndAdd int"); + assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAdd int"); } } static void testAccess(long address) { // Plain { - UNSAFE.putInt(address, 1); + UNSAFE.putInt(address, 0x01234567); int x = UNSAFE.getInt(address); - assertEquals(x, 1, "set int value"); + assertEquals(x, 0x01234567, "set int value"); } } } diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java index 6dd6434c774..2864b042886 100644 --- a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java +++ b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestLong.java @@ -145,71 +145,71 @@ public class SunMiscUnsafeAccessTestLong { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putLong(base, offset, 1L); + UNSAFE.putLong(base, offset, 0x0123456789ABCDEFL); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "set long value"); + assertEquals(x, 0x0123456789ABCDEFL, "set long value"); } // Volatile { - UNSAFE.putLongVolatile(base, offset, 2L); + UNSAFE.putLongVolatile(base, offset, 0xCAFEBABECAFEBABEL); long x = UNSAFE.getLongVolatile(base, offset); - assertEquals(x, 2L, "putVolatile long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "putVolatile long value"); } // Lazy { - UNSAFE.putOrderedLong(base, offset, 1L); + UNSAFE.putOrderedLong(base, offset, 0x0123456789ABCDEFL); long x = UNSAFE.getLongVolatile(base, offset); - assertEquals(x, 1L, "putRelease long value"); + assertEquals(x, 0x0123456789ABCDEFL, "putRelease long value"); } - UNSAFE.putLong(base, offset, 1L); + UNSAFE.putLong(base, offset, 0x0123456789ABCDEFL); // Compare { - boolean r = UNSAFE.compareAndSwapLong(base, offset, 1L, 2L); + boolean r = UNSAFE.compareAndSwapLong(base, offset, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL); assertEquals(r, true, "success compareAndSwap long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 2L, "success compareAndSwap long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndSwap long value"); } { - boolean r = UNSAFE.compareAndSwapLong(base, offset, 1L, 3L); + boolean r = UNSAFE.compareAndSwapLong(base, offset, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL); assertEquals(r, false, "failing compareAndSwap long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 2L, "failing compareAndSwap long value"); + assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndSwap long value"); } - UNSAFE.putLong(base, offset, 2L); + UNSAFE.putLong(base, offset, 0xCAFEBABECAFEBABEL); // Compare set and get { - long o = UNSAFE.getAndSetLong(base, offset, 1L); - assertEquals(o, 2L, "getAndSet long"); + long o = UNSAFE.getAndSetLong(base, offset, 0x0123456789ABCDEFL); + assertEquals(o, 0xCAFEBABECAFEBABEL, "getAndSet long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L, "getAndSet long value"); + assertEquals(x, 0x0123456789ABCDEFL, "getAndSet long value"); } - UNSAFE.putLong(base, offset, 1L); + UNSAFE.putLong(base, offset, 0x0123456789ABCDEFL); // get and add, add and get { - long o = UNSAFE.getAndAddLong(base, offset, 2L); - assertEquals(o, 1L, "getAndAdd long"); + long o = UNSAFE.getAndAddLong(base, offset, 0xCAFEBABECAFEBABEL); + assertEquals(o, 0x0123456789ABCDEFL, "getAndAdd long"); long x = UNSAFE.getLong(base, offset); - assertEquals(x, 1L + 2L, "getAndAdd long"); + assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAdd long"); } } static void testAccess(long address) { // Plain { - UNSAFE.putLong(address, 1L); + UNSAFE.putLong(address, 0x0123456789ABCDEFL); long x = UNSAFE.getLong(address); - assertEquals(x, 1L, "set long value"); + assertEquals(x, 0x0123456789ABCDEFL, "set long value"); } } } diff --git a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java index c8c7284e905..4d43464e312 100644 --- a/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java +++ b/hotspot/test/compiler/unsafe/SunMiscUnsafeAccessTestShort.java @@ -145,16 +145,16 @@ public class SunMiscUnsafeAccessTestShort { static void testAccess(Object base, long offset) { // Plain { - UNSAFE.putShort(base, offset, (short)1); + UNSAFE.putShort(base, offset, (short)0x0123); short x = UNSAFE.getShort(base, offset); - assertEquals(x, (short)1, "set short value"); + assertEquals(x, (short)0x0123, "set short value"); } // Volatile { - UNSAFE.putShortVolatile(base, offset, (short)2); + UNSAFE.putShortVolatile(base, offset, (short)0x4567); short x = UNSAFE.getShortVolatile(base, offset); - assertEquals(x, (short)2, "putVolatile short value"); + assertEquals(x, (short)0x4567, "putVolatile short value"); } @@ -166,9 +166,9 @@ public class SunMiscUnsafeAccessTestShort { static void testAccess(long address) { // Plain { - UNSAFE.putShort(address, (short)1); + UNSAFE.putShort(address, (short)0x0123); short x = UNSAFE.getShort(address); - assertEquals(x, (short)1, "set short value"); + assertEquals(x, (short)0x0123, "set short value"); } } } diff --git a/hotspot/test/compiler/unsafe/X-UnsafeAccessTest.java.template b/hotspot/test/compiler/unsafe/X-UnsafeAccessTest.java.template index 19c3bfa7ef0..2d1743ed607 100644 --- a/hotspot/test/compiler/unsafe/X-UnsafeAccessTest.java.template +++ b/hotspot/test/compiler/unsafe/X-UnsafeAccessTest.java.template @@ -333,7 +333,7 @@ public class $Qualifier$UnsafeAccessTest$Type$ { $type$ o = UNSAFE.getAndAdd$Type$(base, offset, $value2$); assertEquals(o, $value1$, "getAndAdd $type$"); $type$ x = UNSAFE.get$Type$(base, offset); - assertEquals(x, $value1$ + $value2$, "getAndAdd $type$"); + assertEquals(x, ($type$)($value1$ + $value2$), "getAndAdd $type$"); } #end[AtomicAdd] } diff --git a/hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh b/hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh index 100283f245b..6c1dcae3cc7 100644 --- a/hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh +++ b/hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh @@ -53,6 +53,19 @@ function generate { ;; esac + if [ "$package" == "jdk.internal.misc" ]; then + case $type in + boolean|byte|char|short) + args="$args -KCAS" + ;; + esac + case $type in + byte|char|short) + args="$args -KAtomicAdd" + ;; + esac + fi + case $type in short|char|int|long) args="$args -KUnaligned" @@ -66,29 +79,29 @@ function generate { value3=false ;; byte) - value1=(byte)1 - value2=(byte)2 - value3=(byte)3 + value1=(byte)0x01 + value2=(byte)0x23 + value3=(byte)0x45 ;; short) - value1=(short)1 - value2=(short)2 - value3=(short)3 + value1=(short)0x0123 + value2=(short)0x4567 + value3=(short)0x89AB ;; char) - value1=\'a\' - value2=\'b\' - value3=\'c\' + value1=\'\\\\u0123\' + value2=\'\\\\u4567\' + value3=\'\\\\u89AB\' ;; int) - value1=1 - value2=2 - value3=3 + value1=0x01234567 + value2=0x89ABCDEF + value3=0xCAFEBABE ;; long) - value1=1L - value2=2L - value3=3L + value1=0x0123456789ABCDEFL + value2=0xCAFEBABECAFEBABEL + value3=0xDEADBEEFDEADBEEFL ;; float) value1=1.0f From 2ade029123c52ae3f3ffe76cc8d2f14935da85ff Mon Sep 17 00:00:00 2001 From: Michihiro Horie Date: Wed, 15 Jun 2016 13:47:17 +0200 Subject: [PATCH 014/111] 8158232: PPC64: improve byte, int and long array copy stubs by using VSX instructions Reviewed-by: goetz, mdoerr --- hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp | 137 ++++++++++++++++++- 1 file changed, 131 insertions(+), 6 deletions(-) diff --git a/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp b/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp index e845d2872ed..cf07f2bd5dc 100644 --- a/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp +++ b/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp @@ -1123,7 +1123,10 @@ class StubGenerator: public StubCodeGenerator { Register tmp3 = R8_ARG6; Register tmp4 = R9_ARG7; - Label l_1, l_2, l_3, l_4, l_5, l_6, l_7, l_8, l_9; + VectorSRegister tmp_vsr1 = VSR1; + VectorSRegister tmp_vsr2 = VSR2; + + Label l_1, l_2, l_3, l_4, l_5, l_6, l_7, l_8, l_9, l_10; // Don't try anything fancy if arrays don't have many elements. __ li(tmp3, 0); @@ -1178,6 +1181,8 @@ class StubGenerator: public StubCodeGenerator { __ andi_(R5_ARG3, R5_ARG3, 31); __ mtctr(tmp1); + if (!VM_Version::has_vsx()) { + __ bind(l_8); // Use unrolled version for mass copying (copy 32 elements a time) // Load feeding store gets zero latency on Power6, however not on Power5. @@ -1193,7 +1198,44 @@ class StubGenerator: public StubCodeGenerator { __ addi(R3_ARG1, R3_ARG1, 32); __ addi(R4_ARG2, R4_ARG2, 32); __ bdnz(l_8); - } + + } else { // Processor supports VSX, so use it to mass copy. + + // Prefetch the data into the L2 cache. + __ dcbt(R3_ARG1, 0); + + // If supported set DSCR pre-fetch to deepest. + if (VM_Version::has_mfdscr()) { + __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7); + __ mtdscr(tmp2); + } + + __ li(tmp1, 16); + + // Backbranch target aligned to 32-byte. Not 16-byte align as + // loop contains < 8 instructions that fit inside a single + // i-cache sector. + __ align(32); + + __ bind(l_10); + // Use loop with VSX load/store instructions to + // copy 32 elements a time. + __ lxvd2x(tmp_vsr1, 0, R3_ARG1); // Load src + __ stxvd2x(tmp_vsr1, 0, R4_ARG2); // Store to dst + __ lxvd2x(tmp_vsr2, tmp1, R3_ARG1); // Load src + 16 + __ stxvd2x(tmp_vsr2, tmp1, R4_ARG2); // Store to dst + 16 + __ addi(R3_ARG1, R3_ARG1, 32); // Update src+=32 + __ addi(R4_ARG2, R4_ARG2, 32); // Update dsc+=32 + __ bdnz(l_10); // Dec CTR and loop if not zero. + + // Restore DSCR pre-fetch value. + if (VM_Version::has_mfdscr()) { + __ load_const_optimized(tmp2, VM_Version::_dscr_val); + __ mtdscr(tmp2); + } + + } // VSX + } // FasterArrayCopy __ bind(l_6); @@ -1557,7 +1599,10 @@ class StubGenerator: public StubCodeGenerator { Register tmp3 = R8_ARG6; Register tmp4 = R0; - Label l_1, l_2, l_3, l_4, l_5, l_6; + VectorSRegister tmp_vsr1 = VSR1; + VectorSRegister tmp_vsr2 = VSR2; + + Label l_1, l_2, l_3, l_4, l_5, l_6, l_7; // for short arrays, just do single element copy __ li(tmp3, 0); @@ -1593,6 +1638,8 @@ class StubGenerator: public StubCodeGenerator { __ andi_(R5_ARG3, R5_ARG3, 7); __ mtctr(tmp1); + if (!VM_Version::has_vsx()) { + __ bind(l_6); // Use unrolled version for mass copying (copy 8 elements a time). // Load feeding store gets zero latency on power6, however not on power 5. @@ -1608,7 +1655,44 @@ class StubGenerator: public StubCodeGenerator { __ addi(R3_ARG1, R3_ARG1, 32); __ addi(R4_ARG2, R4_ARG2, 32); __ bdnz(l_6); - } + + } else { // Processor supports VSX, so use it to mass copy. + + // Prefetch the data into the L2 cache. + __ dcbt(R3_ARG1, 0); + + // If supported set DSCR pre-fetch to deepest. + if (VM_Version::has_mfdscr()) { + __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7); + __ mtdscr(tmp2); + } + + __ li(tmp1, 16); + + // Backbranch target aligned to 32-byte. Not 16-byte align as + // loop contains < 8 instructions that fit inside a single + // i-cache sector. + __ align(32); + + __ bind(l_7); + // Use loop with VSX load/store instructions to + // copy 8 elements a time. + __ lxvd2x(tmp_vsr1, 0, R3_ARG1); // Load src + __ stxvd2x(tmp_vsr1, 0, R4_ARG2); // Store to dst + __ lxvd2x(tmp_vsr2, tmp1, R3_ARG1); // Load src + 16 + __ stxvd2x(tmp_vsr2, tmp1, R4_ARG2); // Store to dst + 16 + __ addi(R3_ARG1, R3_ARG1, 32); // Update src+=32 + __ addi(R4_ARG2, R4_ARG2, 32); // Update dsc+=32 + __ bdnz(l_7); // Dec CTR and loop if not zero. + + // Restore DSCR pre-fetch value. + if (VM_Version::has_mfdscr()) { + __ load_const_optimized(tmp2, VM_Version::_dscr_val); + __ mtdscr(tmp2); + } + + } // VSX + } // FasterArrayCopy // copy 1 element at a time __ bind(l_2); @@ -1757,7 +1841,10 @@ class StubGenerator: public StubCodeGenerator { Register tmp3 = R8_ARG6; Register tmp4 = R0; - Label l_1, l_2, l_3, l_4; + Label l_1, l_2, l_3, l_4, l_5; + + VectorSRegister tmp_vsr1 = VSR1; + VectorSRegister tmp_vsr2 = VSR2; { // FasterArrayCopy __ cmpwi(CCR0, R5_ARG3, 3); @@ -1767,6 +1854,7 @@ class StubGenerator: public StubCodeGenerator { __ andi_(R5_ARG3, R5_ARG3, 3); __ mtctr(tmp1); + if (!VM_Version::has_vsx()) { __ bind(l_4); // Use unrolled version for mass copying (copy 4 elements a time). // Load feeding store gets zero latency on Power6, however not on Power5. @@ -1782,7 +1870,44 @@ class StubGenerator: public StubCodeGenerator { __ addi(R3_ARG1, R3_ARG1, 32); __ addi(R4_ARG2, R4_ARG2, 32); __ bdnz(l_4); - } + + } else { // Processor supports VSX, so use it to mass copy. + + // Prefetch the data into the L2 cache. + __ dcbt(R3_ARG1, 0); + + // If supported set DSCR pre-fetch to deepest. + if (VM_Version::has_mfdscr()) { + __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7); + __ mtdscr(tmp2); + } + + __ li(tmp1, 16); + + // Backbranch target aligned to 32-byte. Not 16-byte align as + // loop contains < 8 instructions that fit inside a single + // i-cache sector. + __ align(32); + + __ bind(l_5); + // Use loop with VSX load/store instructions to + // copy 4 elements a time. + __ lxvd2x(tmp_vsr1, 0, R3_ARG1); // Load src + __ stxvd2x(tmp_vsr1, 0, R4_ARG2); // Store to dst + __ lxvd2x(tmp_vsr2, tmp1, R3_ARG1); // Load src + 16 + __ stxvd2x(tmp_vsr2, tmp1, R4_ARG2); // Store to dst + 16 + __ addi(R3_ARG1, R3_ARG1, 32); // Update src+=32 + __ addi(R4_ARG2, R4_ARG2, 32); // Update dsc+=32 + __ bdnz(l_5); // Dec CTR and loop if not zero. + + // Restore DSCR pre-fetch value. + if (VM_Version::has_mfdscr()) { + __ load_const_optimized(tmp2, VM_Version::_dscr_val); + __ mtdscr(tmp2); + } + + } // VSX + } // FasterArrayCopy // copy 1 element at a time __ bind(l_3); From cdc436922a6ac77262cf2371c735552f27497294 Mon Sep 17 00:00:00 2001 From: Zoltan Majo Date: Wed, 15 Jun 2016 14:27:58 +0200 Subject: [PATCH 015/111] 8157181: Compilers accept modification of final fields outside initializer methods Track initialized final field updates; disable constant folding if an update is detected. Enforce final field update rules introduced by JVMS-7 (but only for JDK 9). Reviewed-by: vlivanov, dnsimon, forax, never, kvn, coleenp --- .../src/jdk/vm/ci/hotspot/CompilerToVM.java | 7 ++- .../vm/ci/hotspot/HotSpotConstantPool.java | 4 +- .../src/jdk/vm/ci/meta/ConstantPool.java | 6 +- hotspot/src/share/vm/c1/c1_GraphBuilder.cpp | 2 +- hotspot/src/share/vm/c1/c1_Runtime1.cpp | 6 +- hotspot/src/share/vm/ci/ciField.cpp | 23 ++++---- hotspot/src/share/vm/ci/ciField.hpp | 33 +++++++---- hotspot/src/share/vm/ci/ciFlags.hpp | 33 ++++++----- hotspot/src/share/vm/ci/ciStreams.cpp | 2 +- .../vm/interpreter/interpreterRuntime.cpp | 3 +- .../src/share/vm/interpreter/linkResolver.cpp | 59 +++++++++++++++++-- .../src/share/vm/interpreter/linkResolver.hpp | 24 ++++++-- hotspot/src/share/vm/interpreter/rewriter.cpp | 39 +++++++++++- .../src/share/vm/jvmci/jvmciCompilerToVM.cpp | 6 +- hotspot/src/share/vm/oops/method.cpp | 5 +- hotspot/src/share/vm/oops/method.hpp | 3 + hotspot/src/share/vm/opto/parse3.cpp | 2 +- .../src/share/vm/runtime/fieldDescriptor.hpp | 6 ++ .../src/share/vm/utilities/accessFlags.hpp | 22 +++++-- .../jdk/vm/ci/hotspot/CompilerToVMHelper.java | 4 +- .../compilerToVM/ConstantPoolTestCase.java | 12 ++++ .../compilerToVM/ConstantPoolTestsHelper.java | 47 +++++++++++++++ .../compilerToVM/LookupKlassInPoolTest.java | 1 + .../LookupKlassRefIndexInPoolTest.java | 1 + .../compilerToVM/LookupMethodInPoolTest.java | 1 + .../LookupNameAndTypeRefIndexInPoolTest.java | 1 + .../compilerToVM/LookupNameInPoolTest.java | 1 + .../LookupSignatureInPoolTest.java | 1 + .../ResolveConstantInPoolTest.java | 1 + .../compilerToVM/ResolveFieldInPoolTest.java | 2 + ...solvePossiblyCachedConstantInPoolTest.java | 1 + .../compilerToVM/ResolveTypeInPoolTest.java | 1 + 32 files changed, 284 insertions(+), 75 deletions(-) diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java index 760a4e64d49..9cc09b780e7 100644 --- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java +++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java @@ -267,8 +267,9 @@ final class CompilerToVM { native HotSpotResolvedObjectTypeImpl resolveTypeInPool(HotSpotConstantPool constantPool, int cpi) throws LinkageError; /** - * Looks up and attempts to resolve the {@code JVM_CONSTANT_Field} entry at index {@code cpi} in - * {@code constantPool}. The values returned in {@code info} are: + * Looks up and attempts to resolve the {@code JVM_CONSTANT_Field} entry for at index {@code cpi} in + * {@code constantPool}. For some opcodes, checks are performed that require the {@code method} + * that contains {@code opcode} to be specified. The values returned in {@code info} are: * * 
      *     [(int) flags,   // only valid if field is resolved
@@ -281,7 +282,7 @@ final class CompilerToVM {
      * @param info an array in which the details of the field are returned
      * @return the type defining the field if resolution is successful, 0 otherwise
      */
-    native HotSpotResolvedObjectTypeImpl resolveFieldInPool(HotSpotConstantPool constantPool, int cpi, byte opcode, long[] info);
+    native HotSpotResolvedObjectTypeImpl resolveFieldInPool(HotSpotConstantPool constantPool, int cpi, HotSpotResolvedJavaMethodImpl method, byte opcode, long[] info);
 
     /**
      * Converts {@code cpci} from an index into the cache for {@code constantPool} to an index
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
index 4143d1babed..583bc0bd33f 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
@@ -587,7 +587,7 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
     }
 
     @Override
-    public JavaField lookupField(int cpi, int opcode) {
+    public JavaField lookupField(int cpi, ResolvedJavaMethod method, int opcode) {
         final int index = rawIndexToConstantPoolIndex(cpi, opcode);
         final int nameAndTypeIndex = getNameAndTypeRefIndexAt(index);
         final int nameIndex = getNameRefIndexAt(nameAndTypeIndex);
@@ -603,7 +603,7 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
             long[] info = new long[2];
             HotSpotResolvedObjectTypeImpl resolvedHolder;
             try {
-                resolvedHolder = compilerToVM().resolveFieldInPool(this, index, (byte) opcode, info);
+                resolvedHolder = compilerToVM().resolveFieldInPool(this, index, (HotSpotResolvedJavaMethodImpl) method, (byte) opcode, info);
             } catch (Throwable t) {
                 /*
                  * If there was an exception resolving the field we give up and return an unresolved
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java
index f56e802431e..1df1c1faee4 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java
@@ -48,16 +48,18 @@ public interface ConstantPool {
 
     /**
      * Looks up a reference to a field. If {@code opcode} is non-negative, then resolution checks
-     * specific to the bytecode it denotes are performed if the field is already resolved. Should
+     * specific to the bytecode it denotes are performed if the field is already resolved. Checks
+     * for some bytecodes require the method that contains the bytecode to be specified. Should
      * any of these checks fail, an unresolved field reference is returned.
      *
      * @param cpi the constant pool index
      * @param opcode the opcode of the instruction for which the lookup is being performed or
      *            {@code -1}
+     * @param method the method for which the lookup is being performed
      * @return a reference to the field at {@code cpi} in this pool
      * @throws ClassFormatError if the entry at {@code cpi} is not a field
      */
-    JavaField lookupField(int cpi, int opcode);
+    JavaField lookupField(int cpi, ResolvedJavaMethod method, int opcode);
 
     /**
      * Looks up a reference to a method. If {@code opcode} is non-negative, then resolution checks
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
index 0c06df4751c..7120e76c874 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
@@ -1600,7 +1600,7 @@ void GraphBuilder::access_field(Bytecodes::Code code) {
   ValueType* type = as_ValueType(field_type);
   // call will_link again to determine if the field is valid.
   const bool needs_patching = !holder->is_loaded() ||
-                              !field->will_link(method()->holder(), code) ||
+                              !field->will_link(method(), code) ||
                               PatchALot;
 
   ValueStack* state_before = NULL;
diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
index be57ef53e78..3ee774ec00f 100644
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
@@ -759,10 +759,10 @@ static Klass* resolve_field_return_klass(methodHandle caller, int bci, TRAPS) {
   // This can be static or non-static field access
   Bytecodes::Code code       = field_access.code();
 
-  // We must load class, initialize class and resolvethe field
+  // We must load class, initialize class and resolve the field
   fieldDescriptor result; // initialize class if needed
   constantPoolHandle constants(THREAD, caller->constants());
-  LinkResolver::resolve_field_access(result, constants, field_access.index(), Bytecodes::java_code(code), CHECK_NULL);
+  LinkResolver::resolve_field_access(result, constants, field_access.index(), caller, Bytecodes::java_code(code), CHECK_NULL);
   return result.field_holder();
 }
 
@@ -879,7 +879,7 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* thread, Runtime1::StubID stub_i
     fieldDescriptor result; // initialize class if needed
     Bytecodes::Code code = field_access.code();
     constantPoolHandle constants(THREAD, caller_method->constants());
-    LinkResolver::resolve_field_access(result, constants, field_access.index(), Bytecodes::java_code(code), CHECK);
+    LinkResolver::resolve_field_access(result, constants, field_access.index(), caller_method, Bytecodes::java_code(code), CHECK);
     patch_field_offset = result.offset();
 
     // If we're patching a field which is volatile then at compile it
diff --git a/hotspot/src/share/vm/ci/ciField.cpp b/hotspot/src/share/vm/ci/ciField.cpp
index 4d37c923ffe..e066be87191 100644
--- a/hotspot/src/share/vm/ci/ciField.cpp
+++ b/hotspot/src/share/vm/ci/ciField.cpp
@@ -66,7 +66,8 @@
 
 // ------------------------------------------------------------------
 // ciField::ciField
-ciField::ciField(ciInstanceKlass* klass, int index): _known_to_link_with_put(NULL), _known_to_link_with_get(NULL) {
+ciField::ciField(ciInstanceKlass* klass, int index) :
+    _known_to_link_with_put(NULL), _known_to_link_with_get(NULL) {
   ASSERT_IN_VM;
   CompilerThread *thread = CompilerThread::current();
 
@@ -173,7 +174,8 @@ ciField::ciField(ciInstanceKlass* klass, int index): _known_to_link_with_put(NUL
   initialize_from(&field_desc);
 }
 
-ciField::ciField(fieldDescriptor *fd): _known_to_link_with_put(NULL), _known_to_link_with_get(NULL) {
+ciField::ciField(fieldDescriptor *fd) :
+    _known_to_link_with_put(NULL), _known_to_link_with_get(NULL) {
   ASSERT_IN_VM;
 
   // Get the field's name, signature, and type.
@@ -237,7 +239,7 @@ void ciField::initialize_from(fieldDescriptor* fd) {
   // Check to see if the field is constant.
   Klass* k = _holder->get_Klass();
   bool is_stable_field = FoldStableValues && is_stable();
-  if (is_final() || is_stable_field) {
+  if ((is_final() && !has_initialized_final_update()) || is_stable_field) {
     if (is_static()) {
       // This field just may be constant.  The only case where it will
       // not be constant is when the field is a *special* static & final field
@@ -265,6 +267,7 @@ void ciField::initialize_from(fieldDescriptor* fd) {
     assert(SystemDictionary::CallSite_klass() != NULL, "should be already initialized");
     if (k == SystemDictionary::CallSite_klass() &&
         _offset == java_lang_invoke_CallSite::target_offset_in_bytes()) {
+      assert(!has_initialized_final_update(), "CallSite is not supposed to have writes to final fields outside initializers");
       _is_constant = true;
     } else {
       // Non-final & non-stable fields are not constants.
@@ -340,7 +343,7 @@ ciType* ciField::compute_type_impl() {
 //
 // Can a specific access to this field be made without causing
 // link errors?
-bool ciField::will_link(ciInstanceKlass* accessing_klass,
+bool ciField::will_link(ciMethod* accessing_method,
                         Bytecodes::Code bc) {
   VM_ENTRY_MARK;
   assert(bc == Bytecodes::_getstatic || bc == Bytecodes::_putstatic ||
@@ -363,27 +366,27 @@ bool ciField::will_link(ciInstanceKlass* accessing_klass,
   // Get and put can have different accessibility rules
   bool is_put    = (bc == Bytecodes::_putfield  || bc == Bytecodes::_putstatic);
   if (is_put) {
-    if (_known_to_link_with_put == accessing_klass) {
+    if (_known_to_link_with_put == accessing_method) {
       return true;
     }
   } else {
-    if (_known_to_link_with_get == accessing_klass) {
+    if (_known_to_link_with_get == accessing_method->holder()) {
       return true;
     }
   }
 
   LinkInfo link_info(_holder->get_instanceKlass(),
                      _name->get_symbol(), _signature->get_symbol(),
-                     accessing_klass->get_Klass());
+                     accessing_method->get_Method());
   fieldDescriptor result;
   LinkResolver::resolve_field(result, link_info, bc, false, KILL_COMPILE_ON_FATAL_(false));
 
   // update the hit-cache, unless there is a problem with memory scoping:
-  if (accessing_klass->is_shared() || !is_shared()) {
+  if (accessing_method->holder()->is_shared() || !is_shared()) {
     if (is_put) {
-      _known_to_link_with_put = accessing_klass;
+      _known_to_link_with_put = accessing_method;
     } else {
-      _known_to_link_with_get = accessing_klass;
+      _known_to_link_with_get = accessing_method->holder();
     }
   }
 
diff --git a/hotspot/src/share/vm/ci/ciField.hpp b/hotspot/src/share/vm/ci/ciField.hpp
index f30e7144e12..4ff3209d50a 100644
--- a/hotspot/src/share/vm/ci/ciField.hpp
+++ b/hotspot/src/share/vm/ci/ciField.hpp
@@ -48,7 +48,7 @@ private:
   ciType*          _type;
   int              _offset;
   bool             _is_constant;
-  ciInstanceKlass* _known_to_link_with_put;
+  ciMethod*        _known_to_link_with_put;
   ciInstanceKlass* _known_to_link_with_get;
   ciConstant       _constant_value;
 
@@ -131,8 +131,12 @@ public:
   //      non-constant fields.  These are java.lang.System.in
   //      and java.lang.System.out.  Abomination.
   //
-  // A field is also considered constant if it is marked @Stable
-  // and is non-null (or non-zero, if a primitive).
+  // A field is also considered constant if
+  // - it is marked @Stable and is non-null (or non-zero, if a primitive) or
+  // - it is trusted or
+  // - it is the target field of a CallSite object.
+  //
+  // See ciField::initialize_from() for more details.
   //
   // A user should also check the field value (constant_value().is_valid()), since
   // constant fields of non-initialized classes don't have values yet.
@@ -150,25 +154,28 @@ public:
   ciConstant constant_value_of(ciObject* object);
 
   // Check for link time errors.  Accessing a field from a
-  // certain class via a certain bytecode may or may not be legal.
+  // certain method via a certain bytecode may or may not be legal.
   // This call checks to see if an exception may be raised by
   // an access of this field.
   //
   // Usage note: if the same field is accessed multiple times
   // in the same compilation, will_link will need to be checked
   // at each point of access.
-  bool will_link(ciInstanceKlass* accessing_klass,
+  bool will_link(ciMethod* accessing_method,
                  Bytecodes::Code bc);
 
   // Java access flags
-  bool is_public      () const { return flags().is_public(); }
-  bool is_private     () const { return flags().is_private(); }
-  bool is_protected   () const { return flags().is_protected(); }
-  bool is_static      () const { return flags().is_static(); }
-  bool is_final       () const { return flags().is_final(); }
-  bool is_stable      () const { return flags().is_stable(); }
-  bool is_volatile    () const { return flags().is_volatile(); }
-  bool is_transient   () const { return flags().is_transient(); }
+  bool is_public               () const { return flags().is_public(); }
+  bool is_private              () const { return flags().is_private(); }
+  bool is_protected            () const { return flags().is_protected(); }
+  bool is_static               () const { return flags().is_static(); }
+  bool is_final                () const { return flags().is_final(); }
+  bool is_stable               () const { return flags().is_stable(); }
+  bool is_volatile             () const { return flags().is_volatile(); }
+  bool is_transient            () const { return flags().is_transient(); }
+  // The field is modified outside of instance initializer methods
+  // (or class/initializer methods if the field is static).
+  bool has_initialized_final_update() const { return flags().has_initialized_final_update(); }
 
   bool is_call_site_target() {
     ciInstanceKlass* callsite_klass = CURRENT_ENV->CallSite_klass();
diff --git a/hotspot/src/share/vm/ci/ciFlags.hpp b/hotspot/src/share/vm/ci/ciFlags.hpp
index 783064253c1..52b2c6a0322 100644
--- a/hotspot/src/share/vm/ci/ciFlags.hpp
+++ b/hotspot/src/share/vm/ci/ciFlags.hpp
@@ -47,20 +47,25 @@ private:
 
 public:
   // Java access flags
-  bool is_public      () const         { return (_flags & JVM_ACC_PUBLIC      ) != 0; }
-  bool is_private     () const         { return (_flags & JVM_ACC_PRIVATE     ) != 0; }
-  bool is_protected   () const         { return (_flags & JVM_ACC_PROTECTED   ) != 0; }
-  bool is_static      () const         { return (_flags & JVM_ACC_STATIC      ) != 0; }
-  bool is_final       () const         { return (_flags & JVM_ACC_FINAL       ) != 0; }
-  bool is_synchronized() const         { return (_flags & JVM_ACC_SYNCHRONIZED) != 0; }
-  bool is_super       () const         { return (_flags & JVM_ACC_SUPER       ) != 0; }
-  bool is_volatile    () const         { return (_flags & JVM_ACC_VOLATILE    ) != 0; }
-  bool is_transient   () const         { return (_flags & JVM_ACC_TRANSIENT   ) != 0; }
-  bool is_native      () const         { return (_flags & JVM_ACC_NATIVE      ) != 0; }
-  bool is_interface   () const         { return (_flags & JVM_ACC_INTERFACE   ) != 0; }
-  bool is_abstract    () const         { return (_flags & JVM_ACC_ABSTRACT    ) != 0; }
-  bool is_strict      () const         { return (_flags & JVM_ACC_STRICT      ) != 0; }
-  bool is_stable      () const         { return (_flags & JVM_ACC_FIELD_STABLE) != 0; }
+  bool is_public               () const { return (_flags & JVM_ACC_PUBLIC                    ) != 0; }
+  bool is_private              () const { return (_flags & JVM_ACC_PRIVATE                   ) != 0; }
+  bool is_protected            () const { return (_flags & JVM_ACC_PROTECTED                 ) != 0; }
+  bool is_static               () const { return (_flags & JVM_ACC_STATIC                    ) != 0; }
+  bool is_final                () const { return (_flags & JVM_ACC_FINAL                     ) != 0; }
+  bool is_synchronized         () const { return (_flags & JVM_ACC_SYNCHRONIZED              ) != 0; }
+  bool is_super                () const { return (_flags & JVM_ACC_SUPER                     ) != 0; }
+  bool is_volatile             () const { return (_flags & JVM_ACC_VOLATILE                  ) != 0; }
+  bool is_transient            () const { return (_flags & JVM_ACC_TRANSIENT                 ) != 0; }
+  bool is_native               () const { return (_flags & JVM_ACC_NATIVE                    ) != 0; }
+  bool is_interface            () const { return (_flags & JVM_ACC_INTERFACE                 ) != 0; }
+  bool is_abstract             () const { return (_flags & JVM_ACC_ABSTRACT                  ) != 0; }
+  bool is_strict               () const { return (_flags & JVM_ACC_STRICT                    ) != 0; }
+  bool is_stable               () const { return (_flags & JVM_ACC_FIELD_STABLE              ) != 0; }
+  // In case the current object represents a field, return true if
+  // the field is modified outside of instance initializer methods
+  // (or class/initializer methods if the field is static) and false
+  // otherwise.
+  bool has_initialized_final_update() const { return (_flags & JVM_ACC_FIELD_INITIALIZED_FINAL_UPDATE) != 0; };
 
   // Conversion
   jint   as_int()                      { return _flags; }
diff --git a/hotspot/src/share/vm/ci/ciStreams.cpp b/hotspot/src/share/vm/ci/ciStreams.cpp
index a4eaf473984..2edd0d39b8c 100644
--- a/hotspot/src/share/vm/ci/ciStreams.cpp
+++ b/hotspot/src/share/vm/ci/ciStreams.cpp
@@ -278,7 +278,7 @@ int ciBytecodeStream::get_field_index() {
 // or put_static, get the referenced field.
 ciField* ciBytecodeStream::get_field(bool& will_link) {
   ciField* f = CURRENT_ENV->get_field_by_index(_holder, get_field_index());
-  will_link = f->will_link(_holder, _bc);
+  will_link = f->will_link(_method, _bc);
   return f;
 }
 
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
index cd1d88926aa..77309bb34bb 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -558,6 +558,7 @@ void InterpreterRuntime::resolve_get_put(JavaThread* thread, Bytecodes::Code byt
   // resolve field
   fieldDescriptor info;
   constantPoolHandle pool(thread, method(thread)->constants());
+  methodHandle m(thread, method(thread));
   bool is_put    = (bytecode == Bytecodes::_putfield  || bytecode == Bytecodes::_nofast_putfield ||
                     bytecode == Bytecodes::_putstatic);
   bool is_static = (bytecode == Bytecodes::_getstatic || bytecode == Bytecodes::_putstatic);
@@ -565,7 +566,7 @@ void InterpreterRuntime::resolve_get_put(JavaThread* thread, Bytecodes::Code byt
   {
     JvmtiHideSingleStepping jhss(thread);
     LinkResolver::resolve_field_access(info, pool, get_index_u2_cpcache(thread, bytecode),
-                                       bytecode, CHECK);
+                                       m, bytecode, CHECK);
   } // end JvmtiHideSingleStepping
 
   // check if link resolution caused cpCache to be updated
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/hotspot/src/share/vm/interpreter/linkResolver.cpp
index f0337146a82..ed49b476484 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp
@@ -223,6 +223,22 @@ void CallInfo::print() {
 //------------------------------------------------------------------------------------------------------------------------
 // Implementation of LinkInfo
 
+LinkInfo::LinkInfo(const constantPoolHandle& pool, int index, methodHandle current_method, TRAPS) {
+   // resolve klass
+  Klass* result = pool->klass_ref_at(index, CHECK);
+  _resolved_klass = KlassHandle(THREAD, result);
+
+  // Get name, signature, and static klass
+  _name          = pool->name_ref_at(index);
+  _signature     = pool->signature_ref_at(index);
+  _tag           = pool->tag_ref_at(index);
+  _current_klass = KlassHandle(THREAD, pool->pool_holder());
+  _current_method = current_method;
+
+  // Coming from the constant pool always checks access
+  _check_access  = true;
+}
+
 LinkInfo::LinkInfo(const constantPoolHandle& pool, int index, TRAPS) {
    // resolve klass
   Klass* result = pool->klass_ref_at(index, CHECK);
@@ -233,6 +249,7 @@ LinkInfo::LinkInfo(const constantPoolHandle& pool, int index, TRAPS) {
   _signature     = pool->signature_ref_at(index);
   _tag           = pool->tag_ref_at(index);
   _current_klass = KlassHandle(THREAD, pool->pool_holder());
+  _current_method = methodHandle();
 
   // Coming from the constant pool always checks access
   _check_access  = true;
@@ -577,7 +594,7 @@ methodHandle LinkResolver::resolve_method_statically(Bytecodes::Code code,
     return resolve_method(link_info, code, THREAD);
   }
 
-  LinkInfo link_info(pool, index, CHECK_NULL);
+  LinkInfo link_info(pool, index, methodHandle(), CHECK_NULL);
   resolved_klass = link_info.resolved_klass();
 
   if (pool->has_preresolution()
@@ -875,8 +892,8 @@ void LinkResolver::check_field_accessability(KlassHandle ref_klass,
   }
 }
 
-void LinkResolver::resolve_field_access(fieldDescriptor& fd, const constantPoolHandle& pool, int index, Bytecodes::Code byte, TRAPS) {
-  LinkInfo link_info(pool, index, CHECK);
+void LinkResolver::resolve_field_access(fieldDescriptor& fd, const constantPoolHandle& pool, int index, const methodHandle& method, Bytecodes::Code byte, TRAPS) {
+  LinkInfo link_info(pool, index, method, CHECK);
   resolve_field(fd, link_info, byte, true, CHECK);
 }
 
@@ -925,9 +942,39 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
     THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), msg);
   }
 
-  // Final fields can only be accessed from its own class.
-  if (is_put && fd.access_flags().is_final() && sel_klass() != current_klass()) {
-    THROW(vmSymbols::java_lang_IllegalAccessError());
+  // A final field can be modified only
+  // (1) by methods declared in the class declaring the field and
+  // (2) by the  method (in case of a static field)
+  //     or by the  method (in case of an instance field).
+  if (is_put && fd.access_flags().is_final()) {
+    ResourceMark rm(THREAD);
+    stringStream ss;
+
+    if (sel_klass() != current_klass()) {
+      ss.print("Update to %s final field %s.%s attempted from a different class (%s) than the field's declaring class",
+                is_static ? "static" : "non-static", resolved_klass()->external_name(), fd.name()->as_C_string(),
+                current_klass()->external_name());
+      THROW_MSG(vmSymbols::java_lang_IllegalAccessError(), ss.as_string());
+    }
+
+    if (fd.constants()->pool_holder()->major_version() >= 53) {
+      methodHandle m = link_info.current_method();
+      assert(!m.is_null(), "information about the current method must be available for 'put' bytecodes");
+      bool is_initialized_static_final_update = (byte == Bytecodes::_putstatic &&
+                                                 fd.is_static() &&
+                                                 !m()->is_static_initializer());
+      bool is_initialized_instance_final_update = ((byte == Bytecodes::_putfield || byte == Bytecodes::_nofast_putfield) &&
+                                                   !fd.is_static() &&
+                                                   !m->is_object_initializer());
+
+      if (is_initialized_static_final_update || is_initialized_instance_final_update) {
+        ss.print("Update to %s final field %s.%s attempted from a different method (%s) than the initializer method %s ",
+                 is_static ? "static" : "non-static", resolved_klass()->external_name(), fd.name()->as_C_string(),
+                 current_klass()->external_name(),
+                 is_static ? "" : "");
+        THROW_MSG(vmSymbols::java_lang_IllegalAccessError(), ss.as_string());
+      }
+    }
   }
 
   // initialize resolved_klass if necessary
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.hpp b/hotspot/src/share/vm/interpreter/linkResolver.hpp
index 263365b56bf..1c02898b42d 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.hpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.hpp
@@ -131,19 +131,23 @@ class CallInfo : public StackObj {
 //   resolved_klass = specified class (i.e., static receiver class)
 //   current_klass  = sending method holder (i.e., class containing the method
 //                    containing the call being resolved)
+//   current_method = sending method (relevant for field resolution)
 class LinkInfo : public StackObj {
   Symbol*     _name;            // extracted from JVM_CONSTANT_NameAndType
   Symbol*     _signature;
   KlassHandle _resolved_klass;  // class that the constant pool entry points to
   KlassHandle _current_klass;   // class that owns the constant pool
+  methodHandle _current_method;  // sending method
   bool        _check_access;
   constantTag _tag;
+
  public:
   enum AccessCheck {
-     needs_access_check,
-     skip_access_check
+    needs_access_check,
+    skip_access_check
   };
 
+  LinkInfo(const constantPoolHandle& pool, int index, methodHandle current_method, TRAPS);
   LinkInfo(const constantPoolHandle& pool, int index, TRAPS);
 
   // Condensed information from other call sites within the vm.
@@ -151,13 +155,20 @@ class LinkInfo : public StackObj {
            AccessCheck check_access = needs_access_check,
            constantTag tag = JVM_CONSTANT_Invalid) :
     _resolved_klass(resolved_klass),
-    _name(name), _signature(signature), _current_klass(current_klass),
+    _name(name), _signature(signature), _current_klass(current_klass), _current_method(NULL),
+    _check_access(check_access == needs_access_check), _tag(tag) {}
+
+  LinkInfo(KlassHandle resolved_klass, Symbol* name, Symbol* signature, methodHandle current_method,
+           AccessCheck check_access = needs_access_check,
+           constantTag tag = JVM_CONSTANT_Invalid) :
+    _resolved_klass(resolved_klass),
+    _name(name), _signature(signature), _current_klass(current_method->method_holder()), _current_method(current_method),
     _check_access(check_access == needs_access_check), _tag(tag) {}
 
   // Case where we just find the method and don't check access against the current class
   LinkInfo(KlassHandle resolved_klass, Symbol*name, Symbol* signature) :
     _resolved_klass(resolved_klass),
-    _name(name), _signature(signature), _current_klass(NULL),
+    _name(name), _signature(signature), _current_klass(NULL), _current_method(NULL),
     _check_access(false), _tag(JVM_CONSTANT_Invalid) {}
 
   // accessors
@@ -165,6 +176,7 @@ class LinkInfo : public StackObj {
   Symbol* signature() const          { return _signature; }
   KlassHandle resolved_klass() const { return _resolved_klass; }
   KlassHandle current_klass() const  { return _current_klass; }
+  methodHandle current_method() const { return _current_method; }
   constantTag tag() const            { return _tag; }
   bool check_access() const          { return _check_access; }
   char* method_string() const;
@@ -266,7 +278,9 @@ class LinkResolver: AllStatic {
 
   static void resolve_field_access(fieldDescriptor& result,
                                    const constantPoolHandle& pool,
-                                   int index, Bytecodes::Code byte, TRAPS);
+                                   int index,
+                                   const methodHandle& method,
+                                   Bytecodes::Code byte, TRAPS);
   static void resolve_field(fieldDescriptor& result, const LinkInfo& link_info,
                             Bytecodes::Code access_kind,
                             bool initialize_class, TRAPS);
diff --git a/hotspot/src/share/vm/interpreter/rewriter.cpp b/hotspot/src/share/vm/interpreter/rewriter.cpp
index 7680fbf4b50..52832e781ab 100644
--- a/hotspot/src/share/vm/interpreter/rewriter.cpp
+++ b/hotspot/src/share/vm/interpreter/rewriter.cpp
@@ -406,10 +406,45 @@ void Rewriter::scan_method(Method* method, bool reverse, bool* invokespecial_err
           break;
         }
 
+        case Bytecodes::_putstatic      :
+        case Bytecodes::_putfield       : {
+          if (!reverse) {
+            // Check if any final field of the class given as parameter is modified
+            // outside of initializer methods of the class. Fields that are modified
+            // are marked with a flag. For marked fields, the compilers do not perform
+            // constant folding (as the field can be changed after initialization).
+            //
+            // The check is performed after verification and only if verification has
+            // succeeded. Therefore, the class is guaranteed to be well-formed.
+            InstanceKlass* klass = method->method_holder();
+            u2 bc_index = Bytes::get_Java_u2(bcp + prefix_length + 1);
+            constantPoolHandle cp(method->constants());
+            Symbol* field_name = cp->name_ref_at(bc_index);
+            Symbol* field_sig = cp->signature_ref_at(bc_index);
+            Symbol* ref_class_name = cp->klass_name_at(cp->klass_ref_index_at(bc_index));
+
+            if (klass->name() == ref_class_name) {
+              fieldDescriptor fd;
+              klass->find_field(field_name, field_sig, &fd);
+              if (fd.access_flags().is_final()) {
+                if (fd.access_flags().is_static()) {
+                  assert(c == Bytecodes::_putstatic, "must be putstatic");
+                  if (!method->is_static_initializer()) {
+                    fd.set_has_initialized_final_update(true);
+                  }
+                } else {
+                  assert(c == Bytecodes::_putfield, "must be putfield");
+                  if (!method->is_object_initializer()) {
+                    fd.set_has_initialized_final_update(true);
+                  }
+                }
+              }
+            }
+          }
+        }
+        // fall through
         case Bytecodes::_getstatic      : // fall through
-        case Bytecodes::_putstatic      : // fall through
         case Bytecodes::_getfield       : // fall through
-        case Bytecodes::_putfield       : // fall through
         case Bytecodes::_invokevirtual  : // fall through
         case Bytecodes::_invokestatic   :
         case Bytecodes::_invokeinterface:
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
index 63387feb6fb..e9d26ffcb8c 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
@@ -621,12 +621,12 @@ C2V_VMENTRY(jint, constantPoolRemapInstructionOperandFromCache, (JNIEnv*, jobjec
   return cp->remap_instruction_operand_from_cache(index);
 C2V_END
 
-C2V_VMENTRY(jobject, resolveFieldInPool, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index, jbyte opcode, jlongArray info_handle))
+C2V_VMENTRY(jobject, resolveFieldInPool, (JNIEnv*, jobject, jobject jvmci_constant_pool, jint index, jobject jvmci_method, jbyte opcode, jlongArray info_handle))
   ResourceMark rm;
   constantPoolHandle cp = CompilerToVM::asConstantPool(jvmci_constant_pool);
   Bytecodes::Code code = (Bytecodes::Code)(((int) opcode) & 0xFF);
   fieldDescriptor fd;
-  LinkInfo link_info(cp, index, CHECK_0);
+  LinkInfo link_info(cp, index, (jvmci_method != NULL) ? CompilerToVM::asMethod(jvmci_method) : NULL, CHECK_0);
   LinkResolver::resolve_field(fd, link_info, Bytecodes::java_code(code), false, CHECK_0);
   typeArrayOop info = (typeArrayOop) JNIHandles::resolve(info_handle);
   assert(info != NULL && info->length() == 2, "must be");
@@ -1438,7 +1438,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "resolveConstantInPool",                        CC "(" HS_CONSTANT_POOL "I)" OBJECT,                                                  FN_PTR(resolveConstantInPool)},
   {CC "resolvePossiblyCachedConstantInPool",          CC "(" HS_CONSTANT_POOL "I)" OBJECT,                                                  FN_PTR(resolvePossiblyCachedConstantInPool)},
   {CC "resolveTypeInPool",                            CC "(" HS_CONSTANT_POOL "I)" HS_RESOLVED_KLASS,                                       FN_PTR(resolveTypeInPool)},
-  {CC "resolveFieldInPool",                           CC "(" HS_CONSTANT_POOL "IB[J)" HS_RESOLVED_KLASS,                                    FN_PTR(resolveFieldInPool)},
+  {CC "resolveFieldInPool",                           CC "(" HS_CONSTANT_POOL "I" HS_RESOLVED_METHOD "B[J)" HS_RESOLVED_KLASS,              FN_PTR(resolveFieldInPool)},
   {CC "resolveInvokeDynamicInPool",                   CC "(" HS_CONSTANT_POOL "I)V",                                                        FN_PTR(resolveInvokeDynamicInPool)},
   {CC "resolveInvokeHandleInPool",                    CC "(" HS_CONSTANT_POOL "I)V",                                                        FN_PTR(resolveInvokeHandleInPool)},
   {CC "resolveMethod",                                CC "(" HS_RESOLVED_KLASS HS_RESOLVED_METHOD HS_RESOLVED_KLASS ")" HS_RESOLVED_METHOD, FN_PTR(resolveMethod)},
diff --git a/hotspot/src/share/vm/oops/method.cpp b/hotspot/src/share/vm/oops/method.cpp
index 8e7f9c8b42e..1a33bab678f 100644
--- a/hotspot/src/share/vm/oops/method.cpp
+++ b/hotspot/src/share/vm/oops/method.cpp
@@ -627,7 +627,7 @@ bool Method::is_constant_getter() const {
 }
 
 bool Method::is_initializer() const {
-  return name() == vmSymbols::object_initializer_name() || is_static_initializer();
+  return is_object_initializer() || is_static_initializer();
 }
 
 bool Method::has_valid_initializer_flags() const {
@@ -643,6 +643,9 @@ bool Method::is_static_initializer() const {
          has_valid_initializer_flags();
 }
 
+bool Method::is_object_initializer() const {
+   return name() == vmSymbols::object_initializer_name();
+}
 
 objArrayHandle Method::resolved_checked_exceptions_impl(Method* method, TRAPS) {
   int length = method->checked_exceptions_length();
diff --git a/hotspot/src/share/vm/oops/method.hpp b/hotspot/src/share/vm/oops/method.hpp
index 6b852d37502..ee2cd39db0d 100644
--- a/hotspot/src/share/vm/oops/method.hpp
+++ b/hotspot/src/share/vm/oops/method.hpp
@@ -638,6 +638,9 @@ class Method : public Metadata {
   // valid static initializer flags.
   bool is_static_initializer() const;
 
+  // returns true if the method name is 
+  bool is_object_initializer() const;
+
   // compiled code support
   // NOTE: code() is inherently racy as deopt can be clearing code
   // simultaneously. Use with caution.
diff --git a/hotspot/src/share/vm/opto/parse3.cpp b/hotspot/src/share/vm/opto/parse3.cpp
index bd6dcf30b84..ca571af0dd2 100644
--- a/hotspot/src/share/vm/opto/parse3.cpp
+++ b/hotspot/src/share/vm/opto/parse3.cpp
@@ -109,7 +109,7 @@ void Parse::do_field_access(bool is_get, bool is_field) {
     return;
   }
 
-  assert(field->will_link(method()->holder(), bc()), "getfield: typeflow responsibility");
+  assert(field->will_link(method(), bc()), "getfield: typeflow responsibility");
 
   // Note:  We do not check for an unloaded field type here any more.
 
diff --git a/hotspot/src/share/vm/runtime/fieldDescriptor.hpp b/hotspot/src/share/vm/runtime/fieldDescriptor.hpp
index 9c3101b38ba..1810a16cd3d 100644
--- a/hotspot/src/share/vm/runtime/fieldDescriptor.hpp
+++ b/hotspot/src/share/vm/runtime/fieldDescriptor.hpp
@@ -106,6 +106,7 @@ class fieldDescriptor VALUE_OBJ_CLASS_SPEC {
   bool is_field_access_watched()  const    { return access_flags().is_field_access_watched(); }
   bool is_field_modification_watched() const
                                            { return access_flags().is_field_modification_watched(); }
+  bool has_initialized_final_update() const { return access_flags().has_field_initialized_final_update(); }
   bool has_generic_signature()    const    { return access_flags().field_has_generic_signature(); }
 
   void set_is_field_access_watched(const bool value) {
@@ -118,6 +119,11 @@ class fieldDescriptor VALUE_OBJ_CLASS_SPEC {
     update_klass_field_access_flag();
   }
 
+  void set_has_initialized_final_update(const bool value) {
+    _access_flags.set_has_field_initialized_final_update(value);
+    update_klass_field_access_flag();
+  }
+
   // Initialization
   void reinitialize(InstanceKlass* ik, int index);
 
diff --git a/hotspot/src/share/vm/utilities/accessFlags.hpp b/hotspot/src/share/vm/utilities/accessFlags.hpp
index d9c1685e2b9..623def97d30 100644
--- a/hotspot/src/share/vm/utilities/accessFlags.hpp
+++ b/hotspot/src/share/vm/utilities/accessFlags.hpp
@@ -77,11 +77,12 @@ enum {
   // These bits must not conflict with any other field-related access flags
   // (e.g., ACC_ENUM).
   // Note that the class-related ACC_ANNOTATION bit conflicts with these flags.
-  JVM_ACC_FIELD_ACCESS_WATCHED       = 0x00002000,  // field access is watched by JVMTI
-  JVM_ACC_FIELD_MODIFICATION_WATCHED = 0x00008000,  // field modification is watched by JVMTI
-  JVM_ACC_FIELD_INTERNAL             = 0x00000400,  // internal field, same as JVM_ACC_ABSTRACT
-  JVM_ACC_FIELD_STABLE               = 0x00000020,  // @Stable field, same as JVM_ACC_SYNCHRONIZED
-  JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE = 0x00000800, // field has generic signature
+  JVM_ACC_FIELD_ACCESS_WATCHED            = 0x00002000, // field access is watched by JVMTI
+  JVM_ACC_FIELD_MODIFICATION_WATCHED      = 0x00008000, // field modification is watched by JVMTI
+  JVM_ACC_FIELD_INTERNAL                  = 0x00000400, // internal field, same as JVM_ACC_ABSTRACT
+  JVM_ACC_FIELD_STABLE                    = 0x00000020, // @Stable field, same as JVM_ACC_SYNCHRONIZED and JVM_ACC_SUPER
+  JVM_ACC_FIELD_INITIALIZED_FINAL_UPDATE  = 0x00000100, // (static) final field updated outside (class) initializer, same as JVM_ACC_NATIVE
+  JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE     = 0x00000800, // field has generic signature
 
   JVM_ACC_FIELD_INTERNAL_FLAGS       = JVM_ACC_FIELD_ACCESS_WATCHED |
                                        JVM_ACC_FIELD_MODIFICATION_WATCHED |
@@ -154,6 +155,8 @@ class AccessFlags VALUE_OBJ_CLASS_SPEC {
   bool is_field_access_watched() const  { return (_flags & JVM_ACC_FIELD_ACCESS_WATCHED) != 0; }
   bool is_field_modification_watched() const
                                         { return (_flags & JVM_ACC_FIELD_MODIFICATION_WATCHED) != 0; }
+  bool has_field_initialized_final_update() const
+                                        { return (_flags & JVM_ACC_FIELD_INITIALIZED_FINAL_UPDATE) != 0; }
   bool on_stack() const                 { return (_flags & JVM_ACC_ON_STACK) != 0; }
   bool is_internal() const              { return (_flags & JVM_ACC_FIELD_INTERNAL) != 0; }
   bool is_stable() const                { return (_flags & JVM_ACC_FIELD_STABLE) != 0; }
@@ -232,6 +235,15 @@ class AccessFlags VALUE_OBJ_CLASS_SPEC {
                                            atomic_clear_bits(JVM_ACC_FIELD_MODIFICATION_WATCHED);
                                          }
                                        }
+
+  void set_has_field_initialized_final_update(const bool value) {
+    if (value) {
+      atomic_set_bits(JVM_ACC_FIELD_INITIALIZED_FINAL_UPDATE);
+    } else {
+      atomic_clear_bits(JVM_ACC_FIELD_INITIALIZED_FINAL_UPDATE);
+    }
+  }
+
   void set_field_has_generic_signature()
                                        {
                                          atomic_set_bits(JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE);
diff --git a/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java b/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
index 726ff9fc5be..9c9af3ce7ff 100644
--- a/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
+++ b/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
@@ -124,8 +124,8 @@ public class CompilerToVMHelper {
     }
 
     public static HotSpotResolvedObjectType resolveFieldInPool(
-            ConstantPool constantPool, int cpi, byte opcode, long[] info) {
-        return CTVM.resolveFieldInPool((HotSpotConstantPool) constantPool, cpi, opcode, info);
+            ConstantPool constantPool, int cpi, ResolvedJavaMethod method, byte opcode, long[] info) {
+        return CTVM.resolveFieldInPool((HotSpotConstantPool) constantPool, cpi, (HotSpotResolvedJavaMethodImpl) method, opcode, info);
     }
 
     public static int constantPoolRemapInstructionOperandFromCache(
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java b/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java
index ed05fe8a188..d3f85000c4c 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java
@@ -27,6 +27,7 @@ package compiler.jvmci.compilerToVM;
 import java.util.HashMap;
 import java.util.Map;
 import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
 import sun.hotspot.WhiteBox;
 import jdk.internal.reflect.ConstantPool;
 import jdk.internal.reflect.ConstantPool.Tag;
@@ -184,13 +185,24 @@ public class ConstantPoolTestCase {
         public final String klass;
         public final String name;
         public final String type;
+        public final ResolvedJavaMethod[] methods;
         public final byte[] opcodes;
         public final long accFlags;
 
         public TestedCPEntry(String klass, String name, String type, byte[] opcodes, long accFlags) {
+                this(klass, name, type, null, opcodes, accFlags);
+        }
+
+        public TestedCPEntry(String klass, String name, String type, ResolvedJavaMethod[] methods, byte[] opcodes, long accFlags) {
             this.klass = klass;
             this.name = name;
             this.type = type;
+            if (methods != null) {
+                this.methods = new ResolvedJavaMethod[methods.length];
+                System.arraycopy(methods, 0, this.methods, 0, methods.length);
+            } else {
+                this.methods = null;
+            }
             if (opcodes != null) {
                 this.opcodes = new byte[opcodes.length];
                 System.arraycopy(opcodes, 0, this.opcodes, 0, opcodes.length);
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java b/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java
index 12310ddf3ce..fc33560b893 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ConstantPoolTestsHelper.java
@@ -31,6 +31,10 @@ import static compiler.jvmci.compilerToVM.ConstantPoolTestCase.ConstantTypes.*;
 import compiler.jvmci.compilerToVM.ConstantPoolTestCase.TestedCPEntry;
 import java.util.HashMap;
 import java.util.Map;
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.runtime.JVMCI;
 import jdk.internal.misc.SharedSecrets;
 import jdk.internal.org.objectweb.asm.Opcodes;
 import sun.hotspot.WhiteBox;
@@ -44,6 +48,7 @@ import jdk.internal.reflect.ConstantPool.Tag;
 public class ConstantPoolTestsHelper {
 
     public static final int NO_CP_CACHE_PRESENT = Integer.MAX_VALUE;
+    private static final MetaAccessProvider metaAccess = JVMCI.getRuntime().getHostJVMCIBackend().getMetaAccess();
 
     public enum DummyClasses {
         DUMMY_CLASS(MultipleImplementer2.class, CP_MAP_FOR_CLASS),
@@ -76,6 +81,45 @@ public class ConstantPoolTestsHelper {
         }
     }
 
+    /**
+     * Obtain a resolved Java method declared by a given type.
+     *
+     * @param type the declaring type
+     * @param the method's name
+     *
+     * Currently, the lookup is based only on the method's name
+     * but not on the method's signature (i.e., the first method
+     * with a matching name declared on {@code type} is returned).
+     */
+    private static ResolvedJavaMethod getMethod(ResolvedJavaType type, String methodName) {
+        if (methodName.equals("")) {
+            return type.getClassInitializer();
+        }
+
+        if (methodName.equals("")) {
+            ResolvedJavaMethod[] initializers = type.getDeclaredConstructors();
+            if (initializers.length >= 0) {
+                return initializers[0];
+            } else {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        for (ResolvedJavaMethod method : type.getDeclaredMethods()) {
+            if (method.getName().equals(methodName)) {
+                return method;
+            }
+        }
+
+        throw new IllegalArgumentException();
+    }
+
+    private static ResolvedJavaType getType(Class clazz) {
+        ResolvedJavaType type = metaAccess.lookupJavaType(clazz);
+        type.initialize();
+        return type;
+    }
+
     private static final Map CP_MAP_FOR_CLASS = new HashMap<>();
     static {
         CP_MAP_FOR_CLASS.put(CONSTANT_CLASS,
@@ -141,6 +185,7 @@ public class ConstantPoolTestsHelper {
                     new TestedCPEntry("compiler/jvmci/common/testcases/MultipleImplementer2",
                                       "objectField",
                                       "Ljava/lang/Object;",
+                                      new ResolvedJavaMethod[] { getMethod(getType(MultipleImplementer2.class), ""), null },
                                       new byte[] {(byte) Opcodes.PUTFIELD | (byte) Opcodes.GETFIELD},
                                       Opcodes.ACC_FINAL),
                     new TestedCPEntry("compiler/jvmci/common/testcases/MultipleImplementer2",
@@ -296,6 +341,7 @@ public class ConstantPoolTestsHelper {
                     new TestedCPEntry("compiler/jvmci/common/testcases/MultipleAbstractImplementer",
                                       "objectField",
                                       "Ljava/lang/Object;",
+                                      new ResolvedJavaMethod[] { getMethod(getType(MultipleAbstractImplementer.class), ""), null },
                                       new byte[] {(byte) Opcodes.PUTFIELD | (byte) Opcodes.GETFIELD},
                                       Opcodes.ACC_FINAL),
                     new TestedCPEntry("compiler/jvmci/common/testcases/MultipleAbstractImplementer",
@@ -401,6 +447,7 @@ public class ConstantPoolTestsHelper {
                     new TestedCPEntry("compiler/jvmci/common/testcases/MultipleImplementersInterface",
                                       "OBJECT_CONSTANT",
                                       "Ljava/lang/Object;",
+                                      new ResolvedJavaMethod[] { getMethod(getType(MultipleImplementersInterface.class), ""), null },
                                       new byte[] {(byte) Opcodes.PUTSTATIC, (byte) Opcodes.GETSTATIC},
                                       Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_PUBLIC),
                 }
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java
index 88629b101a3..b88e13d5629 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java
@@ -34,6 +34,7 @@
  *          java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java
index 87020af5181..dd3400de768 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java
@@ -33,6 +33,7 @@
  *          java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java
index 3b64af7ffea..a4687dba894 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java
@@ -34,6 +34,7 @@
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.meta
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
  *        compiler.jvmci.compilerToVM.LookupMethodInPoolTest
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java
index 4f1cac0fb47..4b5067d8de9 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java
@@ -33,6 +33,7 @@
  *          java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java
index 65f6ec0efdf..ac253d36244 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java
@@ -33,6 +33,7 @@
  *          java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java
index 391a9dc12f6..8aee2643570 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java
@@ -33,6 +33,7 @@
  *          java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java
index cd16f512e52..86a72375fde 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java
@@ -32,6 +32,7 @@
  *          java.base/jdk.internal.reflect
  *          java.base/jdk.internal.org.objectweb.asm
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java
index 8151340f9f8..6af4991bf60 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java
@@ -34,6 +34,7 @@
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot
  *          jdk.vm.ci/jdk.vm.ci.meta
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
  *        compiler.jvmci.compilerToVM.ResolveFieldInPoolTest
@@ -107,6 +108,7 @@ public class ResolveFieldInPoolTest {
             HotSpotResolvedObjectType fieldToVerify
                     = CompilerToVMHelper.resolveFieldInPool(constantPoolCTVM,
                                                            index,
+                                                           entry.methods == null ? null : entry.methods[j],
                                                            entry.opcodes[j],
                                                            info);
             String msg = String.format("Object returned by resolveFieldInPool method"
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java
index 6a1cfb7623e..f517f113ae5 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java
@@ -33,6 +33,7 @@
  *          java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.org.objectweb.asm.tree
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java b/hotspot/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java
index 92f7a19b5e0..86f96b56fac 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java
@@ -33,6 +33,7 @@
  *          java.base/jdk.internal.reflect
  *          java.base/jdk.internal.org.objectweb.asm
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.meta
  * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
  * @build sun.hotspot.WhiteBox

From 4dad69bb2e74c9b46c007a6e9791bbd0b105a3ae Mon Sep 17 00:00:00 2001
From: Igor Ignatyev 
Date: Wed, 1 Jun 2016 09:13:10 +0300
Subject: [PATCH 016/111] 8149043: Fix code indentation in test/compiler/stable
 tests

Reviewed-by: vlivanov
---
 .../compiler/stable/TestStableBoolean.java    | 52 +++++++-------
 .../test/compiler/stable/TestStableByte.java  | 72 +++++++++----------
 .../test/compiler/stable/TestStableChar.java  | 72 +++++++++----------
 .../compiler/stable/TestStableDouble.java     | 70 +++++++++---------
 .../test/compiler/stable/TestStableFloat.java | 68 +++++++++---------
 .../test/compiler/stable/TestStableInt.java   | 70 +++++++++---------
 .../test/compiler/stable/TestStableLong.java  | 70 +++++++++---------
 .../compiler/stable/TestStableObject.java     | 70 +++++++++---------
 .../test/compiler/stable/TestStableShort.java | 70 +++++++++---------
 9 files changed, 306 insertions(+), 308 deletions(-)

diff --git a/hotspot/test/compiler/stable/TestStableBoolean.java b/hotspot/test/compiler/stable/TestStableBoolean.java
index 0be8173a8ef..0e9f7bc396a 100644
--- a/hotspot/test/compiler/stable/TestStableBoolean.java
+++ b/hotspot/test/compiler/stable/TestStableBoolean.java
@@ -95,13 +95,12 @@ public class TestStableBoolean {
     /* ==================================================== */
 
     static class DefaultValue {
-        public @Stable
-        boolean v;
+        public @Stable boolean v;
 
         public static final DefaultValue c = new DefaultValue();
         public static boolean get() { return c.v; }
         public static void test() throws Exception {
-            boolean val1 = get();
+                        boolean val1 = get();
             c.v = true; boolean val2 = get();
             assertEquals(val1, false);
             assertEquals(val2, true);
@@ -131,7 +130,7 @@ public class TestStableBoolean {
         public static final DefaultStaticValue c = new DefaultStaticValue();
         public static boolean get() { return c.v; }
         public static void test() throws Exception {
-            boolean val1 = get();
+                        boolean val1 = get();
             c.v = true; boolean val2 = get();
             assertEquals(val1, false);
             assertEquals(val2, true);
@@ -181,14 +180,14 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new boolean[1]; c.v[0] = true;  boolean val1 = get();
-                c.v[0] = false; boolean val2 = get();
+                                      c.v[0] = false; boolean val2 = get();
                 assertEquals(val1, true);
                 assertEquals(val2, (isStableEnabled ? true : false));
             }
 
             {
                 c.v = new boolean[20]; c.v[10] = true;  boolean val1 = get1();
-                c.v[10] = false; boolean val2 = get1();
+                                       c.v[10] = false; boolean val2 = get1();
                 assertEquals(val1, true);
                 assertEquals(val2, (isStableEnabled ? true : false));
             }
@@ -213,7 +212,7 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new boolean[1][1]; c.v[0][0] = true;  boolean val1 = get();
-                c.v[0][0] = false; boolean val2 = get();
+                                         c.v[0][0] = false; boolean val2 = get();
                 assertEquals(val1, true);
                 assertEquals(val2, (isStableEnabled ? true : false));
 
@@ -251,7 +250,7 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new boolean[1][1][1]; c.v[0][0][0] = true;  boolean val1 = get();
-                c.v[0][0][0] = false; boolean val2 = get();
+                                            c.v[0][0][0] = false; boolean val2 = get();
                 assertEquals(val1, true);
                 assertEquals(val2, (isStableEnabled ? true : false));
 
@@ -299,7 +298,7 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new boolean[1][1][1][1]; c.v[0][0][0][0] = true;  boolean val1 = get();
-                c.v[0][0][0][0] = false; boolean val2 = get();
+                                               c.v[0][0][0][0] = false; boolean val2 = get();
                 assertEquals(val1, true);
                 assertEquals(val2, (isStableEnabled ? true : false));
 
@@ -357,7 +356,7 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new boolean[1]; ((boolean[])c.v)[0] = true;  boolean val1 = get();
-                ((boolean[])c.v)[0] = false; boolean val2 = get();
+                                      ((boolean[])c.v)[0] = false; boolean val2 = get();
 
                 assertEquals(val1, true);
                 assertEquals(val2, false);
@@ -384,7 +383,7 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new boolean[1][1]; ((boolean[][])c.v)[0][0] = true;  boolean val1 = get();
-                ((boolean[][])c.v)[0][0] = false; boolean val2 = get();
+                                         ((boolean[][])c.v)[0][0] = false; boolean val2 = get();
 
                 assertEquals(val1, true);
                 assertEquals(val2, false);
@@ -392,7 +391,7 @@ public class TestStableBoolean {
 
             {
                 c.v = new boolean[1][1]; c.v[0] = new boolean[0]; boolean[] val1 = get1();
-                c.v[0] = new boolean[0]; boolean[] val2 = get1();
+                                         c.v[0] = new boolean[0]; boolean[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -420,7 +419,7 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new boolean[1][1][1]; ((boolean[][][])c.v)[0][0][0] = true;  boolean val1 = get();
-                ((boolean[][][])c.v)[0][0][0] = false; boolean val2 = get();
+                                            ((boolean[][][])c.v)[0][0][0] = false; boolean val2 = get();
 
                 assertEquals(val1, true);
                 assertEquals(val2, false);
@@ -428,14 +427,14 @@ public class TestStableBoolean {
 
             {
                 c.v = new boolean[1][1][1]; c.v[0][0] = new boolean[0]; boolean[] val1 = get1();
-                c.v[0][0] = new boolean[0]; boolean[] val2 = get1();
+                                            c.v[0][0] = new boolean[0]; boolean[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
 
             {
                 c.v = new boolean[1][1][1]; c.v[0] = new boolean[0][0]; boolean[][] val1 = get2();
-                c.v[0] = new boolean[0][0]; boolean[][] val2 = get2();
+                                            c.v[0] = new boolean[0][0]; boolean[][] val2 = get2();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -465,7 +464,7 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.a = true;  A val1 = get();
-                c.v.a = false; A val2 = get();
+                               c.v.a = false; A val2 = get();
 
                 assertEquals(val1.a, false);
                 assertEquals(val2.a, false);
@@ -473,7 +472,7 @@ public class TestStableBoolean {
 
             {
                 c.v = new A(); c.v.a = true;  boolean val1 = get1();
-                c.v.a = false; boolean val2 = get1();
+                               c.v.a = false; boolean val2 = get1();
                 c.v = new A(); c.v.a = false; boolean val3 = get1();
 
                 assertEquals(val1, true);
@@ -499,8 +498,8 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.next = new A(); c.v.next.next  = c.v;
-                c.v.a = true;  c.v.next.a = true;  A val1 = get();
-                c.v.a = false; c.v.next.a = false; A val2 = get();
+                               c.v.a = true;  c.v.next.a = true;  A val1 = get();
+                               c.v.a = false; c.v.next.a = false; A val2 = get();
 
                 assertEquals(val1.a, false);
                 assertEquals(val2.a, false);
@@ -508,10 +507,10 @@ public class TestStableBoolean {
 
             {
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = true;  boolean val1 = get1();
-                c.v.a = false; boolean val2 = get1();
+                               c.v.a = true;  boolean val1 = get1();
+                               c.v.a = false; boolean val2 = get1();
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = false; boolean val3 = get1();
+                               c.v.a = false; boolean val3 = get1();
 
                 assertEquals(val1, true);
                 assertEquals(val2, (isStableEnabled ? true : false));
@@ -537,8 +536,8 @@ public class TestStableBoolean {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.left = c.v.right = c.v;
-                c.v.a = true;  boolean val1 = get(); boolean val2 = get1();
-                c.v.a = false; boolean val3 = get(); boolean val4 = get1();
+                               c.v.a = true;  boolean val1 = get(); boolean val2 = get1();
+                               c.v.a = false; boolean val3 = get(); boolean val4 = get1();
 
                 assertEquals(val1, true);
                 assertEquals(val3, (isStableEnabled ? true : false));
@@ -568,8 +567,8 @@ public class TestStableBoolean {
             {
                 A elem = new A();
                 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
-                elem.a = true;  boolean val1 = get(); boolean val2 = get1();
-                elem.a = false; boolean val3 = get(); boolean val4 = get1();
+                               elem.a = true;  boolean val1 = get(); boolean val2 = get1();
+                               elem.a = false; boolean val3 = get(); boolean val4 = get1();
 
                 assertEquals(val1, true);
                 assertEquals(val3, (isStableEnabled ? true : false));
@@ -606,5 +605,4 @@ public class TestStableBoolean {
             }
         }
     }
-
 }
diff --git a/hotspot/test/compiler/stable/TestStableByte.java b/hotspot/test/compiler/stable/TestStableByte.java
index a983cfa814f..46f4711c19d 100644
--- a/hotspot/test/compiler/stable/TestStableByte.java
+++ b/hotspot/test/compiler/stable/TestStableByte.java
@@ -100,7 +100,7 @@ public class TestStableByte {
         public static final DefaultValue c = new DefaultValue();
         public static byte get() { return c.v; }
         public static void test() throws Exception {
-            byte val1 = get();
+                     byte val1 = get();
             c.v = 1; byte val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1);
@@ -130,7 +130,7 @@ public class TestStableByte {
         public static final DefaultStaticValue c = new DefaultStaticValue();
         public static byte get() { return c.v; }
         public static void test() throws Exception {
-            byte val1 = get();
+                     byte val1 = get();
             c.v = 1; byte val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1);
@@ -180,24 +180,24 @@ public class TestStableByte {
         public static void test() throws Exception {
             {
                 c.v = new byte[1]; c.v[0] = 1; byte val1 = get();
-                c.v[0] = 2; byte val2 = get();
+                                   c.v[0] = 2; byte val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new byte[1]; c.v[0] = 3; byte val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
             }
 
             {
                 c.v = new byte[20]; c.v[10] = 1; byte val1 = get1();
-                c.v[10] = 2; byte val2 = get1();
+                                    c.v[10] = 2; byte val2 = get1();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new byte[20]; c.v[10] = 3; byte val3 = get1();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
             }
 
             {
@@ -220,17 +220,17 @@ public class TestStableByte {
         public static void test() throws Exception {
             {
                 c.v = new byte[1][1]; c.v[0][0] = 1; byte val1 = get();
-                c.v[0][0] = 2; byte val2 = get();
+                                      c.v[0][0] = 2; byte val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new byte[1][1]; c.v[0][0] = 3; byte val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new byte[1]; c.v[0][0] = 4; byte val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
             }
 
             {
@@ -260,21 +260,21 @@ public class TestStableByte {
         public static void test() throws Exception {
             {
                 c.v = new byte[1][1][1]; c.v[0][0][0] = 1; byte val1 = get();
-                c.v[0][0][0] = 2; byte val2 = get();
+                                         c.v[0][0][0] = 2; byte val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new byte[1][1][1]; c.v[0][0][0] = 3; byte val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new byte[1][1]; c.v[0][0][0] = 4; byte val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
 
                 c.v[0][0] = new byte[1]; c.v[0][0][0] = 5; byte val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 5));
+                                                    : 5));
             }
 
             {
@@ -311,25 +311,25 @@ public class TestStableByte {
         public static void test() throws Exception {
             {
                 c.v = new byte[1][1][1][1]; c.v[0][0][0][0] = 1; byte val1 = get();
-                c.v[0][0][0][0] = 2; byte val2 = get();
+                                            c.v[0][0][0][0] = 2; byte val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new byte[1][1][1][1]; c.v[0][0][0][0] = 3; byte val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new byte[1][1][1]; c.v[0][0][0][0] = 4; byte val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
 
                 c.v[0][0] = new byte[1][1]; c.v[0][0][0][0] = 5; byte val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 5));
+                                                    : 5));
 
                 c.v[0][0][0] = new byte[1]; c.v[0][0][0][0] = 6; byte val6 = get();
                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 6));
+                                                    : 6));
             }
 
             {
@@ -372,7 +372,7 @@ public class TestStableByte {
         public static void test() throws Exception {
             {
                 c.v = new byte[1]; ((byte[])c.v)[0] = 1; byte val1 = get();
-                ((byte[])c.v)[0] = 2; byte val2 = get();
+                                   ((byte[])c.v)[0] = 2; byte val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -399,7 +399,7 @@ public class TestStableByte {
         public static void test() throws Exception {
             {
                 c.v = new byte[1][1]; ((byte[][])c.v)[0][0] = 1; byte val1 = get();
-                ((byte[][])c.v)[0][0] = 2; byte val2 = get();
+                                      ((byte[][])c.v)[0][0] = 2; byte val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -407,7 +407,7 @@ public class TestStableByte {
 
             {
                 c.v = new byte[1][1]; c.v[0] = new byte[0]; byte[] val1 = get1();
-                c.v[0] = new byte[0]; byte[] val2 = get1();
+                                      c.v[0] = new byte[0]; byte[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -434,8 +434,8 @@ public class TestStableByte {
 
         public static void test() throws Exception {
             {
-                c.v = new byte[1][1][1]; ((byte[][][])c.v)[0][0][0] = 1;  byte val1 = get();
-                ((byte[][][])c.v)[0][0][0] = 2; byte val2 = get();
+                c.v = new byte[1][1][1]; ((byte[][][])c.v)[0][0][0] = 1; byte val1 = get();
+                                         ((byte[][][])c.v)[0][0][0] = 2; byte val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -443,14 +443,14 @@ public class TestStableByte {
 
             {
                 c.v = new byte[1][1][1]; c.v[0][0] = new byte[0]; byte[] val1 = get1();
-                c.v[0][0] = new byte[0]; byte[] val2 = get1();
+                                         c.v[0][0] = new byte[0]; byte[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
 
             {
                 c.v = new byte[1][1][1]; c.v[0] = new byte[0][0]; byte[][] val1 = get2();
-                c.v[0] = new byte[0][0]; byte[][] val2 = get2();
+                                         c.v[0] = new byte[0][0]; byte[][] val2 = get2();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -480,7 +480,7 @@ public class TestStableByte {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.a = 1; A val1 = get();
-                c.v.a = 2; A val2 = get();
+                               c.v.a = 2; A val2 = get();
 
                 assertEquals(val1.a, 2);
                 assertEquals(val2.a, 2);
@@ -488,7 +488,7 @@ public class TestStableByte {
 
             {
                 c.v = new A(); c.v.a = 1; byte val1 = get1();
-                c.v.a = 2; byte val2 = get1();
+                               c.v.a = 2; byte val2 = get1();
                 c.v = new A(); c.v.a = 3; byte val3 = get1();
 
                 assertEquals(val1, 1);
@@ -514,8 +514,8 @@ public class TestStableByte {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.next = new A();   c.v.next.next  = c.v;
-                c.v.a = 1; c.v.next.a = 1; A val1 = get();
-                c.v.a = 2; c.v.next.a = 2; A val2 = get();
+                               c.v.a = 1; c.v.next.a = 1; A val1 = get();
+                               c.v.a = 2; c.v.next.a = 2; A val2 = get();
 
                 assertEquals(val1.a, 2);
                 assertEquals(val2.a, 2);
@@ -523,10 +523,10 @@ public class TestStableByte {
 
             {
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 1; byte val1 = get1();
-                c.v.a = 2; byte val2 = get1();
+                               c.v.a = 1; byte val1 = get1();
+                               c.v.a = 2; byte val2 = get1();
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 3; byte val3 = get1();
+                               c.v.a = 3; byte val3 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
@@ -552,8 +552,8 @@ public class TestStableByte {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.left = c.v.right = c.v;
-                c.v.a = 1; byte val1 = get(); byte val2 = get1();
-                c.v.a = 2; byte val3 = get(); byte val4 = get1();
+                               c.v.a = 1; byte val1 = get(); byte val2 = get1();
+                               c.v.a = 2; byte val3 = get(); byte val4 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val3, (isStableEnabled ? 1 : 2));
@@ -583,8 +583,8 @@ public class TestStableByte {
             {
                 A elem = new A();
                 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
-                elem.a = 1; byte val1 = get(); byte val2 = get1();
-                elem.a = 2; byte val3 = get(); byte val4 = get1();
+                               elem.a = 1; byte val1 = get(); byte val2 = get1();
+                               elem.a = 2; byte val3 = get(); byte val4 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val3, (isStableEnabled ? 1 : 2));
diff --git a/hotspot/test/compiler/stable/TestStableChar.java b/hotspot/test/compiler/stable/TestStableChar.java
index 6fcc407a7ac..95c95c1a1f7 100644
--- a/hotspot/test/compiler/stable/TestStableChar.java
+++ b/hotspot/test/compiler/stable/TestStableChar.java
@@ -100,7 +100,7 @@ public class TestStableChar {
         public static final DefaultValue c = new DefaultValue();
         public static char get() { return c.v; }
         public static void test() throws Exception {
-            char val1 = get();
+                       char val1 = get();
             c.v = 'a'; char val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 'a');
@@ -130,7 +130,7 @@ public class TestStableChar {
         public static final DefaultStaticValue c = new DefaultStaticValue();
         public static char get() { return c.v; }
         public static void test() throws Exception {
-            char val1 = get();
+                       char val1 = get();
             c.v = 'a'; char val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 'a');
@@ -180,24 +180,24 @@ public class TestStableChar {
         public static void test() throws Exception {
             {
                 c.v = new char[1]; c.v[0] = 'a'; char val1 = get();
-                c.v[0] = 'b'; char val2 = get();
+                                   c.v[0] = 'b'; char val2 = get();
                 assertEquals(val1, 'a');
                 assertEquals(val2, (isStableEnabled ? 'a' : 'b'));
 
                 c.v = new char[1]; c.v[0] = 'c'; char val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'c'));
+                                                    : 'c'));
             }
 
             {
                 c.v = new char[20]; c.v[10] = 'a'; char val1 = get1();
-                c.v[10] = 'b'; char val2 = get1();
+                                    c.v[10] = 'b'; char val2 = get1();
                 assertEquals(val1, 'a');
                 assertEquals(val2, (isStableEnabled ? 'a' : 'b'));
 
                 c.v = new char[20]; c.v[10] = 'c'; char val3 = get1();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'c'));
+                                                    : 'c'));
             }
 
             {
@@ -220,17 +220,17 @@ public class TestStableChar {
         public static void test() throws Exception {
             {
                 c.v = new char[1][1]; c.v[0][0] = 'a'; char val1 = get();
-                c.v[0][0] = 'b'; char val2 = get();
+                                      c.v[0][0] = 'b'; char val2 = get();
                 assertEquals(val1, 'a');
                 assertEquals(val2, (isStableEnabled ? 'a' : 'b'));
 
                 c.v = new char[1][1]; c.v[0][0] = 'c'; char val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'c'));
+                                                    : 'c'));
 
                 c.v[0] = new char[1]; c.v[0][0] = 'd'; char val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'd'));
+                                                    : 'd'));
             }
 
             {
@@ -260,21 +260,21 @@ public class TestStableChar {
         public static void test() throws Exception {
             {
                 c.v = new char[1][1][1]; c.v[0][0][0] = 'a'; char val1 = get();
-                c.v[0][0][0] = 'b'; char val2 = get();
+                                         c.v[0][0][0] = 'b'; char val2 = get();
                 assertEquals(val1, 'a');
                 assertEquals(val2, (isStableEnabled ? 'a' : 'b'));
 
                 c.v = new char[1][1][1]; c.v[0][0][0] = 'c'; char val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'c'));
+                                                    : 'c'));
 
                 c.v[0] = new char[1][1]; c.v[0][0][0] = 'd'; char val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'd'));
+                                                    : 'd'));
 
                 c.v[0][0] = new char[1]; c.v[0][0][0] = 'e'; char val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'e'));
+                                                    : 'e'));
             }
 
             {
@@ -311,25 +311,25 @@ public class TestStableChar {
         public static void test() throws Exception {
             {
                 c.v = new char[1][1][1][1]; c.v[0][0][0][0] = 'a'; char val1 = get();
-                c.v[0][0][0][0] = 'b'; char val2 = get();
+                                            c.v[0][0][0][0] = 'b'; char val2 = get();
                 assertEquals(val1, 'a');
                 assertEquals(val2, (isStableEnabled ? 'a' : 'b'));
 
                 c.v = new char[1][1][1][1]; c.v[0][0][0][0] = 'c'; char val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'c'));
+                                                    : 'c'));
 
                 c.v[0] = new char[1][1][1]; c.v[0][0][0][0] = 'd'; char val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'd'));
+                                                    : 'd'));
 
                 c.v[0][0] = new char[1][1]; c.v[0][0][0][0] = 'e'; char val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'e'));
+                                                    : 'e'));
 
                 c.v[0][0][0] = new char[1]; c.v[0][0][0][0] = 'f'; char val6 = get();
                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? 'a' : 'b')
-                        : 'f'));
+                                                    : 'f'));
             }
 
             {
@@ -370,7 +370,7 @@ public class TestStableChar {
         public static void test() throws Exception {
             {
                 c.v = new char[1]; ((char[])c.v)[0] = 'a'; char val1 = get();
-                ((char[])c.v)[0] = 'b'; char val2 = get();
+                                   ((char[])c.v)[0] = 'b'; char val2 = get();
 
                 assertEquals(val1, 'a');
                 assertEquals(val2, 'b');
@@ -397,7 +397,7 @@ public class TestStableChar {
         public static void test() throws Exception {
             {
                 c.v = new char[1][1]; ((char[][])c.v)[0][0] = 'a'; char val1 = get();
-                ((char[][])c.v)[0][0] = 'b'; char val2 = get();
+                                      ((char[][])c.v)[0][0] = 'b'; char val2 = get();
 
                 assertEquals(val1, 'a');
                 assertEquals(val2, 'b');
@@ -405,7 +405,7 @@ public class TestStableChar {
 
             {
                 c.v = new char[1][1]; c.v[0] = new char[0]; char[] val1 = get1();
-                c.v[0] = new char[0]; char[] val2 = get1();
+                                      c.v[0] = new char[0]; char[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -432,8 +432,8 @@ public class TestStableChar {
 
         public static void test() throws Exception {
             {
-                c.v = new char[1][1][1]; ((char[][][])c.v)[0][0][0] = 'a';  char val1 = get();
-                ((char[][][])c.v)[0][0][0] = 'b'; char val2 = get();
+                c.v = new char[1][1][1]; ((char[][][])c.v)[0][0][0] = 'a'; char val1 = get();
+                                         ((char[][][])c.v)[0][0][0] = 'b'; char val2 = get();
 
                 assertEquals(val1, 'a');
                 assertEquals(val2, 'b');
@@ -441,14 +441,14 @@ public class TestStableChar {
 
             {
                 c.v = new char[1][1][1]; c.v[0][0] = new char[0]; char[] val1 = get1();
-                c.v[0][0] = new char[0]; char[] val2 = get1();
+                                         c.v[0][0] = new char[0]; char[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
 
             {
                 c.v = new char[1][1][1]; c.v[0] = new char[0][0]; char[][] val1 = get2();
-                c.v[0] = new char[0][0]; char[][] val2 = get2();
+                                         c.v[0] = new char[0][0]; char[][] val2 = get2();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -478,7 +478,7 @@ public class TestStableChar {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.a = 'a'; A val1 = get();
-                c.v.a = 'b'; A val2 = get();
+                               c.v.a = 'b'; A val2 = get();
 
                 assertEquals(val1.a, 'b');
                 assertEquals(val2.a, 'b');
@@ -486,7 +486,7 @@ public class TestStableChar {
 
             {
                 c.v = new A(); c.v.a = 'a'; char val1 = get1();
-                c.v.a = 'b'; char val2 = get1();
+                               c.v.a = 'b'; char val2 = get1();
                 c.v = new A(); c.v.a = 'c'; char val3 = get1();
 
                 assertEquals(val1, 'a');
@@ -512,8 +512,8 @@ public class TestStableChar {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.next = new A(); c.v.next.next  = c.v;
-                c.v.a = 'a'; c.v.next.a = 'a'; A val1 = get();
-                c.v.a = 'b'; c.v.next.a = 'b'; A val2 = get();
+                               c.v.a = 'a'; c.v.next.a = 'a'; A val1 = get();
+                               c.v.a = 'b'; c.v.next.a = 'b'; A val2 = get();
 
                 assertEquals(val1.a, 'b');
                 assertEquals(val2.a, 'b');
@@ -521,10 +521,10 @@ public class TestStableChar {
 
             {
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 'a'; char val1 = get1();
-                c.v.a = 'b'; char val2 = get1();
+                               c.v.a = 'a'; char val1 = get1();
+                               c.v.a = 'b'; char val2 = get1();
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 'c'; char val3 = get1();
+                               c.v.a = 'c'; char val3 = get1();
 
                 assertEquals(val1, 'a');
                 assertEquals(val2, (isStableEnabled ? 'a' : 'b'));
@@ -550,8 +550,8 @@ public class TestStableChar {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.left = c.v.right = c.v;
-                c.v.a = 'a'; char val1 = get(); char val2 = get1();
-                c.v.a = 'b'; char val3 = get(); char val4 = get1();
+                               c.v.a = 'a'; char val1 = get(); char val2 = get1();
+                               c.v.a = 'b'; char val3 = get(); char val4 = get1();
 
                 assertEquals(val1, 'a');
                 assertEquals(val3, (isStableEnabled ? 'a' : 'b'));
@@ -581,8 +581,8 @@ public class TestStableChar {
             {
                 A elem = new A();
                 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
-                elem.a = 'a'; char val1 = get(); char val2 = get1();
-                elem.a = 'b'; char val3 = get(); char val4 = get1();
+                               elem.a = 'a'; char val1 = get(); char val2 = get1();
+                               elem.a = 'b'; char val3 = get(); char val4 = get1();
 
                 assertEquals(val1, 'a');
                 assertEquals(val3, (isStableEnabled ? 'a' : 'b'));
diff --git a/hotspot/test/compiler/stable/TestStableDouble.java b/hotspot/test/compiler/stable/TestStableDouble.java
index 09a388a99a8..34a3df697ea 100644
--- a/hotspot/test/compiler/stable/TestStableDouble.java
+++ b/hotspot/test/compiler/stable/TestStableDouble.java
@@ -100,7 +100,7 @@ public class TestStableDouble {
         public static final DefaultValue c = new DefaultValue();
         public static double get() { return c.v; }
         public static void test() throws Exception {
-            double val1 = get();
+                       double val1 = get();
             c.v = 1.0; double val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1.0);
@@ -130,7 +130,7 @@ public class TestStableDouble {
         public static final DefaultStaticValue c = new DefaultStaticValue();
         public static double get() { return c.v; }
         public static void test() throws Exception {
-            double val1 = get();
+                       double val1 = get();
             c.v = 1.0; double val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1.0);
@@ -180,24 +180,24 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new double[1]; c.v[0] = 1.0; double val1 = get();
-                c.v[0] = 2.0; double val2 = get();
+                                     c.v[0] = 2.0; double val2 = get();
                 assertEquals(val1, 1.0);
                 assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
 
                 c.v = new double[1]; c.v[0] = 3.0; double val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 3.0));
+                                                    : 3.0));
             }
 
             {
                 c.v = new double[20]; c.v[10] = 1.0; double val1 = get1();
-                c.v[10] = 2.0; double val2 = get1();
+                                      c.v[10] = 2.0; double val2 = get1();
                 assertEquals(val1, 1.0);
                 assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
 
                 c.v = new double[20]; c.v[10] = 3.0; double val3 = get1();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 3.0));
+                                                    : 3.0));
             }
 
             {
@@ -220,17 +220,17 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new double[1][1]; c.v[0][0] = 1.0; double val1 = get();
-                c.v[0][0] = 2.0; double val2 = get();
+                                        c.v[0][0] = 2.0; double val2 = get();
                 assertEquals(val1, 1.0);
                 assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
 
                 c.v = new double[1][1]; c.v[0][0] = 3.0; double val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 3.0));
+                                                    : 3.0));
 
                 c.v[0] = new double[1]; c.v[0][0] = 4.0; double val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 4.0));
+                                                    : 4.0));
             }
 
             {
@@ -260,21 +260,21 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new double[1][1][1]; c.v[0][0][0] = 1.0; double val1 = get();
-                c.v[0][0][0] = 2.0; double val2 = get();
+                                           c.v[0][0][0] = 2.0; double val2 = get();
                 assertEquals(val1, 1.0);
                 assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
 
                 c.v = new double[1][1][1]; c.v[0][0][0] = 3.0; double val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 3.0));
+                                                    : 3.0));
 
                 c.v[0] = new double[1][1]; c.v[0][0][0] = 4.0; double val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 4.0));
+                                                    : 4.0));
 
                 c.v[0][0] = new double[1]; c.v[0][0][0] = 5.0; double val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 5.0));
+                                                    : 5.0));
             }
 
             {
@@ -311,25 +311,25 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new double[1][1][1][1]; c.v[0][0][0][0] = 1.0; double val1 = get();
-                c.v[0][0][0][0] = 2.0; double val2 = get();
+                                              c.v[0][0][0][0] = 2.0; double val2 = get();
                 assertEquals(val1, 1.0);
                 assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
 
                 c.v = new double[1][1][1][1]; c.v[0][0][0][0] = 3.0; double val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 3.0));
+                                                    : 3.0));
 
                 c.v[0] = new double[1][1][1]; c.v[0][0][0][0] = 4.0; double val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 4.0));
+                                                    : 4.0));
 
                 c.v[0][0] = new double[1][1]; c.v[0][0][0][0] = 5.0; double val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 5.0));
+                                                    : 5.0));
 
                 c.v[0][0][0] = new double[1]; c.v[0][0][0][0] = 6.0; double val6 = get();
                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? 1.0 : 2.0)
-                        : 6.0));
+                                                    : 6.0));
             }
 
             {
@@ -370,7 +370,7 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new double[1]; ((double[])c.v)[0] = 1.0; double val1 = get();
-                ((double[])c.v)[0] = 2.0; double val2 = get();
+                                     ((double[])c.v)[0] = 2.0; double val2 = get();
 
                 assertEquals(val1, 1.0);
                 assertEquals(val2, 2.0);
@@ -397,7 +397,7 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new double[1][1]; ((double[][])c.v)[0][0] = 1.0; double val1 = get();
-                ((double[][])c.v)[0][0] = 2.0; double val2 = get();
+                                        ((double[][])c.v)[0][0] = 2.0; double val2 = get();
 
                 assertEquals(val1, 1.0);
                 assertEquals(val2, 2.0);
@@ -405,7 +405,7 @@ public class TestStableDouble {
 
             {
                 c.v = new double[1][1]; c.v[0] = new double[0]; double[] val1 = get1();
-                c.v[0] = new double[0]; double[] val2 = get1();
+                                        c.v[0] = new double[0]; double[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -433,7 +433,7 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new double[1][1][1]; ((double[][][])c.v)[0][0][0] = 1.0; double val1 = get();
-                ((double[][][])c.v)[0][0][0] = 2.0; double val2 = get();
+                                           ((double[][][])c.v)[0][0][0] = 2.0; double val2 = get();
 
                 assertEquals(val1, 1.0);
                 assertEquals(val2, 2.0);
@@ -441,14 +441,14 @@ public class TestStableDouble {
 
             {
                 c.v = new double[1][1][1]; c.v[0][0] = new double[0]; double[] val1 = get1();
-                c.v[0][0] = new double[0]; double[] val2 = get1();
+                                           c.v[0][0] = new double[0]; double[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
 
             {
                 c.v = new double[1][1][1]; c.v[0] = new double[0][0]; double[][] val1 = get2();
-                c.v[0] = new double[0][0]; double[][] val2 = get2();
+                                           c.v[0] = new double[0][0]; double[][] val2 = get2();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -478,7 +478,7 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.a = 1.0; A val1 = get();
-                c.v.a = 2.0; A val2 = get();
+                               c.v.a = 2.0; A val2 = get();
 
                 assertEquals(val1.a, 2.0);
                 assertEquals(val2.a, 2.0);
@@ -486,7 +486,7 @@ public class TestStableDouble {
 
             {
                 c.v = new A(); c.v.a = 1.0; double val1 = get1();
-                c.v.a = 2.0; double val2 = get1();
+                               c.v.a = 2.0; double val2 = get1();
                 c.v = new A(); c.v.a = 3.0; double val3 = get1();
 
                 assertEquals(val1, 1.0);
@@ -512,8 +512,8 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.next = new A();   c.v.next.next  = c.v;
-                c.v.a = 1.0; c.v.next.a = 1.0; A val1 = get();
-                c.v.a = 2.0; c.v.next.a = 2.0; A val2 = get();
+                               c.v.a = 1.0; c.v.next.a = 1.0; A val1 = get();
+                               c.v.a = 2.0; c.v.next.a = 2.0; A val2 = get();
 
                 assertEquals(val1.a, 2.0);
                 assertEquals(val2.a, 2.0);
@@ -521,10 +521,10 @@ public class TestStableDouble {
 
             {
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 1.0; double val1 = get1();
-                c.v.a = 2.0; double val2 = get1();
+                               c.v.a = 1.0; double val1 = get1();
+                               c.v.a = 2.0; double val2 = get1();
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 3.0; double val3 = get1();
+                               c.v.a = 3.0; double val3 = get1();
 
                 assertEquals(val1, 1.0);
                 assertEquals(val2, (isStableEnabled ? 1.0 : 2.0));
@@ -550,8 +550,8 @@ public class TestStableDouble {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.left = c.v.right = c.v;
-                c.v.a = 1.0; double val1 = get(); double val2 = get1();
-                c.v.a = 2.0; double val3 = get(); double val4 = get1();
+                               c.v.a = 1.0; double val1 = get(); double val2 = get1();
+                               c.v.a = 2.0; double val3 = get(); double val4 = get1();
 
                 assertEquals(val1, 1.0);
                 assertEquals(val3, (isStableEnabled ? 1.0 : 2.0));
@@ -581,8 +581,8 @@ public class TestStableDouble {
             {
                 A elem = new A();
                 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
-                elem.a = 1.0; double val1 = get(); double val2 = get1();
-                elem.a = 2.0; double val3 = get(); double val4 = get1();
+                               elem.a = 1.0; double val1 = get(); double val2 = get1();
+                               elem.a = 2.0; double val3 = get(); double val4 = get1();
 
                 assertEquals(val1, 1.0);
                 assertEquals(val3, (isStableEnabled ? 1.0 : 2.0));
diff --git a/hotspot/test/compiler/stable/TestStableFloat.java b/hotspot/test/compiler/stable/TestStableFloat.java
index 7053e671c85..0f9fc974269 100644
--- a/hotspot/test/compiler/stable/TestStableFloat.java
+++ b/hotspot/test/compiler/stable/TestStableFloat.java
@@ -100,7 +100,7 @@ public class TestStableFloat {
         public static final DefaultValue c = new DefaultValue();
         public static float get() { return c.v; }
         public static void test() throws Exception {
-            float val1 = get();
+                        float val1 = get();
             c.v = 1.0F; float val2 = get();
             assertEquals(val1, 0F);
             assertEquals(val2, 1.0F);
@@ -180,24 +180,24 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new float[1]; c.v[0] = 1.0F; float val1 = get();
-                c.v[0] = 2.0F; float val2 = get();
+                                    c.v[0] = 2.0F; float val2 = get();
                 assertEquals(val1, 1.0F);
                 assertEquals(val2, (isStableEnabled ? 1.0F : 2.0F));
 
                 c.v = new float[1]; c.v[0] = 3.0F; float val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 3.0F));
+                                                    : 3.0F));
             }
 
             {
                 c.v = new float[20]; c.v[10] = 1.0F; float val1 = get1();
-                c.v[10] = 2.0F; float val2 = get1();
+                                     c.v[10] = 2.0F; float val2 = get1();
                 assertEquals(val1, 1.0F);
                 assertEquals(val2, (isStableEnabled ? 1.0F : 2.0F));
 
                 c.v = new float[20]; c.v[10] = 3.0F; float val3 = get1();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 3.0F));
+                                                    : 3.0F));
             }
 
             {
@@ -220,17 +220,17 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new float[1][1]; c.v[0][0] = 1.0F; float val1 = get();
-                c.v[0][0] = 2.0F; float val2 = get();
+                                       c.v[0][0] = 2.0F; float val2 = get();
                 assertEquals(val1, 1.0F);
                 assertEquals(val2, (isStableEnabled ? 1.0F : 2.0F));
 
                 c.v = new float[1][1]; c.v[0][0] = 3.0F; float val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 3.0F));
+                                                    : 3.0F));
 
                 c.v[0] = new float[1]; c.v[0][0] = 4.0F; float val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 4.0F));
+                                                    : 4.0F));
             }
 
             {
@@ -260,21 +260,21 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new float[1][1][1]; c.v[0][0][0] = 1.0F; float val1 = get();
-                c.v[0][0][0] = 2.0F; float val2 = get();
+                                          c.v[0][0][0] = 2.0F; float val2 = get();
                 assertEquals(val1, 1.0F);
                 assertEquals(val2, (isStableEnabled ? 1.0F : 2.0F));
 
                 c.v = new float[1][1][1]; c.v[0][0][0] = 3.0F; float val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 3.0F));
+                                                    : 3.0F));
 
                 c.v[0] = new float[1][1]; c.v[0][0][0] = 4.0F; float val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 4.0F));
+                                                    : 4.0F));
 
                 c.v[0][0] = new float[1]; c.v[0][0][0] = 5.0F; float val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 5.0F));
+                                                    : 5.0F));
             }
 
             {
@@ -311,25 +311,25 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new float[1][1][1][1]; c.v[0][0][0][0] = 1.0F; float val1 = get();
-                c.v[0][0][0][0] = 2.0F; float val2 = get();
+                                             c.v[0][0][0][0] = 2.0F; float val2 = get();
                 assertEquals(val1, 1.0F);
                 assertEquals(val2, (isStableEnabled ? 1.0F : 2.0F));
 
                 c.v = new float[1][1][1][1]; c.v[0][0][0][0] = 3.0F; float val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 3.0F));
+                                                    : 3.0F));
 
                 c.v[0] = new float[1][1][1]; c.v[0][0][0][0] = 4.0F; float val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 4.0F));
+                                                    : 4.0F));
 
                 c.v[0][0] = new float[1][1]; c.v[0][0][0][0] = 5.0F; float val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 5.0F));
+                                                    : 5.0F));
 
                 c.v[0][0][0] = new float[1]; c.v[0][0][0][0] = 6.0F; float val6 = get();
                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? 1.0F : 2.0F)
-                        : 6.0F));
+                                                    : 6.0F));
             }
 
             {
@@ -370,7 +370,7 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new float[1]; ((float[])c.v)[0] = 1.0F; float val1 = get();
-                ((float[])c.v)[0] = 2.0F; float val2 = get();
+                                    ((float[])c.v)[0] = 2.0F; float val2 = get();
 
                 assertEquals(val1, 1.0F);
                 assertEquals(val2, 2.0F);
@@ -397,7 +397,7 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new float[1][1]; ((float[][])c.v)[0][0] = 1.0F; float val1 = get();
-                ((float[][])c.v)[0][0] = 2.0F; float val2 = get();
+                                       ((float[][])c.v)[0][0] = 2.0F; float val2 = get();
 
                 assertEquals(val1, 1.0F);
                 assertEquals(val2, 2.0F);
@@ -405,7 +405,7 @@ public class TestStableFloat {
 
             {
                 c.v = new float[1][1]; c.v[0] = new float[0]; float[] val1 = get1();
-                c.v[0] = new float[0]; float[] val2 = get1();
+                                       c.v[0] = new float[0]; float[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -433,7 +433,7 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new float[1][1][1]; ((float[][][])c.v)[0][0][0] = 1.0F; float val1 = get();
-                ((float[][][])c.v)[0][0][0] = 2.0F; float val2 = get();
+                                          ((float[][][])c.v)[0][0][0] = 2.0F; float val2 = get();
 
                 assertEquals(val1, 1.0F);
                 assertEquals(val2, 2.0F);
@@ -441,14 +441,14 @@ public class TestStableFloat {
 
             {
                 c.v = new float[1][1][1]; c.v[0][0] = new float[0]; float[] val1 = get1();
-                c.v[0][0] = new float[0]; float[] val2 = get1();
+                                          c.v[0][0] = new float[0]; float[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
 
             {
                 c.v = new float[1][1][1]; c.v[0] = new float[0][0]; float[][] val1 = get2();
-                c.v[0] = new float[0][0]; float[][] val2 = get2();
+                                          c.v[0] = new float[0][0]; float[][] val2 = get2();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -478,7 +478,7 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.a = 1.0F; A val1 = get();
-                c.v.a = 2.0F; A val2 = get();
+                               c.v.a = 2.0F; A val2 = get();
 
                 assertEquals(val1.a, 2.0F);
                 assertEquals(val2.a, 2.0F);
@@ -486,7 +486,7 @@ public class TestStableFloat {
 
             {
                 c.v = new A(); c.v.a = 1.0F; float val1 = get1();
-                c.v.a = 2.0F; float val2 = get1();
+                               c.v.a = 2.0F; float val2 = get1();
                 c.v = new A(); c.v.a = 3.0F; float val3 = get1();
 
                 assertEquals(val1, 1.0F);
@@ -512,8 +512,8 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.next = new A();   c.v.next.next  = c.v;
-                c.v.a = 1.0F; c.v.next.a = 1.0F; A val1 = get();
-                c.v.a = 2.0F; c.v.next.a = 2.0F; A val2 = get();
+                               c.v.a = 1.0F; c.v.next.a = 1.0F; A val1 = get();
+                               c.v.a = 2.0F; c.v.next.a = 2.0F; A val2 = get();
 
                 assertEquals(val1.a, 2.0F);
                 assertEquals(val2.a, 2.0F);
@@ -521,10 +521,10 @@ public class TestStableFloat {
 
             {
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 1.0F; float val1 = get1();
-                c.v.a = 2.0F; float val2 = get1();
+                               c.v.a = 1.0F; float val1 = get1();
+                               c.v.a = 2.0F; float val2 = get1();
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 3.0F; float val3 = get1();
+                               c.v.a = 3.0F; float val3 = get1();
 
                 assertEquals(val1, 1.0F);
                 assertEquals(val2, (isStableEnabled ? 1.0F : 2.0F));
@@ -550,8 +550,8 @@ public class TestStableFloat {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.left = c.v.right = c.v;
-                c.v.a = 1.0F; float val1 = get(); float val2 = get1();
-                c.v.a = 2.0F; float val3 = get(); float val4 = get1();
+                               c.v.a = 1.0F; float val1 = get(); float val2 = get1();
+                               c.v.a = 2.0F; float val3 = get(); float val4 = get1();
 
                 assertEquals(val1, 1.0F);
                 assertEquals(val3, (isStableEnabled ? 1.0F : 2.0F));
@@ -581,8 +581,8 @@ public class TestStableFloat {
             {
                 A elem = new A();
                 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
-                elem.a = 1.0F; float val1 = get(); float val2 = get1();
-                elem.a = 2.0F; float val3 = get(); float val4 = get1();
+                               elem.a = 1.0F; float val1 = get(); float val2 = get1();
+                               elem.a = 2.0F; float val3 = get(); float val4 = get1();
 
                 assertEquals(val1, 1.0F);
                 assertEquals(val3, (isStableEnabled ? 1.0F : 2.0F));
diff --git a/hotspot/test/compiler/stable/TestStableInt.java b/hotspot/test/compiler/stable/TestStableInt.java
index 1ebe5295592..4da1d89509e 100644
--- a/hotspot/test/compiler/stable/TestStableInt.java
+++ b/hotspot/test/compiler/stable/TestStableInt.java
@@ -100,7 +100,7 @@ public class TestStableInt {
         public static final DefaultValue c = new DefaultValue();
         public static int get() { return c.v; }
         public static void test() throws Exception {
-            int val1 = get();
+                     int val1 = get();
             c.v = 1; int val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1);
@@ -130,7 +130,7 @@ public class TestStableInt {
         public static final DefaultStaticValue c = new DefaultStaticValue();
         public static int get() { return c.v; }
         public static void test() throws Exception {
-            int val1 = get();
+                     int val1 = get();
             c.v = 1; int val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1);
@@ -180,24 +180,24 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new int[1]; c.v[0] = 1; int val1 = get();
-                c.v[0] = 2; int val2 = get();
+                                  c.v[0] = 2; int val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new int[1]; c.v[0] = 3; int val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
             }
 
             {
                 c.v = new int[20]; c.v[10] = 1; int val1 = get1();
-                c.v[10] = 2; int val2 = get1();
+                                   c.v[10] = 2; int val2 = get1();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new int[20]; c.v[10] = 3; int val3 = get1();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
             }
 
             {
@@ -220,17 +220,17 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new int[1][1]; c.v[0][0] = 1; int val1 = get();
-                c.v[0][0] = 2; int val2 = get();
+                                     c.v[0][0] = 2; int val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new int[1][1]; c.v[0][0] = 3; int val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new int[1]; c.v[0][0] = 4; int val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
             }
 
             {
@@ -260,21 +260,21 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new int[1][1][1]; c.v[0][0][0] = 1; int val1 = get();
-                c.v[0][0][0] = 2; int val2 = get();
+                                        c.v[0][0][0] = 2; int val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new int[1][1][1]; c.v[0][0][0] = 3; int val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new int[1][1]; c.v[0][0][0] = 4; int val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
 
                 c.v[0][0] = new int[1]; c.v[0][0][0] = 5; int val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 5));
+                                                    : 5));
             }
 
             {
@@ -311,25 +311,25 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new int[1][1][1][1]; c.v[0][0][0][0] = 1; int val1 = get();
-                c.v[0][0][0][0] = 2; int val2 = get();
+                                           c.v[0][0][0][0] = 2; int val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new int[1][1][1][1]; c.v[0][0][0][0] = 3; int val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new int[1][1][1]; c.v[0][0][0][0] = 4; int val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
 
                 c.v[0][0] = new int[1][1]; c.v[0][0][0][0] = 5; int val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 5));
+                                                    : 5));
 
                 c.v[0][0][0] = new int[1]; c.v[0][0][0][0] = 6; int val6 = get();
                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 6));
+                                                    : 6));
             }
 
             {
@@ -370,7 +370,7 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new int[1]; ((int[])c.v)[0] = 1; int val1 = get();
-                ((int[])c.v)[0] = 2; int val2 = get();
+                                  ((int[])c.v)[0] = 2; int val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -397,7 +397,7 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new int[1][1]; ((int[][])c.v)[0][0] = 1; int val1 = get();
-                ((int[][])c.v)[0][0] = 2; int val2 = get();
+                                     ((int[][])c.v)[0][0] = 2; int val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -405,7 +405,7 @@ public class TestStableInt {
 
             {
                 c.v = new int[1][1]; c.v[0] = new int[0]; int[] val1 = get1();
-                c.v[0] = new int[0]; int[] val2 = get1();
+                                     c.v[0] = new int[0]; int[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -433,7 +433,7 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new int[1][1][1]; ((int[][][])c.v)[0][0][0] = 1; int val1 = get();
-                ((int[][][])c.v)[0][0][0] = 2; int val2 = get();
+                                        ((int[][][])c.v)[0][0][0] = 2; int val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -441,14 +441,14 @@ public class TestStableInt {
 
             {
                 c.v = new int[1][1][1]; c.v[0][0] = new int[0]; int[] val1 = get1();
-                c.v[0][0] = new int[0]; int[] val2 = get1();
+                                        c.v[0][0] = new int[0]; int[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
 
             {
                 c.v = new int[1][1][1]; c.v[0] = new int[0][0]; int[][] val1 = get2();
-                c.v[0] = new int[0][0]; int[][] val2 = get2();
+                                        c.v[0] = new int[0][0]; int[][] val2 = get2();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -478,7 +478,7 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.a = 1; A val1 = get();
-                c.v.a = 2; A val2 = get();
+                               c.v.a = 2; A val2 = get();
 
                 assertEquals(val1.a, 2);
                 assertEquals(val2.a, 2);
@@ -486,7 +486,7 @@ public class TestStableInt {
 
             {
                 c.v = new A(); c.v.a = 1; int val1 = get1();
-                c.v.a = 2; int val2 = get1();
+                               c.v.a = 2; int val2 = get1();
                 c.v = new A(); c.v.a = 3; int val3 = get1();
 
                 assertEquals(val1, 1);
@@ -512,8 +512,8 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.next = new A();   c.v.next.next  = c.v;
-                c.v.a = 1; c.v.next.a = 1; A val1 = get();
-                c.v.a = 2; c.v.next.a = 2; A val2 = get();
+                               c.v.a = 1; c.v.next.a = 1; A val1 = get();
+                               c.v.a = 2; c.v.next.a = 2; A val2 = get();
 
                 assertEquals(val1.a, 2);
                 assertEquals(val2.a, 2);
@@ -521,10 +521,10 @@ public class TestStableInt {
 
             {
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 1; int val1 = get1();
-                c.v.a = 2; int val2 = get1();
+                               c.v.a = 1; int val1 = get1();
+                               c.v.a = 2; int val2 = get1();
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 3; int val3 = get1();
+                               c.v.a = 3; int val3 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
@@ -550,8 +550,8 @@ public class TestStableInt {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.left = c.v.right = c.v;
-                c.v.a = 1; int val1 = get(); int val2 = get1();
-                c.v.a = 2; int val3 = get(); int val4 = get1();
+                               c.v.a = 1; int val1 = get(); int val2 = get1();
+                               c.v.a = 2; int val3 = get(); int val4 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val3, (isStableEnabled ? 1 : 2));
@@ -581,8 +581,8 @@ public class TestStableInt {
             {
                 A elem = new A();
                 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
-                elem.a = 1; int val1 = get(); int val2 = get1();
-                elem.a = 2; int val3 = get(); int val4 = get1();
+                               elem.a = 1; int val1 = get(); int val2 = get1();
+                               elem.a = 2; int val3 = get(); int val4 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val3, (isStableEnabled ? 1 : 2));
diff --git a/hotspot/test/compiler/stable/TestStableLong.java b/hotspot/test/compiler/stable/TestStableLong.java
index b70ea910d51..dfbf93b623f 100644
--- a/hotspot/test/compiler/stable/TestStableLong.java
+++ b/hotspot/test/compiler/stable/TestStableLong.java
@@ -100,7 +100,7 @@ public class TestStableLong {
         public static final DefaultValue c = new DefaultValue();
         public static long get() { return c.v; }
         public static void test() throws Exception {
-            long val1 = get();
+                      long val1 = get();
             c.v = 1L; long val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1L);
@@ -130,7 +130,7 @@ public class TestStableLong {
         public static final DefaultStaticValue c = new DefaultStaticValue();
         public static long get() { return c.v; }
         public static void test() throws Exception {
-            long val1 = get();
+                      long val1 = get();
             c.v = 1L; long val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1L);
@@ -180,24 +180,24 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new long[1]; c.v[0] = 1; long val1 = get();
-                c.v[0] = 2; long val2 = get();
+                                   c.v[0] = 2; long val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new long[1]; c.v[0] = 3; long val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
             }
 
             {
                 c.v = new long[20]; c.v[10] = 1; long val1 = get1();
-                c.v[10] = 2; long val2 = get1();
+                                    c.v[10] = 2; long val2 = get1();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new long[20]; c.v[10] = 3; long val3 = get1();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
             }
 
             {
@@ -220,17 +220,17 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new long[1][1]; c.v[0][0] = 1; long val1 = get();
-                c.v[0][0] = 2; long val2 = get();
+                                      c.v[0][0] = 2; long val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new long[1][1]; c.v[0][0] = 3; long val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new long[1]; c.v[0][0] = 4; long val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
             }
 
             {
@@ -260,21 +260,21 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new long[1][1][1]; c.v[0][0][0] = 1; long val1 = get();
-                c.v[0][0][0] = 2; long val2 = get();
+                                         c.v[0][0][0] = 2; long val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new long[1][1][1]; c.v[0][0][0] = 3; long val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new long[1][1]; c.v[0][0][0] = 4; long val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
 
                 c.v[0][0] = new long[1]; c.v[0][0][0] = 5; long val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 5));
+                                                    : 5));
             }
 
             {
@@ -311,25 +311,25 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new long[1][1][1][1]; c.v[0][0][0][0] = 1; long val1 = get();
-                c.v[0][0][0][0] = 2; long val2 = get();
+                                            c.v[0][0][0][0] = 2; long val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new long[1][1][1][1]; c.v[0][0][0][0] = 3; long val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new long[1][1][1]; c.v[0][0][0][0] = 4; long val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
 
                 c.v[0][0] = new long[1][1]; c.v[0][0][0][0] = 5; long val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 5));
+                                                    : 5));
 
                 c.v[0][0][0] = new long[1]; c.v[0][0][0][0] = 6; long val6 = get();
                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 6));
+                                                    : 6));
             }
 
             {
@@ -370,7 +370,7 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new long[1]; ((long[])c.v)[0] = 1; long val1 = get();
-                ((long[])c.v)[0] = 2; long val2 = get();
+                                   ((long[])c.v)[0] = 2; long val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -397,7 +397,7 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new long[1][1]; ((long[][])c.v)[0][0] = 1; long val1 = get();
-                ((long[][])c.v)[0][0] = 2; long val2 = get();
+                                      ((long[][])c.v)[0][0] = 2; long val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -405,7 +405,7 @@ public class TestStableLong {
 
             {
                 c.v = new long[1][1]; c.v[0] = new long[0]; long[] val1 = get1();
-                c.v[0] = new long[0]; long[] val2 = get1();
+                                      c.v[0] = new long[0]; long[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -433,7 +433,7 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new long[1][1][1]; ((long[][][])c.v)[0][0][0] = 1L; long val1 = get();
-                ((long[][][])c.v)[0][0][0] = 2L; long val2 = get();
+                                         ((long[][][])c.v)[0][0][0] = 2L; long val2 = get();
 
                 assertEquals(val1, 1L);
                 assertEquals(val2, 2L);
@@ -441,14 +441,14 @@ public class TestStableLong {
 
             {
                 c.v = new long[1][1][1]; c.v[0][0] = new long[0]; long[] val1 = get1();
-                c.v[0][0] = new long[0]; long[] val2 = get1();
+                                         c.v[0][0] = new long[0]; long[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
 
             {
                 c.v = new long[1][1][1]; c.v[0] = new long[0][0]; long[][] val1 = get2();
-                c.v[0] = new long[0][0]; long[][] val2 = get2();
+                                         c.v[0] = new long[0][0]; long[][] val2 = get2();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -478,7 +478,7 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.a = 1; A val1 = get();
-                c.v.a = 2; A val2 = get();
+                               c.v.a = 2; A val2 = get();
 
                 assertEquals(val1.a, 2);
                 assertEquals(val2.a, 2);
@@ -486,7 +486,7 @@ public class TestStableLong {
 
             {
                 c.v = new A(); c.v.a = 1; long val1 = get1();
-                c.v.a = 2; long val2 = get1();
+                               c.v.a = 2; long val2 = get1();
                 c.v = new A(); c.v.a = 3; long val3 = get1();
 
                 assertEquals(val1, 1);
@@ -512,8 +512,8 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.next = new A();   c.v.next.next  = c.v;
-                c.v.a = 1; c.v.next.a = 1; A val1 = get();
-                c.v.a = 2; c.v.next.a = 2; A val2 = get();
+                               c.v.a = 1; c.v.next.a = 1; A val1 = get();
+                               c.v.a = 2; c.v.next.a = 2; A val2 = get();
 
                 assertEquals(val1.a, 2);
                 assertEquals(val2.a, 2);
@@ -521,10 +521,10 @@ public class TestStableLong {
 
             {
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 1; long val1 = get1();
-                c.v.a = 2; long val2 = get1();
+                               c.v.a = 1; long val1 = get1();
+                               c.v.a = 2; long val2 = get1();
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 3; long val3 = get1();
+                               c.v.a = 3; long val3 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
@@ -550,8 +550,8 @@ public class TestStableLong {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.left = c.v.right = c.v;
-                c.v.a = 1; long val1 = get(); long val2 = get1();
-                c.v.a = 2; long val3 = get(); long val4 = get1();
+                               c.v.a = 1; long val1 = get(); long val2 = get1();
+                               c.v.a = 2; long val3 = get(); long val4 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val3, (isStableEnabled ? 1 : 2));
@@ -581,8 +581,8 @@ public class TestStableLong {
             {
                 A elem = new A();
                 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
-                elem.a = 1; long val1 = get(); long val2 = get1();
-                elem.a = 2; long val3 = get(); long val4 = get1();
+                               elem.a = 1; long val1 = get(); long val2 = get1();
+                               elem.a = 2; long val3 = get(); long val4 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val3, (isStableEnabled ? 1 : 2));
diff --git a/hotspot/test/compiler/stable/TestStableObject.java b/hotspot/test/compiler/stable/TestStableObject.java
index cc0f89b4e06..1ad6b681a08 100644
--- a/hotspot/test/compiler/stable/TestStableObject.java
+++ b/hotspot/test/compiler/stable/TestStableObject.java
@@ -102,7 +102,7 @@ public class TestStableObject {
         public static final DefaultValue c = new DefaultValue();
         public static Object get() { return c.v; }
         public static void test() throws Exception {
-            Object val1 = get();
+                            Object val1 = get();
             c.v = Values.A; Object val2 = get();
             assertEquals(val1, null);
             assertEquals(val2, Values.A);
@@ -132,7 +132,7 @@ public class TestStableObject {
         public static final DefaultStaticValue c = new DefaultStaticValue();
         public static Object get() { return c.v; }
         public static void test() throws Exception {
-            Object val1 = get();
+                            Object val1 = get();
             c.v = Values.A; Object val2 = get();
             assertEquals(val1, null);
             assertEquals(val2, Values.A);
@@ -182,24 +182,24 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new Object[1]; c.v[0] = Values.A; Object val1 = get();
-                c.v[0] = Values.B; Object val2 = get();
+                                     c.v[0] = Values.B; Object val2 = get();
                 assertEquals(val1, Values.A);
                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
 
                 c.v = new Object[1]; c.v[0] = Values.C; Object val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.C));
+                                                    : Values.C));
             }
 
             {
                 c.v = new Object[20]; c.v[10] = Values.A; Object val1 = get1();
-                c.v[10] = Values.B; Object val2 = get1();
+                                      c.v[10] = Values.B; Object val2 = get1();
                 assertEquals(val1, Values.A);
                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
 
                 c.v = new Object[20]; c.v[10] = Values.C; Object val3 = get1();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.C));
+                                                    : Values.C));
             }
 
             {
@@ -222,17 +222,17 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new Object[1][1]; c.v[0][0] = Values.A; Object val1 = get();
-                c.v[0][0] = Values.B; Object val2 = get();
+                                        c.v[0][0] = Values.B; Object val2 = get();
                 assertEquals(val1, Values.A);
                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
 
                 c.v = new Object[1][1]; c.v[0][0] = Values.C; Object val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.C));
+                                                    : Values.C));
 
                 c.v[0] = new Object[1]; c.v[0][0] = Values.D; Object val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.D));
+                                                    : Values.D));
             }
 
             {
@@ -262,21 +262,21 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new Object[1][1][1]; c.v[0][0][0] = Values.A; Object val1 = get();
-                c.v[0][0][0] = Values.B; Object val2 = get();
+                                           c.v[0][0][0] = Values.B; Object val2 = get();
                 assertEquals(val1, Values.A);
                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
 
                 c.v = new Object[1][1][1]; c.v[0][0][0] = Values.C; Object val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.C));
+                                                    : Values.C));
 
                 c.v[0] = new Object[1][1]; c.v[0][0][0] = Values.D; Object val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.D));
+                                                    : Values.D));
 
                 c.v[0][0] = new Object[1]; c.v[0][0][0] = Values.E; Object val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.E));
+                                                    : Values.E));
             }
 
             {
@@ -313,25 +313,25 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new Object[1][1][1][1]; c.v[0][0][0][0] = Values.A; Object val1 = get();
-                c.v[0][0][0][0] = Values.B; Object val2 = get();
+                                              c.v[0][0][0][0] = Values.B; Object val2 = get();
                 assertEquals(val1, Values.A);
                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
 
                 c.v = new Object[1][1][1][1]; c.v[0][0][0][0] = Values.C; Object val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.C));
+                                                    : Values.C));
 
                 c.v[0] = new Object[1][1][1]; c.v[0][0][0][0] = Values.D; Object val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.D));
+                                                    : Values.D));
 
                 c.v[0][0] = new Object[1][1]; c.v[0][0][0][0] = Values.E; Object val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.E));
+                                                    : Values.E));
 
                 c.v[0][0][0] = new Object[1]; c.v[0][0][0][0] = Values.F; Object val6 = get();
                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? Values.A : Values.B)
-                        : Values.F));
+                                                    : Values.F));
             }
 
             {
@@ -372,7 +372,7 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new Object[1]; ((Object[])c.v)[0] = Values.A; Object val1 = get();
-                ((Object[])c.v)[0] = Values.B; Object val2 = get();
+                                     ((Object[])c.v)[0] = Values.B; Object val2 = get();
 
                 assertEquals(val1, Values.A);
                 assertEquals(val2, Values.B);
@@ -399,7 +399,7 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new Object[1][1]; ((Object[][])c.v)[0][0] = Values.A; Object val1 = get();
-                ((Object[][])c.v)[0][0] = Values.B; Object val2 = get();
+                                        ((Object[][])c.v)[0][0] = Values.B; Object val2 = get();
 
                 assertEquals(val1, Values.A);
                 assertEquals(val2, Values.B);
@@ -407,7 +407,7 @@ public class TestStableObject {
 
             {
                 c.v = new Object[1][1]; c.v[0] = new Object[0]; Object[] val1 = get1();
-                c.v[0] = new Object[0]; Object[] val2 = get1();
+                                        c.v[0] = new Object[0]; Object[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -435,7 +435,7 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new Object[1][1][1]; ((Object[][][])c.v)[0][0][0] = Values.A; Object val1 = get();
-                ((Object[][][])c.v)[0][0][0] = Values.B; Object val2 = get();
+                                           ((Object[][][])c.v)[0][0][0] = Values.B; Object val2 = get();
 
                 assertEquals(val1, Values.A);
                 assertEquals(val2, Values.B);
@@ -443,14 +443,14 @@ public class TestStableObject {
 
             {
                 c.v = new Object[1][1][1]; c.v[0][0] = new Object[0]; Object[] val1 = get1();
-                c.v[0][0] = new Object[0]; Object[] val2 = get1();
+                                           c.v[0][0] = new Object[0]; Object[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
 
             {
                 c.v = new Object[1][1][1]; c.v[0] = new Object[0][0]; Object[][] val1 = get2();
-                c.v[0] = new Object[0][0]; Object[][] val2 = get2();
+                                           c.v[0] = new Object[0][0]; Object[][] val2 = get2();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -480,7 +480,7 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.a = Values.A; A val1 = get();
-                c.v.a = Values.B; A val2 = get();
+                               c.v.a = Values.B; A val2 = get();
 
                 assertEquals(val1.a, Values.B);
                 assertEquals(val2.a, Values.B);
@@ -488,7 +488,7 @@ public class TestStableObject {
 
             {
                 c.v = new A(); c.v.a = Values.A; Object val1 = get1();
-                c.v.a = Values.B; Object val2 = get1();
+                               c.v.a = Values.B; Object val2 = get1();
                 c.v = new A(); c.v.a = Values.C; Object val3 = get1();
 
                 assertEquals(val1, Values.A);
@@ -514,8 +514,8 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.next = new A();   c.v.next.next  = c.v;
-                c.v.a = Values.A; c.v.next.a = Values.A; A val1 = get();
-                c.v.a = Values.B; c.v.next.a = Values.B; A val2 = get();
+                               c.v.a = Values.A; c.v.next.a = Values.A; A val1 = get();
+                               c.v.a = Values.B; c.v.next.a = Values.B; A val2 = get();
 
                 assertEquals(val1.a, Values.B);
                 assertEquals(val2.a, Values.B);
@@ -523,10 +523,10 @@ public class TestStableObject {
 
             {
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = Values.A; Object val1 = get1();
-                c.v.a = Values.B; Object val2 = get1();
+                               c.v.a = Values.A; Object val1 = get1();
+                               c.v.a = Values.B; Object val2 = get1();
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = Values.C; Object val3 = get1();
+                               c.v.a = Values.C; Object val3 = get1();
 
                 assertEquals(val1, Values.A);
                 assertEquals(val2, (isStableEnabled ? Values.A : Values.B));
@@ -552,8 +552,8 @@ public class TestStableObject {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.left = c.v.right = c.v;
-                c.v.a = Values.A; Object val1 = get(); Object val2 = get1();
-                c.v.a = Values.B; Object val3 = get(); Object val4 = get1();
+                               c.v.a = Values.A; Object val1 = get(); Object val2 = get1();
+                               c.v.a = Values.B; Object val3 = get(); Object val4 = get1();
 
                 assertEquals(val1, Values.A);
                 assertEquals(val3, (isStableEnabled ? Values.A : Values.B));
@@ -583,8 +583,8 @@ public class TestStableObject {
             {
                 A elem = new A();
                 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
-                elem.a = Values.A; Object val1 = get(); Object val2 = get1();
-                elem.a = Values.B; Object val3 = get(); Object val4 = get1();
+                               elem.a = Values.A; Object val1 = get(); Object val2 = get1();
+                               elem.a = Values.B; Object val3 = get(); Object val4 = get1();
 
                 assertEquals(val1, Values.A);
                 assertEquals(val3, (isStableEnabled ? Values.A : Values.B));
diff --git a/hotspot/test/compiler/stable/TestStableShort.java b/hotspot/test/compiler/stable/TestStableShort.java
index 15c71b4c0c8..acd8182f167 100644
--- a/hotspot/test/compiler/stable/TestStableShort.java
+++ b/hotspot/test/compiler/stable/TestStableShort.java
@@ -100,7 +100,7 @@ public class TestStableShort {
         public static final DefaultValue c = new DefaultValue();
         public static short get() { return c.v; }
         public static void test() throws Exception {
-            short val1 = get();
+                     short val1 = get();
             c.v = 1; short val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1);
@@ -130,7 +130,7 @@ public class TestStableShort {
         public static final DefaultStaticValue c = new DefaultStaticValue();
         public static short get() { return c.v; }
         public static void test() throws Exception {
-            short val1 = get();
+                     short val1 = get();
             c.v = 1; short val2 = get();
             assertEquals(val1, 0);
             assertEquals(val2, 1);
@@ -180,24 +180,24 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new short[1]; c.v[0] = 1; short val1 = get();
-                c.v[0] = 2; short val2 = get();
+                                    c.v[0] = 2; short val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new short[1]; c.v[0] = 3; short val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
             }
 
             {
                 c.v = new short[20]; c.v[10] = 1; short val1 = get1();
-                c.v[10] = 2; short val2 = get1();
+                                     c.v[10] = 2; short val2 = get1();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new short[20]; c.v[10] = 3; short val3 = get1();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
             }
 
             {
@@ -220,17 +220,17 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new short[1][1]; c.v[0][0] = 1; short val1 = get();
-                c.v[0][0] = 2; short val2 = get();
+                                       c.v[0][0] = 2; short val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new short[1][1]; c.v[0][0] = 3; short val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new short[1]; c.v[0][0] = 4; short val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
             }
 
             {
@@ -260,21 +260,21 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new short[1][1][1]; c.v[0][0][0] = 1; short val1 = get();
-                c.v[0][0][0] = 2; short val2 = get();
+                                          c.v[0][0][0] = 2; short val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new short[1][1][1]; c.v[0][0][0] = 3; short val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new short[1][1]; c.v[0][0][0] = 4; short val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
 
                 c.v[0][0] = new short[1]; c.v[0][0][0] = 5; short val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 5));
+                                                    : 5));
             }
 
             {
@@ -311,25 +311,25 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new short[1][1][1][1]; c.v[0][0][0][0] = 1; short val1 = get();
-                c.v[0][0][0][0] = 2; short val2 = get();
+                                             c.v[0][0][0][0] = 2; short val2 = get();
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
 
                 c.v = new short[1][1][1][1]; c.v[0][0][0][0] = 3; short val3 = get();
                 assertEquals(val3, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 3));
+                                                    : 3));
 
                 c.v[0] = new short[1][1][1]; c.v[0][0][0][0] = 4; short val4 = get();
                 assertEquals(val4, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 4));
+                                                    : 4));
 
                 c.v[0][0] = new short[1][1]; c.v[0][0][0][0] = 5; short val5 = get();
                 assertEquals(val5, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 5));
+                                                    : 5));
 
                 c.v[0][0][0] = new short[1]; c.v[0][0][0][0] = 6; short val6 = get();
                 assertEquals(val6, (isStableEnabled ? (isStableEnabled ? 1 : 2)
-                        : 6));
+                                                    : 6));
             }
 
             {
@@ -370,7 +370,7 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new short[1]; ((short[])c.v)[0] = 1; short val1 = get();
-                ((short[])c.v)[0] = 2; short val2 = get();
+                                    ((short[])c.v)[0] = 2; short val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -397,7 +397,7 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new short[1][1]; ((short[][])c.v)[0][0] = 1; short val1 = get();
-                ((short[][])c.v)[0][0] = 2; short val2 = get();
+                                       ((short[][])c.v)[0][0] = 2; short val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -405,7 +405,7 @@ public class TestStableShort {
 
             {
                 c.v = new short[1][1]; c.v[0] = new short[0]; short[] val1 = get1();
-                c.v[0] = new short[0]; short[] val2 = get1();
+                                       c.v[0] = new short[0]; short[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -433,7 +433,7 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new short[1][1][1]; ((short[][][])c.v)[0][0][0] = 1; short val1 = get();
-                ((short[][][])c.v)[0][0][0] = 2; short val2 = get();
+                                          ((short[][][])c.v)[0][0][0] = 2; short val2 = get();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, 2);
@@ -441,14 +441,14 @@ public class TestStableShort {
 
             {
                 c.v = new short[1][1][1]; c.v[0][0] = new short[0]; short[] val1 = get1();
-                c.v[0][0] = new short[0]; short[] val2 = get1();
+                                          c.v[0][0] = new short[0]; short[] val2 = get1();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
 
             {
                 c.v = new short[1][1][1]; c.v[0] = new short[0][0]; short[][] val1 = get2();
-                c.v[0] = new short[0][0]; short[][] val2 = get2();
+                                          c.v[0] = new short[0][0]; short[][] val2 = get2();
 
                 assertTrue((isStableEnabled ? (val1 == val2) : (val1 != val2)));
             }
@@ -478,7 +478,7 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.a = 1; A val1 = get();
-                c.v.a = 2; A val2 = get();
+                               c.v.a = 2; A val2 = get();
 
                 assertEquals(val1.a, 2);
                 assertEquals(val2.a, 2);
@@ -486,7 +486,7 @@ public class TestStableShort {
 
             {
                 c.v = new A(); c.v.a = 1; short val1 = get1();
-                c.v.a = 2; short val2 = get1();
+                               c.v.a = 2; short val2 = get1();
                 c.v = new A(); c.v.a = 3; short val3 = get1();
 
                 assertEquals(val1, 1);
@@ -512,8 +512,8 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.next = new A();   c.v.next.next  = c.v;
-                c.v.a = 1; c.v.next.a = 1; A val1 = get();
-                c.v.a = 2; c.v.next.a = 2; A val2 = get();
+                               c.v.a = 1; c.v.next.a = 1; A val1 = get();
+                               c.v.a = 2; c.v.next.a = 2; A val2 = get();
 
                 assertEquals(val1.a, 2);
                 assertEquals(val2.a, 2);
@@ -521,10 +521,10 @@ public class TestStableShort {
 
             {
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 1; short val1 = get1();
-                c.v.a = 2; short val2 = get1();
+                               c.v.a = 1; short val1 = get1();
+                               c.v.a = 2; short val2 = get1();
                 c.v = new A(); c.v.next = c.v;
-                c.v.a = 3; short val3 = get1();
+                               c.v.a = 3; short val3 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val2, (isStableEnabled ? 1 : 2));
@@ -550,8 +550,8 @@ public class TestStableShort {
         public static void test() throws Exception {
             {
                 c.v = new A(); c.v.left = c.v.right = c.v;
-                c.v.a = 1; short val1 = get(); short val2 = get1();
-                c.v.a = 2; short val3 = get(); short val4 = get1();
+                               c.v.a = 1; short val1 = get(); short val2 = get1();
+                               c.v.a = 2; short val3 = get(); short val4 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val3, (isStableEnabled ? 1 : 2));
@@ -581,8 +581,8 @@ public class TestStableShort {
             {
                 A elem = new A();
                 c.v = new A[] { elem, elem }; c.v[0].left = c.v[0].right = c.v;
-                elem.a = 1; short val1 = get(); short val2 = get1();
-                elem.a = 2; short val3 = get(); short val4 = get1();
+                               elem.a = 1; short val1 = get(); short val2 = get1();
+                               elem.a = 2; short val3 = get(); short val4 = get1();
 
                 assertEquals(val1, 1);
                 assertEquals(val3, (isStableEnabled ? 1 : 2));

From 8a945875b6041c79959bc1fcd136b4ef9f9f24dc Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier 
Date: Mon, 13 Jun 2016 09:28:25 +0200
Subject: [PATCH 017/111] 8159335: Fix problems with stack overflow handling

Reviewed-by: dlong, coleenp, mdoerr
---
 .../templateInterpreterGenerator_aarch64.cpp  | 41 ++++-----
 hotspot/src/cpu/ppc/vm/globals_ppc.hpp        |  4 +-
 hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp | 29 +-----
 hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.hpp |  5 +-
 .../vm/templateInterpreterGenerator_ppc.cpp   | 41 +++++++--
 .../src/cpu/ppc/vm/templateTable_ppc_64.cpp   | 18 +---
 hotspot/src/cpu/sparc/vm/globals_sparc.hpp    |  4 +-
 .../vm/templateInterpreterGenerator_sparc.cpp | 90 +++++++++----------
 .../vm/templateInterpreterGenerator_x86.cpp   | 46 ++++------
 hotspot/src/os/aix/vm/os_aix.cpp              | 15 +---
 hotspot/src/os/aix/vm/os_aix.hpp              | 12 ---
 hotspot/src/os/aix/vm/os_aix.inline.hpp       |  6 +-
 hotspot/src/os/bsd/vm/os_bsd.cpp              |  8 +-
 hotspot/src/os/bsd/vm/os_bsd.inline.hpp       |  4 +-
 hotspot/src/os/linux/vm/os_linux.cpp          |  9 +-
 hotspot/src/os/linux/vm/os_linux.hpp          |  3 -
 hotspot/src/os/linux/vm/os_linux.inline.hpp   |  4 +-
 hotspot/src/os/solaris/vm/os_solaris.cpp      |  8 +-
 .../src/os/solaris/vm/os_solaris.inline.hpp   |  5 +-
 hotspot/src/os/windows/vm/os_windows.cpp      | 11 ++-
 .../src/os/windows/vm/os_windows.inline.hpp   | 12 +--
 .../templateInterpreterGenerator.hpp          |  3 +-
 hotspot/src/share/vm/runtime/javaCalls.cpp    |  8 +-
 hotspot/src/share/vm/runtime/os.cpp           |  3 +-
 hotspot/src/share/vm/runtime/os.hpp           |  6 +-
 hotspot/src/share/vm/runtime/thread.cpp       |  8 +-
 .../TestRecursiveReplacedException.java       |  2 +-
 .../runtime/6865265/StackOverflowBug.java     |  2 +-
 .../uncommontrap/8009761/Test8009761.java     |  2 +-
 .../StackOverflowGuardPagesOff.java           |  2 +-
 .../TestStackBangMonitorOwned.java            |  2 +-
 .../uncommontrap/TestStackBangRbp.java        |  2 +-
 hotspot/test/runtime/StackGuardPages/invoke.c |  2 +-
 33 files changed, 182 insertions(+), 235 deletions(-)

diff --git a/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp
index f24536daf75..449cb3d9277 100644
--- a/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp
@@ -630,7 +630,11 @@ void TemplateInterpreterGenerator::generate_counter_overflow(Label& do_continue)
   __ b(do_continue);
 }
 
-// See if we've got enough room on the stack for locals plus overhead.
+// See if we've got enough room on the stack for locals plus overhead
+// below JavaThread::stack_overflow_limit(). If not, throw a StackOverflowError
+// without going through the signal handler, i.e., reserved and yellow zones
+// will not be made usable. The shadow zone must suffice to handle the
+// overflow.
 // The expression stack grows down incrementally, so the normal guard
 // page mechanism will work for that.
 //
@@ -674,40 +678,25 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(void) {
   // compute rsp as if this were going to be the last frame on
   // the stack before the red zone
 
-  const Address stack_base(rthread, Thread::stack_base_offset());
-  const Address stack_size(rthread, Thread::stack_size_offset());
-
   // locals + overhead, in bytes
   __ mov(r0, overhead_size);
   __ add(r0, r0, r3, Assembler::LSL, Interpreter::logStackElementSize);  // 2 slots per parameter.
 
-  __ ldr(rscratch1, stack_base);
-  __ ldr(rscratch2, stack_size);
+  const Address stack_limit(rthread, Thread::stack_overflow_limit_offset());
+  __ ldr(rscratch1, stack_limit);
 
 #ifdef ASSERT
-  Label stack_base_okay, stack_size_okay;
-  // verify that thread stack base is non-zero
-  __ cbnz(rscratch1, stack_base_okay);
-  __ stop("stack base is zero");
+  Label limit_okay;
+  // Verify that thread stack limit is non-zero.
+  __ cbnz(rscratch1, limit_okay);
+  __ stop("stack overflow limit is zero");
   __ bind(stack_base_okay);
-  // verify that thread stack size is non-zero
-  __ cbnz(rscratch2, stack_size_okay);
-  __ stop("stack size is zero");
-  __ bind(stack_size_okay);
 #endif
 
-  // Add stack base to locals and subtract stack size
-  __ sub(rscratch1, rscratch1, rscratch2); // Stack limit
+  // Add stack limit to locals.
   __ add(r0, r0, rscratch1);
 
-  // Use the bigger size for banging.
-  const int max_bang_size = MAX2(JavaThread::stack_shadow_zone_size(),
-                                 JavaThread::stack_red_zone_size() + JavaThread::stack_yellow_zone_size());
-
-  // add in the red and yellow zone sizes
-  __ add(r0, r0, max_bang_size * 2);
-
-  // check against the current stack bottom
+  // Check against the current stack bottom.
   __ cmp(sp, r0);
   __ br(Assembler::HI, after_frame_check);
 
@@ -1088,9 +1077,9 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ ldr(r2, constMethod);
   __ load_unsigned_short(r2, size_of_parameters);
 
-  // native calls don't need the stack size check since they have no
+  // Native calls don't need the stack size check since they have no
   // expression stack and the arguments are already on the stack and
-  // we only add a handful of words to the stack
+  // we only add a handful of words to the stack.
 
   // rmethod: Method*
   // r2: size of parameters
diff --git a/hotspot/src/cpu/ppc/vm/globals_ppc.hpp b/hotspot/src/cpu/ppc/vm/globals_ppc.hpp
index a442f17f4b8..662dc3c6bf1 100644
--- a/hotspot/src/cpu/ppc/vm/globals_ppc.hpp
+++ b/hotspot/src/cpu/ppc/vm/globals_ppc.hpp
@@ -40,9 +40,9 @@ define_pd_global(bool, ImplicitNullChecks,    true);  // Generate code for impli
 define_pd_global(bool, TrapBasedNullChecks,   true);
 define_pd_global(bool, UncommonNullCast,      true);  // Uncommon-trap NULLs passed to check cast.
 
-#define DEFAULT_STACK_YELLOW_PAGES (6)
+#define DEFAULT_STACK_YELLOW_PAGES (2)
 #define DEFAULT_STACK_RED_PAGES (1)
-#define DEFAULT_STACK_SHADOW_PAGES (6 DEBUG_ONLY(+2))
+#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+2))
 #define DEFAULT_STACK_RESERVED_PAGES (1)
 
 #define MIN_STACK_YELLOW_PAGES DEFAULT_STACK_YELLOW_PAGES
diff --git a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
index d3c60b74944..2a8eddf18ad 100644
--- a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
+++ b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -478,33 +478,6 @@ void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass, Register
   profile_typecheck_failed(Rtmp1, Rtmp2);
 }
 
-void InterpreterMacroAssembler::generate_stack_overflow_check_with_compare_and_throw(Register Rmem_frame_size, Register Rscratch1) {
-  Label done;
-  BLOCK_COMMENT("stack_overflow_check_with_compare_and_throw {");
-  sub(Rmem_frame_size, R1_SP, Rmem_frame_size);
-  ld(Rscratch1, thread_(stack_overflow_limit));
-  cmpld(CCR0/*is_stack_overflow*/, Rmem_frame_size, Rscratch1);
-  bgt(CCR0/*is_stack_overflow*/, done);
-
-  // Load target address of the runtime stub.
-  assert(StubRoutines::throw_StackOverflowError_entry() != NULL, "generated in wrong order");
-  load_const_optimized(Rscratch1, (StubRoutines::throw_StackOverflowError_entry()), R0);
-  mtctr(Rscratch1);
-  // Restore caller_sp.
-#ifdef ASSERT
-  ld(Rscratch1, 0, R1_SP);
-  ld(R0, 0, R21_sender_SP);
-  cmpd(CCR0, R0, Rscratch1);
-  asm_assert_eq("backlink", 0x547);
-#endif // ASSERT
-  mr(R1_SP, R21_sender_SP);
-  bctr();
-
-  align(32, 12);
-  bind(done);
-  BLOCK_COMMENT("} stack_overflow_check_with_compare_and_throw");
-}
-
 // Separate these two to allow for delay slot in middle.
 // These are used to do a test and full jump to exception-throwing code.
 
diff --git a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.hpp b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.hpp
index 05bd3aa0bdd..3da602dd93e 100644
--- a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.hpp
+++ b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016 SAP SE. 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
@@ -79,7 +79,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
   // Load object from cpool->resolved_references(index).
   void load_resolved_reference_at_index(Register result, Register index, Label *is_null = NULL);
 
-  void generate_stack_overflow_check_with_compare_and_throw(Register Rmem_frame_size, Register Rscratch1);
   void load_receiver(Register Rparam_count, Register Rrecv_dst);
 
   // helpers for expression stack
diff --git a/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp b/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp
index 11690a1ddf7..591db706231 100644
--- a/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp
@@ -845,9 +845,40 @@ void TemplateInterpreterGenerator::generate_counter_overflow(Label& continue_ent
   __ b(continue_entry);
 }
 
+// See if we've got enough room on the stack for locals plus overhead below
+// JavaThread::stack_overflow_limit(). If not, throw a StackOverflowError
+// without going through the signal handler, i.e., reserved and yellow zones
+// will not be made usable. The shadow zone must suffice to handle the
+// overflow.
+//
+// Kills Rmem_frame_size, Rscratch1.
 void TemplateInterpreterGenerator::generate_stack_overflow_check(Register Rmem_frame_size, Register Rscratch1) {
+  Label done;
   assert_different_registers(Rmem_frame_size, Rscratch1);
-  __ generate_stack_overflow_check_with_compare_and_throw(Rmem_frame_size, Rscratch1);
+
+  BLOCK_COMMENT("stack_overflow_check_with_compare {");
+  __ sub(Rmem_frame_size, R1_SP, Rmem_frame_size);
+  __ ld(Rscratch1, thread_(stack_overflow_limit));
+  __ cmpld(CCR0/*is_stack_overflow*/, Rmem_frame_size, Rscratch1);
+  __ bgt(CCR0/*is_stack_overflow*/, done);
+
+  // The stack overflows. Load target address of the runtime stub and call it.
+  assert(StubRoutines::throw_StackOverflowError_entry() != NULL, "generated in wrong order");
+  __ load_const_optimized(Rscratch1, (StubRoutines::throw_StackOverflowError_entry()), R0);
+  __ mtctr(Rscratch1);
+  // Restore caller_sp.
+#ifdef ASSERT
+  __ ld(Rscratch1, 0, R1_SP);
+  __ ld(R0, 0, R21_sender_SP);
+  __ cmpd(CCR0, R0, Rscratch1);
+  __ asm_assert_eq("backlink", 0x547);
+#endif // ASSERT
+  __ mr(R1_SP, R21_sender_SP);
+  __ bctr();
+
+  __ align(32, 12);
+  __ bind(done);
+  BLOCK_COMMENT("} stack_overflow_check_with_compare");
 }
 
 void TemplateInterpreterGenerator::unlock_method(bool check_exceptions) {
@@ -1014,10 +1045,10 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call, Regist
   // Enlarge by locals-parameters (not in case of native_call), shrink by ESP-SP-ABI48.
 
   if (!native_call) {
-    // --------------------------------------------------------------------------
-    // Stack overflow check
-
-    Label cont;
+    // Stack overflow check.
+    // Native calls don't need the stack size check since they have no
+    // expression stack and the arguments are already on the stack and
+    // we only add a handful of words to the stack.
     __ add(R11_scratch1, parent_frame_resize, top_frame_size);
     generate_stack_overflow_check(R11_scratch1, R12_scratch2);
   }
diff --git a/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp b/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp
index 6b8f658ff09..e27601c707c 100644
--- a/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp
+++ b/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2013, 2016 SAP SE. 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
@@ -4093,20 +4093,8 @@ void TemplateTable::monitorenter() {
   __ lock_object(Rcurrent_monitor, Robj_to_lock);
 
   // Check if there's enough space on the stack for the monitors after locking.
-  Label Lskip_stack_check;
-  // Optimization: If the monitors stack section is less then a std page size (4K) don't run
-  // the stack check. There should be enough shadow pages to fit that in.
-  __ ld(Rscratch3, 0, R1_SP);
-  __ sub(Rscratch3, Rscratch3, R26_monitor);
-  __ cmpdi(CCR0, Rscratch3, 4*K);
-  __ blt(CCR0, Lskip_stack_check);
-
-  DEBUG_ONLY(__ untested("stack overflow check during monitor enter");)
-  __ li(Rscratch1, 0);
-  __ generate_stack_overflow_check_with_compare_and_throw(Rscratch1, Rscratch2);
-
-  __ align(32, 12);
-  __ bind(Lskip_stack_check);
+  // This emits a single store.
+  __ generate_stack_overflow_check(0);
 
   // The bcp has already been incremented. Just need to dispatch to next instruction.
   __ dispatch_next(vtos);
diff --git a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp
index 1e1ef759b45..d1ae77b5df0 100644
--- a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp
@@ -59,11 +59,11 @@ define_pd_global(intx, InlineSmallCode,       1500);
 // Stack slots are 2X larger in LP64 than in the 32 bit VM.
 define_pd_global(intx, ThreadStackSize,       1024);
 define_pd_global(intx, VMThreadStackSize,     1024);
-#define DEFAULT_STACK_SHADOW_PAGES (10 DEBUG_ONLY(+1))
+#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+2))
 #else
 define_pd_global(intx, ThreadStackSize,       512);
 define_pd_global(intx, VMThreadStackSize,     512);
-#define DEFAULT_STACK_SHADOW_PAGES (3 DEBUG_ONLY(+1))
+#define DEFAULT_STACK_SHADOW_PAGES (6 DEBUG_ONLY(+2))
 #endif // _LP64
 
 #define MIN_STACK_YELLOW_PAGES DEFAULT_STACK_YELLOW_PAGES
diff --git a/hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp b/hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp
index f96b3e440a5..7df0e9896c1 100644
--- a/hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp
@@ -578,51 +578,39 @@ void TemplateInterpreterGenerator::lock_method() {
   __ lock_object(Lmonitors, O0);
 }
 
-
+// See if we've got enough room on the stack for locals plus overhead below
+// JavaThread::stack_overflow_limit(). If not, throw a StackOverflowError
+// without going through the signal handler, i.e., reserved and yellow zones
+// will not be made usable. The shadow zone must suffice to handle the
+// overflow.
 void TemplateInterpreterGenerator::generate_stack_overflow_check(Register Rframe_size,
-                                                         Register Rscratch,
-                                                         Register Rscratch2) {
+                                                                 Register Rscratch) {
   const int page_size = os::vm_page_size();
   Label after_frame_check;
 
-  assert_different_registers(Rframe_size, Rscratch, Rscratch2);
+  assert_different_registers(Rframe_size, Rscratch);
 
   __ set(page_size, Rscratch);
   __ cmp_and_br_short(Rframe_size, Rscratch, Assembler::lessEqual, Assembler::pt, after_frame_check);
 
-  // get the stack base, and in debug, verify it is non-zero
-  __ ld_ptr( G2_thread, Thread::stack_base_offset(), Rscratch );
+  // Get the stack overflow limit, and in debug, verify it is non-zero.
+  __ ld_ptr(G2_thread, JavaThread::stack_overflow_limit_offset(), Rscratch);
 #ifdef ASSERT
-  Label base_not_zero;
-  __ br_notnull_short(Rscratch, Assembler::pn, base_not_zero);
-  __ stop("stack base is zero in generate_stack_overflow_check");
-  __ bind(base_not_zero);
+  Label limit_ok;
+  __ br_notnull_short(Rscratch, Assembler::pn, limit_ok);
+  __ stop("stack overflow limit is zero in generate_stack_overflow_check");
+  __ bind(limit_ok);
 #endif
 
-  // get the stack size, and in debug, verify it is non-zero
-  assert( sizeof(size_t) == sizeof(intptr_t), "wrong load size" );
-  __ ld_ptr( G2_thread, Thread::stack_size_offset(), Rscratch2 );
-#ifdef ASSERT
-  Label size_not_zero;
-  __ br_notnull_short(Rscratch2, Assembler::pn, size_not_zero);
-  __ stop("stack size is zero in generate_stack_overflow_check");
-  __ bind(size_not_zero);
-#endif
-
-  // compute the beginning of the protected zone minus the requested frame size
-  __ sub( Rscratch, Rscratch2,   Rscratch );
-  __ set(MAX2(JavaThread::stack_shadow_zone_size(), JavaThread::stack_guard_zone_size()), Rscratch2 );
-  __ add( Rscratch, Rscratch2,   Rscratch );
-
   // Add in the size of the frame (which is the same as subtracting it from the
-  // SP, which would take another register
-  __ add( Rscratch, Rframe_size, Rscratch );
+  // SP, which would take another register.
+  __ add(Rscratch, Rframe_size, Rscratch);
 
-  // the frame is greater than one page in size, so check against
-  // the bottom of the stack
+  // The frame is greater than one page in size, so check against
+  // the bottom of the stack.
   __ cmp_and_brx_short(SP, Rscratch, Assembler::greaterUnsigned, Assembler::pt, after_frame_check);
 
-  // the stack will overflow, throw an exception
+  // The stack will overflow, throw an exception.
 
   // Note that SP is restored to sender's sp (in the delay slot). This
   // is necessary if the sender's frame is an extended compiled frame
@@ -636,8 +624,8 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(Register Rframe
   __ jump_to(stub, Rscratch);
   __ delayed()->mov(O5_savedSP, SP);
 
-  // if you get to here, then there is enough stack space
-  __ bind( after_frame_check );
+  // If you get to here, then there is enough stack space.
+  __ bind(after_frame_check);
 }
 
 
@@ -821,40 +809,44 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
     __ add( Gframe_size,  extra_space, Gframe_size);
     __ round_to( Gframe_size, WordsPerLong );
     __ sll( Gframe_size, LogBytesPerWord, Gframe_size );
+
+    // Native calls don't need the stack size check since they have no
+    // expression stack and the arguments are already on the stack and
+    // we only add a handful of words to the stack.
   } else {
 
     //
     // Compute number of locals in method apart from incoming parameters
     //
-    const Address size_of_locals    (Otmp1, ConstMethod::size_of_locals_offset());
-    __ ld_ptr( constMethod, Otmp1 );
-    __ lduh( size_of_locals, Otmp1 );
-    __ sub( Otmp1, Glocals_size, Glocals_size );
-    __ round_to( Glocals_size, WordsPerLong );
-    __ sll( Glocals_size, Interpreter::logStackElementSize, Glocals_size );
+    const Address size_of_locals(Otmp1, ConstMethod::size_of_locals_offset());
+    __ ld_ptr(constMethod, Otmp1);
+    __ lduh(size_of_locals, Otmp1);
+    __ sub(Otmp1, Glocals_size, Glocals_size);
+    __ round_to(Glocals_size, WordsPerLong);
+    __ sll(Glocals_size, Interpreter::logStackElementSize, Glocals_size);
 
-    // see if the frame is greater than one page in size. If so,
-    // then we need to verify there is enough stack space remaining
+    // See if the frame is greater than one page in size. If so,
+    // then we need to verify there is enough stack space remaining.
     // Frame_size = (max_stack + extra_space) * BytesPerWord;
-    __ ld_ptr( constMethod, Gframe_size );
-    __ lduh( Gframe_size, in_bytes(ConstMethod::max_stack_offset()), Gframe_size );
-    __ add( Gframe_size, extra_space, Gframe_size );
-    __ round_to( Gframe_size, WordsPerLong );
-    __ sll( Gframe_size, Interpreter::logStackElementSize, Gframe_size);
+    __ ld_ptr(constMethod, Gframe_size);
+    __ lduh(Gframe_size, in_bytes(ConstMethod::max_stack_offset()), Gframe_size);
+    __ add(Gframe_size, extra_space, Gframe_size);
+    __ round_to(Gframe_size, WordsPerLong);
+    __ sll(Gframe_size, Interpreter::logStackElementSize, Gframe_size);
 
     // Add in java locals size for stack overflow check only
-    __ add( Gframe_size, Glocals_size, Gframe_size );
+    __ add(Gframe_size, Glocals_size, Gframe_size);
 
     const Register Otmp2 = O4;
     assert_different_registers(Otmp1, Otmp2, O5_savedSP);
-    generate_stack_overflow_check(Gframe_size, Otmp1, Otmp2);
+    generate_stack_overflow_check(Gframe_size, Otmp1);
 
-    __ sub( Gframe_size, Glocals_size, Gframe_size);
+    __ sub(Gframe_size, Glocals_size, Gframe_size);
 
     //
     // bump SP to accomodate the extra locals
     //
-    __ sub( SP, Glocals_size, SP );
+    __ sub(SP, Glocals_size, SP);
   }
 
   //
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp b/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp
index 6d07051c901..225850e8f40 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp
@@ -473,7 +473,11 @@ void TemplateInterpreterGenerator::generate_counter_overflow(Label& do_continue)
   __ jmp(do_continue, relocInfo::none);
 }
 
-// See if we've got enough room on the stack for locals plus overhead.
+// See if we've got enough room on the stack for locals plus overhead below
+// JavaThread::stack_overflow_limit(). If not, throw a StackOverflowError
+// without going through the signal handler, i.e., reserved and yellow zones
+// will not be made usable. The shadow zone must suffice to handle the
+// overflow.
 // The expression stack grows down incrementally, so the normal guard
 // page mechanism will work for that.
 //
@@ -518,40 +522,26 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(void) {
   __ get_thread(thread);
 #endif
 
-  const Address stack_base(thread, Thread::stack_base_offset());
-  const Address stack_size(thread, Thread::stack_size_offset());
+  const Address stack_limit(thread, JavaThread::stack_overflow_limit_offset());
 
   // locals + overhead, in bytes
   __ mov(rax, rdx);
-  __ shlptr(rax, Interpreter::logStackElementSize);  // 2 slots per parameter.
+  __ shlptr(rax, Interpreter::logStackElementSize); // Convert parameter count to bytes.
   __ addptr(rax, overhead_size);
 
 #ifdef ASSERT
-  Label stack_base_okay, stack_size_okay;
-  // verify that thread stack base is non-zero
-  __ cmpptr(stack_base, (int32_t)NULL_WORD);
-  __ jcc(Assembler::notEqual, stack_base_okay);
-  __ stop("stack base is zero");
-  __ bind(stack_base_okay);
-  // verify that thread stack size is non-zero
-  __ cmpptr(stack_size, 0);
-  __ jcc(Assembler::notEqual, stack_size_okay);
-  __ stop("stack size is zero");
-  __ bind(stack_size_okay);
+  Label limit_okay;
+  // Verify that thread stack overflow limit is non-zero.
+  __ cmpptr(stack_limit, (int32_t)NULL_WORD);
+  __ jcc(Assembler::notEqual, limit_okay);
+  __ stop("stack overflow limit is zero");
+  __ bind(limit_okay);
 #endif
 
-  // Add stack base to locals and subtract stack size
-  __ addptr(rax, stack_base);
-  __ subptr(rax, stack_size);
+  // Add locals/frame size to stack limit.
+  __ addptr(rax, stack_limit);
 
-  // Use the bigger size for banging.
-  const int max_bang_size = (int)MAX2(JavaThread::stack_shadow_zone_size(),
-                                      JavaThread::stack_guard_zone_size());
-
-  // add in the red and yellow zone sizes
-  __ addptr(rax, max_bang_size);
-
-  // check against the current stack bottom
+  // Check against the current stack bottom.
   __ cmpptr(rsp, rax);
 
   __ jcc(Assembler::above, after_frame_check_pop);
@@ -782,8 +772,6 @@ address TemplateInterpreterGenerator::generate_Reference_get_entry(void) {
   return NULL;
 }
 
-// TODO: rather than touching all pages, check against stack_overflow_limit and bang yellow page to
-// generate exception.  Windows might need this to map the shadow pages though.
 void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
   // Quick & dirty stack overflow checking: bang the stack & handle trap.
   // Note that we do the banging after the frame is setup, since the exception
@@ -945,7 +933,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ load_unsigned_short(t, Address(t, ConstMethod::size_of_parameters_offset()));
 
 #ifndef _LP64
-  __ shlptr(t, Interpreter::logStackElementSize);
+  __ shlptr(t, Interpreter::logStackElementSize); // Convert parameter count to bytes.
   __ addptr(t, 2*wordSize);     // allocate two more slots for JNIEnv and possible mirror
   __ subptr(rsp, t);
   __ andptr(rsp, -(StackAlignmentInBytes)); // gcc needs 16 byte aligned stacks to do XMM intrinsics
diff --git a/hotspot/src/os/aix/vm/os_aix.cpp b/hotspot/src/os/aix/vm/os_aix.cpp
index 20e3770af33..6b676df416c 100644
--- a/hotspot/src/os/aix/vm/os_aix.cpp
+++ b/hotspot/src/os/aix/vm/os_aix.cpp
@@ -156,8 +156,6 @@ int       os::Aix::_on_pase = -1;
 //  SS - service pack, if known, 0 otherwise
 uint32_t  os::Aix::_os_version = 0;
 
-int       os::Aix::_stack_page_size = -1;
-
 // -1 = uninitialized, 0 - no, 1 - yes
 int       os::Aix::_xpg_sus_mode = -1;
 
@@ -1499,7 +1497,6 @@ void os::print_memory_info(outputStream* st) {
     g_multipage_support.error);
   st->cr();
   st->print_cr("  os::vm_page_size:       %s", describe_pagesize(os::vm_page_size()));
-  // not used in OpenJDK st->print_cr("  os::stack_page_size:    %s", describe_pagesize(os::stack_page_size()));
 
   // print out LDR_CNTRL because it affects the default page sizes
   const char* const ldr_cntrl = ::getenv("LDR_CNTRL");
@@ -3451,10 +3448,6 @@ void os::init(void) {
     FLAG_SET_ERGO(bool, Use64KPages, true);
   }
 
-  // Short-wire stack page size to base page size; if that works, we just remove
-  // that stack page size altogether.
-  Aix::_stack_page_size = Aix::_page_size;
-
   // For now UseLargePages is just ignored.
   FLAG_SET_ERGO(bool, UseLargePages, false);
   _page_sizes[0] = 0;
@@ -3589,15 +3582,15 @@ jint os::init_2(void) {
 
   // Check minimum allowable stack size for thread creation and to initialize
   // the java system classes, including StackOverflowError - depends on page
-  // size. Add a page for compiler2 recursion in main thread.
-  // Add in 2*BytesPerWord times page size to account for VM stack during
+  // size. Add two 4K pages for compiler2 recursion in main thread.
+  // Add in 4*BytesPerWord 4K pages to account for VM stack during
   // class initialization depending on 32 or 64 bit VM.
   os::Aix::min_stack_allowed = MAX2(os::Aix::min_stack_allowed,
                                     JavaThread::stack_guard_zone_size() +
                                     JavaThread::stack_shadow_zone_size() +
-                                    (2*BytesPerWord COMPILER2_PRESENT(+1)) * Aix::vm_default_page_size());
+                                    (4*BytesPerWord COMPILER2_PRESENT(+2)) * 4 * K);
 
-  os::Aix::min_stack_allowed = align_size_up(os::Aix::min_stack_allowed, os::Aix::page_size());
+  os::Aix::min_stack_allowed = align_size_up(os::Aix::min_stack_allowed, os::vm_page_size());
 
   size_t threadStackSizeInBytes = ThreadStackSize * K;
   if (threadStackSizeInBytes != 0 &&
diff --git a/hotspot/src/os/aix/vm/os_aix.hpp b/hotspot/src/os/aix/vm/os_aix.hpp
index db8c38aca5e..c17cd686c1c 100644
--- a/hotspot/src/os/aix/vm/os_aix.hpp
+++ b/hotspot/src/os/aix/vm/os_aix.hpp
@@ -49,9 +49,6 @@ class Aix {
   static Mutex* _createThread_lock;
   static int _page_size;
 
-  // Page size of newly created pthreads.
-  static int _stack_page_size;
-
   // -1 = uninitialized, 0 = AIX, 1 = OS/400 (PASE)
   static int _on_pase;
 
@@ -113,15 +110,6 @@ class Aix {
     return _page_size;
   }
 
-  // Accessor methods for stack page size which may be different from usual page size.
-  static int stack_page_size(void) {
-    assert(_stack_page_size != -1, "not initialized");
-    return _stack_page_size;
-  }
-
-  // This is used to scale stack space (guard pages etc.). The name is somehow misleading.
-  static int vm_default_page_size(void ) { return 8*K; }
-
   static address   ucontext_get_pc(const ucontext_t* uc);
   static intptr_t* ucontext_get_sp(const ucontext_t* uc);
   static intptr_t* ucontext_get_fp(const ucontext_t* uc);
diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp
index 11c0c3fc5d3..0ff36f11452 100644
--- a/hotspot/src/os/aix/vm/os_aix.inline.hpp
+++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2012, 2016 SAP SE. 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
@@ -52,7 +52,7 @@ inline bool os::uses_stack_guard_pages() {
 // Whether or not calling code should/can commit/uncommit stack pages
 // before guarding them. Answer for AIX is definitly no, because memory
 // is automatically committed on touch.
-inline bool os::allocate_stack_guard_pages() {
+inline bool os::must_commit_stack_guard_pages() {
   assert(uses_stack_guard_pages(), "sanity check");
   return false;
 }
@@ -65,7 +65,7 @@ inline void os::pd_split_reserved_memory(char *base, size_t size,
 }
 
 // Bang the shadow pages if they need to be touched to be mapped.
-inline void os::map_stack_shadow_pages() {
+inline void os::map_stack_shadow_pages(address sp) {
 }
 
 inline void os::dll_unload(void *lib) {
diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp
index 6de75924e8d..b8c40f60a00 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -3491,13 +3491,15 @@ jint os::init_2(void) {
 
   // Check minimum allowable stack size for thread creation and to initialize
   // the java system classes, including StackOverflowError - depends on page
-  // size.  Add a page for compiler2 recursion in main thread.
-  // Add in 2*BytesPerWord times page size to account for VM stack during
+  // size.  Add two 4K pages for compiler2 recursion in main thread.
+  // Add in 4*BytesPerWord 4K pages to account for VM stack during
   // class initialization depending on 32 or 64 bit VM.
   os::Bsd::min_stack_allowed = MAX2(os::Bsd::min_stack_allowed,
                                     JavaThread::stack_guard_zone_size() +
                                     JavaThread::stack_shadow_zone_size() +
-                                    (2*BytesPerWord COMPILER2_PRESENT(+1)) * Bsd::page_size());
+                                    (4*BytesPerWord COMPILER2_PRESENT(+2)) * 4 * K);
+
+  os::Bsd::min_stack_allowed = align_size_up(os::Bsd::min_stack_allowed, os::vm_page_size());
 
   size_t threadStackSizeInBytes = ThreadStackSize * K;
   if (threadStackSizeInBytes != 0 &&
diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
index b4a89aa4d8f..3a405dec283 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
@@ -47,7 +47,7 @@ inline bool os::uses_stack_guard_pages() {
   return true;
 }
 
-inline bool os::allocate_stack_guard_pages() {
+inline bool os::must_commit_stack_guard_pages() {
   assert(uses_stack_guard_pages(), "sanity check");
 #if !defined(__FreeBSD__) || __FreeBSD__ < 5
   // Since FreeBSD 4 uses malloc() for allocating the thread stack
@@ -68,7 +68,7 @@ inline void os::pd_split_reserved_memory(char *base, size_t size,
 
 
 // Bang the shadow pages if they need to be touched to be mapped.
-inline void os::map_stack_shadow_pages() {
+inline void os::map_stack_shadow_pages(address sp) {
 }
 
 inline void os::dll_unload(void *lib) {
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index 004779ab740..94d1889d65a 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -142,7 +142,6 @@ int (*os::Linux::_pthread_setname_np)(pthread_t, const char*) = NULL;
 Mutex* os::Linux::_createThread_lock = NULL;
 pthread_t os::Linux::_main_thread;
 int os::Linux::_page_size = -1;
-const int os::Linux::_vm_default_page_size = (8 * K);
 bool os::Linux::_supports_fast_thread_cpu_time = false;
 uint32_t os::Linux::_os_version = 0;
 const char * os::Linux::_glibc_version = NULL;
@@ -4784,13 +4783,15 @@ jint os::init_2(void) {
 
   // Check minimum allowable stack size for thread creation and to initialize
   // the java system classes, including StackOverflowError - depends on page
-  // size.  Add a page for compiler2 recursion in main thread.
-  // Add in 2*BytesPerWord times page size to account for VM stack during
+  // size.  Add two 4K pages for compiler2 recursion in main thread.
+  // Add in 4*BytesPerWord 4K pages to account for VM stack during
   // class initialization depending on 32 or 64 bit VM.
   os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
                                       JavaThread::stack_guard_zone_size() +
                                       JavaThread::stack_shadow_zone_size() +
-                                      (2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size());
+                                      (4*BytesPerWord COMPILER2_PRESENT(+2)) * 4 * K);
+
+  os::Linux::min_stack_allowed = align_size_up(os::Linux::min_stack_allowed, os::vm_page_size());
 
   size_t threadStackSizeInBytes = ThreadStackSize * K;
   if (threadStackSizeInBytes != 0 &&
diff --git a/hotspot/src/os/linux/vm/os_linux.hpp b/hotspot/src/os/linux/vm/os_linux.hpp
index 68e1968d2a1..2b6ae922e3f 100644
--- a/hotspot/src/os/linux/vm/os_linux.hpp
+++ b/hotspot/src/os/linux/vm/os_linux.hpp
@@ -71,7 +71,6 @@ class Linux {
   static pthread_t _main_thread;
   static Mutex* _createThread_lock;
   static int _page_size;
-  static const int _vm_default_page_size;
 
   static julong available_memory();
   static julong physical_memory() { return _physical_memory; }
@@ -130,8 +129,6 @@ class Linux {
   static int page_size(void)                                        { return _page_size; }
   static void set_page_size(int val)                                { _page_size = val; }
 
-  static int vm_default_page_size(void)                             { return _vm_default_page_size; }
-
   static address   ucontext_get_pc(const ucontext_t* uc);
   static void ucontext_set_pc(ucontext_t* uc, address pc);
   static intptr_t* ucontext_get_sp(const ucontext_t* uc);
diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp
index 935b7c3ebd0..937cd474c1c 100644
--- a/hotspot/src/os/linux/vm/os_linux.inline.hpp
+++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp
@@ -47,7 +47,7 @@ inline bool os::uses_stack_guard_pages() {
   return true;
 }
 
-inline bool os::allocate_stack_guard_pages() {
+inline bool os::must_commit_stack_guard_pages() {
   assert(uses_stack_guard_pages(), "sanity check");
   return true;
 }
@@ -60,7 +60,7 @@ inline void os::pd_split_reserved_memory(char *base, size_t size,
 
 
 // Bang the shadow pages if they need to be touched to be mapped.
-inline void os::map_stack_shadow_pages() {
+inline void os::map_stack_shadow_pages(address sp) {
 }
 
 inline void os::dll_unload(void *lib) {
diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index 169937db642..b8cbb78a159 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -4477,13 +4477,15 @@ jint os::init_2(void) {
 
   // Check minimum allowable stack size for thread creation and to initialize
   // the java system classes, including StackOverflowError - depends on page
-  // size.  Add a page for compiler2 recursion in main thread.
-  // Add in 2*BytesPerWord times page size to account for VM stack during
+  // size.  Add two 4K pages for compiler2 recursion in main thread.
+  // Add in 4*BytesPerWord 4K pages to account for VM stack during
   // class initialization depending on 32 or 64 bit VM.
   os::Solaris::min_stack_allowed = MAX2(os::Solaris::min_stack_allowed,
                                         JavaThread::stack_guard_zone_size() +
                                         JavaThread::stack_shadow_zone_size() +
-                                        (2*BytesPerWord COMPILER2_PRESENT(+1)) * page_size);
+                                        (4*BytesPerWord COMPILER2_PRESENT(+2)) * 4 * K);
+
+  os::Solaris::min_stack_allowed = align_size_up(os::Solaris::min_stack_allowed, os::vm_page_size());
 
   size_t threadStackSizeInBytes = ThreadStackSize * K;
   if (threadStackSizeInBytes != 0 &&
diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp
index 24f44704470..b1eb5bbabae 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp
@@ -46,7 +46,7 @@ inline bool os::uses_stack_guard_pages() {
   return true;
 }
 
-inline bool os::allocate_stack_guard_pages() {
+inline bool os::must_commit_stack_guard_pages() {
   assert(uses_stack_guard_pages(), "sanity check");
   int r = thr_main() ;
   guarantee (r == 0 || r == 1, "CR6501650 or CR6493689") ;
@@ -61,8 +61,9 @@ inline void os::pd_split_reserved_memory(char *base, size_t size,
 
 
 // Bang the shadow pages if they need to be touched to be mapped.
-inline void os::map_stack_shadow_pages() {
+inline void os::map_stack_shadow_pages(address sp) {
 }
+
 inline void os::dll_unload(void *lib) { ::dlclose(lib); }
 
 inline const int os::default_file_open_flags() { return 0;}
diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index fcdddd32c26..4c67dbd7e90 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -4183,13 +4183,16 @@ jint os::init_2(void) {
 
   // Check minimum allowable stack size for thread creation and to initialize
   // the java system classes, including StackOverflowError - depends on page
-  // size.  Add a page for compiler2 recursion in main thread.
-  // Add in 2*BytesPerWord times page size to account for VM stack during
+  // size.  Add two 4K pages for compiler2 recursion in main thread.
+  // Add in 4*BytesPerWord 4K pages to account for VM stack during
   // class initialization depending on 32 or 64 bit VM.
   size_t min_stack_allowed =
-            (size_t)(JavaThread::stack_yellow_zone_size() + JavaThread::stack_red_zone_size() +
+            (size_t)(JavaThread::stack_guard_zone_size() +
                      JavaThread::stack_shadow_zone_size() +
-                     (2*BytesPerWord COMPILER2_PRESENT(+1)) * os::vm_page_size());
+                     (4*BytesPerWord COMPILER2_PRESENT(+2)) * 4 * K);
+
+  min_stack_allowed = align_size_up(min_stack_allowed, os::vm_page_size());
+
   if (actual_reserve_size < min_stack_allowed) {
     tty->print_cr("\nThe stack size specified is too small, "
                   "Specify at least %dk",
diff --git a/hotspot/src/os/windows/vm/os_windows.inline.hpp b/hotspot/src/os/windows/vm/os_windows.inline.hpp
index cf4a3005aae..2231b42d581 100644
--- a/hotspot/src/os/windows/vm/os_windows.inline.hpp
+++ b/hotspot/src/os/windows/vm/os_windows.inline.hpp
@@ -53,7 +53,7 @@ inline bool os::uses_stack_guard_pages() {
   return true;
 }
 
-inline bool os::allocate_stack_guard_pages() {
+inline bool os::must_commit_stack_guard_pages() {
   return true;
 }
 
@@ -66,14 +66,16 @@ inline int os::readdir_buf_size(const char *path)
 }
 
 // Bang the shadow pages if they need to be touched to be mapped.
-inline void os::map_stack_shadow_pages() {
+inline void os::map_stack_shadow_pages(address sp) {
   // Write to each page of our new frame to force OS mapping.
   // If we decrement stack pointer more than one page
   // the OS may not map an intervening page into our space
   // and may fault on a memory access to interior of our frame.
-  address sp = current_stack_pointer();
-  for (size_t pages = 1; pages <= (JavaThread::stack_shadow_zone_size() / os::vm_page_size()); pages++) {
-    *((int *)(sp - (pages * vm_page_size()))) = 0;
+  const int page_size = os::win32::vm_page_size();
+  const size_t n_pages = JavaThread::stack_shadow_zone_size() / page_size;
+  for (size_t pages = 1; pages <= n_pages; pages++) {
+    sp -= page_size;
+    *sp = 0;
   }
 }
 
diff --git a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp b/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp
index 3f45525224a..38bad1811d8 100644
--- a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp
+++ b/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp
@@ -108,8 +108,7 @@ class TemplateInterpreterGenerator: public AbstractInterpreterGenerator {
 
   void generate_fixed_frame(bool native_call);
 #ifdef SPARC
-  void generate_stack_overflow_check(Register Rframe_size, Register Rscratch,
-                                     Register Rscratch2);
+  void generate_stack_overflow_check(Register Rframe_size, Register Rscratch);
   void save_native_result(void);
   void restore_native_result(void);
 #endif // SPARC
diff --git a/hotspot/src/share/vm/runtime/javaCalls.cpp b/hotspot/src/share/vm/runtime/javaCalls.cpp
index 34a0787eaac..5c544b4b5dc 100644
--- a/hotspot/src/share/vm/runtime/javaCalls.cpp
+++ b/hotspot/src/share/vm/runtime/javaCalls.cpp
@@ -372,14 +372,16 @@ void JavaCalls::call_helper(JavaValue* result, const methodHandle& method, JavaC
   }
 
   // Check that there are shadow pages available before changing thread state
-  // to Java
-  if (!os::stack_shadow_pages_available(THREAD, method)) {
+  // to Java. Calculate current_stack_pointer here to make sure
+  // stack_shadow_pages_available() and bang_stack_shadow_pages() use the same sp.
+  address sp = os::current_stack_pointer();
+  if (!os::stack_shadow_pages_available(THREAD, method, sp)) {
     // Throw stack overflow exception with preinitialized exception.
     Exceptions::throw_stack_overflow_exception(THREAD, __FILE__, __LINE__, method);
     return;
   } else {
     // Touch pages checked if the OS needs them to be touched to be mapped.
-    os::map_stack_shadow_pages();
+    os::map_stack_shadow_pages(sp);
   }
 
 #if INCLUDE_JVMCI
diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp
index 8acc60b24b2..554a183857e 100644
--- a/hotspot/src/share/vm/runtime/os.cpp
+++ b/hotspot/src/share/vm/runtime/os.cpp
@@ -1325,9 +1325,8 @@ void os::serialize_thread_states() {
 
 // Returns true if the current stack pointer is above the stack shadow
 // pages, false otherwise.
-bool os::stack_shadow_pages_available(Thread *thread, const methodHandle& method) {
+bool os::stack_shadow_pages_available(Thread *thread, const methodHandle& method, address sp) {
   if (!thread->is_Java_thread()) return false;
-  address sp = current_stack_pointer();
   // Check if we have StackShadowPages above the yellow zone.  This parameter
   // is dependent on the depth of the maximum VM call stack possible from
   // the handler for stack overflow.  'instanceof' in the stack overflow
diff --git a/hotspot/src/share/vm/runtime/os.hpp b/hotspot/src/share/vm/runtime/os.hpp
index 4abbdbb0a52..f99088bd999 100644
--- a/hotspot/src/share/vm/runtime/os.hpp
+++ b/hotspot/src/share/vm/runtime/os.hpp
@@ -260,9 +260,9 @@ class os: AllStatic {
   // exception processing)  There are guard pages, and above that shadow
   // pages for stack overflow checking.
   static bool uses_stack_guard_pages();
-  static bool allocate_stack_guard_pages();
-  static void map_stack_shadow_pages();
-  static bool stack_shadow_pages_available(Thread *thread, const methodHandle& method);
+  static bool must_commit_stack_guard_pages();
+  static void map_stack_shadow_pages(address sp);
+  static bool stack_shadow_pages_available(Thread *thread, const methodHandle& method, address sp);
 
   // OS interface to Virtual Memory
 
diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index 91d2ed4aa0c..6c0b2315821 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -2493,10 +2493,10 @@ void JavaThread::create_stack_guard_pages() {
   address low_addr = stack_end();
   size_t len = stack_guard_zone_size();
 
-  int allocate = os::allocate_stack_guard_pages();
+  int must_commit = os::must_commit_stack_guard_pages();
   // warning("Guarding at " PTR_FORMAT " for len " SIZE_FORMAT "\n", low_addr, len);
 
-  if (allocate && !os::create_stack_guard_pages((char *) low_addr, len)) {
+  if (must_commit && !os::create_stack_guard_pages((char *) low_addr, len)) {
     log_warning(os, thread)("Attempt to allocate stack guard pages failed.");
     return;
   }
@@ -2515,7 +2515,6 @@ void JavaThread::create_stack_guard_pages() {
   log_debug(os, thread)("Thread " UINTX_FORMAT " stack guard pages activated: "
     PTR_FORMAT "-" PTR_FORMAT ".",
     os::current_thread_id(), p2i(low_addr), p2i(low_addr + len));
-
 }
 
 void JavaThread::remove_stack_guard_pages() {
@@ -2524,7 +2523,7 @@ void JavaThread::remove_stack_guard_pages() {
   address low_addr = stack_end();
   size_t len = stack_guard_zone_size();
 
-  if (os::allocate_stack_guard_pages()) {
+  if (os::must_commit_stack_guard_pages()) {
     if (os::remove_stack_guard_pages((char *) low_addr, len)) {
       _stack_guard_state = stack_guard_unused;
     } else {
@@ -2546,7 +2545,6 @@ void JavaThread::remove_stack_guard_pages() {
   log_debug(os, thread)("Thread " UINTX_FORMAT " stack guard pages removed: "
     PTR_FORMAT "-" PTR_FORMAT ".",
     os::current_thread_id(), p2i(low_addr), p2i(low_addr + len));
-
 }
 
 void JavaThread::enable_stack_reserved_zone() {
diff --git a/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java b/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java
index d3cace05343..950ed18c928 100644
--- a/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java
+++ b/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8054224
  * @summary Recursive method compiled by C1 is unable to catch StackOverflowError
- * @run main/othervm -Xcomp -XX:CompileOnly=Test.run -XX:+TieredCompilation -XX:TieredStopAtLevel=2 -Xss392K TestRecursiveReplacedException
+ * @run main/othervm -Xcomp -XX:CompileOnly=Test.run -XX:+TieredCompilation -XX:TieredStopAtLevel=2 -Xss512K TestRecursiveReplacedException
  *
  */
 
diff --git a/hotspot/test/compiler/runtime/6865265/StackOverflowBug.java b/hotspot/test/compiler/runtime/6865265/StackOverflowBug.java
index b8fe082fd94..c5d0f3b62e1 100644
--- a/hotspot/test/compiler/runtime/6865265/StackOverflowBug.java
+++ b/hotspot/test/compiler/runtime/6865265/StackOverflowBug.java
@@ -28,7 +28,7 @@
  * @summary JVM crashes with "missing exception handler" error
  * @author volker.simonis@sap.com
  *
- * @run main/othervm -XX:CompileThreshold=100 -Xbatch -Xss392k StackOverflowBug
+ * @run main/othervm -XX:CompileThreshold=100 -Xbatch -Xss512k StackOverflowBug
  */
 
 
diff --git a/hotspot/test/compiler/uncommontrap/8009761/Test8009761.java b/hotspot/test/compiler/uncommontrap/8009761/Test8009761.java
index 7295581bf2a..91b58c651bb 100644
--- a/hotspot/test/compiler/uncommontrap/8009761/Test8009761.java
+++ b/hotspot/test/compiler/uncommontrap/8009761/Test8009761.java
@@ -33,7 +33,7 @@ import java.lang.reflect.Method;
  * @build Test8009761
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss392K Test8009761
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss512K Test8009761
  */
 public class Test8009761 {
 
diff --git a/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java b/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java
index ba3b8795537..835283c0bd3 100644
--- a/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java
+++ b/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8029383
  * @summary stack overflow if callee is marked for deoptimization causes crash
- * @run main/othervm -XX:TieredStopAtLevel=1 -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,StackOverflowGuardPagesOff::m1 -XX:CompileCommand=exclude,StackOverflowGuardPagesOff::m2 -Xss392K -XX:-UseOnStackReplacement StackOverflowGuardPagesOff
+ * @run main/othervm -XX:TieredStopAtLevel=1 -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,StackOverflowGuardPagesOff::m1 -XX:CompileCommand=exclude,StackOverflowGuardPagesOff::m2 -Xss512K -XX:-UseOnStackReplacement StackOverflowGuardPagesOff
  *
  */
 
diff --git a/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java b/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java
index 83345642f74..c07a995dd87 100644
--- a/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java
+++ b/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8032410
  * @summary Stack overflow at deoptimization doesn't release owned monitors
- * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangMonitorOwned::m1 -XX:CompileCommand=exclude,TestStackBangMonitorOwned::m2 -Xss392K -XX:-UseOnStackReplacement TestStackBangMonitorOwned
+ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangMonitorOwned::m1 -XX:CompileCommand=exclude,TestStackBangMonitorOwned::m2 -Xss512K -XX:-UseOnStackReplacement TestStackBangMonitorOwned
  *
  */
 public class TestStackBangMonitorOwned {
diff --git a/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java b/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java
index f242e6edd6b..9b96951a2a6 100644
--- a/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java
+++ b/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8028308
  * @summary rbp not restored when stack overflow is thrown from deopt/uncommon trap blobs
- * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangRbp::m1 -XX:CompileCommand=exclude,TestStackBangRbp::m2 -Xss392K -XX:-UseOnStackReplacement TestStackBangRbp
+ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangRbp::m1 -XX:CompileCommand=exclude,TestStackBangRbp::m2 -Xss512K -XX:-UseOnStackReplacement TestStackBangRbp
  *
  */
 public class TestStackBangRbp {
diff --git a/hotspot/test/runtime/StackGuardPages/invoke.c b/hotspot/test/runtime/StackGuardPages/invoke.c
index be09572e1c6..580e128bb22 100644
--- a/hotspot/test/runtime/StackGuardPages/invoke.c
+++ b/hotspot/test/runtime/StackGuardPages/invoke.c
@@ -221,7 +221,7 @@ int main (int argc, const char** argv) {
   printf("Test started with pid: %ld\n", (long) getpid());
 
   options[0].optionString = "-Xint";
-  options[1].optionString = "-Xss328k";
+  options[1].optionString = "-Xss512k";
 
   vm_args.version = JNI_VERSION_1_2;
   vm_args.ignoreUnrecognized = JNI_TRUE;

From fce572affb34230c009127f0ca2ca60ccd3979d4 Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga 
Date: Mon, 20 Jun 2016 00:07:51 -0400
Subject: [PATCH 018/111] 8156181: UL: File size limit on 32 bit Linux

Reviewed-by: mlarsson, dholmes
---
 hotspot/make/lib/JvmOverrideFiles.gmk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/make/lib/JvmOverrideFiles.gmk b/hotspot/make/lib/JvmOverrideFiles.gmk
index 78a007cc39d..f7827ef5c40 100644
--- a/hotspot/make/lib/JvmOverrideFiles.gmk
+++ b/hotspot/make/lib/JvmOverrideFiles.gmk
@@ -35,6 +35,7 @@ endif
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
   BUILD_LIBJVM_ostream.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
+  BUILD_LIBJVM_logFileOutput.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
 
   ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
     BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)

From 1fd8321e15e9d300164304daecb7938aae939caf Mon Sep 17 00:00:00 2001
From: Erik Helin 
Date: Mon, 13 Jun 2016 11:22:23 +0200
Subject: [PATCH 019/111] 8159340: Add extension to CompileGtest.gmk

Reviewed-by: dholmes, gtriantafill, jwilhelm
---
 hotspot/make/lib/CompileGtest.gmk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hotspot/make/lib/CompileGtest.gmk b/hotspot/make/lib/CompileGtest.gmk
index 2fd3f966704..14988d199c8 100644
--- a/hotspot/make/lib/CompileGtest.gmk
+++ b/hotspot/make/lib/CompileGtest.gmk
@@ -23,7 +23,10 @@
 # questions.
 #
 
-GTEST_TEST_SRC := $(HOTSPOT_TOPDIR)/test/native
+$(eval $(call IncludeCustomExtension, hotspot, lib/CompileGtest.gmk))
+
+GTEST_TEST_SRC += $(HOTSPOT_TOPDIR)/test/native
+GTEST_LAUNCHER_SRC := $(HOTSPOT_TOPDIR)/test/native/gtestLauncher.cpp
 GTEST_FRAMEWORK_SRC := $(SRC_ROOT)/test/fmw/gtest
 
 # On Windows, there are no internal debug symbols so must set copying to true
@@ -65,7 +68,7 @@ $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
         $(BUILD_LIBJVM_ALL_OBJS)), \
     CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \
         -I$(GTEST_FRAMEWORK_SRC)/include \
-        -I$(GTEST_TEST_SRC), \
+        $(addprefix -I,$(GTEST_TEST_SRC)), \
     CFLAGS_windows := /EHsc, \
     CFLAGS_solaris := -DGTEST_HAS_EXCEPTIONS=0 -library=stlport4, \
     CFLAGS_macosx := -DGTEST_OS_MAC=1, \
@@ -93,7 +96,7 @@ $(eval $(call SetupNativeCompilation, BUILD_GTEST_LAUNCHER, \
     TOOLCHAIN := $(JVM_TOOLCHAIN), \
     PROGRAM := gtestLauncher, \
     OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \
-    EXTRA_FILES := $(GTEST_TEST_SRC)/gtestLauncher.cpp, \
+    EXTRA_FILES := $(GTEST_LAUNCHER_SRC), \
     OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/launcher-objs, \
     CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \
         -I$(GTEST_FRAMEWORK_SRC)/include, \

From 3be991b9fb73db0f8b4affc1f85e6338fc8142e4 Mon Sep 17 00:00:00 2001
From: Erik Helin 
Date: Mon, 13 Jun 2016 13:48:37 +0200
Subject: [PATCH 020/111] 8159364: Gtest unit tests does not support PCH

Reviewed-by: erikj, jwilhelm, gtriantafill
---
 hotspot/make/lib/CompileGtest.gmk                  | 4 +++-
 hotspot/test/native/runtime/test_classLoader.cpp   | 1 +
 hotspot/test/native/runtime/test_instanceKlass.cpp | 1 +
 hotspot/test/native/runtime/test_os.cpp            | 1 +
 hotspot/test/native/utilities/test_quicksort.cpp   | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/hotspot/make/lib/CompileGtest.gmk b/hotspot/make/lib/CompileGtest.gmk
index 14988d199c8..2a052a10743 100644
--- a/hotspot/make/lib/CompileGtest.gmk
+++ b/hotspot/make/lib/CompileGtest.gmk
@@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
     CXXFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \
     DISABLED_WARNINGS_gcc := undef, \
     DISABLED_WARNINGS_clang := undef switch format-nonliteral \
-        tautological-undefined-compare, \
+        tautological-undefined-compare $(BUILD_LIBJVM_DISABLED_WARNINGS_clang), \
     DISABLED_WARNINGS_solstudio := identexpected, \
     LDFLAGS := $(JVM_LDFLAGS), \
     LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -86,6 +86,8 @@ $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
     USE_MAPFILE_FOR_SYMBOLS := true, \
     COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
     ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \
+    PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
+    PRECOMPILED_HEADER_EXCLUDE := gtest-all.cc gtestMain.cpp, \
 ))
 
 TARGETS += $(BUILD_GTEST_LIBJVM)
diff --git a/hotspot/test/native/runtime/test_classLoader.cpp b/hotspot/test/native/runtime/test_classLoader.cpp
index 8ca5ba303d0..de37e59dbf5 100644
--- a/hotspot/test/native/runtime/test_classLoader.cpp
+++ b/hotspot/test/native/runtime/test_classLoader.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "precompiled.hpp"
 #include "classfile/classLoader.hpp"
 #include "memory/resourceArea.hpp"
 #include "unittest.hpp"
diff --git a/hotspot/test/native/runtime/test_instanceKlass.cpp b/hotspot/test/native/runtime/test_instanceKlass.cpp
index 179aae5b854..493a4e5d58c 100644
--- a/hotspot/test/native/runtime/test_instanceKlass.cpp
+++ b/hotspot/test/native/runtime/test_instanceKlass.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "precompiled.hpp"
 #include "classfile/symbolTable.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
diff --git a/hotspot/test/native/runtime/test_os.cpp b/hotspot/test/native/runtime/test_os.cpp
index 734668501fb..d73879f3d5d 100644
--- a/hotspot/test/native/runtime/test_os.cpp
+++ b/hotspot/test/native/runtime/test_os.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "precompiled.hpp"
 #include "runtime/os.hpp"
 #include "unittest.hpp"
 
diff --git a/hotspot/test/native/utilities/test_quicksort.cpp b/hotspot/test/native/utilities/test_quicksort.cpp
index 5a56c877786..323bbd968b0 100644
--- a/hotspot/test/native/utilities/test_quicksort.cpp
+++ b/hotspot/test/native/utilities/test_quicksort.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "precompiled.hpp"
 #include "prims/jvm.h"
 #include "utilities/quickSort.hpp"
 #include "unittest.hpp"

From d39f9a9b559ce01f9a6683ab5091f39dfd85a031 Mon Sep 17 00:00:00 2001
From: Erik Helin 
Date: Mon, 13 Jun 2016 13:54:46 +0200
Subject: [PATCH 021/111] 8159365: assert is not defined for unit tests

Reviewed-by: jwilhelm, coleenp
---
 hotspot/test/native/unittest.hpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hotspot/test/native/unittest.hpp b/hotspot/test/native/unittest.hpp
index 5f3f28eeecf..08499f5b0eb 100644
--- a/hotspot/test/native/unittest.hpp
+++ b/hotspot/test/native/unittest.hpp
@@ -27,8 +27,17 @@
 
 #define GTEST_DONT_DEFINE_TEST 1
 #include "gtest/gtest.h"
+
+// gtest/gtest.h includes assert.h which will define the assert macro, but hotspot has its
+// own standards incompatible assert macro that takes two parameters.
+// The workaround is to undef assert and then re-define it. The re-definition
+// must unfortunately be copied since debug.hpp might already have been
+// included and a second include wouldn't work due to the header guards in debug.hpp.
 #ifdef assert
   #undef assert
+  #ifdef vmassert
+    #define assert(p, ...) vmassert(p, __VA_ARGS__)
+  #endif
 #endif
 
 #define CONCAT(a, b) a ## b

From 1d07931eaeaa86f4760ae14e0b2bc5cd68dd92a0 Mon Sep 17 00:00:00 2001
From: Erik Helin 
Date: Mon, 13 Jun 2016 13:52:38 +0200
Subject: [PATCH 022/111] 8159366: Header guards missing for unittest.hpp

Reviewed-by: jwilhelm, stefank, pliden
---
 hotspot/test/native/unittest.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hotspot/test/native/unittest.hpp b/hotspot/test/native/unittest.hpp
index 08499f5b0eb..95ae7b9bb40 100644
--- a/hotspot/test/native/unittest.hpp
+++ b/hotspot/test/native/unittest.hpp
@@ -22,6 +22,9 @@
  *
  */
 
+#ifndef UNITTEST_HPP
+#define UNITTEST_HPP
+
 #include 
 #include 
 
@@ -111,3 +114,5 @@
 #define TEST_VM_ASSERT_MSG(...)                                     \
     TEST_VM_ASSERT_MSG is only available in debug builds
 #endif
+
+#endif // UNITTEST_HPP

From 9f373603a0eea3515221ec4a6ded432d6599057a Mon Sep 17 00:00:00 2001
From: Roland Schatz 
Date: Thu, 16 Jun 2016 16:41:50 +0000
Subject: [PATCH 023/111] 8159167: [JVMCI] fix HotSpotVMConfig startup
 performance

Reviewed-by: iveresov
---
 hotspot/.mx.jvmci/suite.py                    |   17 -
 .../AArch64HotSpotJVMCIBackendFactory.java    |   16 +-
 .../aarch64/AArch64HotSpotRegisterConfig.java |   14 +-
 .../aarch64/AArch64HotSpotVMConfig.java}      |   43 +-
 .../AMD64HotSpotJVMCIBackendFactory.java      |   17 +-
 .../amd64/AMD64HotSpotRegisterConfig.java     |   16 +-
 .../hotspot/amd64/AMD64HotSpotVMConfig.java   |   86 +
 .../SPARCHotSpotJVMCIBackendFactory.java      |   10 +-
 .../sparc/SPARCHotSpotRegisterConfig.java     |    9 +-
 .../hotspot/sparc/SPARCHotSpotVMConfig.java   |   71 +
 .../src/jdk/vm/ci/hotspot/CompilerToVM.java   |   20 +-
 .../ci/hotspot/HotSpotCodeCacheProvider.java  |    2 +-
 .../HotSpotConstantReflectionProvider.java    |    1 -
 .../hotspot/HotSpotJVMCICompilerConfig.java   |    3 -
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    |   56 +-
 .../hotspot/HotSpotJVMCIRuntimeProvider.java  |    4 +-
 .../hotspot/HotSpotMemoryAccessProvider.java  |    5 +-
 .../HotSpotMemoryAccessProviderImpl.java      |    7 +-
 .../hotspot/HotSpotResolvedJavaFieldImpl.java |    6 +-
 .../jdk/vm/ci/hotspot/HotSpotVMConfig.java    | 1858 ++---------------
 .../vm/ci/hotspot/HotSpotVMConfigAccess.java  |  327 +++
 .../vm/ci/hotspot/HotSpotVMConfigStore.java   |  153 ++
 .../ci/hotspot/HotSpotVMConfigVerifier.java   |  164 --
 .../src/jdk/vm/ci/hotspot/VMField.java        |   92 +
 .../src/jdk/vm/ci/hotspot/VMFlag.java}        |   41 +-
 .../services/HotSpotJVMCICompilerFactory.java |   44 +-
 .../ci/hotspotvmconfig/HotSpotVMAddress.java  |   60 -
 .../ci/hotspotvmconfig/HotSpotVMConstant.java |   51 -
 .../vm/ci/hotspotvmconfig/HotSpotVMField.java |   85 -
 .../vm/ci/hotspotvmconfig/HotSpotVMFlag.java  |   53 -
 .../src/share/vm/jvmci/jvmciCompilerToVM.cpp  |  218 +-
 .../src/share/vm/jvmci/jvmciJavaClasses.hpp   |   12 +
 .../share/vm/jvmci/systemDictionary_jvmci.hpp |    2 +
 .../src/share/vm/jvmci/vmStructs_jvmci.cpp    |   66 +-
 .../src/share/vm/jvmci/vmStructs_jvmci.hpp    |    8 +-
 .../src/share/vm/jvmci/vmSymbols_jvmci.hpp    |    2 +
 .../jdk/vm/ci/hotspot/CompilerToVMHelper.java |    4 +-
 .../InitializeConfigurationTest.java          |  184 +-
 .../jvmci/errors/TestInvalidOopMap.java       |   18 -
 .../vm/ci/code/test/CodeInstallationTest.java |    7 +-
 .../jdk/vm/ci/code/test/DataPatchTest.java    |   34 +-
 .../code/test/SimpleCodeInstallationTest.java |    2 +-
 .../vm/ci/code/test/SimpleDebugInfoTest.java  |    7 +-
 .../jdk/vm/ci/code/test/TestAssembler.java    |    4 +-
 .../vm/ci/code/test/TestHotSpotVMConfig.java  |   47 +
 .../code/test/VirtualObjectDebugInfoTest.java |    2 +-
 .../code/test/amd64/AMD64TestAssembler.java   |    7 +-
 .../code/test/sparc/SPARCTestAssembler.java   |    7 +-
 .../test/MemoryAccessProviderData.java        |   13 +-
 49 files changed, 1411 insertions(+), 2564 deletions(-)
 rename hotspot/src/jdk.vm.ci/share/classes/{jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMType.java => jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java} (55%)
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotVMConfig.java
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigVerifier.java
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMField.java
 rename hotspot/src/jdk.vm.ci/share/classes/{jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMData.java => jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMFlag.java} (60%)
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMAddress.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMConstant.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMField.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMFlag.java
 create mode 100644 hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java

diff --git a/hotspot/.mx.jvmci/suite.py b/hotspot/.mx.jvmci/suite.py
index 9ca4c8cb77e..359c2b2ae3a 100644
--- a/hotspot/.mx.jvmci/suite.py
+++ b/hotspot/.mx.jvmci/suite.py
@@ -149,7 +149,6 @@ suite = {
       "subDir" : "src/jdk.vm.ci/share/classes",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "jdk.vm.ci.hotspotvmconfig",
         "jdk.vm.ci.common",
         "jdk.vm.ci.runtime",
         "jdk.vm.ci.services",
@@ -175,14 +174,6 @@ suite = {
       "workingSets" : "API,JVMCI",
     },
 
-    "jdk.vm.ci.hotspotvmconfig" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
-      "sourceDirs" : ["src"],
-      "checkstyle" : "jdk.vm.ci.services",
-      "javaCompliance" : "9",
-      "workingSets" : "JVMCI,HotSpot",
-    },
-
     "jdk.vm.ci.hotspot.aarch64" : {
       "subDir" : "src/jdk.vm.ci/share/classes",
       "sourceDirs" : ["src"],
@@ -248,13 +239,6 @@ suite = {
       ],
     },
 
-    "JVMCI_HOTSPOTVMCONFIG" : {
-      "subDir" : "src/jdk.vm.ci/share/classes",
-      "dependencies" : [
-        "jdk.vm.ci.hotspotvmconfig",
-      ],
-    },
-
     "JVMCI_HOTSPOT" : {
       "subDir" : "src/jdk.vm.ci/share/classes",
       "dependencies" : [
@@ -263,7 +247,6 @@ suite = {
         "jdk.vm.ci.hotspot.sparc",
       ],
       "distDependencies" : [
-        "JVMCI_HOTSPOTVMCONFIG",
         "JVMCI_SERVICES",
         "JVMCI_API",
       ],
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
index 86ab33b915e..42d6a159d43 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
@@ -38,24 +38,23 @@ import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider;
 import jdk.vm.ci.hotspot.HotSpotStackIntrospection;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.runtime.JVMCIBackend;
 
 public class AArch64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFactory {
 
-    protected EnumSet computeFeatures(@SuppressWarnings("unused") HotSpotVMConfig config) {
+    protected EnumSet computeFeatures(@SuppressWarnings("unused") AArch64HotSpotVMConfig config) {
         // Configure the feature set using the HotSpot flag settings.
         EnumSet features = EnumSet.noneOf(AArch64.CPUFeature.class);
         return features;
     }
 
-    protected EnumSet computeFlags(@SuppressWarnings("unused") HotSpotVMConfig config) {
+    protected EnumSet computeFlags(@SuppressWarnings("unused") AArch64HotSpotVMConfig config) {
         EnumSet flags = EnumSet.noneOf(AArch64.Flag.class);
         return flags;
     }
 
-    protected TargetDescription createTarget(HotSpotVMConfig config) {
+    protected TargetDescription createTarget(AArch64HotSpotVMConfig config) {
         final int stackFrameAlignment = 16;
         final int implicitNullCheckLimit = 4096;
         final boolean inlineObjects = true;
@@ -67,8 +66,8 @@ public class AArch64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFac
         return new HotSpotConstantReflectionProvider(runtime);
     }
 
-    protected RegisterConfig createRegisterConfig(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target) {
-        return new AArch64HotSpotRegisterConfig(target, runtime.getConfig());
+    protected RegisterConfig createRegisterConfig(AArch64HotSpotVMConfig config, TargetDescription target) {
+        return new AArch64HotSpotRegisterConfig(target, config.useCompressedOops);
     }
 
     protected HotSpotCodeCacheProvider createCodeCache(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target, RegisterConfig regConfig) {
@@ -93,7 +92,8 @@ public class AArch64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFac
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, JVMCIBackend host) {
 
         assert host == null;
-        TargetDescription target = createTarget(runtime.getConfig());
+        AArch64HotSpotVMConfig config = new AArch64HotSpotVMConfig(runtime.getConfigStore());
+        TargetDescription target = createTarget(config);
 
         RegisterConfig regConfig;
         HotSpotCodeCacheProvider codeCache;
@@ -105,7 +105,7 @@ public class AArch64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFac
                 metaAccess = createMetaAccess(runtime);
             }
             try (InitTimer rt = timer("create RegisterConfig")) {
-                regConfig = createRegisterConfig(runtime, target);
+                regConfig = createRegisterConfig(config, target);
             }
             try (InitTimer rt = timer("create CodeCache provider")) {
                 codeCache = createCodeCache(runtime, target, regConfig);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
index 41a85806197..3a0e2220dfd 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
@@ -67,7 +67,6 @@ import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.code.ValueKindFactory;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
@@ -81,8 +80,6 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
 
     private final Register[] allocatable;
 
-    private final int maxFrameSize;
-
     /**
      * The caller saved registers always include all parameter registers.
      */
@@ -92,10 +89,6 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
 
     private final RegisterAttributes[] attributesMap;
 
-    public int getMaximumFrameSize() {
-        return maxFrameSize;
-    }
-
     @Override
     public Register[] getAllocatableRegisters() {
         return allocatable.clone();
@@ -160,14 +153,13 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
         return registers;
     }
 
-    public AArch64HotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config) {
-        this(target, config, initAllocatable(target.arch, config.useCompressedOops));
+    public AArch64HotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops) {
+        this(target, initAllocatable(target.arch, useCompressedOops));
         assert callerSaved.length >= allocatable.length;
     }
 
-    public AArch64HotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config, Register[] allocatable) {
+    public AArch64HotSpotRegisterConfig(TargetDescription target, Register[] allocatable) {
         this.target = target;
-        this.maxFrameSize = config.maxFrameSize;
 
         this.allocatable = allocatable.clone();
         Set callerSaveSet = new HashSet<>();
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMType.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java
similarity index 55%
rename from hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMType.java
rename to hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java
index 1be06f15630..42119c577e1 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMType.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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
@@ -20,41 +20,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.vm.ci.hotspotvmconfig;
+package jdk.vm.ci.hotspot.aarch64;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
+import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
 
 /**
- * Refers to a C++ type in the VM.
+ * Used to access native configuration details.
+ *
+ * All non-static, public fields in this class are so that they can be compiled as constants.
  */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HotSpotVMType {
+class AArch64HotSpotVMConfig extends HotSpotVMConfigAccess {
 
-    /**
-     * Types of information this annotation can return.
-     */
-    enum Type {
-        /**
-         * Returns the size of the type (C++ {@code sizeof()}).
-         */
-        SIZE;
+    AArch64HotSpotVMConfig(HotSpotVMConfigStore config) {
+        super(config);
     }
 
     /**
-     * Specifies what type of information to return.
-     *
-     * @see Type
+     * Maximum allowed size of allocated area for a frame.
      */
-    Type get();
+    final int maxFrameSize = 16 * 1024;
 
-    /**
-     * Returns the name of the type.
-     *
-     * @return name of type
-     */
-    String name();
+    final boolean linuxOs = System.getProperty("os.name", "").startsWith("Linux");
+
+    final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
index 474153c707e..fa749bf2735 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
@@ -38,13 +38,12 @@ import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider;
 import jdk.vm.ci.hotspot.HotSpotStackIntrospection;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.runtime.JVMCIBackend;
 
 public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFactory {
 
-    protected EnumSet computeFeatures(HotSpotVMConfig config) {
+    protected EnumSet computeFeatures(AMD64HotSpotVMConfig config) {
         // Configure the feature set using the HotSpot flag settings.
         EnumSet features = EnumSet.noneOf(AMD64.CPUFeature.class);
         if ((config.vmVersionFeatures & config.amd643DNOWPREFETCH) != 0) {
@@ -128,7 +127,7 @@ public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
         return features;
     }
 
-    protected EnumSet computeFlags(HotSpotVMConfig config) {
+    protected EnumSet computeFlags(AMD64HotSpotVMConfig config) {
         EnumSet flags = EnumSet.noneOf(AMD64.Flag.class);
         if (config.useCountLeadingZerosInstruction) {
             flags.add(AMD64.Flag.UseCountLeadingZerosInstruction);
@@ -139,7 +138,7 @@ public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
         return flags;
     }
 
-    protected TargetDescription createTarget(HotSpotVMConfig config) {
+    protected TargetDescription createTarget(AMD64HotSpotVMConfig config) {
         final int stackFrameAlignment = 16;
         final int implicitNullCheckLimit = 4096;
         final boolean inlineObjects = true;
@@ -151,8 +150,8 @@ public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
         return new HotSpotConstantReflectionProvider(runtime);
     }
 
-    protected RegisterConfig createRegisterConfig(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target) {
-        return new AMD64HotSpotRegisterConfig(target, runtime.getConfig());
+    protected RegisterConfig createRegisterConfig(AMD64HotSpotVMConfig config, TargetDescription target) {
+        return new AMD64HotSpotRegisterConfig(target, config.useCompressedOops, config.windowsOs);
     }
 
     protected HotSpotCodeCacheProvider createCodeCache(HotSpotJVMCIRuntimeProvider runtime, TargetDescription target, RegisterConfig regConfig) {
@@ -175,9 +174,9 @@ public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
 
     @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, JVMCIBackend host) {
-
         assert host == null;
-        TargetDescription target = createTarget(runtime.getConfig());
+        AMD64HotSpotVMConfig config = new AMD64HotSpotVMConfig(runtime.getConfigStore());
+        TargetDescription target = createTarget(config);
 
         RegisterConfig regConfig;
         HotSpotCodeCacheProvider codeCache;
@@ -189,7 +188,7 @@ public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
                 metaAccess = createMetaAccess(runtime);
             }
             try (InitTimer rt = timer("create RegisterConfig")) {
-                regConfig = createRegisterConfig(runtime, target);
+                regConfig = createRegisterConfig(config, target);
             }
             try (InitTimer rt = timer("create CodeCache provider")) {
                 codeCache = createCodeCache(runtime, target, regConfig);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
index 0424d3aa0e7..74db7d1c76a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
@@ -59,7 +59,6 @@ import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.code.ValueKindFactory;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
@@ -73,8 +72,6 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
 
     private final Register[] allocatable;
 
-    private final int maxFrameSize;
-
     /**
      * The caller saved registers always include all parameter registers.
      */
@@ -84,10 +81,6 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
 
     private final RegisterAttributes[] attributesMap;
 
-    public int getMaximumFrameSize() {
-        return maxFrameSize;
-    }
-
     @Override
     public Register[] getAllocatableRegisters() {
         return allocatable.clone();
@@ -146,16 +139,15 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
         return registers;
     }
 
-    public AMD64HotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config) {
-        this(target, config, initAllocatable(target.arch, config.useCompressedOops));
+    public AMD64HotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops, boolean windowsOs) {
+        this(target, initAllocatable(target.arch, useCompressedOops), windowsOs);
         assert callerSaved.length >= allocatable.length;
     }
 
-    public AMD64HotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config, Register[] allocatable) {
+    public AMD64HotSpotRegisterConfig(TargetDescription target, Register[] allocatable, boolean windowsOs) {
         this.target = target;
-        this.maxFrameSize = config.maxFrameSize;
 
-        if (config.windowsOs) {
+        if (windowsOs) {
             javaGeneralParameterRegisters = new Register[]{rdx, r8, r9, rdi, rsi, rcx};
             nativeGeneralParameterRegisters = new Register[]{rcx, rdx, r8, r9};
             this.needsNativeStackHomeSpace = true;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
new file mode 100644
index 00000000000..4d38a73ebe4
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.hotspot.amd64;
+
+import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
+import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
+
+class AMD64HotSpotVMConfig extends HotSpotVMConfigAccess {
+
+    AMD64HotSpotVMConfig(HotSpotVMConfigStore config) {
+        super(config);
+    }
+
+    /**
+     * Maximum allowed size of allocated area for a frame.
+     */
+    final int maxFrameSize = 16 * 1024;
+
+    final boolean windowsOs = System.getProperty("os.name", "").startsWith("Windows");
+
+    final boolean useCountLeadingZerosInstruction = getFlag("UseCountLeadingZerosInstruction", Boolean.class);
+    final boolean useCountTrailingZerosInstruction = getFlag("UseCountTrailingZerosInstruction", Boolean.class);
+    final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
+
+    // CPU capabilities
+    final int useSSE = getFlag("UseSSE", Integer.class);
+    final int useAVX = getFlag("UseAVX", Integer.class);
+
+    final long vmVersionFeatures = getFieldValue("Abstract_VM_Version::_features", Long.class, "uint64_t");
+
+    // CPU feature flags
+    final long amd64CX8 = getConstant("VM_Version::CPU_CX8", Long.class);
+    final long amd64CMOV = getConstant("VM_Version::CPU_CMOV", Long.class);
+    final long amd64FXSR = getConstant("VM_Version::CPU_FXSR", Long.class);
+    final long amd64HT = getConstant("VM_Version::CPU_HT", Long.class);
+    final long amd64MMX = getConstant("VM_Version::CPU_MMX", Long.class);
+    final long amd643DNOWPREFETCH = getConstant("VM_Version::CPU_3DNOW_PREFETCH", Long.class);
+    final long amd64SSE = getConstant("VM_Version::CPU_SSE", Long.class);
+    final long amd64SSE2 = getConstant("VM_Version::CPU_SSE2", Long.class);
+    final long amd64SSE3 = getConstant("VM_Version::CPU_SSE3", Long.class);
+    final long amd64SSSE3 = getConstant("VM_Version::CPU_SSSE3", Long.class);
+    final long amd64SSE4A = getConstant("VM_Version::CPU_SSE4A", Long.class);
+    final long amd64SSE41 = getConstant("VM_Version::CPU_SSE4_1", Long.class);
+    final long amd64SSE42 = getConstant("VM_Version::CPU_SSE4_2", Long.class);
+    final long amd64POPCNT = getConstant("VM_Version::CPU_POPCNT", Long.class);
+    final long amd64LZCNT = getConstant("VM_Version::CPU_LZCNT", Long.class);
+    final long amd64TSC = getConstant("VM_Version::CPU_TSC", Long.class);
+    final long amd64TSCINV = getConstant("VM_Version::CPU_TSCINV", Long.class);
+    final long amd64AVX = getConstant("VM_Version::CPU_AVX", Long.class);
+    final long amd64AVX2 = getConstant("VM_Version::CPU_AVX2", Long.class);
+    final long amd64AES = getConstant("VM_Version::CPU_AES", Long.class);
+    final long amd64ERMS = getConstant("VM_Version::CPU_ERMS", Long.class);
+    final long amd64CLMUL = getConstant("VM_Version::CPU_CLMUL", Long.class);
+    final long amd64BMI1 = getConstant("VM_Version::CPU_BMI1", Long.class);
+    final long amd64BMI2 = getConstant("VM_Version::CPU_BMI2", Long.class);
+    final long amd64RTM = getConstant("VM_Version::CPU_RTM", Long.class);
+    final long amd64ADX = getConstant("VM_Version::CPU_ADX", Long.class);
+    final long amd64AVX512F = getConstant("VM_Version::CPU_AVX512F", Long.class);
+    final long amd64AVX512DQ = getConstant("VM_Version::CPU_AVX512DQ", Long.class);
+    final long amd64AVX512PF = getConstant("VM_Version::CPU_AVX512PF", Long.class);
+    final long amd64AVX512ER = getConstant("VM_Version::CPU_AVX512ER", Long.class);
+    final long amd64AVX512CD = getConstant("VM_Version::CPU_AVX512CD", Long.class);
+    final long amd64AVX512BW = getConstant("VM_Version::CPU_AVX512BW", Long.class);
+    final long amd64AVX512VL = getConstant("VM_Version::CPU_AVX512VL", Long.class);
+    final long amd64SHA = getConstant("VM_Version::CPU_SHA", Long.class);
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java
index 724266baf8a..e5b2d65b1ec 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java
@@ -37,14 +37,13 @@ import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider;
 import jdk.vm.ci.hotspot.HotSpotStackIntrospection;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.runtime.JVMCIBackend;
 import jdk.vm.ci.sparc.SPARC;
 import jdk.vm.ci.sparc.SPARC.CPUFeature;
 
 public class SPARCHotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFactory {
 
-    protected TargetDescription createTarget(HotSpotVMConfig config) {
+    protected TargetDescription createTarget(SPARCHotSpotVMConfig config) {
         final int stackFrameAlignment = 16;
         final int implicitNullCheckLimit = 4096;
         final boolean inlineObjects = false;
@@ -56,7 +55,7 @@ public class SPARCHotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
         return new HotSpotCodeCacheProvider(runtime, runtime.getConfig(), target, regConfig);
     }
 
-    protected EnumSet computeFeatures(HotSpotVMConfig config) {
+    protected EnumSet computeFeatures(SPARCHotSpotVMConfig config) {
         EnumSet features = EnumSet.noneOf(CPUFeature.class);
         if ((config.vmVersionFeatures & config.sparcVis1Instructions) != 0) {
             features.add(CPUFeature.VIS1);
@@ -143,10 +142,11 @@ public class SPARCHotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFacto
     @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntimeProvider runtime, JVMCIBackend host) {
         assert host == null;
-        TargetDescription target = createTarget(runtime.getConfig());
+        SPARCHotSpotVMConfig config = new SPARCHotSpotVMConfig(runtime.getConfigStore());
+        TargetDescription target = createTarget(config);
 
         HotSpotMetaAccessProvider metaAccess = new HotSpotMetaAccessProvider(runtime);
-        RegisterConfig regConfig = new SPARCHotSpotRegisterConfig(target, runtime.getConfig());
+        RegisterConfig regConfig = new SPARCHotSpotRegisterConfig(target, config.useCompressedOops);
         HotSpotCodeCacheProvider codeCache = createCodeCache(runtime, target, regConfig);
         HotSpotConstantReflectionProvider constantReflection = new HotSpotConstantReflectionProvider(runtime);
         StackIntrospection stackIntrospection = new HotSpotStackIntrospection(runtime);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
index af1b0ef591a..4afc3b07bc4 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
@@ -81,7 +81,6 @@ import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.code.ValueKindFactory;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
@@ -167,14 +166,14 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         return registers;
     }
 
-    public SPARCHotSpotRegisterConfig(TargetDescription target, HotSpotVMConfig config) {
-        this(target, initAllocatable(target.arch, config.useCompressedOops), config);
+    public SPARCHotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops) {
+        this(target, initAllocatable(target.arch, useCompressedOops));
     }
 
-    public SPARCHotSpotRegisterConfig(TargetDescription target, Register[] allocatable, HotSpotVMConfig config) {
+    public SPARCHotSpotRegisterConfig(TargetDescription target, Register[] allocatable) {
         this.target = target;
         this.allocatable = allocatable.clone();
-        this.addNativeRegisterArgumentSlots = config.linuxOs;
+        this.addNativeRegisterArgumentSlots = false;
         HashSet callerSaveSet = new HashSet<>();
         Collections.addAll(callerSaveSet, target.arch.getAvailableValueRegisters());
         for (Register cs : calleeSaveRegisters) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotVMConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotVMConfig.java
new file mode 100644
index 00000000000..d5eee90672f
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotVMConfig.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.hotspot.sparc;
+
+import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
+import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
+
+/**
+ * Used to access native configuration details.
+ *
+ * All non-static, public fields in this class are so that they can be compiled as constants.
+ */
+class SPARCHotSpotVMConfig extends HotSpotVMConfigAccess {
+
+    SPARCHotSpotVMConfig(HotSpotVMConfigStore config) {
+        super(config);
+    }
+
+    final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
+
+    // CPU capabilities
+    final long vmVersionFeatures = getFieldValue("Abstract_VM_Version::_features", Long.class, "uint64_t");
+
+    // SPARC specific values
+    final int sparcVis3Instructions = getConstant("VM_Version::vis3_instructions_m", Integer.class);
+    final int sparcVis2Instructions = getConstant("VM_Version::vis2_instructions_m", Integer.class);
+    final int sparcVis1Instructions = getConstant("VM_Version::vis1_instructions_m", Integer.class);
+    final int sparcCbcondInstructions = getConstant("VM_Version::cbcond_instructions_m", Integer.class);
+    final int sparcV8Instructions = getConstant("VM_Version::v8_instructions_m", Integer.class);
+    final int sparcHardwareMul32 = getConstant("VM_Version::hardware_mul32_m", Integer.class);
+    final int sparcHardwareDiv32 = getConstant("VM_Version::hardware_div32_m", Integer.class);
+    final int sparcHardwareFsmuld = getConstant("VM_Version::hardware_fsmuld_m", Integer.class);
+    final int sparcHardwarePopc = getConstant("VM_Version::hardware_popc_m", Integer.class);
+    final int sparcV9Instructions = getConstant("VM_Version::v9_instructions_m", Integer.class);
+    final int sparcSun4v = getConstant("VM_Version::sun4v_m", Integer.class);
+    final int sparcBlkInitInstructions = getConstant("VM_Version::blk_init_instructions_m", Integer.class);
+    final int sparcFmafInstructions = getConstant("VM_Version::fmaf_instructions_m", Integer.class);
+    final int sparcFmauInstructions = getConstant("VM_Version::fmau_instructions_m", Integer.class);
+    final int sparcSparc64Family = getConstant("VM_Version::sparc64_family_m", Integer.class);
+    final int sparcMFamily = getConstant("VM_Version::M_family_m", Integer.class);
+    final int sparcTFamily = getConstant("VM_Version::T_family_m", Integer.class);
+    final int sparcT1Model = getConstant("VM_Version::T1_model_m", Integer.class);
+    final int sparcSparc5Instructions = getConstant("VM_Version::sparc5_instructions_m", Integer.class);
+    final int sparcAesInstructions = getConstant("VM_Version::aes_instructions_m", Integer.class);
+    final int sparcSha1Instruction = getConstant("VM_Version::sha1_instruction_m", Integer.class);
+    final int sparcSha256Instruction = getConstant("VM_Version::sha256_instruction_m", Integer.class);
+    final int sparcSha512Instruction = getConstant("VM_Version::sha512_instruction_m", Integer.class);
+
+    final boolean useBlockZeroing = getFlag("UseBlockZeroing", Boolean.class);
+    final int blockZeroingLowLimit = getFlag("BlockZeroingLowLimit", Integer.class);
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
index 9cc09b780e7..72f9d18caa3 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -35,11 +35,9 @@ import jdk.vm.ci.code.InvalidInstalledCodeException;
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.hotspotvmconfig.HotSpotVMField;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.internal.misc.Unsafe;
 
 /**
  * Calls from Java into HotSpot. The behavior of all the methods in this class that take a native
@@ -339,9 +337,22 @@ final class CompilerToVM {
     native void resetCompilationStatistics();
 
     /**
-     * Initializes the fields of {@code config}.
+     * Reads the database of VM info. The return value encodes the info in a nested object array
+     * that is described by the pseudo Java object {@code info} below:
+     *
+     * 
+     *     info = [
+     *         VMField[] vmFields,
+     *         [String name, Long size, ...] vmTypeSizes,
+     *         [String name, Long value, ...] vmConstants,
+     *         [String name, Long value, ...] vmAddresses,
+     *         VMFlag[] vmFlags
+     *     ]
+     * 

+     *
+     * @return VM info as encoded above
      */
-    native long initializeConfiguration(HotSpotVMConfig config);
+    native Object[] readConfiguration();
 
     /**
      * Resolves the implementation of {@code method} for virtual dispatches on objects of dynamic
@@ -429,7 +440,6 @@ final class CompilerToVM {
      * 
  • {@link HotSpotVMConfig#localVariableTableElementLengthOffset}
    • 
      * 
  • {@link HotSpotVMConfig#localVariableTableElementNameCpIndexOffset}
    • 
      * 
  • {@link HotSpotVMConfig#localVariableTableElementDescriptorCpIndexOffset}
    • 
-     * 
  • {@link HotSpotVMConfig#localVariableTableElementSignatureCpIndexOffset}
      * 
  • {@link HotSpotVMConfig#localVariableTableElementSlotOffset}
      * 
  • {@link HotSpotVMConfig#localVariableTableElementStartBciOffset}
      * 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
index dac0fb3a553..efb596f0f20 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
@@ -42,7 +42,7 @@ import jdk.vm.ci.meta.SpeculationLog;
 public class HotSpotCodeCacheProvider implements CodeCacheProvider {
 
     protected final HotSpotJVMCIRuntimeProvider runtime;
-    public final HotSpotVMConfig config;
+    protected final HotSpotVMConfig config;
     protected final TargetDescription target;
     protected final RegisterConfig regConfig;
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
index 9538dbcfbb8..e74027f2dd1 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
@@ -25,7 +25,6 @@ package jdk.vm.ci.hotspot;
 import java.lang.reflect.Array;
 import java.util.Objects;
 
-import jdk.internal.vm.annotation.Stable;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
index a3db464894a..672cf0b2b39 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
@@ -22,8 +22,6 @@
  */
 package jdk.vm.ci.hotspot;
 
-import java.lang.reflect.Module;
-
 import jdk.vm.ci.code.CompilationRequest;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
@@ -68,7 +66,6 @@ final class HotSpotJVMCICompilerConfig {
             if (compilerName != null) {
                 for (JVMCICompilerFactory f : Services.load(JVMCICompilerFactory.class)) {
                     if (f.getCompilerName().equals(compilerName)) {
-                        Module jvmciModule = JVMCICompilerFactory.class.getModule();
                         Services.exportJVMCITo(f.getClass());
                         f.onSelection();
                         factory = f;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index c8b12aefe32..4268da3bfe6 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -49,6 +49,7 @@ import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.services.HotSpotJVMCICompilerFactory;
 import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
+import jdk.vm.ci.hotspot.services.HotSpotJVMCICompilerFactory.CompilationLevel;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -200,6 +201,7 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
 
     protected final CompilerToVM compilerToVm;
 
+    protected final HotSpotVMConfigStore configStore;
     protected final HotSpotVMConfig config;
     private final JVMCIBackend hostBackend;
 
@@ -244,7 +246,8 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
         compilerToVm = new CompilerToVM();
 
         try (InitTimer t = timer("HotSpotVMConfig")) {
-            config = new HotSpotVMConfig(compilerToVm);
+            configStore = new HotSpotVMConfigStore(compilerToVm);
+            config = new HotSpotVMConfig(configStore);
         }
 
         String hostArchitecture = config.getHostArchitectureName();
@@ -277,11 +280,24 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
         if (compilerFactory instanceof HotSpotJVMCICompilerFactory) {
             hsCompilerFactory = (HotSpotJVMCICompilerFactory) compilerFactory;
             trivialPrefixes = hsCompilerFactory.getTrivialPrefixes();
-            compilationLevelAdjustment = hsCompilerFactory.getCompilationLevelAdjustment(config);
+            switch (hsCompilerFactory.getCompilationLevelAdjustment()) {
+                case None:
+                    compilationLevelAdjustment = config.compLevelAdjustmentNone;
+                    break;
+                case ByHolder:
+                    compilationLevelAdjustment = config.compLevelAdjustmentByHolder;
+                    break;
+                case ByFullSignature:
+                    compilationLevelAdjustment = config.compLevelAdjustmentByFullSignature;
+                    break;
+                default:
+                    compilationLevelAdjustment = config.compLevelAdjustmentNone;
+                    break;
+            }
         } else {
             hsCompilerFactory = null;
             trivialPrefixes = null;
-            compilationLevelAdjustment = 0;
+            compilationLevelAdjustment = config.compLevelAdjustmentNone;
         }
     }
 
@@ -296,6 +312,10 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
         return metaAccessContext.fromClass(javaClass);
     }
 
+    public HotSpotVMConfigStore getConfigStore() {
+        return configStore;
+    }
+
     public HotSpotVMConfig getConfig() {
         return config;
     }
@@ -352,7 +372,35 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
      */
     @SuppressWarnings({"unused"})
     private int adjustCompilationLevel(Class declaringClass, String name, String signature, boolean isOsr, int level) {
-        return hsCompilerFactory.adjustCompilationLevel(config, declaringClass, name, signature, isOsr, level);
+        CompilationLevel curLevel;
+        if (level == config.compilationLevelNone) {
+            curLevel = CompilationLevel.None;
+        } else if (level == config.compilationLevelSimple) {
+            curLevel = CompilationLevel.Simple;
+        } else if (level == config.compilationLevelLimitedProfile) {
+            curLevel = CompilationLevel.LimitedProfile;
+        } else if (level == config.compilationLevelFullProfile) {
+            curLevel = CompilationLevel.FullProfile;
+        } else if (level == config.compilationLevelFullOptimization) {
+            curLevel = CompilationLevel.FullOptimization;
+        } else {
+            throw JVMCIError.shouldNotReachHere();
+        }
+
+        switch (hsCompilerFactory.adjustCompilationLevel(declaringClass, name, signature, isOsr, curLevel)) {
+            case None:
+                return config.compilationLevelNone;
+            case Simple:
+                return config.compilationLevelSimple;
+            case LimitedProfile:
+                return config.compilationLevelLimitedProfile;
+            case FullProfile:
+                return config.compilationLevelFullProfile;
+            case FullOptimization:
+                return config.compilationLevelFullOptimization;
+            default:
+                return level;
+        }
     }
 
     /**
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java
index 6ad27247907..3397af80aa7 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -36,6 +36,8 @@ import jdk.vm.ci.runtime.JVMCIRuntime;
  */
 public interface HotSpotJVMCIRuntimeProvider extends JVMCIRuntime {
 
+    HotSpotVMConfigStore getConfigStore();
+
     HotSpotVMConfig getConfig();
 
     CompilerToVM getCompilerToVM();
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java
index c5779332e5a..a4d68b56f19 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProvider.java
@@ -22,7 +22,6 @@
  */
 package jdk.vm.ci.hotspot;
 
-import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.MemoryAccessProvider;
@@ -32,11 +31,11 @@ import jdk.vm.ci.meta.MemoryAccessProvider;
  */
 public interface HotSpotMemoryAccessProvider extends MemoryAccessProvider {
 
-    JavaConstant readNarrowOopConstant(Constant base, long displacement, CompressEncoding encoding);
+    JavaConstant readNarrowOopConstant(Constant base, long displacement);
 
     Constant readKlassPointerConstant(Constant base, long displacement);
 
-    Constant readNarrowKlassPointerConstant(Constant base, long displacement, CompressEncoding encoding);
+    Constant readNarrowKlassPointerConstant(Constant base, long displacement);
 
     Constant readMethodPointerConstant(Constant base, long displacement);
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
index 1d8828bb3bf..6bdf2ee4598 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
@@ -23,7 +23,7 @@
 package jdk.vm.ci.hotspot;
 
 import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
-import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding;
+
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
@@ -206,8 +206,7 @@ class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider {
     }
 
     @Override
-    public JavaConstant readNarrowOopConstant(Constant base, long displacement, CompressEncoding encoding) {
-        assert encoding.equals(runtime.getConfig().getOopEncoding()) : "unexpected oop encoding: " + encoding + " != " + runtime.getConfig().getOopEncoding();
+    public JavaConstant readNarrowOopConstant(Constant base, long displacement) {
         return HotSpotObjectConstantImpl.forObject(readRawObject(base, displacement, true), true);
     }
 
@@ -227,7 +226,7 @@ class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider {
     }
 
     @Override
-    public Constant readNarrowKlassPointerConstant(Constant base, long displacement, CompressEncoding encoding) {
+    public Constant readNarrowKlassPointerConstant(Constant base, long displacement) {
         HotSpotResolvedObjectTypeImpl klass = readKlass(base, displacement, true);
         if (klass == null) {
             return HotSpotCompressedNullConstant.COMPRESSED_NULL;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
index e8544775ec0..3cd69d9a9c0 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -28,12 +28,8 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
 import jdk.internal.vm.annotation.Stable;
-import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.meta.JavaType;
-import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ModifiersProvider;
-import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
index b20da3d535b..18fe6adc834 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
@@ -23,315 +23,32 @@
 package jdk.vm.ci.hotspot;
 
 import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
-import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import jdk.internal.misc.Unsafe;
-import jdk.internal.vm.annotation.Stable;
-import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.hotspotvmconfig.HotSpotVMAddress;
-import jdk.vm.ci.hotspotvmconfig.HotSpotVMConstant;
-import jdk.vm.ci.hotspotvmconfig.HotSpotVMData;
-import jdk.vm.ci.hotspotvmconfig.HotSpotVMField;
-import jdk.vm.ci.hotspotvmconfig.HotSpotVMFlag;
-import jdk.vm.ci.hotspotvmconfig.HotSpotVMType;
 
 /**
  * Used to access native configuration details.
  *
  * All non-static, public fields in this class are so that they can be compiled as constants.
  */
-public class HotSpotVMConfig {
+class HotSpotVMConfig extends HotSpotVMConfigAccess {
 
     /**
      * Gets the configuration associated with the singleton {@link HotSpotJVMCIRuntime}.
      */
-    public static HotSpotVMConfig config() {
+    static HotSpotVMConfig config() {
         return runtime().getConfig();
     }
 
-    /**
-     * Maximum allowed size of allocated area for a frame.
-     */
-    public final int maxFrameSize = 16 * 1024;
+    private final String osArch = getHostArchitectureName();
 
-    public HotSpotVMConfig(CompilerToVM compilerToVm) {
-        // Get raw pointer to the array that contains all gHotSpotVM values.
-        final long gHotSpotVMData = compilerToVm.initializeConfiguration(this);
-        assert gHotSpotVMData != 0;
-
-        // Make FindBugs happy.
-        jvmciHotSpotVMStructs = 0;
-        jvmciHotSpotVMTypes = 0;
-        jvmciHotSpotVMIntConstants = 0;
-        jvmciHotSpotVMLongConstants = 0;
-        jvmciHotSpotVMAddresses = 0;
-
-        // Initialize the gHotSpotVM fields.
-        for (Field f : HotSpotVMConfig.class.getDeclaredFields()) {
-            if (f.isAnnotationPresent(HotSpotVMData.class)) {
-                HotSpotVMData annotation = f.getAnnotation(HotSpotVMData.class);
-                final int index = annotation.index();
-                final long value = UNSAFE.getAddress(gHotSpotVMData + Unsafe.ADDRESS_SIZE * index);
-                try {
-                    f.setLong(this, value);
-                } catch (IllegalAccessException e) {
-                    throw new JVMCIError("index " + index, e);
-                }
-            }
-        }
-
-        // Quick sanity check.
-        assert jvmciHotSpotVMStructs != 0;
-        assert jvmciHotSpotVMTypes != 0;
-        assert jvmciHotSpotVMIntConstants != 0;
-        assert jvmciHotSpotVMLongConstants != 0;
-        assert jvmciHotSpotVMAddresses != 0;
-
-        initialize();
-
-        oopEncoding = new CompressEncoding(narrowOopBase, narrowOopShift, logMinObjAlignment());
-        klassEncoding = new CompressEncoding(narrowKlassBase, narrowKlassShift, logKlassAlignment);
-
-        assert check();
-        assert HotSpotVMConfigVerifier.check();
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getSimpleName();
-    }
-
-    /**
-     * Reads a {@code '\0'} terminated C string from native memory and converts it to a
-     * {@link String}.
-     *
-     * @return a Java string
-     */
-    private static String readCString(Unsafe unsafe, long address) {
-        if (address == 0) {
-            return null;
-        }
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0;; i++) {
-            char c = (char) unsafe.getByte(address + i);
-            if (c == 0) {
-                break;
-            }
-            sb.append(c);
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Initialize fields by reading their values from vmStructs.
-     */
-    private void initialize() {
-        // Fill the VM fields hash map.
-        HashMap vmFields = new HashMap<>();
-        for (VMFields.Field e : new VMFields(jvmciHotSpotVMStructs)) {
-            vmFields.put(e.getName(), e);
-        }
-
-        // Fill the VM types hash map.
-        HashMap vmTypes = new HashMap<>();
-        for (VMTypes.Type e : new VMTypes(jvmciHotSpotVMTypes)) {
-            vmTypes.put(e.getTypeName(), e);
-        }
-
-        // Fill the VM constants hash map.
-        HashMap vmConstants = new HashMap<>();
-        for (AbstractConstant e : new VMIntConstants(jvmciHotSpotVMIntConstants)) {
-            vmConstants.put(e.getName(), e);
-        }
-        for (AbstractConstant e : new VMLongConstants(jvmciHotSpotVMLongConstants)) {
-            vmConstants.put(e.getName(), e);
-        }
-
-        // Fill the VM addresses hash map.
-        HashMap vmAddresses = new HashMap<>();
-        for (VMAddresses.Address e : new VMAddresses(jvmciHotSpotVMAddresses)) {
-            vmAddresses.put(e.getName(), e);
-        }
-
-        // Fill the flags hash map.
-        HashMap flags = new HashMap<>();
-        for (Flags.Flag e : new Flags(vmFields, vmTypes)) {
-            flags.put(e.getName(), e);
-        }
-
-        String osName = getHostOSName();
-        String osArch = getHostArchitectureName();
-
-        for (Field f : HotSpotVMConfig.class.getDeclaredFields()) {
-            if (f.isAnnotationPresent(HotSpotVMField.class)) {
-                HotSpotVMField annotation = f.getAnnotation(HotSpotVMField.class);
-                String name = annotation.name();
-                String type = annotation.type();
-                VMFields.Field entry = vmFields.get(name);
-                if (entry == null) {
-                    if (!isRequired(osArch, annotation.archs())) {
-                        continue;
-                    }
-                    throw new JVMCIError(f.getName() + ": expected VM field not found: " + name);
-                }
-
-                // Make sure the native type is still the type we expect.
-                if (!type.isEmpty()) {
-                    if (!type.equals(entry.getTypeString())) {
-                        throw new JVMCIError(f.getName() + ": compiler expects type " + type + " but VM field " + name + " is of type " + entry.getTypeString());
-                    }
-                }
-
-                switch (annotation.get()) {
-                    case OFFSET:
-                        setField(f, entry.getOffset());
-                        break;
-                    case ADDRESS:
-                        setField(f, entry.getAddress());
-                        break;
-                    case VALUE:
-                        setField(f, entry.getValue());
-                        break;
-                    default:
-                        throw new JVMCIError(f.getName() + ": unknown kind: " + annotation.get());
-                }
-            } else if (f.isAnnotationPresent(HotSpotVMType.class)) {
-                HotSpotVMType annotation = f.getAnnotation(HotSpotVMType.class);
-                String name = annotation.name();
-                VMTypes.Type entry = vmTypes.get(name);
-                if (entry == null) {
-                    throw new JVMCIError(f.getName() + ": expected VM type not found: " + name);
-                }
-
-                switch (annotation.get()) {
-                    case SIZE:
-                        setField(f, entry.getSize());
-                        break;
-                    default:
-                        throw new JVMCIError(f.getName() + ": unknown kind: " + annotation.get());
-                }
-            } else if (f.isAnnotationPresent(HotSpotVMConstant.class)) {
-                HotSpotVMConstant annotation = f.getAnnotation(HotSpotVMConstant.class);
-                String name = annotation.name();
-                AbstractConstant entry = vmConstants.get(name);
-                if (entry == null) {
-                    if (!isRequired(osArch, annotation.archs())) {
-                        continue;
-                    }
-                    throw new JVMCIError(f.getName() + ": expected VM constant not found: " + name);
-                }
-                setField(f, entry.getValue());
-            } else if (f.isAnnotationPresent(HotSpotVMAddress.class)) {
-                HotSpotVMAddress annotation = f.getAnnotation(HotSpotVMAddress.class);
-                String name = annotation.name();
-                VMAddresses.Address entry = vmAddresses.get(name);
-                if (entry == null) {
-                    if (!isRequired(osName, annotation.os())) {
-                        continue;
-                    }
-                    throw new JVMCIError(f.getName() + ": expected VM address not found: " + name);
-                }
-                setField(f, entry.getValue());
-            } else if (f.isAnnotationPresent(HotSpotVMFlag.class)) {
-                HotSpotVMFlag annotation = f.getAnnotation(HotSpotVMFlag.class);
-                String name = annotation.name();
-                Flags.Flag entry = flags.get(name);
-                if (entry == null) {
-                    if (annotation.optional() || !isRequired(osArch, annotation.archs())) {
-                        continue;
-                    }
-                    throw new JVMCIError(f.getName() + ": expected VM flag not found: " + name);
-
-                }
-                setField(f, entry.getValue());
-            }
-        }
-    }
-
-    private final CompressEncoding oopEncoding;
-    private final CompressEncoding klassEncoding;
-
-    public CompressEncoding getOopEncoding() {
-        return oopEncoding;
-    }
-
-    public CompressEncoding getKlassEncoding() {
-        return klassEncoding;
-    }
-
-    private void setField(Field field, Object value) {
-        try {
-            Class fieldType = field.getType();
-            if (fieldType == boolean.class) {
-                if (value instanceof String) {
-                    field.setBoolean(this, Boolean.valueOf((String) value));
-                } else if (value instanceof Boolean) {
-                    field.setBoolean(this, (boolean) value);
-                } else if (value instanceof Long) {
-                    field.setBoolean(this, ((long) value) != 0);
-                } else {
-                    throw new JVMCIError(value.getClass().getSimpleName());
-                }
-            } else if (fieldType == byte.class) {
-                if (value instanceof Long) {
-                    field.setByte(this, (byte) (long) value);
-                } else {
-                    throw new JVMCIError(value.getClass().getSimpleName());
-                }
-            } else if (fieldType == int.class) {
-                if (value instanceof Integer) {
-                    field.setInt(this, (int) value);
-                } else if (value instanceof Long) {
-                    field.setInt(this, (int) (long) value);
-                } else {
-                    throw new JVMCIError(value.getClass().getSimpleName());
-                }
-            } else if (fieldType == long.class) {
-                field.setLong(this, (long) value);
-            } else {
-                throw new JVMCIError(field.toString());
-            }
-        } catch (IllegalAccessException e) {
-            throw new JVMCIError("%s: %s", field, e);
-        }
-    }
-
-    /**
-     * Gets the host operating system name.
-     */
-    private static String getHostOSName() {
-        String osName = System.getProperty("os.name");
-        switch (osName) {
-            case "Linux":
-                osName = "linux";
-                break;
-            case "SunOS":
-                osName = "solaris";
-                break;
-            case "Mac OS X":
-                osName = "bsd";
-                break;
-            default:
-                // Of course Windows is different...
-                if (osName.startsWith("Windows")) {
-                    osName = "windows";
-                } else {
-                    throw new JVMCIError("Unexpected OS name: " + osName);
-                }
-        }
-        return osName;
+    HotSpotVMConfig(HotSpotVMConfigStore store) {
+        super(store);
     }
 
     /**
      * Gets the host architecture name for the purpose of finding the corresponding
      * {@linkplain HotSpotJVMCIBackendFactory backend}.
      */
-    public String getHostArchitectureName() {
+    String getHostArchitectureName() {
         String arch = System.getProperty("os.arch");
         switch (arch) {
             case "x86_64":
@@ -344,1320 +61,256 @@ public class HotSpotVMConfig {
         return arch;
     }
 
-    /**
-     * Determines if the current specification is included in a given set of specifications.
-     *
-     * @param current
-     * @param specification specifies a set of specifications, e.g. architectures or operating
-     *            systems. A zero length value implies all.
-     */
-    private static boolean isRequired(String current, String[] specification) {
-        if (specification.length == 0) {
-            return true;
-        }
-        for (String arch : specification) {
-            if (arch.equals(current)) {
-                return true;
-            }
-        }
-        return false;
-    }
+    final boolean useDeferredInitBarriers = getFlag("ReduceInitialCardMarks", Boolean.class);
 
-    /**
-     * VMStructEntry (see {@code vmStructs.hpp}).
-     */
-    @HotSpotVMData(index = 0) @Stable private long jvmciHotSpotVMStructs;
-    @HotSpotVMData(index = 1) @Stable private long jvmciHotSpotVMStructEntryTypeNameOffset;
-    @HotSpotVMData(index = 2) @Stable private long jvmciHotSpotVMStructEntryFieldNameOffset;
-    @HotSpotVMData(index = 3) @Stable private long jvmciHotSpotVMStructEntryTypeStringOffset;
-    @HotSpotVMData(index = 4) @Stable private long jvmciHotSpotVMStructEntryIsStaticOffset;
-    @HotSpotVMData(index = 5) @Stable private long jvmciHotSpotVMStructEntryOffsetOffset;
-    @HotSpotVMData(index = 6) @Stable private long jvmciHotSpotVMStructEntryAddressOffset;
-    @HotSpotVMData(index = 7) @Stable private long jvmciHotSpotVMStructEntryArrayStride;
+    final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
 
-    final class VMFields implements Iterable {
-
-        private final long address;
-
-        VMFields(long address) {
-            this.address = address;
-        }
-
-        public Iterator iterator() {
-            return new Iterator() {
-
-                private int index = 0;
-
-                private Field current() {
-                    return new Field(address + jvmciHotSpotVMStructEntryArrayStride * index);
-                }
-
-                /**
-                 * The last entry is identified by a NULL fieldName.
-                 */
-                public boolean hasNext() {
-                    Field entry = current();
-                    return entry.getFieldName() != null;
-                }
-
-                public Field next() {
-                    Field entry = current();
-                    index++;
-                    return entry;
-                }
-            };
-        }
-
-        final class Field {
-
-            private final long entryAddress;
-
-            Field(long address) {
-                this.entryAddress = address;
-            }
-
-            public String getTypeName() {
-                long typeNameAddress = UNSAFE.getAddress(entryAddress + jvmciHotSpotVMStructEntryTypeNameOffset);
-                return readCString(UNSAFE, typeNameAddress);
-            }
-
-            public String getFieldName() {
-                long fieldNameAddress = UNSAFE.getAddress(entryAddress + jvmciHotSpotVMStructEntryFieldNameOffset);
-                return readCString(UNSAFE, fieldNameAddress);
-            }
-
-            public String getTypeString() {
-                long typeStringAddress = UNSAFE.getAddress(entryAddress + jvmciHotSpotVMStructEntryTypeStringOffset);
-                return readCString(UNSAFE, typeStringAddress);
-            }
-
-            public boolean isStatic() {
-                return UNSAFE.getInt(entryAddress + jvmciHotSpotVMStructEntryIsStaticOffset) != 0;
-            }
-
-            public long getOffset() {
-                return UNSAFE.getLong(entryAddress + jvmciHotSpotVMStructEntryOffsetOffset);
-            }
-
-            public long getAddress() {
-                return UNSAFE.getAddress(entryAddress + jvmciHotSpotVMStructEntryAddressOffset);
-            }
-
-            public String getName() {
-                String typeName = getTypeName();
-                String fieldName = getFieldName();
-                return typeName + "::" + fieldName;
-            }
-
-            public long getValue() {
-                String type = getTypeString();
-                switch (type) {
-                    case "bool":
-                        return UNSAFE.getByte(getAddress());
-                    case "int":
-                        return UNSAFE.getInt(getAddress());
-                    case "uint64_t":
-                        return UNSAFE.getLong(getAddress());
-                    case "address":
-                    case "intptr_t":
-                    case "uintptr_t":
-                    case "size_t":
-                        return UNSAFE.getAddress(getAddress());
-                    default:
-                        // All foo* types are addresses.
-                        if (type.endsWith("*")) {
-                            return UNSAFE.getAddress(getAddress());
-                        }
-                        throw new JVMCIError(type);
-                }
-            }
-
-            @Override
-            public String toString() {
-                return String.format("Field[typeName=%s, fieldName=%s, typeString=%s, isStatic=%b, offset=%d, address=0x%x]", getTypeName(), getFieldName(), getTypeString(), isStatic(), getOffset(),
-                                getAddress());
-            }
-        }
-    }
-
-    /**
-     * VMTypeEntry (see vmStructs.hpp).
-     */
-    @HotSpotVMData(index = 8) @Stable private long jvmciHotSpotVMTypes;
-    @HotSpotVMData(index = 9) @Stable private long jvmciHotSpotVMTypeEntryTypeNameOffset;
-    @HotSpotVMData(index = 10) @Stable private long jvmciHotSpotVMTypeEntrySuperclassNameOffset;
-    @HotSpotVMData(index = 11) @Stable private long jvmciHotSpotVMTypeEntryIsOopTypeOffset;
-    @HotSpotVMData(index = 12) @Stable private long jvmciHotSpotVMTypeEntryIsIntegerTypeOffset;
-    @HotSpotVMData(index = 13) @Stable private long jvmciHotSpotVMTypeEntryIsUnsignedOffset;
-    @HotSpotVMData(index = 14) @Stable private long jvmciHotSpotVMTypeEntrySizeOffset;
-    @HotSpotVMData(index = 15) @Stable private long jvmciHotSpotVMTypeEntryArrayStride;
-
-    final class VMTypes implements Iterable {
-
-        private final long address;
-
-        VMTypes(long address) {
-            this.address = address;
-        }
-
-        public Iterator iterator() {
-            return new Iterator() {
-
-                private int index = 0;
-
-                private Type current() {
-                    return new Type(address + jvmciHotSpotVMTypeEntryArrayStride * index);
-                }
-
-                /**
-                 * The last entry is identified by a NULL type name.
-                 */
-                public boolean hasNext() {
-                    Type entry = current();
-                    return entry.getTypeName() != null;
-                }
-
-                public Type next() {
-                    Type entry = current();
-                    index++;
-                    return entry;
-                }
-            };
-        }
-
-        final class Type {
-
-            private final long entryAddress;
-
-            Type(long address) {
-                this.entryAddress = address;
-            }
-
-            public String getTypeName() {
-                long typeNameAddress = UNSAFE.getAddress(entryAddress + jvmciHotSpotVMTypeEntryTypeNameOffset);
-                return readCString(UNSAFE, typeNameAddress);
-            }
-
-            public String getSuperclassName() {
-                long superclassNameAddress = UNSAFE.getAddress(entryAddress + jvmciHotSpotVMTypeEntrySuperclassNameOffset);
-                return readCString(UNSAFE, superclassNameAddress);
-            }
-
-            public boolean isOopType() {
-                return UNSAFE.getInt(entryAddress + jvmciHotSpotVMTypeEntryIsOopTypeOffset) != 0;
-            }
-
-            public boolean isIntegerType() {
-                return UNSAFE.getInt(entryAddress + jvmciHotSpotVMTypeEntryIsIntegerTypeOffset) != 0;
-            }
-
-            public boolean isUnsigned() {
-                return UNSAFE.getInt(entryAddress + jvmciHotSpotVMTypeEntryIsUnsignedOffset) != 0;
-            }
-
-            public long getSize() {
-                return UNSAFE.getLong(entryAddress + jvmciHotSpotVMTypeEntrySizeOffset);
-            }
-
-            @Override
-            public String toString() {
-                return String.format("Type[typeName=%s, superclassName=%s, isOopType=%b, isIntegerType=%b, isUnsigned=%b, size=%d]", getTypeName(), getSuperclassName(), isOopType(), isIntegerType(),
-                                isUnsigned(), getSize());
-            }
-        }
-    }
-
-    public abstract class AbstractConstant {
-
-        protected final long address;
-        protected final long nameOffset;
-        protected final long valueOffset;
-
-        AbstractConstant(long address, long nameOffset, long valueOffset) {
-            this.address = address;
-            this.nameOffset = nameOffset;
-            this.valueOffset = valueOffset;
-        }
-
-        public String getName() {
-            long nameAddress = UNSAFE.getAddress(address + nameOffset);
-            return readCString(UNSAFE, nameAddress);
-        }
-
-        public abstract long getValue();
-    }
-
-    /**
-     * VMIntConstantEntry (see vmStructs.hpp).
-     */
-    @HotSpotVMData(index = 16) @Stable private long jvmciHotSpotVMIntConstants;
-    @HotSpotVMData(index = 17) @Stable private long jvmciHotSpotVMIntConstantEntryNameOffset;
-    @HotSpotVMData(index = 18) @Stable private long jvmciHotSpotVMIntConstantEntryValueOffset;
-    @HotSpotVMData(index = 19) @Stable private long jvmciHotSpotVMIntConstantEntryArrayStride;
-
-    final class VMIntConstants implements Iterable {
-
-        private final long address;
-
-        VMIntConstants(long address) {
-            this.address = address;
-        }
-
-        public Iterator iterator() {
-            return new Iterator() {
-
-                private int index = 0;
-
-                private Constant current() {
-                    return new Constant(address + jvmciHotSpotVMIntConstantEntryArrayStride * index);
-                }
-
-                /**
-                 * The last entry is identified by a NULL name.
-                 */
-                public boolean hasNext() {
-                    Constant entry = current();
-                    return entry.getName() != null;
-                }
-
-                public Constant next() {
-                    Constant entry = current();
-                    index++;
-                    return entry;
-                }
-            };
-        }
-
-        final class Constant extends AbstractConstant {
-
-            Constant(long address) {
-                super(address, jvmciHotSpotVMIntConstantEntryNameOffset, jvmciHotSpotVMIntConstantEntryValueOffset);
-            }
-
-            @Override
-            public long getValue() {
-                return UNSAFE.getInt(address + valueOffset);
-            }
-
-            @Override
-            public String toString() {
-                return String.format("IntConstant[name=%s, value=%d (0x%x)]", getName(), getValue(), getValue());
-            }
-        }
-    }
-
-    /**
-     * VMLongConstantEntry (see vmStructs.hpp).
-     */
-    @HotSpotVMData(index = 20) @Stable private long jvmciHotSpotVMLongConstants;
-    @HotSpotVMData(index = 21) @Stable private long jvmciHotSpotVMLongConstantEntryNameOffset;
-    @HotSpotVMData(index = 22) @Stable private long jvmciHotSpotVMLongConstantEntryValueOffset;
-    @HotSpotVMData(index = 23) @Stable private long jvmciHotSpotVMLongConstantEntryArrayStride;
-
-    final class VMLongConstants implements Iterable {
-
-        private final long address;
-
-        VMLongConstants(long address) {
-            this.address = address;
-        }
-
-        public Iterator iterator() {
-            return new Iterator() {
-
-                private int index = 0;
-
-                private Constant currentEntry() {
-                    return new Constant(address + jvmciHotSpotVMLongConstantEntryArrayStride * index);
-                }
-
-                /**
-                 * The last entry is identified by a NULL name.
-                 */
-                public boolean hasNext() {
-                    Constant entry = currentEntry();
-                    return entry.getName() != null;
-                }
-
-                public Constant next() {
-                    Constant entry = currentEntry();
-                    index++;
-                    return entry;
-                }
-            };
-        }
-
-        final class Constant extends AbstractConstant {
-
-            Constant(long address) {
-                super(address, jvmciHotSpotVMLongConstantEntryNameOffset, jvmciHotSpotVMLongConstantEntryValueOffset);
-            }
-
-            @Override
-            public long getValue() {
-                return UNSAFE.getLong(address + valueOffset);
-            }
-
-            @Override
-            public String toString() {
-                return String.format("LongConstant[name=%s, value=%d (0x%x)]", getName(), getValue(), getValue());
-            }
-        }
-    }
-
-    /**
-     * VMAddressEntry (see vmStructs.hpp).
-     */
-    @HotSpotVMData(index = 24) @Stable private long jvmciHotSpotVMAddresses;
-    @HotSpotVMData(index = 25) @Stable private long jvmciHotSpotVMAddressEntryNameOffset;
-    @HotSpotVMData(index = 26) @Stable private long jvmciHotSpotVMAddressEntryValueOffset;
-    @HotSpotVMData(index = 27) @Stable private long jvmciHotSpotVMAddressEntryArrayStride;
-
-    final class VMAddresses implements Iterable {
-
-        private final long address;
-
-        VMAddresses(long address) {
-            this.address = address;
-        }
-
-        public Iterator iterator() {
-            return new Iterator() {
-
-                private int index = 0;
-
-                private Address currentEntry() {
-                    return new Address(address + jvmciHotSpotVMAddressEntryArrayStride * index);
-                }
-
-                /**
-                 * The last entry is identified by a NULL name.
-                 */
-                public boolean hasNext() {
-                    Address entry = currentEntry();
-                    return entry.getName() != null;
-                }
-
-                public Address next() {
-                    Address entry = currentEntry();
-                    index++;
-                    return entry;
-                }
-            };
-        }
-
-        final class Address extends AbstractConstant {
-
-            Address(long address) {
-                super(address, jvmciHotSpotVMAddressEntryNameOffset, jvmciHotSpotVMAddressEntryValueOffset);
-            }
-
-            @Override
-            public long getValue() {
-                return UNSAFE.getLong(address + valueOffset);
-            }
-
-            @Override
-            public String toString() {
-                return String.format("Address[name=%s, value=%d (0x%x)]", getName(), getValue(), getValue());
-            }
-        }
-    }
-
-    final class Flags implements Iterable {
-
-        private final long address;
-        private final long entrySize;
-        private final long typeOffset;
-        private final long nameOffset;
-        private final long addrOffset;
-
-        Flags(HashMap vmStructs, HashMap vmTypes) {
-            address = vmStructs.get("Flag::flags").getValue();
-            entrySize = vmTypes.get("Flag").getSize();
-            typeOffset = vmStructs.get("Flag::_type").getOffset();
-            nameOffset = vmStructs.get("Flag::_name").getOffset();
-            addrOffset = vmStructs.get("Flag::_addr").getOffset();
-
-            assert vmTypes.get("bool").getSize() == Byte.BYTES;
-            assert vmTypes.get("intx").getSize() == Long.BYTES;
-            assert vmTypes.get("uintx").getSize() == Long.BYTES;
-        }
-
-        public Iterator iterator() {
-            return new Iterator() {
-
-                private int index = 0;
-
-                private Flag current() {
-                    return new Flag(address + entrySize * index);
-                }
-
-                /**
-                 * The last entry is identified by a NULL name.
-                 */
-                public boolean hasNext() {
-                    Flag entry = current();
-                    return entry.getName() != null;
-                }
-
-                public Flag next() {
-                    Flag entry = current();
-                    index++;
-                    return entry;
-                }
-            };
-        }
-
-        final class Flag {
-
-            private final long entryAddress;
-
-            Flag(long address) {
-                this.entryAddress = address;
-            }
-
-            public String getType() {
-                long typeAddress = UNSAFE.getAddress(entryAddress + typeOffset);
-                return readCString(UNSAFE, typeAddress);
-            }
-
-            public String getName() {
-                long nameAddress = UNSAFE.getAddress(entryAddress + nameOffset);
-                return readCString(UNSAFE, nameAddress);
-            }
-
-            public long getAddr() {
-                return UNSAFE.getAddress(entryAddress + addrOffset);
-            }
-
-            public Object getValue() {
-                switch (getType()) {
-                    case "bool":
-                        return Boolean.valueOf(UNSAFE.getByte(getAddr()) != 0);
-                    case "intx":
-                    case "uintx":
-                    case "uint64_t":
-                        return Long.valueOf(UNSAFE.getLong(getAddr()));
-                    case "double":
-                        return Double.valueOf(UNSAFE.getDouble(getAddr()));
-                    case "ccstr":
-                    case "ccstrlist":
-                        return readCString(UNSAFE, getAddr());
-                    default:
-                        throw new JVMCIError(getType());
-                }
-            }
-
-            @Override
-            public String toString() {
-                return String.format("Flag[type=%s, name=%s, value=%s]", getType(), getName(), getValue());
-            }
-        }
-    }
-
-    @HotSpotVMConstant(name = "ASSERT") @Stable public boolean cAssertions;
-    public final boolean windowsOs = System.getProperty("os.name", "").startsWith("Windows");
-    public final boolean linuxOs = System.getProperty("os.name", "").startsWith("Linux");
-
-    @HotSpotVMFlag(name = "CodeEntryAlignment") @Stable public int codeEntryAlignment;
-    @HotSpotVMFlag(name = "VerifyOops") @Stable public boolean verifyOops;
-    @HotSpotVMFlag(name = "CITime") @Stable public boolean ciTime;
-    @HotSpotVMFlag(name = "CITimeEach") @Stable public boolean ciTimeEach;
-    @HotSpotVMFlag(name = "CompileTheWorldStartAt", optional = true) @Stable public int compileTheWorldStartAt;
-    @HotSpotVMFlag(name = "CompileTheWorldStopAt", optional = true) @Stable public int compileTheWorldStopAt;
-    @HotSpotVMFlag(name = "DontCompileHugeMethods") @Stable public boolean dontCompileHugeMethods;
-    @HotSpotVMFlag(name = "HugeMethodLimit") @Stable public int hugeMethodLimit;
-    @HotSpotVMFlag(name = "PrintInlining") @Stable public boolean printInlining;
-    @HotSpotVMFlag(name = "Inline") @Stable public boolean inline;
-    @HotSpotVMFlag(name = "JVMCIUseFastLocking") @Stable public boolean useFastLocking;
-    @HotSpotVMFlag(name = "ForceUnreachable") @Stable public boolean forceUnreachable;
-    @HotSpotVMFlag(name = "CodeCacheSegmentSize") @Stable public int codeSegmentSize;
-    @HotSpotVMFlag(name = "FoldStableValues") @Stable public boolean foldStableValues;
-
-    @HotSpotVMFlag(name = "UseTLAB") @Stable public boolean useTLAB;
-    @HotSpotVMFlag(name = "UseBiasedLocking") @Stable public boolean useBiasedLocking;
-    @HotSpotVMFlag(name = "UsePopCountInstruction") @Stable public boolean usePopCountInstruction;
-    @HotSpotVMFlag(name = "UseCountLeadingZerosInstruction", archs = {"amd64"}) @Stable public boolean useCountLeadingZerosInstruction;
-    @HotSpotVMFlag(name = "UseCountTrailingZerosInstruction", archs = {"amd64"}) @Stable public boolean useCountTrailingZerosInstruction;
-    @HotSpotVMFlag(name = "UseAESIntrinsics") @Stable public boolean useAESIntrinsics;
-    @HotSpotVMFlag(name = "UseCRC32Intrinsics") @Stable public boolean useCRC32Intrinsics;
-    @HotSpotVMFlag(name = "UseG1GC") @Stable public boolean useG1GC;
-    @HotSpotVMFlag(name = "UseConcMarkSweepGC") @Stable public boolean useCMSGC;
-
-    @HotSpotVMFlag(name = "AllocatePrefetchStyle") @Stable public int allocatePrefetchStyle;
-    @HotSpotVMFlag(name = "AllocatePrefetchInstr") @Stable public int allocatePrefetchInstr;
-    @HotSpotVMFlag(name = "AllocatePrefetchLines") @Stable public int allocatePrefetchLines;
-    @HotSpotVMFlag(name = "AllocateInstancePrefetchLines") @Stable public int allocateInstancePrefetchLines;
-    @HotSpotVMFlag(name = "AllocatePrefetchStepSize") @Stable public int allocatePrefetchStepSize;
-    @HotSpotVMFlag(name = "AllocatePrefetchDistance") @Stable public int allocatePrefetchDistance;
-
-    @HotSpotVMFlag(name = "FlightRecorder", optional = true) @Stable public boolean flightRecorder;
-
-    @HotSpotVMField(name = "CompilerToVM::Data::Universe_collectedHeap", type = "CollectedHeap*", get = HotSpotVMField.Type.VALUE) @Stable private long universeCollectedHeap;
-    @HotSpotVMField(name = "CollectedHeap::_total_collections", type = "unsigned int", get = HotSpotVMField.Type.OFFSET) @Stable private int collectedHeapTotalCollectionsOffset;
-
-    public long gcTotalCollectionsAddress() {
-        return universeCollectedHeap + collectedHeapTotalCollectionsOffset;
-    }
-
-    @HotSpotVMFlag(name = "ReduceInitialCardMarks") @Stable public boolean useDeferredInitBarriers;
-
-    // Compressed Oops related values.
-    @HotSpotVMFlag(name = "UseCompressedOops") @Stable public boolean useCompressedOops;
-    @HotSpotVMFlag(name = "UseCompressedClassPointers") @Stable public boolean useCompressedClassPointers;
-
-    @HotSpotVMField(name = "CompilerToVM::Data::Universe_narrow_oop_base", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long narrowOopBase;
-    @HotSpotVMField(name = "CompilerToVM::Data::Universe_narrow_oop_shift", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int narrowOopShift;
-    @HotSpotVMFlag(name = "ObjectAlignmentInBytes") @Stable public int objectAlignment;
-
-    public final int minObjAlignment() {
-        return objectAlignment / heapWordSize;
-    }
-
-    public final int logMinObjAlignment() {
-        return (int) (Math.log(objectAlignment) / Math.log(2));
-    }
-
-    @HotSpotVMType(name = "narrowKlass", get = HotSpotVMType.Type.SIZE) @Stable public int narrowKlassSize;
-    @HotSpotVMField(name = "CompilerToVM::Data::Universe_narrow_klass_base", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long narrowKlassBase;
-    @HotSpotVMField(name = "CompilerToVM::Data::Universe_narrow_klass_shift", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int narrowKlassShift;
-    @HotSpotVMConstant(name = "LogKlassAlignmentInBytes") @Stable public int logKlassAlignment;
-
-    // CPU capabilities
-    @HotSpotVMFlag(name = "UseSSE") @Stable public int useSSE;
-    @HotSpotVMFlag(name = "UseAVX", archs = {"amd64"}) @Stable public int useAVX;
-
-    @HotSpotVMField(name = "Abstract_VM_Version::_features", type = "uint64_t", get = HotSpotVMField.Type.VALUE) @Stable public long vmVersionFeatures;
-
-    // AMD64 specific values
-    @HotSpotVMConstant(name = "VM_Version::CPU_CX8", archs = {"amd64"}) @Stable public long amd64CX8;
-    @HotSpotVMConstant(name = "VM_Version::CPU_CMOV", archs = {"amd64"}) @Stable public long amd64CMOV;
-    @HotSpotVMConstant(name = "VM_Version::CPU_FXSR", archs = {"amd64"}) @Stable public long amd64FXSR;
-    @HotSpotVMConstant(name = "VM_Version::CPU_HT", archs = {"amd64"}) @Stable public long amd64HT;
-    @HotSpotVMConstant(name = "VM_Version::CPU_MMX", archs = {"amd64"}) @Stable public long amd64MMX;
-    @HotSpotVMConstant(name = "VM_Version::CPU_3DNOW_PREFETCH", archs = {"amd64"}) @Stable public long amd643DNOWPREFETCH;
-    @HotSpotVMConstant(name = "VM_Version::CPU_SSE", archs = {"amd64"}) @Stable public long amd64SSE;
-    @HotSpotVMConstant(name = "VM_Version::CPU_SSE2", archs = {"amd64"}) @Stable public long amd64SSE2;
-    @HotSpotVMConstant(name = "VM_Version::CPU_SSE3", archs = {"amd64"}) @Stable public long amd64SSE3;
-    @HotSpotVMConstant(name = "VM_Version::CPU_SSSE3", archs = {"amd64"}) @Stable public long amd64SSSE3;
-    @HotSpotVMConstant(name = "VM_Version::CPU_SSE4A", archs = {"amd64"}) @Stable public long amd64SSE4A;
-    @HotSpotVMConstant(name = "VM_Version::CPU_SSE4_1", archs = {"amd64"}) @Stable public long amd64SSE41;
-    @HotSpotVMConstant(name = "VM_Version::CPU_SSE4_2", archs = {"amd64"}) @Stable public long amd64SSE42;
-    @HotSpotVMConstant(name = "VM_Version::CPU_POPCNT", archs = {"amd64"}) @Stable public long amd64POPCNT;
-    @HotSpotVMConstant(name = "VM_Version::CPU_LZCNT", archs = {"amd64"}) @Stable public long amd64LZCNT;
-    @HotSpotVMConstant(name = "VM_Version::CPU_TSC", archs = {"amd64"}) @Stable public long amd64TSC;
-    @HotSpotVMConstant(name = "VM_Version::CPU_TSCINV", archs = {"amd64"}) @Stable public long amd64TSCINV;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AVX", archs = {"amd64"}) @Stable public long amd64AVX;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AVX2", archs = {"amd64"}) @Stable public long amd64AVX2;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AES", archs = {"amd64"}) @Stable public long amd64AES;
-    @HotSpotVMConstant(name = "VM_Version::CPU_ERMS", archs = {"amd64"}) @Stable public long amd64ERMS;
-    @HotSpotVMConstant(name = "VM_Version::CPU_CLMUL", archs = {"amd64"}) @Stable public long amd64CLMUL;
-    @HotSpotVMConstant(name = "VM_Version::CPU_BMI1", archs = {"amd64"}) @Stable public long amd64BMI1;
-    @HotSpotVMConstant(name = "VM_Version::CPU_BMI2", archs = {"amd64"}) @Stable public long amd64BMI2;
-    @HotSpotVMConstant(name = "VM_Version::CPU_RTM", archs = {"amd64"}) @Stable public long amd64RTM;
-    @HotSpotVMConstant(name = "VM_Version::CPU_ADX", archs = {"amd64"}) @Stable public long amd64ADX;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AVX512F", archs = {"amd64"}) @Stable public long amd64AVX512F;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AVX512DQ", archs = {"amd64"}) @Stable public long amd64AVX512DQ;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AVX512PF", archs = {"amd64"}) @Stable public long amd64AVX512PF;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AVX512ER", archs = {"amd64"}) @Stable public long amd64AVX512ER;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AVX512CD", archs = {"amd64"}) @Stable public long amd64AVX512CD;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AVX512BW", archs = {"amd64"}) @Stable public long amd64AVX512BW;
-    @HotSpotVMConstant(name = "VM_Version::CPU_AVX512VL", archs = {"amd64"}) @Stable public long amd64AVX512VL;
-    @HotSpotVMConstant(name = "VM_Version::CPU_SHA", archs = {"amd64"}) @Stable public long amd64SHA;
-
-    // SPARC specific values
-    @HotSpotVMConstant(name = "VM_Version::vis3_instructions_m", archs = {"sparc"}) @Stable public int sparcVis3Instructions;
-    @HotSpotVMConstant(name = "VM_Version::vis2_instructions_m", archs = {"sparc"}) @Stable public int sparcVis2Instructions;
-    @HotSpotVMConstant(name = "VM_Version::vis1_instructions_m", archs = {"sparc"}) @Stable public int sparcVis1Instructions;
-    @HotSpotVMConstant(name = "VM_Version::cbcond_instructions_m", archs = {"sparc"}) @Stable public int sparcCbcondInstructions;
-    @HotSpotVMConstant(name = "VM_Version::v8_instructions_m", archs = {"sparc"}) @Stable public int sparcV8Instructions;
-    @HotSpotVMConstant(name = "VM_Version::hardware_mul32_m", archs = {"sparc"}) @Stable public int sparcHardwareMul32;
-    @HotSpotVMConstant(name = "VM_Version::hardware_div32_m", archs = {"sparc"}) @Stable public int sparcHardwareDiv32;
-    @HotSpotVMConstant(name = "VM_Version::hardware_fsmuld_m", archs = {"sparc"}) @Stable public int sparcHardwareFsmuld;
-    @HotSpotVMConstant(name = "VM_Version::hardware_popc_m", archs = {"sparc"}) @Stable public int sparcHardwarePopc;
-    @HotSpotVMConstant(name = "VM_Version::v9_instructions_m", archs = {"sparc"}) @Stable public int sparcV9Instructions;
-    @HotSpotVMConstant(name = "VM_Version::sun4v_m", archs = {"sparc"}) @Stable public int sparcSun4v;
-    @HotSpotVMConstant(name = "VM_Version::blk_init_instructions_m", archs = {"sparc"}) @Stable public int sparcBlkInitInstructions;
-    @HotSpotVMConstant(name = "VM_Version::fmaf_instructions_m", archs = {"sparc"}) @Stable public int sparcFmafInstructions;
-    @HotSpotVMConstant(name = "VM_Version::fmau_instructions_m", archs = {"sparc"}) @Stable public int sparcFmauInstructions;
-    @HotSpotVMConstant(name = "VM_Version::sparc64_family_m", archs = {"sparc"}) @Stable public int sparcSparc64Family;
-    @HotSpotVMConstant(name = "VM_Version::M_family_m", archs = {"sparc"}) @Stable public int sparcMFamily;
-    @HotSpotVMConstant(name = "VM_Version::T_family_m", archs = {"sparc"}) @Stable public int sparcTFamily;
-    @HotSpotVMConstant(name = "VM_Version::T1_model_m", archs = {"sparc"}) @Stable public int sparcT1Model;
-    @HotSpotVMConstant(name = "VM_Version::sparc5_instructions_m", archs = {"sparc"}) @Stable public int sparcSparc5Instructions;
-    @HotSpotVMConstant(name = "VM_Version::aes_instructions_m", archs = {"sparc"}) @Stable public int sparcAesInstructions;
-    @HotSpotVMConstant(name = "VM_Version::sha1_instruction_m", archs = {"sparc"}) @Stable public int sparcSha1Instruction;
-    @HotSpotVMConstant(name = "VM_Version::sha256_instruction_m", archs = {"sparc"}) @Stable public int sparcSha256Instruction;
-    @HotSpotVMConstant(name = "VM_Version::sha512_instruction_m", archs = {"sparc"}) @Stable public int sparcSha512Instruction;
-
-    @HotSpotVMFlag(name = "UseBlockZeroing", archs = {"sparc"}) @Stable public boolean useBlockZeroing;
-    @HotSpotVMFlag(name = "BlockZeroingLowLimit", archs = {"sparc"}) @Stable public int blockZeroingLowLimit;
-
-    @HotSpotVMFlag(name = "StackShadowPages") @Stable public int stackShadowPages;
-    @HotSpotVMFlag(name = "StackReservedPages") @Stable public int stackReservedPages;
-    @HotSpotVMFlag(name = "UseStackBanging") @Stable public boolean useStackBanging;
-    @HotSpotVMConstant(name = "STACK_BIAS") @Stable public int stackBias;
-    @HotSpotVMField(name = "CompilerToVM::Data::vm_page_size", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int vmPageSize;
-
-    // offsets, ...
-    @HotSpotVMField(name = "oopDesc::_mark", type = "markOop", get = HotSpotVMField.Type.OFFSET) @Stable public int markOffset;
-    @HotSpotVMField(name = "oopDesc::_metadata._klass", type = "Klass*", get = HotSpotVMField.Type.OFFSET) @Stable public int hubOffset;
-
-    @HotSpotVMField(name = "Klass::_prototype_header", type = "markOop", get = HotSpotVMField.Type.OFFSET) @Stable public int prototypeMarkWordOffset;
-    @HotSpotVMField(name = "Klass::_subklass", type = "Klass*", get = HotSpotVMField.Type.OFFSET) @Stable public int subklassOffset;
-    @HotSpotVMField(name = "Klass::_next_sibling", type = "Klass*", get = HotSpotVMField.Type.OFFSET) @Stable public int nextSiblingOffset;
-    @HotSpotVMField(name = "Klass::_super_check_offset", type = "juint", get = HotSpotVMField.Type.OFFSET) @Stable public int superCheckOffsetOffset;
-    @HotSpotVMField(name = "Klass::_secondary_super_cache", type = "Klass*", get = HotSpotVMField.Type.OFFSET) @Stable public int secondarySuperCacheOffset;
-    @HotSpotVMField(name = "Klass::_secondary_supers", type = "Array*", get = HotSpotVMField.Type.OFFSET) @Stable public int secondarySupersOffset;
+    final int prototypeMarkWordOffset = getFieldOffset("Klass::_prototype_header", Integer.class, "markOop");
+    final int subklassOffset = getFieldOffset("Klass::_subklass", Integer.class, "Klass*");
+    final int nextSiblingOffset = getFieldOffset("Klass::_next_sibling", Integer.class, "Klass*");
+    final int superCheckOffsetOffset = getFieldOffset("Klass::_super_check_offset", Integer.class, "juint");
+    final int secondarySuperCacheOffset = getFieldOffset("Klass::_secondary_super_cache", Integer.class, "Klass*");
 
     /**
      * The offset of the _java_mirror field (of type {@link Class}) in a Klass.
      */
-    @HotSpotVMField(name = "Klass::_java_mirror", type = "oop", get = HotSpotVMField.Type.OFFSET) @Stable public int classMirrorOffset;
+    final int classMirrorOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "oop");
 
-    @HotSpotVMField(name = "Klass::_super", type = "Klass*", get = HotSpotVMField.Type.OFFSET) @Stable public int klassSuperKlassOffset;
-    @HotSpotVMField(name = "Klass::_modifier_flags", type = "jint", get = HotSpotVMField.Type.OFFSET) @Stable public int klassModifierFlagsOffset;
-    @HotSpotVMField(name = "Klass::_access_flags", type = "AccessFlags", get = HotSpotVMField.Type.OFFSET) @Stable public int klassAccessFlagsOffset;
-    @HotSpotVMField(name = "Klass::_layout_helper", type = "jint", get = HotSpotVMField.Type.OFFSET) @Stable public int klassLayoutHelperOffset;
-    @HotSpotVMField(name = "Klass::_name", type = "Symbol*", get = HotSpotVMField.Type.OFFSET) @Stable public int klassNameOffset;
+    final int klassAccessFlagsOffset = getFieldOffset("Klass::_access_flags", Integer.class, "AccessFlags");
+    final int klassLayoutHelperOffset = getFieldOffset("Klass::_layout_helper", Integer.class, "jint");
 
-    @HotSpotVMConstant(name = "Klass::_lh_neutral_value") @Stable public int klassLayoutHelperNeutralValue;
-    @HotSpotVMConstant(name = "Klass::_lh_instance_slow_path_bit") @Stable public int klassLayoutHelperInstanceSlowPathBit;
-    @HotSpotVMConstant(name = "Klass::_lh_log2_element_size_shift") @Stable public int layoutHelperLog2ElementSizeShift;
-    @HotSpotVMConstant(name = "Klass::_lh_log2_element_size_mask") @Stable public int layoutHelperLog2ElementSizeMask;
-    @HotSpotVMConstant(name = "Klass::_lh_element_type_shift") @Stable public int layoutHelperElementTypeShift;
-    @HotSpotVMConstant(name = "Klass::_lh_element_type_mask") @Stable public int layoutHelperElementTypeMask;
-    @HotSpotVMConstant(name = "Klass::_lh_header_size_shift") @Stable public int layoutHelperHeaderSizeShift;
-    @HotSpotVMConstant(name = "Klass::_lh_header_size_mask") @Stable public int layoutHelperHeaderSizeMask;
-    @HotSpotVMConstant(name = "Klass::_lh_array_tag_shift") @Stable public int layoutHelperArrayTagShift;
-    @HotSpotVMConstant(name = "Klass::_lh_array_tag_type_value") @Stable public int layoutHelperArrayTagTypeValue;
-    @HotSpotVMConstant(name = "Klass::_lh_array_tag_obj_value") @Stable public int layoutHelperArrayTagObjectValue;
+    final int klassLayoutHelperNeutralValue = getConstant("Klass::_lh_neutral_value", Integer.class);
+    final int klassLayoutHelperInstanceSlowPathBit = getConstant("Klass::_lh_instance_slow_path_bit", Integer.class);
 
-    /**
-     * This filters out the bit that differentiates a type array from an object array.
-     */
-    public int layoutHelperElementTypePrimitiveInPlace() {
-        return (layoutHelperArrayTagTypeValue & ~layoutHelperArrayTagObjectValue) << layoutHelperArrayTagShift;
-    }
+    final int vtableEntrySize = getTypeSize("vtableEntry");
+    final int vtableEntryMethodOffset = getFieldOffset("vtableEntry::_method", Integer.class, "Method*");
 
-    /**
-     * Bit pattern in the klass layout helper that can be used to identify arrays.
-     */
-    public final int arrayKlassLayoutHelperIdentifier = 0x80000000;
+    final int instanceKlassSourceFileNameIndexOffset = getFieldOffset("InstanceKlass::_source_file_name_index", Integer.class, "u2");
+    final int instanceKlassInitStateOffset = getFieldOffset("InstanceKlass::_init_state", Integer.class, "u1");
+    final int instanceKlassConstantsOffset = getFieldOffset("InstanceKlass::_constants", Integer.class, "ConstantPool*");
+    final int instanceKlassFieldsOffset = getFieldOffset("InstanceKlass::_fields", Integer.class, "Array*");
+    final int klassVtableStartOffset = getFieldValue("CompilerToVM::Data::Klass_vtable_start_offset", Integer.class, "int");
+    final int klassVtableLengthOffset = getFieldValue("CompilerToVM::Data::Klass_vtable_length_offset", Integer.class, "int");
 
-    @HotSpotVMType(name = "vtableEntry", get = HotSpotVMType.Type.SIZE) @Stable public int vtableEntrySize;
-    @HotSpotVMField(name = "vtableEntry::_method", type = "Method*", get = HotSpotVMField.Type.OFFSET) @Stable public int vtableEntryMethodOffset;
+    final int instanceKlassStateLinked = getConstant("InstanceKlass::linked", Integer.class);
+    final int instanceKlassStateFullyInitialized = getConstant("InstanceKlass::fully_initialized", Integer.class);
 
-    @HotSpotVMType(name = "InstanceKlass", get = HotSpotVMType.Type.SIZE) @Stable public int instanceKlassSize;
-    @HotSpotVMField(name = "InstanceKlass::_source_file_name_index", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int instanceKlassSourceFileNameIndexOffset;
-    @HotSpotVMField(name = "InstanceKlass::_init_state", type = "u1", get = HotSpotVMField.Type.OFFSET) @Stable public int instanceKlassInitStateOffset;
-    @HotSpotVMField(name = "InstanceKlass::_constants", type = "ConstantPool*", get = HotSpotVMField.Type.OFFSET) @Stable public int instanceKlassConstantsOffset;
-    @HotSpotVMField(name = "InstanceKlass::_fields", type = "Array*", get = HotSpotVMField.Type.OFFSET) @Stable public int instanceKlassFieldsOffset;
-    @HotSpotVMField(name = "CompilerToVM::Data::Klass_vtable_start_offset", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int klassVtableStartOffset;
-    @HotSpotVMField(name = "CompilerToVM::Data::Klass_vtable_length_offset", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int klassVtableLengthOffset;
+    final int arrayU1LengthOffset = getFieldOffset("Array::_length", Integer.class, "int");
+    final int arrayU1DataOffset = getFieldOffset("Array::_data", Integer.class);
+    final int arrayU2DataOffset = getFieldOffset("Array::_data", Integer.class);
 
-    @HotSpotVMConstant(name = "InstanceKlass::linked") @Stable public int instanceKlassStateLinked;
-    @HotSpotVMConstant(name = "InstanceKlass::fully_initialized") @Stable public int instanceKlassStateFullyInitialized;
+    final int fieldInfoAccessFlagsOffset = getConstant("FieldInfo::access_flags_offset", Integer.class);
+    final int fieldInfoNameIndexOffset = getConstant("FieldInfo::name_index_offset", Integer.class);
+    final int fieldInfoSignatureIndexOffset = getConstant("FieldInfo::signature_index_offset", Integer.class);
+    final int fieldInfoLowPackedOffset = getConstant("FieldInfo::low_packed_offset", Integer.class);
+    final int fieldInfoHighPackedOffset = getConstant("FieldInfo::high_packed_offset", Integer.class);
+    final int fieldInfoFieldSlots = getConstant("FieldInfo::field_slots", Integer.class);
 
-    @HotSpotVMType(name = "arrayOopDesc", get = HotSpotVMType.Type.SIZE) @Stable public int arrayOopDescSize;
+    final int fieldInfoTagSize = getConstant("FIELDINFO_TAG_SIZE", Integer.class);
 
-    /**
-     * The offset of the array length word in an array object's header.
-     *
-     * See {@code arrayOopDesc::length_offset_in_bytes()}.
-     */
-    public final int arrayOopDescLengthOffset() {
-        return useCompressedClassPointers ? hubOffset + narrowKlassSize : arrayOopDescSize;
-    }
-
-    @HotSpotVMField(name = "Array::_length", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int arrayU1LengthOffset;
-    @HotSpotVMField(name = "Array::_data", type = "", get = HotSpotVMField.Type.OFFSET) @Stable public int arrayU1DataOffset;
-    @HotSpotVMField(name = "Array::_data", type = "", get = HotSpotVMField.Type.OFFSET) @Stable public int arrayU2DataOffset;
-    @HotSpotVMField(name = "Array::_length", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int metaspaceArrayLengthOffset;
-    @HotSpotVMField(name = "Array::_data[0]", type = "Klass*", get = HotSpotVMField.Type.OFFSET) @Stable public int metaspaceArrayBaseOffset;
-
-    @HotSpotVMField(name = "ObjArrayKlass::_element_klass", type = "Klass*", get = HotSpotVMField.Type.OFFSET) @Stable public int arrayClassElementOffset;
-
-    @HotSpotVMConstant(name = "FieldInfo::access_flags_offset") @Stable public int fieldInfoAccessFlagsOffset;
-    @HotSpotVMConstant(name = "FieldInfo::name_index_offset") @Stable public int fieldInfoNameIndexOffset;
-    @HotSpotVMConstant(name = "FieldInfo::signature_index_offset") @Stable public int fieldInfoSignatureIndexOffset;
-    @HotSpotVMConstant(name = "FieldInfo::initval_index_offset") @Stable public int fieldInfoInitvalIndexOffset;
-    @HotSpotVMConstant(name = "FieldInfo::low_packed_offset") @Stable public int fieldInfoLowPackedOffset;
-    @HotSpotVMConstant(name = "FieldInfo::high_packed_offset") @Stable public int fieldInfoHighPackedOffset;
-    @HotSpotVMConstant(name = "FieldInfo::field_slots") @Stable public int fieldInfoFieldSlots;
-
-    @HotSpotVMConstant(name = "FIELDINFO_TAG_SIZE") @Stable public int fieldInfoTagSize;
-
-    @HotSpotVMConstant(name = "JVM_ACC_MONITOR_MATCH") @Stable public int jvmAccMonitorMatch;
-    @HotSpotVMConstant(name = "JVM_ACC_HAS_MONITOR_BYTECODES") @Stable public int jvmAccHasMonitorBytecodes;
-    @HotSpotVMConstant(name = "JVM_ACC_HAS_FINALIZER") @Stable public int jvmAccHasFinalizer;
-    @HotSpotVMConstant(name = "JVM_ACC_FIELD_INTERNAL") @Stable public int jvmAccFieldInternal;
-    @HotSpotVMConstant(name = "JVM_ACC_FIELD_STABLE") @Stable public int jvmAccFieldStable;
-    @HotSpotVMConstant(name = "JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE") @Stable public int jvmAccFieldHasGenericSignature;
-    @HotSpotVMConstant(name = "JVM_ACC_WRITTEN_FLAGS") @Stable public int jvmAccWrittenFlags;
-    @HotSpotVMConstant(name = "JVM_ACC_IS_CLONEABLE_FAST") @Stable public int jvmAccIsCloneableFast;
+    final int jvmAccHasFinalizer = getConstant("JVM_ACC_HAS_FINALIZER", Integer.class);
+    final int jvmAccFieldInternal = getConstant("JVM_ACC_FIELD_INTERNAL", Integer.class);
+    final int jvmAccFieldStable = getConstant("JVM_ACC_FIELD_STABLE", Integer.class);
+    final int jvmAccFieldHasGenericSignature = getConstant("JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE", Integer.class);
+    final int jvmAccIsCloneableFast = getConstant("JVM_ACC_IS_CLONEABLE_FAST", Integer.class);
 
     // Modifier.SYNTHETIC is not public so we get it via vmStructs.
-    @HotSpotVMConstant(name = "JVM_ACC_SYNTHETIC") @Stable public int jvmAccSynthetic;
+    final int jvmAccSynthetic = getConstant("JVM_ACC_SYNTHETIC", Integer.class);
 
-    /**
-     * @see HotSpotResolvedObjectTypeImpl#createField
-     */
-    @HotSpotVMConstant(name = "JVM_RECOGNIZED_FIELD_MODIFIERS") @Stable public int recognizedFieldModifiers;
+    // This is only valid on AMD64.
+    final int runtimeCallStackSize = getConstant("frame::arg_reg_save_area_bytes", Integer.class, osArch.equals("amd64") ? null : 0);
 
-    @HotSpotVMField(name = "Thread::_tlab", type = "ThreadLocalAllocBuffer", get = HotSpotVMField.Type.OFFSET) @Stable public int threadTlabOffset;
-
-    @HotSpotVMField(name = "JavaThread::_anchor", type = "JavaFrameAnchor", get = HotSpotVMField.Type.OFFSET) @Stable public int javaThreadAnchorOffset;
-    @HotSpotVMField(name = "JavaThread::_threadObj", type = "oop", get = HotSpotVMField.Type.OFFSET) @Stable public int threadObjectOffset;
-    @HotSpotVMField(name = "JavaThread::_osthread", type = "OSThread*", get = HotSpotVMField.Type.OFFSET) @Stable public int osThreadOffset;
-    @HotSpotVMField(name = "JavaThread::_dirty_card_queue", type = "DirtyCardQueue", get = HotSpotVMField.Type.OFFSET) @Stable public int javaThreadDirtyCardQueueOffset;
-    @HotSpotVMField(name = "JavaThread::_is_method_handle_return", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int threadIsMethodHandleReturnOffset;
-    @HotSpotVMField(name = "JavaThread::_satb_mark_queue", type = "SATBMarkQueue", get = HotSpotVMField.Type.OFFSET) @Stable public int javaThreadSatbMarkQueueOffset;
-    @HotSpotVMField(name = "JavaThread::_vm_result", type = "oop", get = HotSpotVMField.Type.OFFSET) @Stable public int threadObjectResultOffset;
-    @HotSpotVMField(name = "JavaThread::_jvmci_counters", type = "jlong*", get = HotSpotVMField.Type.OFFSET) @Stable public int jvmciCountersThreadOffset;
-    @HotSpotVMField(name = "JavaThread::_reserved_stack_activation", type = "address", get = HotSpotVMField.Type.OFFSET) @Stable public int javaThreadReservedStackActivationOffset;
-
-    /**
-     * An invalid value for {@link #rtldDefault}.
-     */
-    public static final long INVALID_RTLD_DEFAULT_HANDLE = 0xDEADFACE;
-
-    /**
-     * Address of the library lookup routine. The C signature of this routine is:
-     *
-     * 
    -     *     void* (const char *filename, char *ebuf, int ebuflen)
-     * 
    
-     */
-    @HotSpotVMAddress(name = "os::dll_load") @Stable public long dllLoad;
-
-    /**
-     * Address of the library lookup routine. The C signature of this routine is:
-     *
-     * 
    -     *     void* (void* handle, const char* name)
-     * 
    
-     */
-    @HotSpotVMAddress(name = "os::dll_lookup") @Stable public long dllLookup;
-
-    /**
-     * A pseudo-handle which when used as the first argument to {@link #dllLookup} means lookup will
-     * return the first occurrence of the desired symbol using the default library search order. If
-     * this field is {@value #INVALID_RTLD_DEFAULT_HANDLE}, then this capability is not supported on
-     * the current platform.
-     */
-    @HotSpotVMAddress(name = "RTLD_DEFAULT", os = {"bsd", "linux"}) @Stable public long rtldDefault = INVALID_RTLD_DEFAULT_HANDLE;
-
-    /**
-     * This field is used to pass exception objects into and out of the runtime system during
-     * exception handling for compiled code.
-     */
-    @HotSpotVMField(name = "JavaThread::_exception_oop", type = "oop", get = HotSpotVMField.Type.OFFSET) @Stable public int threadExceptionOopOffset;
-    @HotSpotVMField(name = "JavaThread::_exception_pc", type = "address", get = HotSpotVMField.Type.OFFSET) @Stable public int threadExceptionPcOffset;
-    @HotSpotVMField(name = "ThreadShadow::_pending_exception", type = "oop", get = HotSpotVMField.Type.OFFSET) @Stable public int pendingExceptionOffset;
-
-    @HotSpotVMField(name = "JavaThread::_pending_deoptimization", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int pendingDeoptimizationOffset;
-    @HotSpotVMField(name = "JavaThread::_pending_failed_speculation", type = "oop", get = HotSpotVMField.Type.OFFSET) @Stable public int pendingFailedSpeculationOffset;
-    @HotSpotVMField(name = "JavaThread::_pending_transfer_to_interpreter", type = "bool", get = HotSpotVMField.Type.OFFSET) @Stable public int pendingTransferToInterpreterOffset;
-
-    @HotSpotVMField(name = "JavaFrameAnchor::_last_Java_sp", type = "intptr_t*", get = HotSpotVMField.Type.OFFSET) @Stable private int javaFrameAnchorLastJavaSpOffset;
-    @HotSpotVMField(name = "JavaFrameAnchor::_last_Java_pc", type = "address", get = HotSpotVMField.Type.OFFSET) @Stable private int javaFrameAnchorLastJavaPcOffset;
-    @HotSpotVMField(name = "JavaFrameAnchor::_last_Java_fp", type = "intptr_t*", get = HotSpotVMField.Type.OFFSET, archs = {"aarch64, amd64"}) @Stable private int javaFrameAnchorLastJavaFpOffset;
-    @HotSpotVMField(name = "JavaFrameAnchor::_flags", type = "int", get = HotSpotVMField.Type.OFFSET, archs = {"sparc"}) @Stable private int javaFrameAnchorFlagsOffset;
-
-    public int threadLastJavaSpOffset() {
-        return javaThreadAnchorOffset + javaFrameAnchorLastJavaSpOffset;
-    }
-
-    public int threadLastJavaPcOffset() {
-        return javaThreadAnchorOffset + javaFrameAnchorLastJavaPcOffset;
-    }
-
-    public int threadLastJavaFpOffset() {
-        assert getHostArchitectureName().equals("aarch64") || getHostArchitectureName().equals("amd64");
-        return javaThreadAnchorOffset + javaFrameAnchorLastJavaFpOffset;
-    }
-
-    /**
-     * This value is only valid on SPARC.
-     */
-    public int threadJavaFrameAnchorFlagsOffset() {
-        // TODO add an assert for SPARC
-        return javaThreadAnchorOffset + javaFrameAnchorFlagsOffset;
-    }
-
-    // These are only valid on AMD64.
-    @HotSpotVMConstant(name = "frame::arg_reg_save_area_bytes", archs = {"amd64"}) @Stable public int runtimeCallStackSize;
-    @HotSpotVMConstant(name = "frame::interpreter_frame_sender_sp_offset", archs = {"amd64"}) @Stable public int frameInterpreterFrameSenderSpOffset;
-    @HotSpotVMConstant(name = "frame::interpreter_frame_last_sp_offset", archs = {"amd64"}) @Stable public int frameInterpreterFrameLastSpOffset;
-
-    @HotSpotVMConstant(name = "dirtyCardQueueBufferOffset") @Stable private int dirtyCardQueueBufferOffset;
-    @HotSpotVMConstant(name = "dirtyCardQueueIndexOffset") @Stable private int dirtyCardQueueIndexOffset;
-
-    @HotSpotVMConstant(name = "satbMarkQueueBufferOffset") @Stable private int satbMarkQueueBufferOffset;
-    @HotSpotVMConstant(name = "satbMarkQueueIndexOffset") @Stable private int satbMarkQueueIndexOffset;
-    @HotSpotVMConstant(name = "satbMarkQueueActiveOffset") @Stable private int satbMarkQueueActiveOffset;
-
-    @HotSpotVMField(name = "OSThread::_interrupted", type = "jint", get = HotSpotVMField.Type.OFFSET) @Stable public int osThreadInterruptedOffset;
-
-    @HotSpotVMConstant(name = "markOopDesc::hash_shift") @Stable public long markOopDescHashShift;
-
-    @HotSpotVMConstant(name = "markOopDesc::biased_lock_mask_in_place") @Stable public int biasedLockMaskInPlace;
-    @HotSpotVMConstant(name = "markOopDesc::age_mask_in_place") @Stable public int ageMaskInPlace;
-    @HotSpotVMConstant(name = "markOopDesc::epoch_mask_in_place") @Stable public int epochMaskInPlace;
-    @HotSpotVMConstant(name = "markOopDesc::hash_mask") @Stable public long markOopDescHashMask;
-    @HotSpotVMConstant(name = "markOopDesc::hash_mask_in_place") @Stable public long markOopDescHashMaskInPlace;
-
-    @HotSpotVMConstant(name = "markOopDesc::unlocked_value") @Stable public int unlockedMask;
-    @HotSpotVMConstant(name = "markOopDesc::biased_lock_pattern") @Stable public int biasedLockPattern;
-
-    @HotSpotVMConstant(name = "markOopDesc::no_hash_in_place") @Stable public int markWordNoHashInPlace;
-    @HotSpotVMConstant(name = "markOopDesc::no_lock_in_place") @Stable public int markWordNoLockInPlace;
+    private final int markWordNoHashInPlace = getConstant("markOopDesc::no_hash_in_place", Integer.class);
+    private final int markWordNoLockInPlace = getConstant("markOopDesc::no_lock_in_place", Integer.class);
 
     /**
      * See {@code markOopDesc::prototype()}.
      */
-    public long arrayPrototypeMarkWord() {
+    long arrayPrototypeMarkWord() {
         return markWordNoHashInPlace | markWordNoLockInPlace;
     }
 
-    /**
-     * See {@code markOopDesc::copy_set_hash()}.
-     */
-    public long tlabIntArrayMarkWord() {
-        long tmp = arrayPrototypeMarkWord() & (~markOopDescHashMaskInPlace);
-        tmp |= ((0x2 & markOopDescHashMask) << markOopDescHashShift);
-        return tmp;
-    }
+    final int methodAccessFlagsOffset = getFieldOffset("Method::_access_flags", Integer.class, "AccessFlags");
+    final int methodConstMethodOffset = getFieldOffset("Method::_constMethod", Integer.class, "ConstMethod*");
+    final int methodIntrinsicIdOffset = getFieldOffset("Method::_intrinsic_id", Integer.class, "u2");
+    final int methodFlagsOffset = getFieldOffset("Method::_flags", Integer.class, "u2");
+    final int methodVtableIndexOffset = getFieldOffset("Method::_vtable_index", Integer.class, "int");
 
-    /**
-     * Mark word right shift to get identity hash code.
-     */
-    @HotSpotVMConstant(name = "markOopDesc::hash_shift") @Stable public int identityHashCodeShift;
+    final int methodDataOffset = getFieldOffset("Method::_method_data", Integer.class, "MethodData*");
+    final int methodCodeOffset = getFieldOffset("Method::_code", Integer.class, "CompiledMethod*");
 
-    /**
-     * Identity hash code value when uninitialized.
-     */
-    @HotSpotVMConstant(name = "markOopDesc::no_hash") @Stable public int uninitializedIdentityHashCodeValue;
+    final int methodFlagsCallerSensitive = getConstant("Method::_caller_sensitive", Integer.class);
+    final int methodFlagsForceInline = getConstant("Method::_force_inline", Integer.class);
+    final int methodFlagsDontInline = getConstant("Method::_dont_inline", Integer.class);
+    final int methodFlagsReservedStackAccess = getConstant("Method::_reserved_stack_access", Integer.class);
+    final int nonvirtualVtableIndex = getConstant("Method::nonvirtual_vtable_index", Integer.class);
+    final int invalidVtableIndex = getConstant("Method::invalid_vtable_index", Integer.class);
 
-    @HotSpotVMField(name = "Method::_access_flags", type = "AccessFlags", get = HotSpotVMField.Type.OFFSET) @Stable public int methodAccessFlagsOffset;
-    @HotSpotVMField(name = "Method::_constMethod", type = "ConstMethod*", get = HotSpotVMField.Type.OFFSET) @Stable public int methodConstMethodOffset;
-    @HotSpotVMField(name = "Method::_intrinsic_id", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int methodIntrinsicIdOffset;
-    @HotSpotVMField(name = "Method::_flags", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int methodFlagsOffset;
-    @HotSpotVMField(name = "Method::_vtable_index", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int methodVtableIndexOffset;
+    final int methodDataSize = getFieldOffset("MethodData::_size", Integer.class, "int");
+    final int methodDataDataSize = getFieldOffset("MethodData::_data_size", Integer.class, "int");
+    final int methodDataOopDataOffset = getFieldOffset("MethodData::_data[0]", Integer.class, "intptr_t");
+    final int methodDataOopTrapHistoryOffset = getFieldOffset("MethodData::_trap_hist._array[0]", Integer.class, "u1");
+    final int methodDataIRSizeOffset = getFieldOffset("MethodData::_jvmci_ir_size", Integer.class, "int");
 
-    @HotSpotVMField(name = "Method::_method_counters", type = "MethodCounters*", get = HotSpotVMField.Type.OFFSET) @Stable public int methodCountersOffset;
-    @HotSpotVMField(name = "Method::_method_data", type = "MethodData*", get = HotSpotVMField.Type.OFFSET) @Stable public int methodDataOffset;
-    @HotSpotVMField(name = "Method::_from_compiled_entry", type = "address", get = HotSpotVMField.Type.OFFSET) @Stable public int methodCompiledEntryOffset;
-    @HotSpotVMField(name = "Method::_code", type = "CompiledMethod*", get = HotSpotVMField.Type.OFFSET) @Stable public int methodCodeOffset;
+    final int nmethodCompLevelOffset = getFieldOffset("nmethod::_comp_level", Integer.class, "int");
 
-    @HotSpotVMConstant(name = "Method::_jfr_towrite") @Stable public int methodFlagsJfrTowrite;
-    @HotSpotVMConstant(name = "Method::_caller_sensitive") @Stable public int methodFlagsCallerSensitive;
-    @HotSpotVMConstant(name = "Method::_force_inline") @Stable public int methodFlagsForceInline;
-    @HotSpotVMConstant(name = "Method::_dont_inline") @Stable public int methodFlagsDontInline;
-    @HotSpotVMConstant(name = "Method::_hidden") @Stable public int methodFlagsHidden;
-    @HotSpotVMConstant(name = "Method::_reserved_stack_access") @Stable public int methodFlagsReservedStackAccess;
-    @HotSpotVMConstant(name = "Method::nonvirtual_vtable_index") @Stable public int nonvirtualVtableIndex;
-    @HotSpotVMConstant(name = "Method::invalid_vtable_index") @Stable public int invalidVtableIndex;
+    final int compilationLevelNone = getConstant("CompLevel_none", Integer.class);
+    final int compilationLevelSimple = getConstant("CompLevel_simple", Integer.class);
+    final int compilationLevelLimitedProfile = getConstant("CompLevel_limited_profile", Integer.class);
+    final int compilationLevelFullProfile = getConstant("CompLevel_full_profile", Integer.class);
+    final int compilationLevelFullOptimization = getConstant("CompLevel_full_optimization", Integer.class);
 
-    @HotSpotVMField(name = "MethodCounters::_invocation_counter", type = "InvocationCounter", get = HotSpotVMField.Type.OFFSET) @Stable public int invocationCounterOffset;
-    @HotSpotVMField(name = "MethodCounters::_backedge_counter", type = "InvocationCounter", get = HotSpotVMField.Type.OFFSET) @Stable public int backedgeCounterOffset;
-    @HotSpotVMConstant(name = "InvocationCounter::count_increment") @Stable public int invocationCounterIncrement;
-    @HotSpotVMConstant(name = "InvocationCounter::count_shift") @Stable public int invocationCounterShift;
+    final int compLevelAdjustmentNone = getConstant("JVMCIRuntime::none", Integer.class);
+    final int compLevelAdjustmentByHolder = getConstant("JVMCIRuntime::by_holder", Integer.class);
+    final int compLevelAdjustmentByFullSignature = getConstant("JVMCIRuntime::by_full_signature", Integer.class);
 
-    @HotSpotVMField(name = "MethodData::_size", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int methodDataSize;
-    @HotSpotVMField(name = "MethodData::_data_size", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int methodDataDataSize;
-    @HotSpotVMField(name = "MethodData::_data[0]", type = "intptr_t", get = HotSpotVMField.Type.OFFSET) @Stable public int methodDataOopDataOffset;
-    @HotSpotVMField(name = "MethodData::_trap_hist._array[0]", type = "u1", get = HotSpotVMField.Type.OFFSET) @Stable public int methodDataOopTrapHistoryOffset;
-    @HotSpotVMField(name = "MethodData::_jvmci_ir_size", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int methodDataIRSizeOffset;
+    final int invocationEntryBci = getConstant("InvocationEntryBci", Integer.class);
 
-    @HotSpotVMField(name = "nmethod::_verified_entry_point", type = "address", get = HotSpotVMField.Type.OFFSET) @Stable public int nmethodEntryOffset;
-    @HotSpotVMField(name = "nmethod::_comp_level", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int nmethodCompLevelOffset;
+    final int extraStackEntries = getFieldValue("CompilerToVM::Data::Method_extra_stack_entries", Integer.class, "int");
 
-    @HotSpotVMConstant(name = "CompLevel_none") @Stable public int compilationLevelNone;
-    @HotSpotVMConstant(name = "CompLevel_simple") @Stable public int compilationLevelSimple;
-    @HotSpotVMConstant(name = "CompLevel_limited_profile") @Stable public int compilationLevelLimitedProfile;
-    @HotSpotVMConstant(name = "CompLevel_full_profile") @Stable public int compilationLevelFullProfile;
-    @HotSpotVMConstant(name = "CompLevel_full_optimization") @Stable public int compilationLevelFullOptimization;
+    final int constMethodConstantsOffset = getFieldOffset("ConstMethod::_constants", Integer.class, "ConstantPool*");
+    final int constMethodFlagsOffset = getFieldOffset("ConstMethod::_flags", Integer.class, "u2");
+    final int constMethodCodeSizeOffset = getFieldOffset("ConstMethod::_code_size", Integer.class, "u2");
+    final int constMethodNameIndexOffset = getFieldOffset("ConstMethod::_name_index", Integer.class, "u2");
+    final int constMethodSignatureIndexOffset = getFieldOffset("ConstMethod::_signature_index", Integer.class, "u2");
+    final int constMethodMaxStackOffset = getFieldOffset("ConstMethod::_max_stack", Integer.class, "u2");
+    final int methodMaxLocalsOffset = getFieldOffset("ConstMethod::_max_locals", Integer.class, "u2");
 
-    @HotSpotVMConstant(name = "JVMCIRuntime::none") @Stable public int compLevelAdjustmentNone;
-    @HotSpotVMConstant(name = "JVMCIRuntime::by_holder") @Stable public int compLevelAdjustmentByHolder;
-    @HotSpotVMConstant(name = "JVMCIRuntime::by_full_signature") @Stable public int compLevelAdjustmentByFullSignature;
+    final int constMethodHasLineNumberTable = getConstant("ConstMethod::_has_linenumber_table", Integer.class);
+    final int constMethodHasLocalVariableTable = getConstant("ConstMethod::_has_localvariable_table", Integer.class);
+    final int constMethodHasExceptionTable = getConstant("ConstMethod::_has_exception_table", Integer.class);
 
-    @HotSpotVMConstant(name = "InvocationEntryBci") @Stable public int invocationEntryBci;
+    final int exceptionTableElementSize = getTypeSize("ExceptionTableElement");
+    final int exceptionTableElementStartPcOffset = getFieldOffset("ExceptionTableElement::start_pc", Integer.class, "u2");
+    final int exceptionTableElementEndPcOffset = getFieldOffset("ExceptionTableElement::end_pc", Integer.class, "u2");
+    final int exceptionTableElementHandlerPcOffset = getFieldOffset("ExceptionTableElement::handler_pc", Integer.class, "u2");
+    final int exceptionTableElementCatchTypeIndexOffset = getFieldOffset("ExceptionTableElement::catch_type_index", Integer.class, "u2");
 
-    @HotSpotVMField(name = "JVMCIEnv::_task", type = "CompileTask*", get = HotSpotVMField.Type.OFFSET) @Stable public int jvmciEnvTaskOffset;
-    @HotSpotVMField(name = "JVMCIEnv::_jvmti_can_hotswap_or_post_breakpoint", type = "bool", get = HotSpotVMField.Type.OFFSET) @Stable public int jvmciEnvJvmtiCanHotswapOrPostBreakpointOffset;
-    @HotSpotVMField(name = "CompileTask::_num_inlined_bytecodes", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int compileTaskNumInlinedBytecodesOffset;
+    final int localVariableTableElementSize = getTypeSize("LocalVariableTableElement");
+    final int localVariableTableElementStartBciOffset = getFieldOffset("LocalVariableTableElement::start_bci", Integer.class, "u2");
+    final int localVariableTableElementLengthOffset = getFieldOffset("LocalVariableTableElement::length", Integer.class, "u2");
+    final int localVariableTableElementNameCpIndexOffset = getFieldOffset("LocalVariableTableElement::name_cp_index", Integer.class, "u2");
+    final int localVariableTableElementDescriptorCpIndexOffset = getFieldOffset("LocalVariableTableElement::descriptor_cp_index", Integer.class, "u2");
+    final int localVariableTableElementSlotOffset = getFieldOffset("LocalVariableTableElement::slot", Integer.class, "u2");
 
-    @HotSpotVMField(name = "CompilerToVM::Data::Method_extra_stack_entries", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int extraStackEntries;
+    final int constantPoolSize = getTypeSize("ConstantPool");
+    final int constantPoolTagsOffset = getFieldOffset("ConstantPool::_tags", Integer.class, "Array*");
+    final int constantPoolHolderOffset = getFieldOffset("ConstantPool::_pool_holder", Integer.class, "InstanceKlass*");
+    final int constantPoolLengthOffset = getFieldOffset("ConstantPool::_length", Integer.class, "int");
 
-    @HotSpotVMField(name = "ConstMethod::_constants", type = "ConstantPool*", get = HotSpotVMField.Type.OFFSET) @Stable public int constMethodConstantsOffset;
-    @HotSpotVMField(name = "ConstMethod::_flags", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int constMethodFlagsOffset;
-    @HotSpotVMField(name = "ConstMethod::_code_size", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int constMethodCodeSizeOffset;
-    @HotSpotVMField(name = "ConstMethod::_name_index", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int constMethodNameIndexOffset;
-    @HotSpotVMField(name = "ConstMethod::_signature_index", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int constMethodSignatureIndexOffset;
-    @HotSpotVMField(name = "ConstMethod::_max_stack", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int constMethodMaxStackOffset;
-    @HotSpotVMField(name = "ConstMethod::_max_locals", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int methodMaxLocalsOffset;
+    final int constantPoolCpCacheIndexTag = getConstant("ConstantPool::CPCACHE_INDEX_TAG", Integer.class);
 
-    @HotSpotVMConstant(name = "ConstMethod::_has_linenumber_table") @Stable public int constMethodHasLineNumberTable;
-    @HotSpotVMConstant(name = "ConstMethod::_has_localvariable_table") @Stable public int constMethodHasLocalVariableTable;
-    @HotSpotVMConstant(name = "ConstMethod::_has_exception_table") @Stable public int constMethodHasExceptionTable;
+    final int jvmConstantUtf8 = getConstant("JVM_CONSTANT_Utf8", Integer.class);
+    final int jvmConstantInteger = getConstant("JVM_CONSTANT_Integer", Integer.class);
+    final int jvmConstantLong = getConstant("JVM_CONSTANT_Long", Integer.class);
+    final int jvmConstantFloat = getConstant("JVM_CONSTANT_Float", Integer.class);
+    final int jvmConstantDouble = getConstant("JVM_CONSTANT_Double", Integer.class);
+    final int jvmConstantClass = getConstant("JVM_CONSTANT_Class", Integer.class);
+    final int jvmConstantUnresolvedClass = getConstant("JVM_CONSTANT_UnresolvedClass", Integer.class);
+    final int jvmConstantUnresolvedClassInError = getConstant("JVM_CONSTANT_UnresolvedClassInError", Integer.class);
+    final int jvmConstantString = getConstant("JVM_CONSTANT_String", Integer.class);
+    final int jvmConstantFieldref = getConstant("JVM_CONSTANT_Fieldref", Integer.class);
+    final int jvmConstantMethodref = getConstant("JVM_CONSTANT_Methodref", Integer.class);
+    final int jvmConstantInterfaceMethodref = getConstant("JVM_CONSTANT_InterfaceMethodref", Integer.class);
+    final int jvmConstantNameAndType = getConstant("JVM_CONSTANT_NameAndType", Integer.class);
+    final int jvmConstantMethodHandle = getConstant("JVM_CONSTANT_MethodHandle", Integer.class);
+    final int jvmConstantMethodHandleInError = getConstant("JVM_CONSTANT_MethodHandleInError", Integer.class);
+    final int jvmConstantMethodType = getConstant("JVM_CONSTANT_MethodType", Integer.class);
+    final int jvmConstantMethodTypeInError = getConstant("JVM_CONSTANT_MethodTypeInError", Integer.class);
+    final int jvmConstantInvokeDynamic = getConstant("JVM_CONSTANT_InvokeDynamic", Integer.class);
 
-    @HotSpotVMType(name = "ExceptionTableElement", get = HotSpotVMType.Type.SIZE) @Stable public int exceptionTableElementSize;
-    @HotSpotVMField(name = "ExceptionTableElement::start_pc", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int exceptionTableElementStartPcOffset;
-    @HotSpotVMField(name = "ExceptionTableElement::end_pc", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int exceptionTableElementEndPcOffset;
-    @HotSpotVMField(name = "ExceptionTableElement::handler_pc", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int exceptionTableElementHandlerPcOffset;
-    @HotSpotVMField(name = "ExceptionTableElement::catch_type_index", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int exceptionTableElementCatchTypeIndexOffset;
+    final int jvmConstantExternalMax = getConstant("JVM_CONSTANT_ExternalMax", Integer.class);
+    final int jvmConstantInternalMin = getConstant("JVM_CONSTANT_InternalMin", Integer.class);
+    final int jvmConstantInternalMax = getConstant("JVM_CONSTANT_InternalMax", Integer.class);
 
-    @HotSpotVMType(name = "LocalVariableTableElement", get = HotSpotVMType.Type.SIZE) @Stable public int localVariableTableElementSize;
-    @HotSpotVMField(name = "LocalVariableTableElement::start_bci", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int localVariableTableElementStartBciOffset;
-    @HotSpotVMField(name = "LocalVariableTableElement::length", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int localVariableTableElementLengthOffset;
-    @HotSpotVMField(name = "LocalVariableTableElement::name_cp_index", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int localVariableTableElementNameCpIndexOffset;
-    @HotSpotVMField(name = "LocalVariableTableElement::descriptor_cp_index", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int localVariableTableElementDescriptorCpIndexOffset;
-    @HotSpotVMField(name = "LocalVariableTableElement::signature_cp_index", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int localVariableTableElementSignatureCpIndexOffset;
-    @HotSpotVMField(name = "LocalVariableTableElement::slot", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int localVariableTableElementSlotOffset;
+    final int heapWordSize = getConstant("HeapWordSize", Integer.class);
 
-    @HotSpotVMType(name = "ConstantPool", get = HotSpotVMType.Type.SIZE) @Stable public int constantPoolSize;
-    @HotSpotVMField(name = "ConstantPool::_tags", type = "Array*", get = HotSpotVMField.Type.OFFSET) @Stable public int constantPoolTagsOffset;
-    @HotSpotVMField(name = "ConstantPool::_pool_holder", type = "InstanceKlass*", get = HotSpotVMField.Type.OFFSET) @Stable public int constantPoolHolderOffset;
-    @HotSpotVMField(name = "ConstantPool::_length", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int constantPoolLengthOffset;
+    final int symbolPointerSize = getTypeSize("Symbol*");
 
-    @HotSpotVMConstant(name = "ConstantPool::CPCACHE_INDEX_TAG") @Stable public int constantPoolCpCacheIndexTag;
+    final long vmSymbolsSymbols = getFieldAddress("vmSymbols::_symbols[0]", "Symbol*");
+    final int vmSymbolsFirstSID = getConstant("vmSymbols::FIRST_SID", Integer.class);
+    final int vmSymbolsSIDLimit = getConstant("vmSymbols::SID_LIMIT", Integer.class);
 
-    @HotSpotVMConstant(name = "JVM_CONSTANT_Utf8") @Stable public int jvmConstantUtf8;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_Integer") @Stable public int jvmConstantInteger;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_Long") @Stable public int jvmConstantLong;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_Float") @Stable public int jvmConstantFloat;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_Double") @Stable public int jvmConstantDouble;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_Class") @Stable public int jvmConstantClass;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_UnresolvedClass") @Stable public int jvmConstantUnresolvedClass;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_UnresolvedClassInError") @Stable public int jvmConstantUnresolvedClassInError;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_String") @Stable public int jvmConstantString;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_Fieldref") @Stable public int jvmConstantFieldref;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_Methodref") @Stable public int jvmConstantMethodref;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_InterfaceMethodref") @Stable public int jvmConstantInterfaceMethodref;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_NameAndType") @Stable public int jvmConstantNameAndType;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_MethodHandle") @Stable public int jvmConstantMethodHandle;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_MethodHandleInError") @Stable public int jvmConstantMethodHandleInError;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_MethodType") @Stable public int jvmConstantMethodType;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_MethodTypeInError") @Stable public int jvmConstantMethodTypeInError;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_InvokeDynamic") @Stable public int jvmConstantInvokeDynamic;
+    final int universeBaseVtableSize = getFieldValue("CompilerToVM::Data::Universe_base_vtable_size", Integer.class, "int");
 
-    @HotSpotVMConstant(name = "JVM_CONSTANT_ExternalMax") @Stable public int jvmConstantExternalMax;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_InternalMin") @Stable public int jvmConstantInternalMin;
-    @HotSpotVMConstant(name = "JVM_CONSTANT_InternalMax") @Stable public int jvmConstantInternalMax;
-
-    @HotSpotVMConstant(name = "HeapWordSize") @Stable public int heapWordSize;
-
-    @HotSpotVMType(name = "Symbol*", get = HotSpotVMType.Type.SIZE) @Stable public int symbolPointerSize;
-
-    @HotSpotVMField(name = "vmSymbols::_symbols[0]", type = "Symbol*", get = HotSpotVMField.Type.ADDRESS) @Stable public long vmSymbolsSymbols;
-    @HotSpotVMConstant(name = "vmSymbols::FIRST_SID") @Stable public int vmSymbolsFirstSID;
-    @HotSpotVMConstant(name = "vmSymbols::SID_LIMIT") @Stable public int vmSymbolsSIDLimit;
-
-    /**
-     * Bit pattern that represents a non-oop. Neither the high bits nor the low bits of this value
-     * are allowed to look like (respectively) the high or low bits of a real oop.
-     */
-    @HotSpotVMField(name = "CompilerToVM::Data::Universe_non_oop_bits", type = "void*", get = HotSpotVMField.Type.VALUE) @Stable public long nonOopBits;
-
-    @HotSpotVMField(name = "StubRoutines::_verify_oop_count", type = "jint", get = HotSpotVMField.Type.ADDRESS) @Stable public long verifyOopCounterAddress;
-    @HotSpotVMField(name = "CompilerToVM::Data::Universe_verify_oop_mask", type = "uintptr_t", get = HotSpotVMField.Type.VALUE) @Stable public long verifyOopMask;
-    @HotSpotVMField(name = "CompilerToVM::Data::Universe_verify_oop_bits", type = "uintptr_t", get = HotSpotVMField.Type.VALUE) @Stable public long verifyOopBits;
-    @HotSpotVMField(name = "CompilerToVM::Data::Universe_base_vtable_size", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int universeBaseVtableSize;
-
-    public final int baseVtableLength() {
+    final int baseVtableLength() {
         return universeBaseVtableSize / vtableEntrySize;
     }
 
-    @HotSpotVMField(name = "HeapRegion::LogOfHRGrainBytes", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int logOfHRGrainBytes;
-
-    @HotSpotVMConstant(name = "CardTableModRefBS::dirty_card") @Stable public byte dirtyCardValue;
-    @HotSpotVMConstant(name = "G1SATBCardTableModRefBS::g1_young_gen") @Stable public byte g1YoungCardValue;
-
-    @HotSpotVMField(name = "CompilerToVM::Data::cardtable_start_address", type = "jbyte*", get = HotSpotVMField.Type.VALUE) @Stable private long cardtableStartAddress;
-    @HotSpotVMField(name = "CompilerToVM::Data::cardtable_shift", type = "int", get = HotSpotVMField.Type.VALUE) @Stable private int cardtableShift;
-
-    public long cardtableStartAddress() {
-        return cardtableStartAddress;
-    }
-
-    public int cardtableShift() {
-        return cardtableShift;
-    }
-
-    @HotSpotVMField(name = "os::_polling_page", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long safepointPollingAddress;
-
-    // G1 Collector Related Values.
-
-    public int g1CardQueueIndexOffset() {
-        return javaThreadDirtyCardQueueOffset + dirtyCardQueueIndexOffset;
-    }
-
-    public int g1CardQueueBufferOffset() {
-        return javaThreadDirtyCardQueueOffset + dirtyCardQueueBufferOffset;
-    }
-
-    public int g1SATBQueueMarkingOffset() {
-        return javaThreadSatbMarkQueueOffset + satbMarkQueueActiveOffset;
-    }
-
-    public int g1SATBQueueIndexOffset() {
-        return javaThreadSatbMarkQueueOffset + satbMarkQueueIndexOffset;
-    }
-
-    public int g1SATBQueueBufferOffset() {
-        return javaThreadSatbMarkQueueOffset + satbMarkQueueBufferOffset;
-    }
-
-    @HotSpotVMField(name = "java_lang_Class::_klass_offset", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int klassOffset;
-    @HotSpotVMField(name = "java_lang_Class::_array_klass_offset", type = "int", get = HotSpotVMField.Type.VALUE) @Stable public int arrayKlassOffset;
-
-    @HotSpotVMType(name = "BasicLock", get = HotSpotVMType.Type.SIZE) @Stable public int basicLockSize;
-    @HotSpotVMField(name = "BasicLock::_displaced_header", type = "markOop", get = HotSpotVMField.Type.OFFSET) @Stable public int basicLockDisplacedHeaderOffset;
-
-    @HotSpotVMField(name = "Thread::_allocated_bytes", type = "jlong", get = HotSpotVMField.Type.OFFSET) @Stable public int threadAllocatedBytesOffset;
-
-    @HotSpotVMFlag(name = "TLABWasteIncrement") @Stable public int tlabRefillWasteIncrement;
-
-    @HotSpotVMField(name = "ThreadLocalAllocBuffer::_start", type = "HeapWord*", get = HotSpotVMField.Type.OFFSET) @Stable private int threadLocalAllocBufferStartOffset;
-    @HotSpotVMField(name = "ThreadLocalAllocBuffer::_end", type = "HeapWord*", get = HotSpotVMField.Type.OFFSET) @Stable private int threadLocalAllocBufferEndOffset;
-    @HotSpotVMField(name = "ThreadLocalAllocBuffer::_top", type = "HeapWord*", get = HotSpotVMField.Type.OFFSET) @Stable private int threadLocalAllocBufferTopOffset;
-    @HotSpotVMField(name = "ThreadLocalAllocBuffer::_pf_top", type = "HeapWord*", get = HotSpotVMField.Type.OFFSET) @Stable private int threadLocalAllocBufferPfTopOffset;
-    @HotSpotVMField(name = "ThreadLocalAllocBuffer::_slow_allocations", type = "unsigned", get = HotSpotVMField.Type.OFFSET) @Stable private int threadLocalAllocBufferSlowAllocationsOffset;
-    @HotSpotVMField(name = "ThreadLocalAllocBuffer::_fast_refill_waste", type = "unsigned", get = HotSpotVMField.Type.OFFSET) @Stable private int threadLocalAllocBufferFastRefillWasteOffset;
-    @HotSpotVMField(name = "ThreadLocalAllocBuffer::_number_of_refills", type = "unsigned", get = HotSpotVMField.Type.OFFSET) @Stable private int threadLocalAllocBufferNumberOfRefillsOffset;
-    @HotSpotVMField(name = "ThreadLocalAllocBuffer::_refill_waste_limit", type = "size_t", get = HotSpotVMField.Type.OFFSET) @Stable private int threadLocalAllocBufferRefillWasteLimitOffset;
-    @HotSpotVMField(name = "ThreadLocalAllocBuffer::_desired_size", type = "size_t", get = HotSpotVMField.Type.OFFSET) @Stable private int threadLocalAllocBufferDesiredSizeOffset;
-
-    public int tlabSlowAllocationsOffset() {
-        return threadTlabOffset + threadLocalAllocBufferSlowAllocationsOffset;
-    }
-
-    public int tlabFastRefillWasteOffset() {
-        return threadTlabOffset + threadLocalAllocBufferFastRefillWasteOffset;
-    }
-
-    public int tlabNumberOfRefillsOffset() {
-        return threadTlabOffset + threadLocalAllocBufferNumberOfRefillsOffset;
-    }
-
-    public int tlabRefillWasteLimitOffset() {
-        return threadTlabOffset + threadLocalAllocBufferRefillWasteLimitOffset;
-    }
-
-    public int threadTlabSizeOffset() {
-        return threadTlabOffset + threadLocalAllocBufferDesiredSizeOffset;
-    }
-
-    public int threadTlabStartOffset() {
-        return threadTlabOffset + threadLocalAllocBufferStartOffset;
-    }
-
-    public int threadTlabEndOffset() {
-        return threadTlabOffset + threadLocalAllocBufferEndOffset;
-    }
-
-    public int threadTlabTopOffset() {
-        return threadTlabOffset + threadLocalAllocBufferTopOffset;
-    }
-
-    public int threadTlabPfTopOffset() {
-        return threadTlabOffset + threadLocalAllocBufferPfTopOffset;
-    }
-
-    @HotSpotVMField(name = "CompilerToVM::Data::ThreadLocalAllocBuffer_alignment_reserve", type = "size_t", get = HotSpotVMField.Type.VALUE) @Stable public int tlabAlignmentReserve;
-
-    @HotSpotVMFlag(name = "TLABStats") @Stable public boolean tlabStats;
-
-    // FIXME This is only temporary until the GC code is changed.
-    @HotSpotVMField(name = "CompilerToVM::Data::_supports_inline_contig_alloc", type = "bool", get = HotSpotVMField.Type.VALUE) @Stable public boolean inlineContiguousAllocationSupported;
-    @HotSpotVMField(name = "CompilerToVM::Data::_heap_end_addr", type = "HeapWord**", get = HotSpotVMField.Type.VALUE) @Stable public long heapEndAddress;
-    @HotSpotVMField(name = "CompilerToVM::Data::_heap_top_addr", type = "HeapWord**", get = HotSpotVMField.Type.VALUE) @Stable public long heapTopAddress;
+    final int klassOffset = getFieldValue("java_lang_Class::_klass_offset", Integer.class, "int");
 
     /**
      * The DataLayout header size is the same as the cell size.
      */
-    @HotSpotVMConstant(name = "DataLayout::cell_size") @Stable public int dataLayoutHeaderSize;
-    @HotSpotVMField(name = "DataLayout::_header._struct._tag", type = "u1", get = HotSpotVMField.Type.OFFSET) @Stable public int dataLayoutTagOffset;
-    @HotSpotVMField(name = "DataLayout::_header._struct._flags", type = "u1", get = HotSpotVMField.Type.OFFSET) @Stable public int dataLayoutFlagsOffset;
-    @HotSpotVMField(name = "DataLayout::_header._struct._bci", type = "u2", get = HotSpotVMField.Type.OFFSET) @Stable public int dataLayoutBCIOffset;
-    @HotSpotVMField(name = "DataLayout::_cells[0]", type = "intptr_t", get = HotSpotVMField.Type.OFFSET) @Stable public int dataLayoutCellsOffset;
-    @HotSpotVMConstant(name = "DataLayout::cell_size") @Stable public int dataLayoutCellSize;
+    final int dataLayoutHeaderSize = getConstant("DataLayout::cell_size", Integer.class);
+    final int dataLayoutTagOffset = getFieldOffset("DataLayout::_header._struct._tag", Integer.class, "u1");
+    final int dataLayoutFlagsOffset = getFieldOffset("DataLayout::_header._struct._flags", Integer.class, "u1");
+    final int dataLayoutBCIOffset = getFieldOffset("DataLayout::_header._struct._bci", Integer.class, "u2");
+    final int dataLayoutCellSize = getConstant("DataLayout::cell_size", Integer.class);
 
-    @HotSpotVMConstant(name = "DataLayout::no_tag") @Stable public int dataLayoutNoTag;
-    @HotSpotVMConstant(name = "DataLayout::bit_data_tag") @Stable public int dataLayoutBitDataTag;
-    @HotSpotVMConstant(name = "DataLayout::counter_data_tag") @Stable public int dataLayoutCounterDataTag;
-    @HotSpotVMConstant(name = "DataLayout::jump_data_tag") @Stable public int dataLayoutJumpDataTag;
-    @HotSpotVMConstant(name = "DataLayout::receiver_type_data_tag") @Stable public int dataLayoutReceiverTypeDataTag;
-    @HotSpotVMConstant(name = "DataLayout::virtual_call_data_tag") @Stable public int dataLayoutVirtualCallDataTag;
-    @HotSpotVMConstant(name = "DataLayout::ret_data_tag") @Stable public int dataLayoutRetDataTag;
-    @HotSpotVMConstant(name = "DataLayout::branch_data_tag") @Stable public int dataLayoutBranchDataTag;
-    @HotSpotVMConstant(name = "DataLayout::multi_branch_data_tag") @Stable public int dataLayoutMultiBranchDataTag;
-    @HotSpotVMConstant(name = "DataLayout::arg_info_data_tag") @Stable public int dataLayoutArgInfoDataTag;
-    @HotSpotVMConstant(name = "DataLayout::call_type_data_tag") @Stable public int dataLayoutCallTypeDataTag;
-    @HotSpotVMConstant(name = "DataLayout::virtual_call_type_data_tag") @Stable public int dataLayoutVirtualCallTypeDataTag;
-    @HotSpotVMConstant(name = "DataLayout::parameters_type_data_tag") @Stable public int dataLayoutParametersTypeDataTag;
-    @HotSpotVMConstant(name = "DataLayout::speculative_trap_data_tag") @Stable public int dataLayoutSpeculativeTrapDataTag;
+    final int dataLayoutNoTag = getConstant("DataLayout::no_tag", Integer.class);
+    final int dataLayoutBitDataTag = getConstant("DataLayout::bit_data_tag", Integer.class);
+    final int dataLayoutCounterDataTag = getConstant("DataLayout::counter_data_tag", Integer.class);
+    final int dataLayoutJumpDataTag = getConstant("DataLayout::jump_data_tag", Integer.class);
+    final int dataLayoutReceiverTypeDataTag = getConstant("DataLayout::receiver_type_data_tag", Integer.class);
+    final int dataLayoutVirtualCallDataTag = getConstant("DataLayout::virtual_call_data_tag", Integer.class);
+    final int dataLayoutRetDataTag = getConstant("DataLayout::ret_data_tag", Integer.class);
+    final int dataLayoutBranchDataTag = getConstant("DataLayout::branch_data_tag", Integer.class);
+    final int dataLayoutMultiBranchDataTag = getConstant("DataLayout::multi_branch_data_tag", Integer.class);
+    final int dataLayoutArgInfoDataTag = getConstant("DataLayout::arg_info_data_tag", Integer.class);
+    final int dataLayoutCallTypeDataTag = getConstant("DataLayout::call_type_data_tag", Integer.class);
+    final int dataLayoutVirtualCallTypeDataTag = getConstant("DataLayout::virtual_call_type_data_tag", Integer.class);
+    final int dataLayoutParametersTypeDataTag = getConstant("DataLayout::parameters_type_data_tag", Integer.class);
+    final int dataLayoutSpeculativeTrapDataTag = getConstant("DataLayout::speculative_trap_data_tag", Integer.class);
 
-    @HotSpotVMFlag(name = "BciProfileWidth") @Stable public int bciProfileWidth;
-    @HotSpotVMFlag(name = "TypeProfileWidth") @Stable public int typeProfileWidth;
-    @HotSpotVMFlag(name = "MethodProfileWidth") @Stable public int methodProfileWidth;
+    final int bciProfileWidth = getFlag("BciProfileWidth", Integer.class);
+    final int typeProfileWidth = getFlag("TypeProfileWidth", Integer.class);
+    final int methodProfileWidth = getFlag("MethodProfileWidth", Integer.class);
 
-    @HotSpotVMField(name = "CompilerToVM::Data::SharedRuntime_ic_miss_stub", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long inlineCacheMissStub;
-    @HotSpotVMField(name = "CompilerToVM::Data::SharedRuntime_handle_wrong_method_stub", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long handleWrongMethodStub;
+    final int deoptReasonNone = getConstant("Deoptimization::Reason_none", Integer.class);
+    final int deoptReasonNullCheck = getConstant("Deoptimization::Reason_null_check", Integer.class);
+    final int deoptReasonRangeCheck = getConstant("Deoptimization::Reason_range_check", Integer.class);
+    final int deoptReasonClassCheck = getConstant("Deoptimization::Reason_class_check", Integer.class);
+    final int deoptReasonArrayCheck = getConstant("Deoptimization::Reason_array_check", Integer.class);
+    final int deoptReasonUnreached0 = getConstant("Deoptimization::Reason_unreached0", Integer.class);
+    final int deoptReasonTypeCheckInlining = getConstant("Deoptimization::Reason_type_checked_inlining", Integer.class);
+    final int deoptReasonOptimizedTypeCheck = getConstant("Deoptimization::Reason_optimized_type_check", Integer.class);
+    final int deoptReasonNotCompiledExceptionHandler = getConstant("Deoptimization::Reason_not_compiled_exception_handler", Integer.class);
+    final int deoptReasonUnresolved = getConstant("Deoptimization::Reason_unresolved", Integer.class);
+    final int deoptReasonJsrMismatch = getConstant("Deoptimization::Reason_jsr_mismatch", Integer.class);
+    final int deoptReasonDiv0Check = getConstant("Deoptimization::Reason_div0_check", Integer.class);
+    final int deoptReasonConstraint = getConstant("Deoptimization::Reason_constraint", Integer.class);
+    final int deoptReasonLoopLimitCheck = getConstant("Deoptimization::Reason_loop_limit_check", Integer.class);
+    final int deoptReasonAliasing = getConstant("Deoptimization::Reason_aliasing", Integer.class);
+    final int deoptReasonTransferToInterpreter = getConstant("Deoptimization::Reason_transfer_to_interpreter", Integer.class);
+    final int deoptReasonOSROffset = getConstant("Deoptimization::Reason_LIMIT", Integer.class);
 
-    @HotSpotVMField(name = "CompilerToVM::Data::SharedRuntime_deopt_blob_unpack", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long handleDeoptStub;
-    @HotSpotVMField(name = "CompilerToVM::Data::SharedRuntime_deopt_blob_uncommon_trap", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long uncommonTrapStub;
+    final int deoptActionNone = getConstant("Deoptimization::Action_none", Integer.class);
+    final int deoptActionMaybeRecompile = getConstant("Deoptimization::Action_maybe_recompile", Integer.class);
+    final int deoptActionReinterpret = getConstant("Deoptimization::Action_reinterpret", Integer.class);
+    final int deoptActionMakeNotEntrant = getConstant("Deoptimization::Action_make_not_entrant", Integer.class);
+    final int deoptActionMakeNotCompilable = getConstant("Deoptimization::Action_make_not_compilable", Integer.class);
 
-    @HotSpotVMField(name = "CodeCache::_low_bound", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long codeCacheLowBound;
-    @HotSpotVMField(name = "CodeCache::_high_bound", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long codeCacheHighBound;
+    final int deoptimizationActionBits = getConstant("Deoptimization::_action_bits", Integer.class);
+    final int deoptimizationReasonBits = getConstant("Deoptimization::_reason_bits", Integer.class);
+    final int deoptimizationDebugIdBits = getConstant("Deoptimization::_debug_id_bits", Integer.class);
+    final int deoptimizationActionShift = getConstant("Deoptimization::_action_shift", Integer.class);
+    final int deoptimizationReasonShift = getConstant("Deoptimization::_reason_shift", Integer.class);
+    final int deoptimizationDebugIdShift = getConstant("Deoptimization::_debug_id_shift", Integer.class);
 
-    @HotSpotVMField(name = "StubRoutines::_aescrypt_encryptBlock", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long aescryptEncryptBlockStub;
-    @HotSpotVMField(name = "StubRoutines::_aescrypt_decryptBlock", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long aescryptDecryptBlockStub;
-    @HotSpotVMField(name = "StubRoutines::_cipherBlockChaining_encryptAESCrypt", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long cipherBlockChainingEncryptAESCryptStub;
-    @HotSpotVMField(name = "StubRoutines::_cipherBlockChaining_decryptAESCrypt", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long cipherBlockChainingDecryptAESCryptStub;
-    @HotSpotVMField(name = "StubRoutines::_updateBytesCRC32", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long updateBytesCRC32Stub;
-    @HotSpotVMField(name = "StubRoutines::_crc_table_adr", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long crcTableAddress;
+    final int vmIntrinsicInvokeBasic = getConstant("vmIntrinsics::_invokeBasic", Integer.class);
+    final int vmIntrinsicLinkToVirtual = getConstant("vmIntrinsics::_linkToVirtual", Integer.class);
+    final int vmIntrinsicLinkToStatic = getConstant("vmIntrinsics::_linkToStatic", Integer.class);
+    final int vmIntrinsicLinkToSpecial = getConstant("vmIntrinsics::_linkToSpecial", Integer.class);
+    final int vmIntrinsicLinkToInterface = getConstant("vmIntrinsics::_linkToInterface", Integer.class);
 
-    @HotSpotVMField(name = "StubRoutines::_throw_delayed_StackOverflowError_entry", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long throwDelayedStackOverflowErrorEntry;
+    final int codeInstallResultOk = getConstant("JVMCIEnv::ok", Integer.class);
+    final int codeInstallResultDependenciesFailed = getConstant("JVMCIEnv::dependencies_failed", Integer.class);
+    final int codeInstallResultDependenciesInvalid = getConstant("JVMCIEnv::dependencies_invalid", Integer.class);
+    final int codeInstallResultCacheFull = getConstant("JVMCIEnv::cache_full", Integer.class);
+    final int codeInstallResultCodeTooLarge = getConstant("JVMCIEnv::code_too_large", Integer.class);
 
-    @HotSpotVMField(name = "StubRoutines::_jbyte_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jbyteArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_jshort_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jshortArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_jint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jintArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_jlong_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jlongArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_oop_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long oopArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_oop_arraycopy_uninit", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long oopArraycopyUninit;
-    @HotSpotVMField(name = "StubRoutines::_jbyte_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jbyteDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_jshort_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jshortDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_jint_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jintDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_jlong_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jlongDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_oop_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long oopDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_oop_disjoint_arraycopy_uninit", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long oopDisjointArraycopyUninit;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_jbyte_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jbyteAlignedArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_jshort_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jshortAlignedArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_jint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jintAlignedArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_jlong_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jlongAlignedArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_oop_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long oopAlignedArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_oop_arraycopy_uninit", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long oopAlignedArraycopyUninit;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_jbyte_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jbyteAlignedDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_jshort_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jshortAlignedDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_jint_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jintAlignedDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_jlong_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long jlongAlignedDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_oop_disjoint_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long oopAlignedDisjointArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_arrayof_oop_disjoint_arraycopy_uninit", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long oopAlignedDisjointArraycopyUninit;
-    @HotSpotVMField(name = "StubRoutines::_checkcast_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long checkcastArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_checkcast_arraycopy_uninit", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long checkcastArraycopyUninit;
-    @HotSpotVMField(name = "StubRoutines::_unsafe_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long unsafeArraycopy;
-    @HotSpotVMField(name = "StubRoutines::_generic_arraycopy", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long genericArraycopy;
-
-    @HotSpotVMAddress(name = "JVMCIRuntime::new_instance") @Stable public long newInstanceAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::new_array") @Stable public long newArrayAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::new_multi_array") @Stable public long newMultiArrayAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::dynamic_new_array") @Stable public long dynamicNewArrayAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::dynamic_new_instance") @Stable public long dynamicNewInstanceAddress;
-
-    @HotSpotVMAddress(name = "JVMCIRuntime::thread_is_interrupted") @Stable public long threadIsInterruptedAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::vm_message") @Stable public long vmMessageAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::identity_hash_code") @Stable public long identityHashCodeAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::exception_handler_for_pc") @Stable public long exceptionHandlerForPcAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::monitorenter") @Stable public long monitorenterAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::monitorexit") @Stable public long monitorexitAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::throw_and_post_jvmti_exception") @Stable public long throwAndPostJvmtiExceptionAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::throw_klass_external_name_exception") @Stable public long throwKlassExternalNameExceptionAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::throw_class_cast_exception") @Stable public long throwClassCastExceptionAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::log_primitive") @Stable public long logPrimitiveAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::log_object") @Stable public long logObjectAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::log_printf") @Stable public long logPrintfAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::vm_error") @Stable public long vmErrorAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::load_and_clear_exception") @Stable public long loadAndClearExceptionAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::write_barrier_pre") @Stable public long writeBarrierPreAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::write_barrier_post") @Stable public long writeBarrierPostAddress;
-    @HotSpotVMAddress(name = "JVMCIRuntime::validate_object") @Stable public long validateObject;
-
-    @HotSpotVMAddress(name = "JVMCIRuntime::test_deoptimize_call_int") @Stable public long testDeoptimizeCallInt;
-
-    @HotSpotVMAddress(name = "SharedRuntime::register_finalizer") @Stable public long registerFinalizerAddress;
-    @HotSpotVMAddress(name = "SharedRuntime::exception_handler_for_return_address") @Stable public long exceptionHandlerForReturnAddressAddress;
-    @HotSpotVMAddress(name = "SharedRuntime::OSR_migration_end") @Stable public long osrMigrationEndAddress;
-    @HotSpotVMAddress(name = "SharedRuntime::enable_stack_reserved_zone") @Stable public long enableStackReservedZoneAddress;
-
-    @HotSpotVMAddress(name = "os::javaTimeMillis") @Stable public long javaTimeMillisAddress;
-    @HotSpotVMAddress(name = "os::javaTimeNanos") @Stable public long javaTimeNanosAddress;
-    @HotSpotVMField(name = "CompilerToVM::Data::dsin", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long arithmeticSinAddress;
-    @HotSpotVMField(name = "CompilerToVM::Data::dcos", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long arithmeticCosAddress;
-    @HotSpotVMField(name = "CompilerToVM::Data::dtan", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long arithmeticTanAddress;
-    @HotSpotVMField(name = "CompilerToVM::Data::dexp", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long arithmeticExpAddress;
-    @HotSpotVMField(name = "CompilerToVM::Data::dlog", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long arithmeticLogAddress;
-    @HotSpotVMField(name = "CompilerToVM::Data::dlog10", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long arithmeticLog10Address;
-    @HotSpotVMField(name = "CompilerToVM::Data::dpow", type = "address", get = HotSpotVMField.Type.VALUE) @Stable public long arithmeticPowAddress;
-
-    @HotSpotVMFlag(name = "JVMCICounterSize") @Stable public int jvmciCountersSize;
-
-    @HotSpotVMAddress(name = "Deoptimization::fetch_unroll_info") @Stable public long deoptimizationFetchUnrollInfo;
-    @HotSpotVMAddress(name = "Deoptimization::uncommon_trap") @Stable public long deoptimizationUncommonTrap;
-    @HotSpotVMAddress(name = "Deoptimization::unpack_frames") @Stable public long deoptimizationUnpackFrames;
-
-    @HotSpotVMConstant(name = "Deoptimization::Reason_none") @Stable public int deoptReasonNone;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_null_check") @Stable public int deoptReasonNullCheck;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_range_check") @Stable public int deoptReasonRangeCheck;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_class_check") @Stable public int deoptReasonClassCheck;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_array_check") @Stable public int deoptReasonArrayCheck;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_unreached0") @Stable public int deoptReasonUnreached0;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_type_checked_inlining") @Stable public int deoptReasonTypeCheckInlining;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_optimized_type_check") @Stable public int deoptReasonOptimizedTypeCheck;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_not_compiled_exception_handler") @Stable public int deoptReasonNotCompiledExceptionHandler;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_unresolved") @Stable public int deoptReasonUnresolved;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_jsr_mismatch") @Stable public int deoptReasonJsrMismatch;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_div0_check") @Stable public int deoptReasonDiv0Check;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_constraint") @Stable public int deoptReasonConstraint;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_loop_limit_check") @Stable public int deoptReasonLoopLimitCheck;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_aliasing") @Stable public int deoptReasonAliasing;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_transfer_to_interpreter") @Stable public int deoptReasonTransferToInterpreter;
-    @HotSpotVMConstant(name = "Deoptimization::Reason_LIMIT") @Stable public int deoptReasonOSROffset;
-
-    @HotSpotVMConstant(name = "Deoptimization::Action_none") @Stable public int deoptActionNone;
-    @HotSpotVMConstant(name = "Deoptimization::Action_maybe_recompile") @Stable public int deoptActionMaybeRecompile;
-    @HotSpotVMConstant(name = "Deoptimization::Action_reinterpret") @Stable public int deoptActionReinterpret;
-    @HotSpotVMConstant(name = "Deoptimization::Action_make_not_entrant") @Stable public int deoptActionMakeNotEntrant;
-    @HotSpotVMConstant(name = "Deoptimization::Action_make_not_compilable") @Stable public int deoptActionMakeNotCompilable;
-
-    @HotSpotVMConstant(name = "Deoptimization::_action_bits") @Stable public int deoptimizationActionBits;
-    @HotSpotVMConstant(name = "Deoptimization::_reason_bits") @Stable public int deoptimizationReasonBits;
-    @HotSpotVMConstant(name = "Deoptimization::_debug_id_bits") @Stable public int deoptimizationDebugIdBits;
-    @HotSpotVMConstant(name = "Deoptimization::_action_shift") @Stable public int deoptimizationActionShift;
-    @HotSpotVMConstant(name = "Deoptimization::_reason_shift") @Stable public int deoptimizationReasonShift;
-    @HotSpotVMConstant(name = "Deoptimization::_debug_id_shift") @Stable public int deoptimizationDebugIdShift;
-
-    @HotSpotVMConstant(name = "Deoptimization::Unpack_deopt") @Stable public int deoptimizationUnpackDeopt;
-    @HotSpotVMConstant(name = "Deoptimization::Unpack_exception") @Stable public int deoptimizationUnpackException;
-    @HotSpotVMConstant(name = "Deoptimization::Unpack_uncommon_trap") @Stable public int deoptimizationUnpackUncommonTrap;
-    @HotSpotVMConstant(name = "Deoptimization::Unpack_reexecute") @Stable public int deoptimizationUnpackReexecute;
-
-    @HotSpotVMField(name = "Deoptimization::UnrollBlock::_size_of_deoptimized_frame", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int deoptimizationUnrollBlockSizeOfDeoptimizedFrameOffset;
-    @HotSpotVMField(name = "Deoptimization::UnrollBlock::_caller_adjustment", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int deoptimizationUnrollBlockCallerAdjustmentOffset;
-    @HotSpotVMField(name = "Deoptimization::UnrollBlock::_number_of_frames", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int deoptimizationUnrollBlockNumberOfFramesOffset;
-    @HotSpotVMField(name = "Deoptimization::UnrollBlock::_total_frame_sizes", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int deoptimizationUnrollBlockTotalFrameSizesOffset;
-    @HotSpotVMField(name = "Deoptimization::UnrollBlock::_unpack_kind", type = "int", get = HotSpotVMField.Type.OFFSET) @Stable public int deoptimizationUnrollBlockUnpackKindOffset;
-    @HotSpotVMField(name = "Deoptimization::UnrollBlock::_frame_sizes", type = "intptr_t*", get = HotSpotVMField.Type.OFFSET) @Stable public int deoptimizationUnrollBlockFrameSizesOffset;
-    @HotSpotVMField(name = "Deoptimization::UnrollBlock::_frame_pcs", type = "address*", get = HotSpotVMField.Type.OFFSET) @Stable public int deoptimizationUnrollBlockFramePcsOffset;
-    @HotSpotVMField(name = "Deoptimization::UnrollBlock::_initial_info", type = "intptr_t", get = HotSpotVMField.Type.OFFSET) @Stable public int deoptimizationUnrollBlockInitialInfoOffset;
-
-    @HotSpotVMConstant(name = "vmIntrinsics::_invokeBasic") @Stable public int vmIntrinsicInvokeBasic;
-    @HotSpotVMConstant(name = "vmIntrinsics::_linkToVirtual") @Stable public int vmIntrinsicLinkToVirtual;
-    @HotSpotVMConstant(name = "vmIntrinsics::_linkToStatic") @Stable public int vmIntrinsicLinkToStatic;
-    @HotSpotVMConstant(name = "vmIntrinsics::_linkToSpecial") @Stable public int vmIntrinsicLinkToSpecial;
-    @HotSpotVMConstant(name = "vmIntrinsics::_linkToInterface") @Stable public int vmIntrinsicLinkToInterface;
-
-    @HotSpotVMConstant(name = "JVMCIEnv::ok") @Stable public int codeInstallResultOk;
-    @HotSpotVMConstant(name = "JVMCIEnv::dependencies_failed") @Stable public int codeInstallResultDependenciesFailed;
-    @HotSpotVMConstant(name = "JVMCIEnv::dependencies_invalid") @Stable public int codeInstallResultDependenciesInvalid;
-    @HotSpotVMConstant(name = "JVMCIEnv::cache_full") @Stable public int codeInstallResultCacheFull;
-    @HotSpotVMConstant(name = "JVMCIEnv::code_too_large") @Stable public int codeInstallResultCodeTooLarge;
-
-    public String getCodeInstallResultDescription(int codeInstallResult) {
+    String getCodeInstallResultDescription(int codeInstallResult) {
         if (codeInstallResult == codeInstallResultOk) {
             return "ok";
         }
@@ -1677,114 +330,17 @@ public class HotSpotVMConfig {
         return "unknown";
     }
 
-    // Checkstyle: stop
-    @HotSpotVMConstant(name = "CodeInstaller::VERIFIED_ENTRY") @Stable public int MARKID_VERIFIED_ENTRY;
-    @HotSpotVMConstant(name = "CodeInstaller::UNVERIFIED_ENTRY") @Stable public int MARKID_UNVERIFIED_ENTRY;
-    @HotSpotVMConstant(name = "CodeInstaller::OSR_ENTRY") @Stable public int MARKID_OSR_ENTRY;
-    @HotSpotVMConstant(name = "CodeInstaller::EXCEPTION_HANDLER_ENTRY") @Stable public int MARKID_EXCEPTION_HANDLER_ENTRY;
-    @HotSpotVMConstant(name = "CodeInstaller::DEOPT_HANDLER_ENTRY") @Stable public int MARKID_DEOPT_HANDLER_ENTRY;
-    @HotSpotVMConstant(name = "CodeInstaller::INVOKEINTERFACE") @Stable public int MARKID_INVOKEINTERFACE;
-    @HotSpotVMConstant(name = "CodeInstaller::INVOKEVIRTUAL") @Stable public int MARKID_INVOKEVIRTUAL;
-    @HotSpotVMConstant(name = "CodeInstaller::INVOKESTATIC") @Stable public int MARKID_INVOKESTATIC;
-    @HotSpotVMConstant(name = "CodeInstaller::INVOKESPECIAL") @Stable public int MARKID_INVOKESPECIAL;
-    @HotSpotVMConstant(name = "CodeInstaller::INLINE_INVOKE") @Stable public int MARKID_INLINE_INVOKE;
-    @HotSpotVMConstant(name = "CodeInstaller::POLL_NEAR") @Stable public int MARKID_POLL_NEAR;
-    @HotSpotVMConstant(name = "CodeInstaller::POLL_RETURN_NEAR") @Stable public int MARKID_POLL_RETURN_NEAR;
-    @HotSpotVMConstant(name = "CodeInstaller::POLL_FAR") @Stable public int MARKID_POLL_FAR;
-    @HotSpotVMConstant(name = "CodeInstaller::POLL_RETURN_FAR") @Stable public int MARKID_POLL_RETURN_FAR;
-    @HotSpotVMConstant(name = "CodeInstaller::CARD_TABLE_SHIFT") @Stable public int MARKID_CARD_TABLE_SHIFT;
-    @HotSpotVMConstant(name = "CodeInstaller::CARD_TABLE_ADDRESS") @Stable public int MARKID_CARD_TABLE_ADDRESS;
-    @HotSpotVMConstant(name = "CodeInstaller::HEAP_TOP_ADDRESS") @Stable public int MARKID_HEAP_TOP_ADDRESS;
-    @HotSpotVMConstant(name = "CodeInstaller::HEAP_END_ADDRESS") @Stable public int MARKID_HEAP_END_ADDRESS;
-    @HotSpotVMConstant(name = "CodeInstaller::NARROW_KLASS_BASE_ADDRESS") @Stable public int MARKID_NARROW_KLASS_BASE_ADDRESS;
-    @HotSpotVMConstant(name = "CodeInstaller::CRC_TABLE_ADDRESS") @Stable public int MARKID_CRC_TABLE_ADDRESS;
-    @HotSpotVMConstant(name = "CodeInstaller::INVOKE_INVALID") @Stable public int MARKID_INVOKE_INVALID;
-
-    @HotSpotVMConstant(name = "BitData::exception_seen_flag") @Stable public int bitDataExceptionSeenFlag;
-    @HotSpotVMConstant(name = "BitData::null_seen_flag") @Stable public int bitDataNullSeenFlag;
-    @HotSpotVMConstant(name = "CounterData::count_off") @Stable public int methodDataCountOffset;
-    @HotSpotVMConstant(name = "JumpData::taken_off_set") @Stable public int jumpDataTakenOffset;
-    @HotSpotVMConstant(name = "JumpData::displacement_off_set") @Stable public int jumpDataDisplacementOffset;
-    @HotSpotVMConstant(name = "ReceiverTypeData::nonprofiled_count_off_set") @Stable public int receiverTypeDataNonprofiledCountOffset;
-    @HotSpotVMConstant(name = "ReceiverTypeData::receiver_type_row_cell_count") @Stable public int receiverTypeDataReceiverTypeRowCellCount;
-    @HotSpotVMConstant(name = "ReceiverTypeData::receiver0_offset") @Stable public int receiverTypeDataReceiver0Offset;
-    @HotSpotVMConstant(name = "ReceiverTypeData::count0_offset") @Stable public int receiverTypeDataCount0Offset;
-    @HotSpotVMConstant(name = "BranchData::not_taken_off_set") @Stable public int branchDataNotTakenOffset;
-    @HotSpotVMConstant(name = "ArrayData::array_len_off_set") @Stable public int arrayDataArrayLenOffset;
-    @HotSpotVMConstant(name = "ArrayData::array_start_off_set") @Stable public int arrayDataArrayStartOffset;
-    @HotSpotVMConstant(name = "MultiBranchData::per_case_cell_count") @Stable public int multiBranchDataPerCaseCellCount;
-
-    // Checkstyle: resume
-
-    private boolean check() {
-        for (Field f : getClass().getDeclaredFields()) {
-            int modifiers = f.getModifiers();
-            if (Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers)) {
-                assert Modifier.isFinal(modifiers) || f.getAnnotation(Stable.class) != null : "field should either be final or @Stable: " + f;
-            }
-        }
-
-        assert codeEntryAlignment > 0 : codeEntryAlignment;
-        assert (layoutHelperArrayTagObjectValue & (1 << (Integer.SIZE - 1))) != 0 : "object array must have first bit set";
-        assert (layoutHelperArrayTagTypeValue & (1 << (Integer.SIZE - 1))) != 0 : "type array must have first bit set";
-
-        return true;
-    }
-
-    /**
-     * A compact representation of the different encoding strategies for Objects and metadata.
-     */
-    public static class CompressEncoding {
-        public final long base;
-        public final int shift;
-        public final int alignment;
-
-        CompressEncoding(long base, int shift, int alignment) {
-            this.base = base;
-            this.shift = shift;
-            this.alignment = alignment;
-        }
-
-        public int compress(long ptr) {
-            if (ptr == 0L) {
-                return 0;
-            } else {
-                return (int) ((ptr - base) >>> shift);
-            }
-        }
-
-        public long uncompress(int ptr) {
-            if (ptr == 0) {
-                return 0L;
-            } else {
-                return ((ptr & 0xFFFFFFFFL) << shift) + base;
-            }
-        }
-
-        @Override
-        public String toString() {
-            return "base: " + base + " shift: " + shift + " alignment: " + alignment;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + alignment;
-            result = prime * result + (int) (base ^ (base >>> 32));
-            result = prime * result + shift;
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj instanceof CompressEncoding) {
-                CompressEncoding other = (CompressEncoding) obj;
-                return alignment == other.alignment && base == other.base && shift == other.shift;
-            } else {
-                return false;
-            }
-        }
-    }
-
+    final int bitDataExceptionSeenFlag = getConstant("BitData::exception_seen_flag", Integer.class);
+    final int bitDataNullSeenFlag = getConstant("BitData::null_seen_flag", Integer.class);
+    final int methodDataCountOffset = getConstant("CounterData::count_off", Integer.class);
+    final int jumpDataTakenOffset = getConstant("JumpData::taken_off_set", Integer.class);
+    final int jumpDataDisplacementOffset = getConstant("JumpData::displacement_off_set", Integer.class);
+    final int receiverTypeDataNonprofiledCountOffset = getConstant("ReceiverTypeData::nonprofiled_count_off_set", Integer.class);
+    final int receiverTypeDataReceiverTypeRowCellCount = getConstant("ReceiverTypeData::receiver_type_row_cell_count", Integer.class);
+    final int receiverTypeDataReceiver0Offset = getConstant("ReceiverTypeData::receiver0_offset", Integer.class);
+    final int receiverTypeDataCount0Offset = getConstant("ReceiverTypeData::count0_offset", Integer.class);
+    final int branchDataNotTakenOffset = getConstant("BranchData::not_taken_off_set", Integer.class);
+    final int arrayDataArrayLenOffset = getConstant("ArrayData::array_len_off_set", Integer.class);
+    final int arrayDataArrayStartOffset = getConstant("ArrayData::array_start_off_set", Integer.class);
+    final int multiBranchDataPerCaseCellCount = getConstant("MultiBranchData::per_case_cell_count", Integer.class);
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java
new file mode 100644
index 00000000000..ab9ad6ea79a
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.hotspot;
+
+import jdk.vm.ci.common.JVMCIError;
+
+/**
+ * Access to VM configuration data.
+ */
+public class HotSpotVMConfigAccess {
+
+    /**
+     * Gets the address of a C++ symbol.
+     *
+     * @param name name of C++ symbol
+     * @param notPresent if non-null and the symbol is not present then this value is returned
+     * @return the address of the symbol
+     * @throws JVMCIError if the symbol is not present and {@code notPresent == null}
+     */
+    public long getAddress(String name, Long notPresent) {
+        Long entry = store.vmAddresses.get(name);
+        if (entry == null) {
+            if (notPresent != null) {
+                return notPresent;
+            }
+            throw new JVMCIError("expected VM symbol not found: " + name);
+        }
+        return entry;
+    }
+
+    /**
+     * Gets the address of a C++ symbol.
+     *
+     * @param name name of C++ symbol
+     * @return the address of the symbol
+     * @throws JVMCIError if the symbol is not present
+     */
+    public long getAddress(String name) {
+        return getAddress(name, null);
+    }
+
+    /**
+     * Gets the size of a C++ type.
+     *
+     * @param name name of the type
+     * @return the size in bytes of the requested field
+     * @throws JVMCIError if the field is not present and {@code notPresent} is null
+     */
+    public int getTypeSize(String name) {
+        Long entry = store.vmTypeSizes.get(name);
+        if (entry == null) {
+            throw new JVMCIError("expected VM type not found: " + name);
+        }
+        return (int) (long) entry;
+    }
+
+    /**
+     * Gets the value of a C++ constant.
+     *
+     * @param name name of the constant (e.g., {@code "frame::arg_reg_save_area_bytes"})
+     * @param type the boxed type to which the constant value will be converted
+     * @param notPresent if non-null and the constant is not present then this value is returned
+     * @return the constant value converted to {@code type}
+     * @throws JVMCIError if the constant is not present and {@code notPresent == null}
+     */
+    public  T getConstant(String name, Class type, T notPresent) {
+        Long c = store.vmConstants.get(name);
+        if (c == null) {
+            if (notPresent != null) {
+                return notPresent;
+            }
+            throw new JVMCIError("expected VM constant not found: " + name);
+        }
+        return type.cast(convertValue(name, type, c, null));
+    }
+
+    /**
+     * Gets the value of a C++ constant.
+     *
+     * @param name name of the constant (e.g., {@code "frame::arg_reg_save_area_bytes"})
+     * @param type the boxed type to which the constant value will be converted
+     * @return the constant value converted to {@code type}
+     * @throws JVMCIError if the constant is not present
+     */
+    public  T getConstant(String name, Class type) {
+        return getConstant(name, type, null);
+    }
+
+    /**
+     * Gets the offset of a non-static C++ field.
+     *
+     * @param name fully qualified name of the field
+     * @param type the boxed type to which the offset value will be converted (must be
+     *            {@link Integer} or {@link Long})
+     * @param cppType if non-null, the expected C++ type of the field (e.g., {@code "HeapWord*"})
+     * @param notPresent if non-null and the field is not present then this value is returned
+     * @return the offset in bytes of the requested field
+     * @throws JVMCIError if the field is static or not present and {@code notPresent} is null
+     */
+    public  T getFieldOffset(String name, Class type, String cppType, T notPresent) {
+        assert type == Integer.class || type == Long.class;
+        VMField entry = getField(name, cppType, notPresent == null);
+        if (entry == null) {
+            return notPresent;
+        }
+        if (entry.address != 0) {
+            throw new JVMCIError("cannot get offset of static field " + name);
+        }
+        return entry == null ? notPresent : type.cast(convertValue(name, type, entry.offset, cppType));
+    }
+
+    /**
+     * Gets the offset of a non-static C++ field.
+     *
+     * @param name fully qualified name of the field
+     * @param type the boxed type to which the offset value will be converted (must be
+     *            {@link Integer} or {@link Long})
+     * @param cppType if non-null, the expected C++ type of the field (e.g., {@code "HeapWord*"})
+     * @return the offset in bytes of the requested field
+     * @throws JVMCIError if the field is static or not present
+     */
+    public  T getFieldOffset(String name, Class type, String cppType) {
+        return getFieldOffset(name, type, cppType, null);
+    }
+
+    /**
+     * Gets the offset of a non-static C++ field.
+     *
+     * @param name fully qualified name of the field
+     * @param type the boxed type to which the offset value will be converted (must be
+     *            {@link Integer} or {@link Long})
+     * @return the offset in bytes of the requested field
+     * @throws JVMCIError if the field is static or not present
+     */
+    public  T getFieldOffset(String name, Class type) {
+        return getFieldOffset(name, type, null, null);
+    }
+
+    /**
+     * Gets the address of a static C++ field.
+     *
+     * @param name fully qualified name of the field
+     * @param cppType if non-null, the expected C++ type of the field (e.g., {@code "HeapWord*"})
+     * @param notPresent if non-null and the field is not present then this value is returned
+     * @return the address of the requested field
+     * @throws JVMCIError if the field is not static or not present and {@code notPresent} is null
+     */
+    public long getFieldAddress(String name, String cppType, Long notPresent) {
+        VMField entry = getField(name, cppType, notPresent == null);
+        if (entry == null) {
+            return notPresent;
+        }
+        if (entry.address == 0) {
+            throw new JVMCIError(name + " is not a static field");
+        }
+        return entry == null ? notPresent : entry.address;
+    }
+
+    /**
+     * Gets the address of a static C++ field.
+     *
+     * @param name fully qualified name of the field
+     * @param cppType if non-null, the expected C++ type of the field (e.g., {@code "HeapWord*"})
+     * @return the address of the requested field
+     * @throws JVMCIError if the field is not static or not present
+     */
+    public long getFieldAddress(String name, String cppType) {
+        return getFieldAddress(name, cppType, null);
+    }
+
+    /**
+     * Gets the value of a static C++ field.
+     *
+     * @param name fully qualified name of the field
+     * @param type the boxed type to which the constant value will be converted
+     * @param cppType if non-null, the expected C++ type of the field (e.g., {@code "HeapWord*"})
+     * @param notPresent if non-null and the field is not present then this value is returned
+     * @return the value of the requested field
+     * @throws JVMCIError if the field is not static or not present and {@code notPresent} is null
+     */
+    public  T getFieldValue(String name, Class type, String cppType, T notPresent) {
+        VMField entry = getField(name, cppType, notPresent == null);
+        if (entry == null) {
+            return notPresent;
+        }
+        if (entry.value == null) {
+            throw new JVMCIError(name + " is not a static field");
+        }
+        return type.cast(convertValue(name, type, entry.value, cppType));
+    }
+
+    /**
+     * Gets the value of a static C++ field.
+     *
+     * @param name fully qualified name of the field
+     * @param type the boxed type to which the constant value will be converted
+     * @param cppType if non-null, the expected C++ type of the field (e.g., {@code "HeapWord*"})
+     * @return the value of the requested field
+     * @throws JVMCIError if the field is not static or not present
+     */
+    public  T getFieldValue(String name, Class type, String cppType) {
+        return getFieldValue(name, type, cppType, null);
+    }
+
+    /**
+     * Gets the value of a static C++ field.
+     *
+     * @param name fully qualified name of the field
+     * @param type the boxed type to which the constant value will be converted
+     * @return the value of the requested field
+     * @throws JVMCIError if the field is not static or not present
+     */
+    public  T getFieldValue(String name, Class type) {
+        return getFieldValue(name, type, null, null);
+    }
+
+    /**
+     * Gets a C++ field.
+     *
+     * @param name fully qualified name of the field
+     * @param cppType if non-null, the expected C++ type of the field (e.g., {@code "HeapWord*"})
+     * @param required specifies if the field must be present
+     * @return the field
+     * @throws JVMCIError if the field is not present and {@code required == true}
+     */
+    private VMField getField(String name, String cppType, boolean required) {
+        VMField entry = store.vmFields.get(name);
+        if (entry == null) {
+            if (!required) {
+                return null;
+            }
+            throw new JVMCIError("expected VM field not found: " + name);
+        }
+
+        // Make sure the native type is still the type we expect.
+        if (cppType != null && !cppType.equals(entry.type)) {
+            throw new JVMCIError("expected type " + cppType + " but VM field " + name + " is of type " + entry.type);
+        }
+        return entry;
+    }
+
+    /**
+     * Gets a VM flag value.
+     *
+     * @param name name of the flag (e.g., {@code "CompileTheWorldStartAt"})
+     * @param type the boxed type to which the flag's value will be converted
+     * @return the flag's value converted to {@code type} or {@code notPresent} if the flag is not
+     *         present
+     * @throws JVMCIError if the flag is not present
+     */
+    public  T getFlag(String name, Class type) {
+        return getFlag(name, type, null);
+    }
+
+    /**
+     * Gets a VM flag value.
+     *
+     * @param name name of the flag (e.g., {@code "CompileTheWorldStartAt"})
+     * @param type the boxed type to which the flag's value will be converted
+     * @param notPresent if non-null and the flag is not present then this value is returned
+     * @return the flag's value converted to {@code type} or {@code notPresent} if the flag is not
+     *         present
+     * @throws JVMCIError if the flag is not present and {@code notPresent == null}
+     */
+    public  T getFlag(String name, Class type, T notPresent) {
+        VMFlag entry = store.vmFlags.get(name);
+        if (entry == null) {
+            if (notPresent != null) {
+                return notPresent;
+            }
+            throw new JVMCIError("expected VM flag not found: " + name);
+        }
+        return type.cast(convertValue(name, type, entry.value, entry.type));
+    }
+
+    private static  Object convertValue(String name, Class toType, Object value, String cppType) throws JVMCIError {
+        if (toType == Boolean.class) {
+            if (value instanceof String) {
+                return Boolean.valueOf((String) value);
+            } else if (value instanceof Boolean) {
+                return value;
+            } else if (value instanceof Long) {
+                return ((long) value) != 0;
+            }
+        } else if (toType == Byte.class) {
+            if (value instanceof Long) {
+                return (byte) (long) value;
+            }
+        } else if (toType == Integer.class) {
+            if (value instanceof Integer) {
+                return value;
+            } else if (value instanceof Long) {
+                return (int) (long) value;
+            }
+        } else if (toType == Long.class) {
+            return (long) value;
+        }
+
+        throw new JVMCIError("cannot convert " + name + " of type " + value.getClass().getSimpleName() + (cppType == null ? "" : " [" + cppType + "]") + " to " + toType.getSimpleName());
+    }
+
+    private final HotSpotVMConfigStore store;
+
+    public HotSpotVMConfigAccess(HotSpotVMConfigStore store) {
+        this.store = store;
+    }
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java
new file mode 100644
index 00000000000..c0554391a79
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigStore.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.hotspot;
+
+import static jdk.vm.ci.common.InitTimer.timer;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import jdk.vm.ci.common.InitTimer;
+
+/**
+ * Access to VM configuration data.
+ */
+public final class HotSpotVMConfigStore {
+
+    /**
+     * Gets the C++ symbols whose addresses are exposed by this object.
+     *
+     * @return an unmodifiable map from the symbol names to their addresses
+     */
+    public Map getAddresses() {
+        return Collections.unmodifiableMap(vmAddresses);
+    }
+
+    /**
+     * Gets the C++ type sizes exposed by this object.
+     *
+     * @return an unmodifiable map from C++ type names to their sizes in bytes
+     */
+    public Map getTypeSizes() {
+        return Collections.unmodifiableMap(vmTypeSizes);
+    }
+
+    /**
+     * Gets the C++ constants exposed by this object.
+     *
+     * @return an unmodifiable map from the names of C++ constants to their values
+     */
+    public Map getConstants() {
+        return Collections.unmodifiableMap(vmConstants);
+    }
+
+    /**
+     * Gets the VM flags exposed by this object.
+     *
+     * @return an unmodifiable map from VM flag names to {@link VMFlag} objects
+     */
+    public Map getFlags() {
+        return Collections.unmodifiableMap(vmFlags);
+    }
+
+    /**
+     * Gets the C++ fields exposed by this object.
+     *
+     * @return an unmodifiable map from VM field names to {@link VMField} objects
+     */
+    public Map getFields() {
+        return Collections.unmodifiableMap(vmFields);
+    }
+
+    final HashMap vmFields;
+    final HashMap vmTypeSizes;
+    final HashMap vmConstants;
+    final HashMap vmAddresses;
+    final HashMap vmFlags;
+
+    /**
+     * Reads the database of VM info. The return value encodes the info in a nested object array
+     * that is described by the pseudo Java object {@code info} below:
+     *
+     * 
    +     *     info = [
+     *         VMField[] vmFields,
+     *         [String name, Long size, ...] vmTypeSizes,
+     *         [String name, Long value, ...] vmConstants,
+     *         [String name, Long value, ...] vmAddresses,
+     *         VMFlag[] vmFlags
+     *     ]
+     * 
    
+     */
+    @SuppressWarnings("try")
+    HotSpotVMConfigStore(CompilerToVM compilerToVm) {
+        Object[] data;
+        try (InitTimer t = timer("CompilerToVm readConfiguration")) {
+            data = compilerToVm.readConfiguration();
+        }
+        assert data.length == 5 : data.length;
+
+        // @formatter:off
+        VMField[] vmFieldsInfo    = (VMField[]) data[0];
+        Object[] vmTypesSizesInfo = (Object[])  data[1];
+        Object[] vmConstantsInfo  = (Object[])  data[2];
+        Object[] vmAddressesInfo  = (Object[])  data[3];
+        VMFlag[] vmFlagsInfo      = (VMFlag[])  data[4];
+
+        vmFields    = new HashMap<>(vmFieldsInfo.length);
+        vmTypeSizes = new HashMap<>(vmTypesSizesInfo.length);
+        vmConstants = new HashMap<>(vmConstantsInfo.length);
+        vmAddresses = new HashMap<>(vmAddressesInfo.length);
+        vmFlags     = new HashMap<>(vmFlagsInfo.length);
+        // @formatter:on
+
+        try (InitTimer t = timer("HotSpotVMConfigStore fill maps")) {
+            for (VMField vmField : vmFieldsInfo) {
+                vmFields.put(vmField.name, vmField);
+            }
+
+            for (int i = 0; i < vmTypesSizesInfo.length / 2; i++) {
+                String name = (String) vmTypesSizesInfo[i * 2];
+                Long size = (Long) vmTypesSizesInfo[i * 2 + 1];
+                vmTypeSizes.put(name, size);
+            }
+
+            for (int i = 0; i < vmConstantsInfo.length / 2; i++) {
+                String name = (String) vmConstantsInfo[i * 2];
+                Long value = (Long) vmConstantsInfo[i * 2 + 1];
+                vmConstants.put(name, value);
+            }
+
+            for (int i = 0; i < vmAddressesInfo.length / 2; i++) {
+                String name = (String) vmAddressesInfo[i * 2];
+                Long value = (Long) vmAddressesInfo[i * 2 + 1];
+                vmAddresses.put(name, value);
+            }
+
+            for (VMFlag vmFlag : vmFlagsInfo) {
+                vmFlags.put(vmFlag.name, vmFlag);
+            }
+        }
+    }
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigVerifier.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigVerifier.java
deleted file mode 100644
index 8995bd60797..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigVerifier.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.vm.ci.hotspot;
-
-import static java.lang.String.format;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Executable;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Objects;
-
-import jdk.vm.ci.common.JVMCIError;
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.internal.org.objectweb.asm.Type;
-import jdk.internal.misc.Unsafe;
-
-/**
- * A {@link ClassVisitor} that verifies {@link HotSpotVMConfig} does not access {@link Unsafe} from
- * any of its non-static, non-constructor methods. This ensures that a deserialized
- * {@link HotSpotVMConfig} object does not perform any unsafe reads on addresses that are only valid
- * in the context in which the object was serialized. Note that this does not catch cases where a
- * client uses an address stored in a {@link HotSpotVMConfig} field.
- */
-final class HotSpotVMConfigVerifier extends ClassVisitor {
-
-    public static boolean check() {
-        Class cls = HotSpotVMConfig.class;
-        String classFilePath = "/" + cls.getName().replace('.', '/') + ".class";
-        try {
-            InputStream classfile = cls.getResourceAsStream(classFilePath);
-            ClassReader cr = new ClassReader(Objects.requireNonNull(classfile, "Could not find class file for " + cls.getName()));
-            ClassVisitor cv = new HotSpotVMConfigVerifier();
-            cr.accept(cv, 0);
-            return true;
-        } catch (IOException e) {
-            throw new JVMCIError(e);
-        }
-    }
-
-    /**
-     * Source file context for error reporting.
-     */
-    String sourceFile = null;
-
-    /**
-     * Line number for error reporting.
-     */
-    int lineNo = -1;
-
-    private static Class resolve(String name) {
-        try {
-            return Class.forName(name.replace('/', '.'));
-        } catch (ClassNotFoundException e) {
-            throw new JVMCIError(e);
-        }
-    }
-
-    HotSpotVMConfigVerifier() {
-        super(Opcodes.ASM5);
-    }
-
-    @Override
-    public void visitSource(String source, String debug) {
-        this.sourceFile = source;
-    }
-
-    void verify(boolean condition, String message) {
-        if (!condition) {
-            error(message);
-        }
-    }
-
-    void error(String message) {
-        String errorMessage = format("%s:%d: %s is not allowed in the context of compilation replay. The unsafe access should be moved into the %s constructor and the result cached in a field",
-                        sourceFile, lineNo, message, HotSpotVMConfig.class.getSimpleName());
-        throw new JVMCIError(errorMessage);
-
-    }
-
-    @Override
-    public MethodVisitor visitMethod(int access, String name, String d, String signature, String[] exceptions) {
-        if (!Modifier.isStatic(access) && Modifier.isPublic(access) && !name.equals("")) {
-            return new MethodVisitor(Opcodes.ASM5) {
-
-                @Override
-                public void visitLineNumber(int line, Label start) {
-                    lineNo = line;
-                }
-
-                private Executable resolveMethod(String owner, String methodName, String methodDesc) {
-                    Class declaringClass = resolve(owner);
-                    while (declaringClass != null) {
-                        if (methodName.equals("")) {
-                            for (Constructor c : declaringClass.getDeclaredConstructors()) {
-                                if (methodDesc.equals(Type.getConstructorDescriptor(c))) {
-                                    return c;
-                                }
-                            }
-                        } else {
-                            Type[] argumentTypes = Type.getArgumentTypes(methodDesc);
-                            for (Method m : declaringClass.getDeclaredMethods()) {
-                                if (m.getName().equals(methodName)) {
-                                    if (Arrays.equals(argumentTypes, Type.getArgumentTypes(m))) {
-                                        if (Type.getReturnType(methodDesc).equals(Type.getReturnType(m))) {
-                                            return m;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        declaringClass = declaringClass.getSuperclass();
-                    }
-                    throw new NoSuchMethodError(owner + "." + methodName + methodDesc);
-                }
-
-                /**
-                 * Checks whether a given method is allowed to be called.
-                 */
-                private boolean checkInvokeTarget(Executable method) {
-                    if (method.getDeclaringClass().equals(Unsafe.class)) {
-                        return false;
-                    }
-                    return true;
-                }
-
-                @Override
-                public void visitMethodInsn(int opcode, String owner, String methodName, String methodDesc, boolean itf) {
-                    Executable callee = resolveMethod(owner, methodName, methodDesc);
-                    verify(checkInvokeTarget(callee), "invocation of " + callee);
-                }
-            };
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMField.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMField.java
new file mode 100644
index 00000000000..094d92cdd32
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMField.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.hotspot;
+
+/**
+ * Describes a C++ field exposed via {@link HotSpotVMConfigAccess}.
+ */
+public final class VMField {
+
+    /**
+     * Fully qualified name of the represented field (e.g., "Klass::_name").
+     */
+    public final String name;
+
+    /**
+     * The represented field's type (e.g., "Symbol*"). This may be {@code null}.
+     */
+    public final String type;
+
+    /**
+     * If represented field is non-static, this is its offset within the containing structure.
+     */
+    public final long offset;
+
+    /**
+     * If represented field is static, this is its address. Otherwise, this field is 0.
+     */
+    public final long address;
+
+    /**
+     * Value of the field represented as a boxed long; only valid for non-oop static fields. This
+     * value is only captured once, during JVMCI initialization. If {@link #type} cannot be
+     * meaningfully (e.g., a struct) or safely (e.g., an oop) expressed as a boxed long, this is
+     * {@code null}.
+     */
+    public final Long value;
+
+    /**
+     * Determines if the represented field is static.
+     */
+    public boolean isStatic() {
+        return address != 0;
+    }
+
+    /**
+     * Creates a description of a non-static field.
+     */
+    public VMField(String name, String type, long offset) {
+        this.name = name;
+        this.type = type;
+        this.offset = offset;
+        this.address = 0;
+        this.value = null;
+    }
+
+    /**
+     * Creates a description of a static field.
+     */
+    public VMField(String name, String type, long address, Long value) {
+        this.name = name;
+        this.type = type;
+        this.offset = 0;
+        this.address = address;
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        String val = value == null ? "null" : String.format("0x%x", value);
+        return String.format("Field[name=%s, type=%s, offset=%d, address=0x%x, value=%s]", name, type, offset, address, val);
+    }
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMData.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMFlag.java
similarity index 60%
rename from hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMData.java
rename to hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMFlag.java
index f993fd620ee..77ede1c3796 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMData.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/VMFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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
@@ -20,25 +20,36 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.vm.ci.hotspotvmconfig;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+package jdk.vm.ci.hotspot;
 
 /**
- * Refers to a entry in {@code gHotSpotVMData}.
+ * Describes a VM flag exposed via {@link HotSpotVMConfigAccess}.
  */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HotSpotVMData {
+public final class VMFlag {
 
     /**
-     * Returns the array index of this field.
-     *
-     * @return array index of field
+     * The name of the flag.
      */
-    int index();
+    public final String name;
 
+    /**
+     * The C++ type of the flag.
+     */
+    public final String type;
+
+    /**
+     * The flag's value.
+     */
+    public final Object value;
+
+    VMFlag(String name, String type, Object value) {
+        this.name = name;
+        this.type = type;
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("Flag[type=%s, name=%s, value=%s]", type, name, value);
+    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotJVMCICompilerFactory.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotJVMCICompilerFactory.java
index 6b7d48bec07..e629bc91150 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotJVMCICompilerFactory.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/services/HotSpotJVMCICompilerFactory.java
@@ -22,7 +22,6 @@
  */
 package jdk.vm.ci.hotspot.services;
 
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.runtime.services.JVMCICompilerFactory;
 
 /**
@@ -42,35 +41,54 @@ public abstract class HotSpotJVMCICompilerFactory extends JVMCICompilerFactory {
         return null;
     }
 
+    public enum CompilationLevelAdjustment {
+        /**
+         * No adjustment.
+         */
+        None,
+
+        /**
+         * Adjust based on declaring class of method.
+         */
+        ByHolder,
+
+        /**
+         * Adjust based on declaring class, name and signature of method.
+         */
+        ByFullSignature
+    }
+
     /**
      * Determines if this object may want to adjust the compilation level for a method that is being
-     * scheduled by the VM for compilation. The legal return values and their meanings are:
-     * 
      
-     * 
    • 0 - no adjustment
      • 
-     * 
    • 1 - adjust based on declaring class of method
      • 
-     * 
    • 2 - adjust based on declaring class, name and signature of method
      • 
-     * 
    
+     * scheduled by the VM for compilation.
      */
-    public int getCompilationLevelAdjustment(HotSpotVMConfig config) {
-        return config.compLevelAdjustmentNone;
+    public CompilationLevelAdjustment getCompilationLevelAdjustment() {
+        return CompilationLevelAdjustment.None;
+    }
+
+    public enum CompilationLevel {
+        None,
+        Simple,
+        LimitedProfile,
+        FullProfile,
+        FullOptimization
     }
 
     /**
      * Potentially modifies the compilation level currently selected by the VM compilation policy
      * for a method.
      *
-     * @param config object for reading HotSpot {@code CompLevel} enum values
      * @param declaringClass the class in which the method is declared
      * @param name the name of the method or {@code null} depending on the value that was returned
-     *            by {@link #getCompilationLevelAdjustment(HotSpotVMConfig)}
+     *            by {@link #getCompilationLevelAdjustment()}
      * @param signature the signature of the method or {@code null} depending on the value that was
-     *            returned by {@link #getCompilationLevelAdjustment(HotSpotVMConfig)}
+     *            returned by {@link #getCompilationLevelAdjustment()}
      * @param isOsr specifies if the compilation being scheduled in an OSR compilation
      * @param level the compilation level currently selected by the VM compilation policy
      * @return the compilation level to use for the compilation being scheduled (must be a valid
      *         {@code CompLevel} enum value)
      */
-    public int adjustCompilationLevel(HotSpotVMConfig config, Class declaringClass, String name, String signature, boolean isOsr, int level) {
+    public CompilationLevel adjustCompilationLevel(Class declaringClass, String name, String signature, boolean isOsr, CompilationLevel level) {
         throw new InternalError("Should not reach here");
     }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMAddress.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMAddress.java
deleted file mode 100644
index 0900bfa207d..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMAddress.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.vm.ci.hotspotvmconfig;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Refers to a C++ address in the VM.
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HotSpotVMAddress {
-
-    /**
-     * Returns the name of the symbol this address is referring to.
-     *
-     * @return name of symbol of this address
-     */
-    String name();
-
-    /**
-     * List of architectures where this constant is required. Names are derived from
-     * {@link HotSpotVMConfig#getHostArchitectureName()}. An empty list implies that the constant is
-     * required on all architectures.
-     */
-    @SuppressWarnings("javadoc")
-    String[] archs() default {};
-
-    /**
-     * List of operating systems where this constant is required. Names are derived from
-     * {@link HotSpotVMConfig#getHostOSName()}. An empty list implies that the constant is required
-     * on all operating systems.
-     */
-    @SuppressWarnings("javadoc")
-    String[] os() default {};
-
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMConstant.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMConstant.java
deleted file mode 100644
index 10da8b6ecdd..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMConstant.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.vm.ci.hotspotvmconfig;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Refers to a C++ constant in the VM.
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HotSpotVMConstant {
-
-    /**
-     * Returns the name of the constant.
-     *
-     * @return name of constant
-     */
-    String name();
-
-    /**
-     * List of architectures where this constant is required. Names are derived from
-     * {@link HotSpotVMConfig#getHostArchitectureName()}. An empty list implies that the constant is
-     * required on all architectures.
-     */
-    @SuppressWarnings("javadoc")
-    String[] archs() default {};
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMField.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMField.java
deleted file mode 100644
index c58c9e72fd5..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMField.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.vm.ci.hotspotvmconfig;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Refers to a C++ field in the VM.
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HotSpotVMField {
-
-    /**
-     * Types of information this annotation can return.
-     */
-    enum Type {
-        /**
-         * Returns the offset of this field within the type. Only valid for instance fields.
-         */
-        OFFSET,
-
-        /**
-         * Returns the absolute address of this field. Only valid for static fields.
-         */
-        ADDRESS,
-
-        /**
-         * Returns the value of this field. Only valid for static fields.
-         */
-        VALUE;
-    }
-
-    /**
-     * Specifies what type of information to return.
-     *
-     * @see Type
-     */
-    Type get();
-
-    /**
-     * Returns the type name containing this field.
-     *
-     * @return name of containing type
-     */
-    String type();
-
-    /**
-     * Returns the name of this field.
-     *
-     * @return name of field
-     */
-    String name();
-
-    /**
-     * List of architectures where this constant is required. Names are derived from
-     * {@link HotSpotVMConfig#getHostArchitectureName()}. An empty list implies that the constant is
-     * required on all architectures.
-     */
-    @SuppressWarnings("javadoc")
-    String[] archs() default {};
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMFlag.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMFlag.java
deleted file mode 100644
index 99e9ac39fb2..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspotvmconfig/src/jdk/vm/ci/hotspotvmconfig/HotSpotVMFlag.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.vm.ci.hotspotvmconfig;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Refers to a C++ flag in the VM.
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface HotSpotVMFlag {
-
-    /**
-     * Returns the name of this flag.
-     *
-     * @return name of flag.
-     */
-    String name();
-
-    /**
-     * List of architectures where this constant is required. Names are derived from
-     * {@link HotSpotVMConfig#getHostArchitectureName()}. An empty list implies that the constant is
-     * required on all architectures.
-     */
-    @SuppressWarnings("javadoc")
-    String[] archs() default {};
-
-    boolean optional() default false;
-}
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
index e9d26ffcb8c..9f5a486e8da 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
@@ -88,41 +88,6 @@ oop CompilerToVM::get_jvmci_type(KlassHandle klass, TRAPS) {
   return NULL;
 }
 
-extern "C" {
-extern VMStructEntry* jvmciHotSpotVMStructs;
-extern uint64_t jvmciHotSpotVMStructEntryTypeNameOffset;
-extern uint64_t jvmciHotSpotVMStructEntryFieldNameOffset;
-extern uint64_t jvmciHotSpotVMStructEntryTypeStringOffset;
-extern uint64_t jvmciHotSpotVMStructEntryIsStaticOffset;
-extern uint64_t jvmciHotSpotVMStructEntryOffsetOffset;
-extern uint64_t jvmciHotSpotVMStructEntryAddressOffset;
-extern uint64_t jvmciHotSpotVMStructEntryArrayStride;
-
-extern VMTypeEntry* jvmciHotSpotVMTypes;
-extern uint64_t jvmciHotSpotVMTypeEntryTypeNameOffset;
-extern uint64_t jvmciHotSpotVMTypeEntrySuperclassNameOffset;
-extern uint64_t jvmciHotSpotVMTypeEntryIsOopTypeOffset;
-extern uint64_t jvmciHotSpotVMTypeEntryIsIntegerTypeOffset;
-extern uint64_t jvmciHotSpotVMTypeEntryIsUnsignedOffset;
-extern uint64_t jvmciHotSpotVMTypeEntrySizeOffset;
-extern uint64_t jvmciHotSpotVMTypeEntryArrayStride;
-
-extern VMIntConstantEntry* jvmciHotSpotVMIntConstants;
-extern uint64_t jvmciHotSpotVMIntConstantEntryNameOffset;
-extern uint64_t jvmciHotSpotVMIntConstantEntryValueOffset;
-extern uint64_t jvmciHotSpotVMIntConstantEntryArrayStride;
-
-extern VMLongConstantEntry* jvmciHotSpotVMLongConstants;
-extern uint64_t jvmciHotSpotVMLongConstantEntryNameOffset;
-extern uint64_t jvmciHotSpotVMLongConstantEntryValueOffset;
-extern uint64_t jvmciHotSpotVMLongConstantEntryArrayStride;
-
-extern VMAddressEntry* jvmciHotSpotVMAddresses;
-extern uint64_t jvmciHotSpotVMAddressEntryNameOffset;
-extern uint64_t jvmciHotSpotVMAddressEntryValueOffset;
-extern uint64_t jvmciHotSpotVMAddressEntryArrayStride;
-}
-
 int CompilerToVM::Data::Klass_vtable_start_offset;
 int CompilerToVM::Data::Klass_vtable_length_offset;
 
@@ -232,48 +197,151 @@ void CompilerToVM::Data::initialize() {
 #undef SET_TRIGFUNC
 }
 
-/**
- * We put all jvmciHotSpotVM values in an array so we can read them easily from Java.
- */
-static uintptr_t ciHotSpotVMData[28];
-
-C2V_VMENTRY(jlong, initializeConfiguration, (JNIEnv *env, jobject))
-  ciHotSpotVMData[0] = (uintptr_t) jvmciHotSpotVMStructs;
-  ciHotSpotVMData[1] = jvmciHotSpotVMStructEntryTypeNameOffset;
-  ciHotSpotVMData[2] = jvmciHotSpotVMStructEntryFieldNameOffset;
-  ciHotSpotVMData[3] = jvmciHotSpotVMStructEntryTypeStringOffset;
-  ciHotSpotVMData[4] = jvmciHotSpotVMStructEntryIsStaticOffset;
-  ciHotSpotVMData[5] = jvmciHotSpotVMStructEntryOffsetOffset;
-  ciHotSpotVMData[6] = jvmciHotSpotVMStructEntryAddressOffset;
-  ciHotSpotVMData[7] = jvmciHotSpotVMStructEntryArrayStride;
-
-  ciHotSpotVMData[8] = (uintptr_t) jvmciHotSpotVMTypes;
-  ciHotSpotVMData[9] = jvmciHotSpotVMTypeEntryTypeNameOffset;
-  ciHotSpotVMData[10] = jvmciHotSpotVMTypeEntrySuperclassNameOffset;
-  ciHotSpotVMData[11] = jvmciHotSpotVMTypeEntryIsOopTypeOffset;
-  ciHotSpotVMData[12] = jvmciHotSpotVMTypeEntryIsIntegerTypeOffset;
-  ciHotSpotVMData[13] = jvmciHotSpotVMTypeEntryIsUnsignedOffset;
-  ciHotSpotVMData[14] = jvmciHotSpotVMTypeEntrySizeOffset;
-  ciHotSpotVMData[15] = jvmciHotSpotVMTypeEntryArrayStride;
-
-  ciHotSpotVMData[16] = (uintptr_t) jvmciHotSpotVMIntConstants;
-  ciHotSpotVMData[17] = jvmciHotSpotVMIntConstantEntryNameOffset;
-  ciHotSpotVMData[18] = jvmciHotSpotVMIntConstantEntryValueOffset;
-  ciHotSpotVMData[19] = jvmciHotSpotVMIntConstantEntryArrayStride;
-
-  ciHotSpotVMData[20] = (uintptr_t) jvmciHotSpotVMLongConstants;
-  ciHotSpotVMData[21] = jvmciHotSpotVMLongConstantEntryNameOffset;
-  ciHotSpotVMData[22] = jvmciHotSpotVMLongConstantEntryValueOffset;
-  ciHotSpotVMData[23] = jvmciHotSpotVMLongConstantEntryArrayStride;
-
-  ciHotSpotVMData[24] = (uintptr_t) jvmciHotSpotVMAddresses;
-  ciHotSpotVMData[25] = jvmciHotSpotVMAddressEntryNameOffset;
-  ciHotSpotVMData[26] = jvmciHotSpotVMAddressEntryValueOffset;
-  ciHotSpotVMData[27] = jvmciHotSpotVMAddressEntryArrayStride;
+C2V_VMENTRY(jobjectArray, readConfiguration, (JNIEnv *env))
+#define BOXED_LONG(name, value) oop name; do { jvalue p; p.j = (jlong) (value); name = java_lang_boxing_object::create(T_LONG, &p, CHECK_NULL);} while(0)
+#define BOXED_DOUBLE(name, value) oop name; do { jvalue p; p.d = (jdouble) (value); name = java_lang_boxing_object::create(T_DOUBLE, &p, CHECK_NULL);} while(0)
+  ResourceMark rm;
+  HandleMark hm;
 
   CompilerToVM::Data::initialize();
 
-  return (jlong) (address) &ciHotSpotVMData;
+  VMField::klass()->initialize(thread);
+  VMFlag::klass()->initialize(thread);
+
+  int len = JVMCIVMStructs::localHotSpotVMStructs_count();
+  objArrayHandle vmFields = oopFactory::new_objArray(VMField::klass(), len, CHECK_NULL);
+  for (int i = 0; i < len ; i++) {
+    VMStructEntry vmField = JVMCIVMStructs::localHotSpotVMStructs[i];
+    instanceHandle vmFieldObj = InstanceKlass::cast(VMField::klass())->allocate_instance_handle(CHECK_NULL);
+    size_t name_buf_len = strlen(vmField.typeName) + strlen(vmField.fieldName) + 2 /* "::" */;
+    char* name_buf = NEW_RESOURCE_ARRAY(char, name_buf_len + 1);
+    sprintf(name_buf, "%s::%s", vmField.typeName, vmField.fieldName);
+    Handle name = java_lang_String::create_from_str(name_buf, CHECK_NULL);
+    Handle type = java_lang_String::create_from_str(vmField.typeString, CHECK_NULL);
+    VMField::set_name(vmFieldObj, name());
+    VMField::set_type(vmFieldObj, type());
+    VMField::set_offset(vmFieldObj, vmField.offset);
+    VMField::set_address(vmFieldObj, (jlong) vmField.address);
+    if (vmField.isStatic) {
+      if (strcmp(vmField.typeString, "bool") == 0) {
+        BOXED_LONG(value, *(jbyte*) vmField.address);
+        VMField::set_value(vmFieldObj, value);
+      } else if (strcmp(vmField.typeString, "int") == 0 ||
+                 strcmp(vmField.typeString, "jint") == 0) {
+        BOXED_LONG(value, *(jint*) vmField.address);
+        VMField::set_value(vmFieldObj, value);
+      } else if (strcmp(vmField.typeString, "uint64_t") == 0) {
+        BOXED_LONG(value, *(uint64_t*) vmField.address);
+        VMField::set_value(vmFieldObj, value);
+      } else if (strcmp(vmField.typeString, "address") == 0 ||
+                 strcmp(vmField.typeString, "intptr_t") == 0 ||
+                 strcmp(vmField.typeString, "uintptr_t") == 0 ||
+                 strcmp(vmField.typeString, "size_t") == 0 ||
+                 // All foo* types are addresses.
+                 vmField.typeString[strlen(vmField.typeString) - 1] == '*') {
+        BOXED_LONG(value, *((address*) vmField.address));
+        VMField::set_value(vmFieldObj, value);
+      } else {
+        JVMCI_ERROR_NULL("VM field %s has unsupported type %s", name_buf, vmField.typeString);
+      }
+    }
+    vmFields->obj_at_put(i, vmFieldObj());
+  }
+
+  len = JVMCIVMStructs::localHotSpotVMTypes_count();
+  objArrayHandle vmTypes = oopFactory::new_objArray(SystemDictionary::Object_klass(), len * 2, CHECK_NULL);
+  for (int i = 0; i < len ; i++) {
+    VMTypeEntry vmType = JVMCIVMStructs::localHotSpotVMTypes[i];
+    Handle name = java_lang_String::create_from_str(vmType.typeName, CHECK_NULL);
+    BOXED_LONG(size, vmType.size);
+    vmTypes->obj_at_put(i * 2, name());
+    vmTypes->obj_at_put(i * 2 + 1, size);
+  }
+
+  int ints_len = JVMCIVMStructs::localHotSpotVMIntConstants_count();
+  int longs_len = JVMCIVMStructs::localHotSpotVMLongConstants_count();
+  len = ints_len + longs_len;
+  objArrayHandle vmConstants = oopFactory::new_objArray(SystemDictionary::Object_klass(), len * 2, CHECK_NULL);
+  int insert = 0;
+  for (int i = 0; i < ints_len ; i++) {
+    VMIntConstantEntry c = JVMCIVMStructs::localHotSpotVMIntConstants[i];
+    Handle name = java_lang_String::create_from_str(c.name, CHECK_NULL);
+    BOXED_LONG(value, c.value);
+    vmConstants->obj_at_put(insert++, name());
+    vmConstants->obj_at_put(insert++, value);
+  }
+  for (int i = 0; i < longs_len ; i++) {
+    VMLongConstantEntry c = JVMCIVMStructs::localHotSpotVMLongConstants[i];
+    Handle name = java_lang_String::create_from_str(c.name, CHECK_NULL);
+    BOXED_LONG(value, c.value);
+    vmConstants->obj_at_put(insert++, name());
+    vmConstants->obj_at_put(insert++, value);
+  }
+  assert(insert == len * 2, "must be");
+
+  len = JVMCIVMStructs::localHotSpotVMAddresses_count();
+  objArrayHandle vmAddresses = oopFactory::new_objArray(SystemDictionary::Object_klass(), len * 2, CHECK_NULL);
+  for (int i = 0; i < len ; i++) {
+    VMAddressEntry a = JVMCIVMStructs::localHotSpotVMAddresses[i];
+    Handle name = java_lang_String::create_from_str(a.name, CHECK_NULL);
+    BOXED_LONG(value, a.value);
+    vmAddresses->obj_at_put(i * 2, name());
+    vmAddresses->obj_at_put(i * 2 + 1, value);
+  }
+
+  // The last entry is the null entry.
+  len = (int) Flag::numFlags - 1;
+  objArrayHandle vmFlags = oopFactory::new_objArray(VMFlag::klass(), len, CHECK_NULL);
+  for (int i = 0; i < len; i++) {
+    Flag* flag = &Flag::flags[i];
+    instanceHandle vmFlagObj = InstanceKlass::cast(VMFlag::klass())->allocate_instance_handle(CHECK_NULL);
+    Handle name = java_lang_String::create_from_str(flag->_name, CHECK_NULL);
+    Handle type = java_lang_String::create_from_str(flag->_type, CHECK_NULL);
+    VMFlag::set_name(vmFlagObj, name());
+    VMFlag::set_type(vmFlagObj, type());
+    if (flag->is_bool()) {
+      BOXED_LONG(value, flag->get_bool());
+      VMFlag::set_value(vmFlagObj, value);
+    } else if (flag->is_ccstr()) {
+      Handle value = java_lang_String::create_from_str(flag->get_ccstr(), CHECK_NULL);
+      VMFlag::set_value(vmFlagObj, value());
+    } else if (flag->is_int()) {
+      BOXED_LONG(value, flag->get_int());
+      VMFlag::set_value(vmFlagObj, value);
+    } else if (flag->is_intx()) {
+      BOXED_LONG(value, flag->get_intx());
+      VMFlag::set_value(vmFlagObj, value);
+    } else if (flag->is_uint()) {
+      BOXED_LONG(value, flag->get_uint());
+      VMFlag::set_value(vmFlagObj, value);
+    } else if (flag->is_uint64_t()) {
+      BOXED_LONG(value, flag->get_uint64_t());
+      VMFlag::set_value(vmFlagObj, value);
+    } else if (flag->is_uintx()) {
+      BOXED_LONG(value, flag->get_uintx());
+      VMFlag::set_value(vmFlagObj, value);
+    } else if (flag->is_double()) {
+      BOXED_DOUBLE(value, flag->get_double());
+      VMFlag::set_value(vmFlagObj, value);
+    } else if (flag->is_size_t()) {
+      BOXED_LONG(value, flag->get_size_t());
+      VMFlag::set_value(vmFlagObj, value);
+    } else {
+      JVMCI_ERROR_NULL("VM flag %s has unsupported type %s", flag->_name, flag->_type);
+    }
+    vmFlags->obj_at_put(i, vmFlagObj());
+  }
+
+  objArrayOop data = oopFactory::new_objArray(SystemDictionary::Object_klass(), 5, CHECK_NULL);
+  data->obj_at_put(0, vmFields());
+  data->obj_at_put(1, vmTypes());
+  data->obj_at_put(2, vmConstants());
+  data->obj_at_put(3, vmAddresses());
+  data->obj_at_put(4, vmFlags());
+
+  return (jobjectArray) JNIHandles::make_local(THREAD, data);
+#undef BOXED_LONG
+#undef BOXED_DOUBLE
 C2V_END
 
 C2V_VMENTRY(jbyteArray, getBytecode, (JNIEnv *, jobject, jobject jvmci_method))
@@ -1450,7 +1518,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "getResolvedJavaMethod",                        CC "(Ljava/lang/Object;J)" HS_RESOLVED_METHOD,                                        FN_PTR(getResolvedJavaMethod)},
   {CC "getConstantPool",                              CC "(Ljava/lang/Object;J)" HS_CONSTANT_POOL,                                          FN_PTR(getConstantPool)},
   {CC "getResolvedJavaType",                          CC "(Ljava/lang/Object;JZ)" HS_RESOLVED_KLASS,                                        FN_PTR(getResolvedJavaType)},
-  {CC "initializeConfiguration",                      CC "(" HS_CONFIG ")J",                                                                FN_PTR(initializeConfiguration)},
+  {CC "readConfiguration",                            CC "()[" OBJECT,                                                                      FN_PTR(readConfiguration)},
   {CC "installCode",                                  CC "(" TARGET_DESCRIPTION HS_COMPILED_CODE INSTALLED_CODE HS_SPECULATION_LOG ")I",    FN_PTR(installCode)},
   {CC "getMetadata",                                  CC "(" TARGET_DESCRIPTION HS_COMPILED_CODE HS_METADATA ")I",                          FN_PTR(getMetadata)},
   {CC "resetCompilationStatistics",                   CC "()V",                                                                             FN_PTR(resetCompilationStatistics)},
diff --git a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
index 312ae64b952..8f8f0715ef7 100644
--- a/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciJavaClasses.hpp
@@ -112,6 +112,18 @@ class JVMCIJavaClasses : AllStatic {
   start_class(HotSpotForeignCallTarget)                                                                                                                        \
     long_field(HotSpotForeignCallTarget, address)                                                                                                              \
   end_class                                                                                                                                                    \
+  start_class(VMField)                                                                                                                                         \
+    oop_field(VMField, name, "Ljava/lang/String;")                                                                                                             \
+    oop_field(VMField, type, "Ljava/lang/String;")                                                                                                             \
+    long_field(VMField, offset)                                                                                                                                \
+    long_field(VMField, address)                                                                                                                               \
+    oop_field(VMField, value, "Ljava/lang/Long;")                                                                                                              \
+  end_class                                                                                                                                                    \
+  start_class(VMFlag)                                                                                                                                          \
+    oop_field(VMFlag, name, "Ljava/lang/String;")                                                                                                              \
+    oop_field(VMFlag, type, "Ljava/lang/String;")                                                                                                              \
+    oop_field(VMFlag, value, "Ljava/lang/Object;")                                                                                                             \
+  end_class                                                                                                                                                    \
   start_class(Assumptions_NoFinalizableSubclass)                                                                                                               \
     oop_field(Assumptions_NoFinalizableSubclass, receiverType, "Ljdk/vm/ci/meta/ResolvedJavaType;")                                                            \
   end_class                                                                                                                                                    \
diff --git a/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp b/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
index ae905169ef1..05f12fb84ed 100644
--- a/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/systemDictionary_jvmci.hpp
@@ -49,6 +49,8 @@
   do_klass(HotSpotJVMCIRuntime_klass,                    jdk_vm_ci_hotspot_HotSpotJVMCIRuntime,                 Jvmci) \
   do_klass(HotSpotSpeculationLog_klass,                  jdk_vm_ci_hotspot_HotSpotSpeculationLog,               Jvmci) \
   do_klass(HotSpotCompilationRequestResult_klass,        jdk_vm_ci_hotspot_HotSpotCompilationRequestResult,     Jvmci) \
+  do_klass(VMField_klass,                                jdk_vm_ci_hotspot_VMField,                             Jvmci) \
+  do_klass(VMFlag_klass,                                 jdk_vm_ci_hotspot_VMFlag,                              Jvmci) \
   do_klass(Assumptions_ConcreteMethod_klass,             jdk_vm_ci_meta_Assumptions_ConcreteMethod,             Jvmci) \
   do_klass(Assumptions_NoFinalizableSubclass_klass,      jdk_vm_ci_meta_Assumptions_NoFinalizableSubclass,      Jvmci) \
   do_klass(Assumptions_ConcreteSubtype_klass,            jdk_vm_ci_meta_Assumptions_ConcreteSubtype,            Jvmci) \
diff --git a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp b/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
index e35345b42a8..2efb9ac8364 100644
--- a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
+++ b/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
@@ -539,6 +539,8 @@
   declare_function(SharedRuntime::exception_handler_for_return_address)   \
   declare_function(SharedRuntime::OSR_migration_end)                      \
   declare_function(SharedRuntime::enable_stack_reserved_zone)             \
+  declare_function(SharedRuntime::frem)                                   \
+  declare_function(SharedRuntime::drem)                                   \
                                                                           \
   declare_function(os::dll_load)                                          \
   declare_function(os::dll_lookup)                                        \
@@ -733,22 +735,6 @@
 #endif
 
 
-// whole purpose of this function is to work around bug c++/27724 in gcc 4.1.1
-// with optimization turned on it doesn't affect produced code
-static inline uint64_t cast_uint64_t(size_t x)
-{
-  return x;
-}
-
-#define ASSIGN_CONST_TO_64BIT_VAR(var, expr) \
-  JNIEXPORT uint64_t var = cast_uint64_t(expr);
-
-#define ASSIGN_OFFSET_TO_64BIT_VAR(var, type, field)   \
-  ASSIGN_CONST_TO_64BIT_VAR(var, offset_of(type, field))
-
-#define ASSIGN_STRIDE_TO_64BIT_VAR(var, array) \
-  ASSIGN_CONST_TO_64BIT_VAR(var, (char*)&array[1] - (char*)&array[0])
-
 //
 // Instantiation of VMStructEntries, VMTypeEntries and VMIntConstantEntries
 //
@@ -871,37 +857,31 @@ VMAddressEntry JVMCIVMStructs::localHotSpotVMAddresses[] = {
   GENERATE_VM_ADDRESS_LAST_ENTRY()
 };
 
+int JVMCIVMStructs::localHotSpotVMStructs_count() {
+  // Ignore sentinel entry at the end
+  return (sizeof(localHotSpotVMStructs) / sizeof(VMStructEntry)) - 1;
+}
+int JVMCIVMStructs::localHotSpotVMTypes_count() {
+  // Ignore sentinel entry at the end
+  return (sizeof(localHotSpotVMTypes) / sizeof(VMTypeEntry)) - 1;
+}
+int JVMCIVMStructs::localHotSpotVMIntConstants_count() {
+  // Ignore sentinel entry at the end
+  return (sizeof(localHotSpotVMIntConstants) / sizeof(VMIntConstantEntry)) - 1;
+}
+int JVMCIVMStructs::localHotSpotVMLongConstants_count() {
+  // Ignore sentinel entry at the end
+  return (sizeof(localHotSpotVMLongConstants) / sizeof(VMLongConstantEntry)) - 1;
+}
+int JVMCIVMStructs::localHotSpotVMAddresses_count() {
+  // Ignore sentinel entry at the end
+  return (sizeof(localHotSpotVMAddresses) / sizeof(VMAddressEntry)) - 1;
+}
+
 extern "C" {
 JNIEXPORT VMStructEntry* jvmciHotSpotVMStructs = JVMCIVMStructs::localHotSpotVMStructs;
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMStructEntryTypeNameOffset,   VMStructEntry, typeName);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMStructEntryFieldNameOffset,  VMStructEntry, fieldName);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMStructEntryTypeStringOffset, VMStructEntry, typeString);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMStructEntryIsStaticOffset,   VMStructEntry, isStatic);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMStructEntryOffsetOffset,     VMStructEntry, offset);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMStructEntryAddressOffset,    VMStructEntry, address);
-ASSIGN_STRIDE_TO_64BIT_VAR(jvmciHotSpotVMStructEntryArrayStride, jvmciHotSpotVMStructs);
-
 JNIEXPORT VMTypeEntry* jvmciHotSpotVMTypes = JVMCIVMStructs::localHotSpotVMTypes;
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMTypeEntryTypeNameOffset,       VMTypeEntry, typeName);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMTypeEntrySuperclassNameOffset, VMTypeEntry, superclassName);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMTypeEntryIsOopTypeOffset,      VMTypeEntry, isOopType);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMTypeEntryIsIntegerTypeOffset,  VMTypeEntry, isIntegerType);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMTypeEntryIsUnsignedOffset,     VMTypeEntry, isUnsigned);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMTypeEntrySizeOffset,           VMTypeEntry, size);
-ASSIGN_STRIDE_TO_64BIT_VAR(jvmciHotSpotVMTypeEntryArrayStride, jvmciHotSpotVMTypes);
-
 JNIEXPORT VMIntConstantEntry* jvmciHotSpotVMIntConstants = JVMCIVMStructs::localHotSpotVMIntConstants;
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMIntConstantEntryNameOffset,  VMIntConstantEntry, name);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMIntConstantEntryValueOffset, VMIntConstantEntry, value);
-ASSIGN_STRIDE_TO_64BIT_VAR(jvmciHotSpotVMIntConstantEntryArrayStride, jvmciHotSpotVMIntConstants);
-
 JNIEXPORT VMLongConstantEntry* jvmciHotSpotVMLongConstants = JVMCIVMStructs::localHotSpotVMLongConstants;
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMLongConstantEntryNameOffset,  VMLongConstantEntry, name);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMLongConstantEntryValueOffset, VMLongConstantEntry, value);
-ASSIGN_STRIDE_TO_64BIT_VAR(jvmciHotSpotVMLongConstantEntryArrayStride, jvmciHotSpotVMLongConstants);
-
 JNIEXPORT VMAddressEntry* jvmciHotSpotVMAddresses = JVMCIVMStructs::localHotSpotVMAddresses;
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMAddressEntryNameOffset,  VMAddressEntry, name);
-ASSIGN_OFFSET_TO_64BIT_VAR(jvmciHotSpotVMAddressEntryValueOffset, VMAddressEntry, value);
-ASSIGN_STRIDE_TO_64BIT_VAR(jvmciHotSpotVMAddressEntryArrayStride, jvmciHotSpotVMAddresses);
 }
diff --git a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.hpp b/hotspot/src/share/vm/jvmci/vmStructs_jvmci.hpp
index 36bfe7289c9..bacfee0d984 100644
--- a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/vmStructs_jvmci.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -55,6 +55,12 @@ public:
    * Table of addresses.
    */
   static VMAddressEntry localHotSpotVMAddresses[];
+
+  static int localHotSpotVMStructs_count();
+  static int localHotSpotVMTypes_count();
+  static int localHotSpotVMIntConstants_count();
+  static int localHotSpotVMLongConstants_count();
+  static int localHotSpotVMAddresses_count();
 };
 
 #endif // SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP
diff --git a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
index fe853aa9e91..70d4b99fb23 100644
--- a/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
+++ b/hotspot/src/share/vm/jvmci/vmSymbols_jvmci.hpp
@@ -50,6 +50,8 @@
   template(jdk_vm_ci_hotspot_HotSpotJVMCIRuntime,                 "jdk/vm/ci/hotspot/HotSpotJVMCIRuntime")                 \
   template(jdk_vm_ci_hotspot_HotSpotSpeculationLog,               "jdk/vm/ci/hotspot/HotSpotSpeculationLog")               \
   template(jdk_vm_ci_hotspot_HotSpotCompilationRequestResult,     "jdk/vm/ci/hotspot/HotSpotCompilationRequestResult")     \
+  template(jdk_vm_ci_hotspot_VMField,                             "jdk/vm/ci/hotspot/VMField")                             \
+  template(jdk_vm_ci_hotspot_VMFlag,                              "jdk/vm/ci/hotspot/VMFlag")                              \
   template(jdk_vm_ci_meta_JavaConstant,                           "jdk/vm/ci/meta/JavaConstant")                           \
   template(jdk_vm_ci_meta_PrimitiveConstant,                      "jdk/vm/ci/meta/PrimitiveConstant")                      \
   template(jdk_vm_ci_meta_RawConstant,                            "jdk/vm/ci/meta/RawConstant")                            \
diff --git a/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java b/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
index 9c9af3ce7ff..e35c516880d 100644
--- a/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
+++ b/hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
@@ -152,8 +152,8 @@ public class CompilerToVMHelper {
         CTVM.resetCompilationStatistics();
     }
 
-    public static long initializeConfiguration(HotSpotVMConfig config) {
-        return CTVM.initializeConfiguration(config);
+    public static Object[] readConfiguration() {
+        return CTVM.readConfiguration();
     }
 
     public static HotSpotResolvedJavaMethod resolveMethod(
diff --git a/hotspot/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java b/hotspot/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java
index 9087b52baf1..b40c92471a0 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -45,188 +45,30 @@ import java.util.Objects;
 import java.util.function.Consumer;
 import jdk.vm.ci.hotspot.CompilerToVMHelper;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
+import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
 import jdk.internal.misc.Unsafe;
 
 public class InitializeConfigurationTest {
-    private static final Unsafe UNSAFE = Utils.getUnsafe();
-
     public static void main(String args[]) {
-        new InitializeConfigurationTest().runTest(generateTestCases());
+        new InitializeConfigurationTest().runTest();
     }
 
-    private static List generateTestCases() {
-        List result = new ArrayList<>();
-        result.add(new TestCase("CodeCache", "_high_bound", "address",
-                InitializeConfigurationTest::verifyLongIsNotZero));
-        result.add(new TestCase("StubRoutines", "_jint_arraycopy", "address",
-                InitializeConfigurationTest::verifyLongIsNotZero));
-        return result;
+    private void runTest() {
+        TestHotSpotVMConfig config = new TestHotSpotVMConfig(HotSpotJVMCIRuntime.runtime().getConfigStore());
+        Asserts.assertNE(config.codeCacheHighBound, 0L, "Got null address");
+        Asserts.assertNE(config.stubRoutineJintArrayCopy, 0L, "Got null address");
     }
 
-    private static void verifyLongIsNotZero(Object o) {
-        Asserts.assertNotNull(o, "Got null value");
-        Asserts.assertEQ(o.getClass(), Long.class, "Unexpected value type");
-        Asserts.assertNE(o, 0L, "Got null address");
-    }
+    private static class TestHotSpotVMConfig extends HotSpotVMConfigAccess {
 
-    private void runTest(List tcases) {
-        VMStructDataReader reader = new VMStructDataReader(
-                CompilerToVMHelper.initializeConfiguration(HotSpotJVMCIRuntime.runtime().getConfig()));
-        while (reader.hasNext()) {
-            VMFieldData data = reader.next();
-            for (TestCase tcase : tcases) {
-                tcase.check(data);
-            }
-        }
-        // now check if all passed
-        for (TestCase tcase: tcases) {
-            Asserts.assertTrue(tcase.isFound(), "Case failed: " + tcase);
-        }
-    }
-
-    private static class VMStructDataReader implements Iterator {
-        // see jvmciCompilerToVM:105 static uintptr_t ciHotSpotVMData[28];
-        private static final int HOTSPOT_VM_DATA_INDEX_COUNT = 28;
-        private final long addresses[];
-        private final long vmStructsBase;
-        private final long entityNameFieldOffset;
-        private final long nameFieldOffset;
-        private final long typeStringFieldOffset;
-        private final long addressOffset;
-        private final long entrySize;
-        private long nextElementAddress;
-        private VMFieldData nextElement;
-
-        public VMStructDataReader(long gHotSpotVMData) {
-            Asserts.assertNE(gHotSpotVMData, 0L, "Got null base address");
-            addresses = new long[HOTSPOT_VM_DATA_INDEX_COUNT];
-            for (int i = 0; i < HOTSPOT_VM_DATA_INDEX_COUNT; i++) {
-                addresses[i] = UNSAFE.getAddress(
-                        gHotSpotVMData + Unsafe.ADDRESS_SIZE * i);
-            }
-            vmStructsBase = addresses[0];
-            entityNameFieldOffset = addresses[1];
-            nameFieldOffset = addresses[2];
-            typeStringFieldOffset = addresses[3];
-            addressOffset = addresses[6];
-            entrySize = addresses[7];
-            nextElementAddress = vmStructsBase;
-            nextElement = read();
+        private TestHotSpotVMConfig(HotSpotVMConfigStore store) {
+            super(store);
         }
 
-        @Override
-        public boolean hasNext() {
-            return nextElement != null;
-        }
-
-        @Override
-        public VMFieldData next() {
-            if (nextElement == null) {
-                throw new NoSuchElementException("Next element is null");
-            }
-            VMFieldData toReturn = nextElement;
-            nextElementAddress += entrySize;
-            nextElement = read();
-            return toReturn;
-        }
-
-        private VMFieldData read() {
-            String entityFieldName = readCString(
-                    UNSAFE.getAddress(nextElementAddress + nameFieldOffset));
-            if (entityFieldName == null) {
-                return null;
-            }
-            String fieldType = readCString(UNSAFE.getAddress(
-                    nextElementAddress + typeStringFieldOffset));
-            String entityName = readCString(UNSAFE.getAddress(
-                    nextElementAddress + entityNameFieldOffset));
-            Object value;
-            if ("address".equals(fieldType)) {
-                long address = UNSAFE.getAddress(
-                        nextElementAddress + addressOffset);
-                value = address;
-            } else {
-                // non-address cases are not supported
-                value = null;
-            }
-            return new VMFieldData(entityName, entityFieldName, fieldType,
-                    value);
-        }
-
-        private static String readCString(long address) {
-            if (address == 0) {
-                return null;
-            }
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0;; i++) {
-                char c = (char) UNSAFE.getByte(address + i);
-                if (c == 0) {
-                    break;
-                }
-                sb.append(c);
-            }
-            return sb.toString();
-        }
-    }
-
-    private static class VMFieldData {
-        public final String entityFieldName;
-        public final String entityName;
-        public final String fieldType;
-        public final Object value;
-
-        private VMFieldData(String entityName, String entityFieldName,
-                String fieldType, Object value) {
-            this.entityName = entityName;
-            this.entityFieldName = entityFieldName;
-            this.fieldType = fieldType;
-            this.value = value;
-        }
-    }
-
-    private static class TestCase {
-        public final String entityName;
-        public final String fieldType;
-        public final String entityFieldName;
-        public final Consumer consumer;
-        private boolean found;
-
-        public TestCase(String entityName, String entityFieldName,
-                String fieldType, Consumer predicate) {
-            Objects.requireNonNull(entityName, "Got null entityName");
-            Objects.requireNonNull(entityFieldName, "Got null entityFieldName");
-            Objects.requireNonNull(fieldType, "Got null type");
-            if (!"address".equals(fieldType)) {
-                throw new Error("TESTBUG: unsupported testcase with fieldType="
-                        + fieldType);
-            }
-            this.entityName = entityName;
-            this.fieldType = fieldType;
-            this.entityFieldName = entityFieldName;
-            this.consumer = predicate;
-            this.found = false;
-        }
-
-        public void check(VMFieldData data) {
-            if (entityFieldName.equals(data.entityFieldName)
-                    && entityName.equals(data.entityName)
-                    && fieldType.equals(data.fieldType)) {
-                Asserts.assertFalse(found, "Found 2 entries of " + this);
-                found = true;
-                consumer.accept(data.value);
-            }
-        }
-
-        @Override
-        public String toString() {
-            return "CASE: entityName=" + entityName + " entityFieldName="
-                    + entityFieldName + " fieldType=" + fieldType;
-        }
-
-        public boolean isFound() {
-            return found;
-        }
+        final long codeCacheHighBound = getFieldValue("CodeCache::_high_bound", Long.class);
+        final long stubRoutineJintArrayCopy = getFieldValue("StubRoutines::_jint_arraycopy", Long.class);
     }
 }
diff --git a/hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java b/hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java
index 7fe01e55470..ad1c0801f78 100644
--- a/hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java
+++ b/hotspot/test/compiler/jvmci/errors/TestInvalidOopMap.java
@@ -49,7 +49,6 @@ import jdk.vm.ci.code.site.Site;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.HotSpotCompiledCode.Comment;
 import jdk.vm.ci.hotspot.HotSpotReferenceMap;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.Assumptions.Assumption;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
@@ -112,21 +111,4 @@ public class TestInvalidOopMap extends CodeInstallerTest {
 
         test(new HotSpotReferenceMap(oops, base, size, 8));
     }
-
-    @Test(expected = JVMCIError.class)
-    public void testInvalidNarrowDerivedOop() {
-        if (!HotSpotVMConfig.config().useCompressedOops) {
-            throw new JVMCIError("skipping test");
-        }
-
-        PlatformKind kind = arch.getPlatformKind(JavaKind.Int);
-        Register reg = getRegister(kind, 0);
-        Register baseReg = getRegister(arch.getPlatformKind(JavaKind.Object), 1);
-
-        Location[] oops = new Location[]{Location.register(reg)};
-        Location[] base = new Location[]{Location.register(baseReg)};
-        int[] size = new int[]{kind.getSizeInBytes()};
-
-        test(new HotSpotReferenceMap(oops, base, size, 8));
-    }
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
index 67a66660ca1..55896c1d08c 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
@@ -34,6 +34,7 @@ import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.code.test.amd64.AMD64TestAssembler;
 import jdk.vm.ci.code.test.sparc.SPARCTestAssembler;
 import jdk.vm.ci.hotspot.HotSpotCompiledCode;
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -50,6 +51,7 @@ public class CodeInstallationTest {
     protected final CodeCacheProvider codeCache;
     protected final TargetDescription target;
     protected final ConstantReflectionProvider constantReflection;
+    protected final TestHotSpotVMConfig config;
 
     public CodeInstallationTest() {
         JVMCIBackend backend = JVMCI.getRuntime().getHostJVMCIBackend();
@@ -57,6 +59,7 @@ public class CodeInstallationTest {
         codeCache = backend.getCodeCache();
         target = backend.getTarget();
         constantReflection = backend.getConstantReflection();
+        config = new TestHotSpotVMConfig(HotSpotJVMCIRuntime.runtime().getConfigStore());
     }
 
     protected interface TestCompiler {
@@ -67,9 +70,9 @@ public class CodeInstallationTest {
     private TestAssembler createAssembler() {
         Architecture arch = codeCache.getTarget().arch;
         if (arch instanceof AMD64) {
-            return new AMD64TestAssembler(codeCache);
+            return new AMD64TestAssembler(codeCache, config);
         } else if (arch instanceof SPARC) {
-            return new SPARCTestAssembler(codeCache);
+            return new SPARCTestAssembler(codeCache, config);
         } else {
             Assert.fail("unsupported architecture");
             return null;
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java
index b2070884fc3..7522bb23df2 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java
@@ -32,22 +32,20 @@
  *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.amd64
  *          jdk.vm.ci/jdk.vm.ci.sparc
- * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
+ * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.code.test.DataPatchTest
  */
 
 package jdk.vm.ci.code.test;
 
+import org.junit.Assume;
+import org.junit.Test;
+
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.site.DataSectionReference;
 import jdk.vm.ci.hotspot.HotSpotConstant;
-import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
-import org.junit.Assume;
-import org.junit.Test;
-
 /**
  * Test code installation with data patches.
  */
@@ -73,12 +71,12 @@ public class DataPatchTest extends CodeInstallationTest {
 
     @Test
     public void testInlineNarrowObject() {
-        Assume.assumeTrue(HotSpotVMConfig.config().useCompressedOops);
+        Assume.assumeTrue(config.useCompressedOops);
         test(asm -> {
             ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
             HotSpotConstant c = (HotSpotConstant) constantReflection.asJavaClass(type);
             Register compressed = asm.emitLoadPointer((HotSpotConstant) c.compress());
-            Register ret = asm.emitUncompressPointer(compressed, HotSpotVMConfig.config().narrowOopBase, HotSpotVMConfig.config().narrowOopShift);
+            Register ret = asm.emitUncompressPointer(compressed, config.narrowOopBase, config.narrowOopShift);
             asm.emitPointerRet(ret);
         });
     }
@@ -96,14 +94,14 @@ public class DataPatchTest extends CodeInstallationTest {
 
     @Test
     public void testNarrowDataSectionReference() {
-        Assume.assumeTrue(HotSpotVMConfig.config().useCompressedOops);
+        Assume.assumeTrue(config.useCompressedOops);
         test(asm -> {
             ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
             HotSpotConstant c = (HotSpotConstant) constantReflection.asJavaClass(type);
             HotSpotConstant cCompressed = (HotSpotConstant) c.compress();
             DataSectionReference ref = asm.emitDataItem(cCompressed);
             Register compressed = asm.emitLoadNarrowPointer(ref);
-            Register ret = asm.emitUncompressPointer(compressed, HotSpotVMConfig.config().narrowOopBase, HotSpotVMConfig.config().narrowOopShift);
+            Register ret = asm.emitUncompressPointer(compressed, config.narrowOopBase, config.narrowOopShift);
             asm.emitPointerRet(ret);
         });
     }
@@ -113,20 +111,20 @@ public class DataPatchTest extends CodeInstallationTest {
         test(asm -> {
             ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
             Register klass = asm.emitLoadPointer((HotSpotConstant) constantReflection.asObjectHub(type));
-            Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
+            Register ret = asm.emitLoadPointer(klass, config.classMirrorOffset);
             asm.emitPointerRet(ret);
         });
     }
 
     @Test
     public void testInlineNarrowMetadata() {
-        Assume.assumeTrue(HotSpotVMConfig.config().useCompressedClassPointers);
+        Assume.assumeTrue(config.useCompressedClassPointers);
         test(asm -> {
             ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
             HotSpotConstant hub = (HotSpotConstant) constantReflection.asObjectHub(type);
             Register narrowKlass = asm.emitLoadPointer((HotSpotConstant) hub.compress());
-            Register klass = asm.emitUncompressPointer(narrowKlass, HotSpotVMConfig.config().narrowKlassBase, HotSpotVMConfig.config().narrowKlassShift);
-            Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
+            Register klass = asm.emitUncompressPointer(narrowKlass, config.narrowKlassBase, config.narrowKlassShift);
+            Register ret = asm.emitLoadPointer(klass, config.classMirrorOffset);
             asm.emitPointerRet(ret);
         });
     }
@@ -138,22 +136,22 @@ public class DataPatchTest extends CodeInstallationTest {
             HotSpotConstant hub = (HotSpotConstant) constantReflection.asObjectHub(type);
             DataSectionReference ref = asm.emitDataItem(hub);
             Register klass = asm.emitLoadPointer(ref);
-            Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
+            Register ret = asm.emitLoadPointer(klass, config.classMirrorOffset);
             asm.emitPointerRet(ret);
         });
     }
 
     @Test
     public void testNarrowMetadataInDataSection() {
-        Assume.assumeTrue(HotSpotVMConfig.config().useCompressedClassPointers);
+        Assume.assumeTrue(config.useCompressedClassPointers);
         test(asm -> {
             ResolvedJavaType type = metaAccess.lookupJavaType(getConstClass());
             HotSpotConstant hub = (HotSpotConstant) constantReflection.asObjectHub(type);
             HotSpotConstant narrowHub = (HotSpotConstant) hub.compress();
             DataSectionReference ref = asm.emitDataItem(narrowHub);
             Register narrowKlass = asm.emitLoadNarrowPointer(ref);
-            Register klass = asm.emitUncompressPointer(narrowKlass, HotSpotVMConfig.config().narrowKlassBase, HotSpotVMConfig.config().narrowKlassShift);
-            Register ret = asm.emitLoadPointer(klass, HotSpotVMConfig.config().classMirrorOffset);
+            Register klass = asm.emitUncompressPointer(narrowKlass, config.narrowKlassBase, config.narrowKlassShift);
+            Register ret = asm.emitLoadPointer(klass, config.classMirrorOffset);
             asm.emitPointerRet(ret);
         });
     }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java
index 0b8ca5c19f7..b9fdeaa6bf7 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java
@@ -32,7 +32,7 @@
  *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.amd64
  *          jdk.vm.ci/jdk.vm.ci.sparc
- * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
+ * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.code.test.SimpleCodeInstallationTest
  */
 
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
index 13c9d3a9012..970988c41fc 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
@@ -32,7 +32,7 @@
  *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.amd64
  *          jdk.vm.ci/jdk.vm.ci.sparc
- * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
+ * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.code.test.SimpleDebugInfoTest
  */
 
@@ -43,7 +43,6 @@ import org.junit.Test;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.hotspot.HotSpotConstant;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -255,7 +254,7 @@ public class SimpleDebugInfoTest extends DebugInfoTest {
 
     @Test
     public void testRegNarrowObject() {
-        Assume.assumeTrue(HotSpotVMConfig.config().useCompressedOops);
+        Assume.assumeTrue(config.useCompressedOops);
         ResolvedJavaType type = metaAccess.lookupJavaType(objectOnStack());
         DebugInfoCompiler compiler = (asm, values) -> {
             HotSpotConstant wide = (HotSpotConstant) constantReflection.asJavaClass(type);
@@ -269,7 +268,7 @@ public class SimpleDebugInfoTest extends DebugInfoTest {
 
     @Test
     public void testStackNarrowObject() {
-        Assume.assumeTrue(HotSpotVMConfig.config().useCompressedOops);
+        Assume.assumeTrue(config.useCompressedOops);
         ResolvedJavaType type = metaAccess.lookupJavaType(objectOnStack());
         DebugInfoCompiler compiler = (asm, values) -> {
             HotSpotConstant wide = (HotSpotConstant) constantReflection.asJavaClass(type);
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
index a1ca6be48d9..1f1601b7ed4 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
@@ -182,6 +182,7 @@ public abstract class TestAssembler {
     private final ArrayList dataPatches;
 
     protected final CodeCacheProvider codeCache;
+    protected final TestHotSpotVMConfig config;
 
     private final Register[] registers;
     private int nextRegister;
@@ -204,7 +205,7 @@ public abstract class TestAssembler {
         }
     }
 
-    protected TestAssembler(CodeCacheProvider codeCache, int initialFrameSize, int stackAlignment, PlatformKind narrowOopKind, Register... registers) {
+    protected TestAssembler(CodeCacheProvider codeCache, TestHotSpotVMConfig config, int initialFrameSize, int stackAlignment, PlatformKind narrowOopKind, Register... registers) {
         this.narrowOopKind = new TestValueKind(narrowOopKind);
 
         this.code = new Buffer();
@@ -213,6 +214,7 @@ public abstract class TestAssembler {
         this.dataPatches = new ArrayList<>();
 
         this.codeCache = codeCache;
+        this.config = config;
 
         this.registers = registers;
         this.nextRegister = 0;
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
new file mode 100644
index 00000000000..6112107127b
--- /dev/null
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.code.test;
+
+import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
+import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
+
+public class TestHotSpotVMConfig extends HotSpotVMConfigAccess {
+
+    public TestHotSpotVMConfig(HotSpotVMConfigStore config) {
+        super(config);
+    }
+
+    public final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
+    public final boolean useCompressedClassPointers = getFlag("UseCompressedClassPointers", Boolean.class);
+
+    public final long narrowOopBase = getFieldValue("CompilerToVM::Data::Universe_narrow_oop_base", Long.class, "address");
+    public final int narrowOopShift = getFieldValue("CompilerToVM::Data::Universe_narrow_oop_shift", Integer.class, "int");
+
+    public final long narrowKlassBase = getFieldValue("CompilerToVM::Data::Universe_narrow_klass_base", Long.class, "address");
+    public final int narrowKlassShift = getFieldValue("CompilerToVM::Data::Universe_narrow_klass_shift", Integer.class, "int");
+
+    public final int classMirrorOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "oop");
+
+    public final int MARKID_DEOPT_HANDLER_ENTRY = getConstant("CodeInstaller::DEOPT_HANDLER_ENTRY", Integer.class);
+    public final long handleDeoptStub = getFieldValue("CompilerToVM::Data::SharedRuntime_deopt_blob_unpack", Long.class, "address");
+}
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java
index 6c2f5d7ae31..c9d0fa5b68d 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java
@@ -32,7 +32,7 @@
  *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.amd64
  *          jdk.vm.ci/jdk.vm.ci.sparc
- * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
+ * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.code.test.VirtualObjectDebugInfoTest
  */
 
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
index 61dcbe36444..0d6765b4bea 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
@@ -32,17 +32,17 @@ import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.site.ConstantReference;
 import jdk.vm.ci.code.site.DataSectionReference;
 import jdk.vm.ci.code.test.TestAssembler;
+import jdk.vm.ci.code.test.TestHotSpotVMConfig;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
 import jdk.vm.ci.hotspot.HotSpotConstant;
 import jdk.vm.ci.hotspot.HotSpotForeignCallTarget;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.VMConstant;
 
 public class AMD64TestAssembler extends TestAssembler {
 
-    public AMD64TestAssembler(CodeCacheProvider codeCache) {
-        super(codeCache, 16, 16, AMD64Kind.DWORD, AMD64.rax, AMD64.rcx, AMD64.rdi, AMD64.r8, AMD64.r9, AMD64.r10);
+    public AMD64TestAssembler(CodeCacheProvider codeCache, TestHotSpotVMConfig config) {
+        super(codeCache, config, 16, 16, AMD64Kind.DWORD, AMD64.rax, AMD64.rcx, AMD64.rdi, AMD64.r8, AMD64.r9, AMD64.r10);
     }
 
     private void emitFatNop() {
@@ -68,7 +68,6 @@ public class AMD64TestAssembler extends TestAssembler {
 
     @Override
     public void emitEpilogue() {
-        HotSpotVMConfig config = HotSpotVMConfig.config();
         recordMark(config.MARKID_DEOPT_HANDLER_ENTRY);
         recordCall(new HotSpotForeignCallTarget(config.handleDeoptStub), 5, true, null);
         code.emitByte(0xE8); // CALL rel32
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
index 5ac0592a74e..3427d91e919 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
@@ -30,12 +30,12 @@ import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.site.ConstantReference;
 import jdk.vm.ci.code.site.DataSectionReference;
 import jdk.vm.ci.code.test.TestAssembler;
+import jdk.vm.ci.code.test.TestHotSpotVMConfig;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
 import jdk.vm.ci.hotspot.HotSpotCompiledCode;
 import jdk.vm.ci.hotspot.HotSpotConstant;
 import jdk.vm.ci.hotspot.HotSpotForeignCallTarget;
 import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
-import jdk.vm.ci.hotspot.HotSpotVMConfig;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.VMConstant;
 import jdk.vm.ci.sparc.SPARC;
@@ -45,8 +45,8 @@ public class SPARCTestAssembler extends TestAssembler {
 
     private static final int MASK13 = (1 << 13) - 1;
 
-    public SPARCTestAssembler(CodeCacheProvider codeCache) {
-        super(codeCache, 0, 16, SPARCKind.WORD, SPARC.l0, SPARC.l1, SPARC.l2, SPARC.l3, SPARC.l4, SPARC.l5, SPARC.l6, SPARC.l7);
+    public SPARCTestAssembler(CodeCacheProvider codeCache, TestHotSpotVMConfig config) {
+        super(codeCache, config, 0, 16, SPARCKind.WORD, SPARC.l0, SPARC.l1, SPARC.l2, SPARC.l3, SPARC.l4, SPARC.l5, SPARC.l6, SPARC.l7);
     }
 
     private void emitOp2(Register rd, int op2, int imm22) {
@@ -74,7 +74,6 @@ public class SPARCTestAssembler extends TestAssembler {
 
     @Override
     public void emitEpilogue() {
-        HotSpotVMConfig config = HotSpotVMConfig.config();
         recordMark(config.MARKID_DEOPT_HANDLER_ENTRY);
         recordCall(new HotSpotForeignCallTarget(config.handleDeoptStub), 4, true, null);
         code.emitInt(1 << 30); // CALL
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java
index e07963f191b..a880dc452bb 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java
@@ -24,15 +24,18 @@
 package jdk.vm.ci.hotspot.test;
 
 import java.lang.reflect.Field;
-import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.runtime.JVMCI;
+
 import org.testng.annotations.DataProvider;
+
+import jdk.internal.misc.Unsafe;
 import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
+import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
 import jdk.vm.ci.meta.Constant;
-import jdk.internal.misc.Unsafe;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.runtime.JVMCI;
 
 public class MemoryAccessProviderData {
     private static final Unsafe UNSAFE = getUnsafe();
@@ -54,7 +57,7 @@ public class MemoryAccessProviderData {
     @DataProvider(name = "positiveObject")
     public static Object[][] getPositiveObjectJavaKind() {
         HotSpotJVMCIRuntimeProvider runtime = (HotSpotJVMCIRuntimeProvider) JVMCI.getRuntime();
-        int offset = runtime.getConfig().classMirrorOffset;
+        int offset = new HotSpotVMConfigAccess(runtime.getConfigStore()).getFieldOffset("Klass::_java_mirror", Integer.class, "oop");
         Constant wrappedKlassPointer = ((HotSpotResolvedObjectType) runtime.fromClass(TestClass.class)).klass();
         return new Object[][]{new Object[]{JavaKind.Object, wrappedKlassPointer, (long) offset, TEST_CLASS_CONSTANT, 0}};
     }

From 0fd874e9c58aa665e58cc532d26f4e9135a1d9df Mon Sep 17 00:00:00 2001
From: Gustavo Romero 
Date: Fri, 17 Jun 2016 11:31:24 +0200
Subject: [PATCH 024/111] 8158260: PPC64: unaligned Unsafe.getInt can lead to
 the generation of illegal instructions

Adjust instruction generation.

Co-authored-by: Hiroshi H Horii 
Reviewed-by: goetz
---
 hotspot/src/cpu/ppc/vm/ppc.ad                 |   4 +-
 .../JdkInternalMiscUnsafeUnalignedAccess.java | 315 ++++++++++++++++++
 2 files changed, 317 insertions(+), 2 deletions(-)
 create mode 100644 hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java

diff --git a/hotspot/src/cpu/ppc/vm/ppc.ad b/hotspot/src/cpu/ppc/vm/ppc.ad
index a62eef493b4..8badeb041a1 100644
--- a/hotspot/src/cpu/ppc/vm/ppc.ad
+++ b/hotspot/src/cpu/ppc/vm/ppc.ad
@@ -5416,7 +5416,7 @@ instruct loadUI2L(iRegLdst dst, memory mem, immL_32bits mask) %{
 %}
 
 // Match loading integer and casting it to long.
-instruct loadI2L(iRegLdst dst, memory mem) %{
+instruct loadI2L(iRegLdst dst, memoryAlg4 mem) %{
   match(Set dst (ConvI2L (LoadI mem)));
   predicate(_kids[0]->_leaf->as_Load()->is_unordered());
   ins_cost(MEMORY_REF_COST);
@@ -5432,7 +5432,7 @@ instruct loadI2L(iRegLdst dst, memory mem) %{
 %}
 
 // Match loading integer and casting it to long - acquire.
-instruct loadI2L_ac(iRegLdst dst, memory mem) %{
+instruct loadI2L_ac(iRegLdst dst, memoryAlg4 mem) %{
   match(Set dst (ConvI2L (LoadI mem)));
   ins_cost(3*MEMORY_REF_COST);
 
diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java
new file mode 100644
index 00000000000..45959f00cfa
--- /dev/null
+++ b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2016 SAP SE. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8158260
+ * @summary Test unaligned Unsafe accesses
+ * @modules java.base/jdk.internal.misc
+ * @run main/othervm -Diters=20000 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation JdkInternalMiscUnsafeUnalignedAccess
+ * @author volker.simonis@gmail.com
+ */
+
+import java.lang.reflect.Field;
+import java.nio.ByteOrder;
+import jdk.internal.misc.Unsafe;
+
+public class JdkInternalMiscUnsafeUnalignedAccess {
+    static final int ITERS = Integer.getInteger("iters", 20_000);
+    private static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
+    private static final Unsafe UNSAFE;
+    private static final int SIZE = 1024;
+    private static long memory;
+
+    static {
+        try {
+            Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
+            unsafeField.setAccessible(true);
+            UNSAFE = (Unsafe) unsafeField.get(null);
+        }
+        catch (Exception e) {
+            throw new RuntimeException("Unable to get Unsafe instance.", e);
+        }
+    }
+
+    static int getInt_0() {
+        return UNSAFE.getInt(memory + 0);
+    }
+    static int getInt_1() {
+        return UNSAFE.getInt(memory + 1);
+    }
+    static int getInt_4() {
+        return UNSAFE.getInt(memory + 4);
+    }
+    static int getInt_17() {
+        return UNSAFE.getInt(memory + 17);
+    }
+
+    static long getIntAsLong_0() {
+        return UNSAFE.getInt(memory + 0);
+    }
+    static long getIntAsLong_1() {
+        return UNSAFE.getInt(memory + 1);
+    }
+    static long getIntAsLong_4() {
+        return UNSAFE.getInt(memory + 4);
+    }
+    static long getIntAsLong_17() {
+        return UNSAFE.getInt(memory + 17);
+    }
+
+    static long getLong_0() {
+        return UNSAFE.getLong(memory + 0);
+    }
+    static long getLong_1() {
+        return UNSAFE.getLong(memory + 1);
+    }
+    static long getLong_4() {
+        return UNSAFE.getLong(memory + 4);
+    }
+    static long getLong_8() {
+        return UNSAFE.getLong(memory + 8);
+    }
+    static long getLong_17() {
+        return UNSAFE.getLong(memory + 17);
+    }
+
+    static void putInt_0(int i) {
+        UNSAFE.putInt(memory + 0, i);
+    }
+    static void putInt_1(int i) {
+        UNSAFE.putInt(memory + 1, i);
+    }
+    static void putInt_4(int i) {
+        UNSAFE.putInt(memory + 4, i);
+    }
+    static void putInt_17(int i) {
+        UNSAFE.putInt(memory + 17, i);
+    }
+
+    static void putLong_0(long l) {
+        UNSAFE.putLong(memory + 0, l);
+    }
+    static void putLong_1(long l) {
+        UNSAFE.putLong(memory + 1, l);
+    }
+    static void putLong_4(long l) {
+        UNSAFE.putLong(memory + 4, l);
+    }
+    static void putLong_8(long l) {
+        UNSAFE.putLong(memory + 8, l);
+    }
+    static void putLong_17(long l) {
+        UNSAFE.putLong(memory + 17, l);
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        if (!UNSAFE.unalignedAccess()) {
+            System.out.println("Platform is not supporting unaligned access - nothing to test.");
+            return;
+        }
+
+        memory = UNSAFE.allocateMemory(SIZE);
+
+        UNSAFE.putInt(memory +  0, 0x00112233);
+        UNSAFE.putInt(memory +  4, 0x44556677);
+        UNSAFE.putInt(memory +  8, 0x8899aabb);
+        UNSAFE.putInt(memory + 12, 0xccddeeff);
+        UNSAFE.putInt(memory + 16, 0x01234567);
+        UNSAFE.putInt(memory + 20, 0x89abcdef);
+        UNSAFE.putInt(memory + 24, 0x01234567);
+
+        // Unsafe.getInt()
+        int res;
+        for (int i = 0; i < ITERS; i++) {
+            res = getInt_0();
+            if (res != 0x00112233) {
+                throw new Exception(res + " != 0x00112233");
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            res = getInt_1();
+            if (res != (BIG_ENDIAN ? 0x11223344 : 0x77001122)) {
+                throw new Exception(res + " != " + (BIG_ENDIAN ? 0x11223344 : 0x77001122));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            res = getInt_4();
+            if (res != 0x44556677) {
+                throw new Exception(res + " != 0x44556677");
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            res = getInt_17();
+            if (res != (BIG_ENDIAN ? 0x23456789 : 0xef012345)) {
+                throw new Exception(res + " != " + (BIG_ENDIAN ? 0x23456789 : 0xef012345));
+            }
+        }
+
+        // (long)Unsafe.getInt()
+        long lres;
+        for (int i = 0; i < ITERS; i++) {
+            lres = getIntAsLong_0();
+            if (lres != (long)0x00112233) {
+                throw new Exception(lres + " != 0x00112233");
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            lres = getIntAsLong_1();
+            if (lres != (BIG_ENDIAN ? (long)0x11223344 : (long)0x77001122)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? (long)0x11223344 : (long)0x77001122));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            lres = getIntAsLong_4();
+            if (lres != (long)0x44556677) {
+                throw new Exception(lres + " != 0x44556677");
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            lres = getIntAsLong_17();
+            if (lres != (BIG_ENDIAN ? (long)0x23456789 : (long)0xef012345)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? (long)0x23456789 : (long)0xef012345));
+            }
+        }
+
+        // Unsafe.getLong()
+        for (int i = 0; i < ITERS; i++) {
+            lres = getLong_0();
+            if (lres != (BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            lres = getLong_1();
+            if (lres != (BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            lres = getLong_4();
+            if (lres != (BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            lres = getLong_8();
+            if (lres != (BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            lres = getLong_17();
+            if (lres != (BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L));
+            }
+        }
+
+        // Unsafe.putInt()
+        for (int i = 0; i < ITERS; i++) {
+            putInt_0(0x00112233);
+            res = getInt_0();
+            if (res != 0x00112233) {
+                throw new Exception(res + " != 0x00112233");
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            putInt_1(BIG_ENDIAN ? 0x11223344 : 0x77001122);
+            res = getInt_1();
+            if (res != (BIG_ENDIAN ? 0x11223344 : 0x77001122)) {
+                throw new Exception(res + " != " + (BIG_ENDIAN ? 0x11223344 : 0x77001122));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            putInt_4(0x44556677);
+            res = getInt_4();
+            if (res != 0x44556677) {
+                throw new Exception(res + " != 0x44556677");
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            putInt_17(BIG_ENDIAN ? 0x23456789 : 0xef012345);
+            res = getInt_17();
+            if (res != (BIG_ENDIAN ? 0x23456789 : 0xef012345)) {
+                throw new Exception(res + " != " + (BIG_ENDIAN ? 0x23456789 : 0xef012345));
+            }
+        }
+
+
+        // Unsafe.putLong()
+        for (int i = 0; i < ITERS; i++) {
+            putLong_0(BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L);
+            lres = getLong_0();
+            if (lres != (BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x0011223344556677L : 0x4455667700112233L));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            putLong_1(BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L);
+            lres = getLong_1();
+            if (lres != (BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x1122334455667788L : 0xbb44556677001122L));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            putLong_4(BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L);
+            lres = getLong_4();
+            if (lres != (BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x445566778899aabbL : 0x8899aabb44556677L));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            putLong_8(BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL);
+            lres = getLong_8();
+            if (lres != (BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x8899aabbccddeeffL : 0xccddeeff8899aabbL));
+            }
+        }
+
+        for (int i = 0; i < ITERS; i++) {
+            putLong_17(BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L);
+            lres = getLong_17();
+            if (lres != (BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L)) {
+                throw new Exception(lres + " != " + (BIG_ENDIAN ? 0x23456789abcdef01L : 0x6789abcdef012345L));
+            }
+        }
+    }
+
+}

From f81f745028dcecc888682c0be8a97a599af3c8ed Mon Sep 17 00:00:00 2001
From: Gilles Duboscq 
Date: Fri, 17 Jun 2016 16:50:49 +0000
Subject: [PATCH 025/111] 8159236: [JVMCI] Window-saved SPARC registers should
 not be considered callee-save

Reviewed-by: iveresov
---
 .../ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
index 4afc3b07bc4..e8ebf5cf0e2 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
@@ -133,10 +133,9 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
     private final Register[] callerSaveRegisters;
 
     /**
-     * Registers saved by the callee. This lists all L and I registers which are saved in the
-     * register window.
+     * This lists all L and I registers which are saved in the register window.
      */
-    private final Register[] calleeSaveRegisters = {
+    private final Register[] windowSaveRegisters = {
                     l0, l1, l2, l3, l4, l5, l6, l7,
                     i0, i1, i2, i3, i4, i5, i6, i7};
     // @formatter:on
@@ -176,7 +175,7 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         this.addNativeRegisterArgumentSlots = false;
         HashSet callerSaveSet = new HashSet<>();
         Collections.addAll(callerSaveSet, target.arch.getAvailableValueRegisters());
-        for (Register cs : calleeSaveRegisters) {
+        for (Register cs : windowSaveRegisters) {
             callerSaveSet.remove(cs);
         }
         this.callerSaveRegisters = callerSaveSet.toArray(new Register[callerSaveSet.size()]);
@@ -188,8 +187,9 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         return callerSaveRegisters;
     }
 
+    @Override
     public Register[] getCalleeSaveRegisters() {
-        return calleeSaveRegisters;
+        return null;
     }
 
     @Override

From fcff9c216b052b1b5226cb65ea015eef09ab36bd Mon Sep 17 00:00:00 2001
From: Tom Rodriguez 
Date: Mon, 13 Jun 2016 17:36:57 -0700
Subject: [PATCH 026/111] 8159010: [JVMCI] crashes with class redefinition

Reviewed-by: kvn
---
 .../jdk/vm/ci/hotspot/HotSpotConstantPool.java |  4 +++-
 .../hotspot/HotSpotJVMCIMetaAccessContext.java | 12 +++++++++++-
 .../hotspot/HotSpotResolvedObjectTypeImpl.java | 18 +++++++++++++++++-
 .../vm/ci/hotspot/MetaspaceWrapperObject.java  | 17 ++++++++++++++++-
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
index 583bc0bd33f..2d9d022e06f 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
@@ -196,7 +196,9 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
      */
     @SuppressWarnings("unused")
     private static HotSpotConstantPool fromMetaspace(long metaspaceConstantPool) {
-        return new HotSpotConstantPool(metaspaceConstantPool);
+        HotSpotConstantPool cp = new HotSpotConstantPool(metaspaceConstantPool);
+        runtime().metaAccessContext.add(cp);
+        return cp;
     }
 
     private HotSpotConstantPool(long metaspaceConstantPool) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java
index c0de936bd4d..529a561eb5e 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIMetaAccessContext.java
@@ -135,6 +135,7 @@ public class HotSpotJVMCIMetaAccessContext {
              */
             metadataRoots = list.getHead();
         }
+        assert isRegistered(metaspaceObject);
     }
 
     protected ResolvedJavaType createClass(Class javaClass) {
@@ -208,7 +209,7 @@ public class HotSpotJVMCIMetaAccessContext {
             ChunkIterator() {
                 currentChunk = head;
                 currentIndex = -1;
-                findNext();
+                next = findNext();
             }
 
             Object[] currentChunk;
@@ -245,4 +246,13 @@ public class HotSpotJVMCIMetaAccessContext {
         }
 
     }
+
+    synchronized boolean isRegistered(MetaspaceWrapperObject wrapper) {
+        for (WeakReference m : list) {
+            if (m != null && m.get() == wrapper) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index f180891829e..fb98a0e6096 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -132,10 +132,20 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         return UNSAFE.getInt(javaClass, config().klassOffset) & 0xFFFFFFFFL;
     }
 
+    @Override
     public long getMetaspacePointer() {
         return getMetaspaceKlass();
     }
 
+    /**
+     * The Klass* for this object is kept alive by the direct reference to {@link #javaClass} so no
+     * extra work is required.
+     */
+    @Override
+    public boolean isRegistered() {
+        return true;
+    }
+
     @Override
     public int getModifiers() {
         if (isArray()) {
@@ -428,7 +438,13 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
     }
 
     public HotSpotConstantPool getConstantPool() {
-        if (constantPool == null) {
+        if (constantPool == null || !isArray() && UNSAFE.getAddress(getMetaspaceKlass() + config().instanceKlassConstantsOffset) != constantPool.getMetaspaceConstantPool()) {
+            /*
+             * If the pointer to the ConstantPool has changed since this was last read refresh the
+             * HotSpotConstantPool wrapper object. This ensures that uses of the constant pool are
+             * operating on the latest one and that HotSpotResolvedJavaMethodImpls will be able to
+             * use the shared copy instead of creating their own instance.
+             */
             constantPool = compilerToVM().getConstantPool(this, config().instanceKlassConstantsOffset);
         }
         return constantPool;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java
index 444b25bed3d..1cb4dad6596 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/MetaspaceWrapperObject.java
@@ -23,7 +23,8 @@
 package jdk.vm.ci.hotspot;
 
 /**
- * A tag interface indicating that this type is a wrapper around a HotSpot metaspace object.
+ * A tag interface indicating that this type is a wrapper around a HotSpot metaspace object that
+ * requires GC interaction to keep alive.
  *
  * It would preferable if this were the base class containing the pointer but that would require
  * mixins since most of the wrapper types have complex supertype hierarchies.
@@ -31,4 +32,18 @@ package jdk.vm.ci.hotspot;
 interface MetaspaceWrapperObject {
 
     long getMetaspacePointer();
+
+    /**
+     * Check if this object is properly registered for metadata tracking. All classes which
+     * implement this interface must be registered with the
+     * {@link HotSpotJVMCIMetaAccessContext#add} unless they are kept alive through other means.
+     * Currently the only type which doesn't require explicit registration is
+     * {@link HotSpotResolvedObjectTypeImpl} since it's kept alive by references to the
+     * {@link Class}.
+     *
+     * @return true if this object is properly registered for meta data tracking.
+     */
+    default boolean isRegistered() {
+        return HotSpotJVMCIRuntime.runtime().metaAccessContext.isRegistered(this);
+    }
 }

From 46225e207d47395307edf565995f480ab4fb1e37 Mon Sep 17 00:00:00 2001
From: Igor Ignatyev 
Date: Wed, 15 Jun 2016 22:58:04 +0300
Subject: [PATCH 027/111] 8158754: compilercontrol tests:
 RandomCommandsTest.java and RandomValidCommandsTest.java - fail in PIT

Reviewed-by: neliasso
---
 hotspot/test/compiler/compilercontrol/share/MultiCommand.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/test/compiler/compilercontrol/share/MultiCommand.java b/hotspot/test/compiler/compilercontrol/share/MultiCommand.java
index c5bfa5347f6..ab51daa1520 100644
--- a/hotspot/test/compiler/compilercontrol/share/MultiCommand.java
+++ b/hotspot/test/compiler/compilercontrol/share/MultiCommand.java
@@ -73,6 +73,7 @@ public class MultiCommand extends AbstractTestBase {
     public void test() {
         Scenario.Builder builder = Scenario.getBuilder();
         builder.addFlag("-Xmixed");
+        builder.addFlag("-XX:+UnlockDiagnosticVMOptions");
         builder.addFlag("-XX:CompilerDirectivesLimit=101");
         for (CompileCommand cc : testCases) {
             cc.print();

From 063397934df5e3b07c79030a0a8d8ba9b1b0f56e Mon Sep 17 00:00:00 2001
From: Igor Ignatyev 
Date: Thu, 16 Jun 2016 01:43:11 +0300
Subject: [PATCH 028/111] 8159149: Several compiler tests fail with minimal VM

Reviewed-by: kvn, psandoz
---
 .../c2/8004867/TestIntUnsafeOrdered.java      | 116 +++++++++---------
 .../compiler/codegen/8011901/Test8011901.java |  10 +-
 .../jcmd/PrintDirectivesTest.java             |   1 +
 .../logcompilation/LogTest.java               |   5 +-
 .../mixed/RandomValidCommandsTest.java        |   2 +-
 .../jsr292/NonInlinedCall/RedefineTest.java   |   1 +
 6 files changed, 69 insertions(+), 66 deletions(-)

diff --git a/hotspot/test/compiler/c2/8004867/TestIntUnsafeOrdered.java b/hotspot/test/compiler/c2/8004867/TestIntUnsafeOrdered.java
index 137080eb289..3fec4bd9a7b 100644
--- a/hotspot/test/compiler/c2/8004867/TestIntUnsafeOrdered.java
+++ b/hotspot/test/compiler/c2/8004867/TestIntUnsafeOrdered.java
@@ -32,8 +32,8 @@
  * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeOrdered
  */
 
-import sun.misc.Unsafe;
-import java.lang.reflect.*;
+import jdk.internal.misc.Unsafe;
+import java.lang.reflect.Field;
 
 public class TestIntUnsafeOrdered {
   private static final int ARRLEN = 97;
@@ -47,10 +47,10 @@ public class TestIntUnsafeOrdered {
   private static final int BASE;
   static {
     try {
-      Class c = TestIntUnsafeOrdered.class.getClassLoader().loadClass("sun.misc.Unsafe");
+      Class c = Unsafe.class;
       Field f = c.getDeclaredField("theUnsafe");
       f.setAccessible(true);
-      unsafe = (Unsafe)f.get(c);
+      unsafe = (Unsafe) f.get(c);
       BASE = unsafe.arrayBaseOffset(int[].class);
     } catch (Exception e) {
       InternalError err = new InternalError();
@@ -771,213 +771,213 @@ public class TestIntUnsafeOrdered {
 
   static void test_ci(int[] a) {
     for (int i = 0; i < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), -123);
+      unsafe.putIntRelease(a, byte_offset(i), -123);
     }
   }
   static void test_vi(int[] a, int b, int old) {
     for (int i = 0; i < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), b);
+      unsafe.putIntRelease(a, byte_offset(i), b);
     }
   }
   static void test_cp(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), b[i]);
+      unsafe.putIntRelease(a, byte_offset(i), b[i]);
     }
   }
   static void test_2ci(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), -123);
-      unsafe.putOrderedInt(b, byte_offset(i), -103);
+      unsafe.putIntRelease(a, byte_offset(i), -123);
+      unsafe.putIntRelease(b, byte_offset(i), -103);
     }
   }
   static void test_2vi(int[] a, int[] b, int c, int d) {
     for (int i = 0; i < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), c);
-      unsafe.putOrderedInt(b, byte_offset(i), d);
+      unsafe.putIntRelease(a, byte_offset(i), c);
+      unsafe.putIntRelease(b, byte_offset(i), d);
     }
   }
   static void test_ci_neg(int[] a, int old) {
     for (int i = ARRLEN-1; i >= 0; i-=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), -123);
+      unsafe.putIntRelease(a, byte_offset(i), -123);
     }
   }
   static void test_vi_neg(int[] a, int b, int old) {
     for (int i = ARRLEN-1; i >= 0; i-=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), b);
+      unsafe.putIntRelease(a, byte_offset(i), b);
     }
   }
   static void test_cp_neg(int[] a, int[] b) {
     for (int i = ARRLEN-1; i >= 0; i-=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), b[i]);
+      unsafe.putIntRelease(a, byte_offset(i), b[i]);
     }
   }
   static void test_2ci_neg(int[] a, int[] b) {
     for (int i = ARRLEN-1; i >= 0; i-=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), -123);
-      unsafe.putOrderedInt(b, byte_offset(i), -103);
+      unsafe.putIntRelease(a, byte_offset(i), -123);
+      unsafe.putIntRelease(b, byte_offset(i), -103);
     }
   }
   static void test_2vi_neg(int[] a, int[] b, int c, int d) {
     for (int i = ARRLEN-1; i >= 0; i-=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), c);
-      unsafe.putOrderedInt(b, byte_offset(i), d);
+      unsafe.putIntRelease(a, byte_offset(i), c);
+      unsafe.putIntRelease(b, byte_offset(i), d);
     }
   }
   static void test_ci_oppos(int[] a, int old) {
     int limit = ARRLEN-1;
     for (int i = 0; i < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(limit-i), -123);
+      unsafe.putIntRelease(a, byte_offset(limit-i), -123);
     }
   }
   static void test_vi_oppos(int[] a, int b, int old) {
     int limit = ARRLEN-1;
     for (int i = limit; i >= 0; i-=1) {
-      unsafe.putOrderedInt(a, byte_offset(limit-i), b);
+      unsafe.putIntRelease(a, byte_offset(limit-i), b);
     }
   }
   static void test_cp_oppos(int[] a, int[] b) {
     int limit = ARRLEN-1;
     for (int i = 0; i < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), b[limit-i]);
+      unsafe.putIntRelease(a, byte_offset(i), b[limit-i]);
     }
   }
   static void test_2ci_oppos(int[] a, int[] b) {
     int limit = ARRLEN-1;
     for (int i = 0; i < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(limit-i), -123);
-      unsafe.putOrderedInt(b, byte_offset(i), -103);
+      unsafe.putIntRelease(a, byte_offset(limit-i), -123);
+      unsafe.putIntRelease(b, byte_offset(i), -103);
     }
   }
   static void test_2vi_oppos(int[] a, int[] b, int c, int d) {
     int limit = ARRLEN-1;
     for (int i = limit; i >= 0; i-=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), c);
-      unsafe.putOrderedInt(b, byte_offset(limit-i), d);
+      unsafe.putIntRelease(a, byte_offset(i), c);
+      unsafe.putIntRelease(b, byte_offset(limit-i), d);
     }
   }
   static void test_ci_off(int[] a, int old) {
     for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+OFFSET), -123);
+      unsafe.putIntRelease(a, byte_offset(i+OFFSET), -123);
     }
   }
   static void test_vi_off(int[] a, int b, int old) {
     for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+OFFSET), b);
+      unsafe.putIntRelease(a, byte_offset(i+OFFSET), b);
     }
   }
   static void test_cp_off(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+OFFSET), b[i+OFFSET]);
+      unsafe.putIntRelease(a, byte_offset(i+OFFSET), b[i+OFFSET]);
     }
   }
   static void test_2ci_off(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+OFFSET), -123);
-      unsafe.putOrderedInt(b, byte_offset(i+OFFSET), -103);
+      unsafe.putIntRelease(a, byte_offset(i+OFFSET), -123);
+      unsafe.putIntRelease(b, byte_offset(i+OFFSET), -103);
     }
   }
   static void test_2vi_off(int[] a, int[] b, int c, int d) {
     for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+OFFSET), c);
-      unsafe.putOrderedInt(b, byte_offset(i+OFFSET), d);
+      unsafe.putIntRelease(a, byte_offset(i+OFFSET), c);
+      unsafe.putIntRelease(b, byte_offset(i+OFFSET), d);
     }
   }
   static void test_ci_inv(int[] a, int k, int old) {
     for (int i = 0; i < ARRLEN-k; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+k), -123);
+      unsafe.putIntRelease(a, byte_offset(i+k), -123);
     }
   }
   static void test_vi_inv(int[] a, int b, int k, int old) {
     for (int i = 0; i < ARRLEN-k; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+k), b);
+      unsafe.putIntRelease(a, byte_offset(i+k), b);
     }
   }
   static void test_cp_inv(int[] a, int[] b, int k) {
     for (int i = 0; i < ARRLEN-k; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+k), b[i+k]);
+      unsafe.putIntRelease(a, byte_offset(i+k), b[i+k]);
     }
   }
   static void test_2ci_inv(int[] a, int[] b, int k) {
     for (int i = 0; i < ARRLEN-k; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+k), -123);
-      unsafe.putOrderedInt(b, byte_offset(i+k), -103);
+      unsafe.putIntRelease(a, byte_offset(i+k), -123);
+      unsafe.putIntRelease(b, byte_offset(i+k), -103);
     }
   }
   static void test_2vi_inv(int[] a, int[] b, int c, int d, int k) {
     for (int i = 0; i < ARRLEN-k; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+k), c);
-      unsafe.putOrderedInt(b, byte_offset(i+k), d);
+      unsafe.putIntRelease(a, byte_offset(i+k), c);
+      unsafe.putIntRelease(b, byte_offset(i+k), d);
     }
   }
   static void test_ci_scl(int[] a, int old) {
     for (int i = 0; i*SCALE < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i*SCALE), -123);
+      unsafe.putIntRelease(a, byte_offset(i*SCALE), -123);
     }
   }
   static void test_vi_scl(int[] a, int b, int old) {
     for (int i = 0; i*SCALE < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i*SCALE), b);
+      unsafe.putIntRelease(a, byte_offset(i*SCALE), b);
     }
   }
   static void test_cp_scl(int[] a, int[] b) {
     for (int i = 0; i*SCALE < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i*SCALE), b[i*SCALE]);
+      unsafe.putIntRelease(a, byte_offset(i*SCALE), b[i*SCALE]);
     }
   }
   static void test_2ci_scl(int[] a, int[] b) {
     for (int i = 0; i*SCALE < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i*SCALE), -123);
-      unsafe.putOrderedInt(b, byte_offset(i*SCALE), -103);
+      unsafe.putIntRelease(a, byte_offset(i*SCALE), -123);
+      unsafe.putIntRelease(b, byte_offset(i*SCALE), -103);
     }
   }
   static void test_2vi_scl(int[] a, int[] b, int c, int d) {
     for (int i = 0; i*SCALE < ARRLEN; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i*SCALE), c);
-      unsafe.putOrderedInt(b, byte_offset(i*SCALE), d);
+      unsafe.putIntRelease(a, byte_offset(i*SCALE), c);
+      unsafe.putIntRelease(b, byte_offset(i*SCALE), d);
     }
   }
   static void test_cp_alndst(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+ALIGN_OFF), b[i]);
+      unsafe.putIntRelease(a, byte_offset(i+ALIGN_OFF), b[i]);
     }
   }
   static void test_cp_alnsrc(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), b[i+ALIGN_OFF]);
+      unsafe.putIntRelease(a, byte_offset(i), b[i+ALIGN_OFF]);
     }
   }
   static void test_2ci_aln(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+ALIGN_OFF), -123);
-      unsafe.putOrderedInt(b, byte_offset(i), -103);
+      unsafe.putIntRelease(a, byte_offset(i+ALIGN_OFF), -123);
+      unsafe.putIntRelease(b, byte_offset(i), -103);
     }
   }
   static void test_2vi_aln(int[] a, int[] b, int c, int d) {
     for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), c);
-      unsafe.putOrderedInt(b, byte_offset(i+ALIGN_OFF), d);
+      unsafe.putIntRelease(a, byte_offset(i), c);
+      unsafe.putIntRelease(b, byte_offset(i+ALIGN_OFF), d);
     }
   }
   static void test_cp_unalndst(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+UNALIGN_OFF), b[i]);
+      unsafe.putIntRelease(a, byte_offset(i+UNALIGN_OFF), b[i]);
     }
   }
   static void test_cp_unalnsrc(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), b[i+UNALIGN_OFF]);
+      unsafe.putIntRelease(a, byte_offset(i), b[i+UNALIGN_OFF]);
     }
   }
   static void test_2ci_unaln(int[] a, int[] b) {
     for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i+UNALIGN_OFF), -123);
-      unsafe.putOrderedInt(b, byte_offset(i), -103);
+      unsafe.putIntRelease(a, byte_offset(i+UNALIGN_OFF), -123);
+      unsafe.putIntRelease(b, byte_offset(i), -103);
     }
   }
   static void test_2vi_unaln(int[] a, int[] b, int c, int d) {
     for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
-      unsafe.putOrderedInt(a, byte_offset(i), c);
-      unsafe.putOrderedInt(b, byte_offset(i+UNALIGN_OFF), d);
+      unsafe.putIntRelease(a, byte_offset(i), c);
+      unsafe.putIntRelease(b, byte_offset(i+UNALIGN_OFF), d);
     }
   }
 
diff --git a/hotspot/test/compiler/codegen/8011901/Test8011901.java b/hotspot/test/compiler/codegen/8011901/Test8011901.java
index 9f071d58563..837a92c0058 100644
--- a/hotspot/test/compiler/codegen/8011901/Test8011901.java
+++ b/hotspot/test/compiler/codegen/8011901/Test8011901.java
@@ -30,21 +30,21 @@
  *
  */
 
-import java.lang.reflect.*;
-import sun.misc.*;
+import java.lang.reflect.Field;
+import jdk.internal.misc.Unsafe;
 
 public class Test8011901 {
 
     private long ctl;
 
-    private static final sun.misc.Unsafe U;
+    private static final Unsafe U;
     private static final long CTL;
 
     static {
         try {
-            Field unsafe = sun.misc.Unsafe.class.getDeclaredField("theUnsafe");
+            Field unsafe = Unsafe.class.getDeclaredField("theUnsafe");
             unsafe.setAccessible(true);
-            U = (sun.misc.Unsafe) unsafe.get(null);
+            U = (Unsafe) unsafe.get(null);
             CTL = U.objectFieldOffset(Test8011901.class.getDeclaredField("ctl"));
         } catch (Exception e) {
             throw new Error(e);
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java b/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java
index 74bc4eef3ae..dfa3b82cd0f 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java
@@ -27,6 +27,7 @@
  * @summary Tests jcmd to be able to add a directive to compile only specified methods
  * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @requires vm.flavor != "minimal"
  * @build compiler.compilercontrol.jcmd.PrintDirectivesTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
diff --git a/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java b/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java
index 001251c4315..48f200cc638 100644
--- a/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java
+++ b/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java
@@ -32,8 +32,7 @@
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *  -XX:+UnlockDiagnosticVMOptions compiler.compilercontrol.logcompilation.LogTest
+ * @run driver compiler.compilercontrol.logcompilation.LogTest
  */
 
 package compiler.compilercontrol.logcompilation;
@@ -45,6 +44,8 @@ public class LogTest {
     public static void main(String[] args) {
         Scenario.Builder builder = Scenario.getBuilder();
         builder.addFlag("-XX:+UnlockDiagnosticVMOptions");
+        builder.addFlag("-Xbootclasspath/a:.");
+        builder.addFlag("-XX:+WhiteBoxAPI");
         builder.addFlag("-XX:+LogCompilation");
         builder.addFlag("-XX:LogFile=" + LogProcessor.LOG_FILE);
         Scenario scenario = builder.build();
diff --git a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java b/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java
index 46c795205a6..0964178f7b2 100644
--- a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java
@@ -32,7 +32,7 @@
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm/timeout=600 compiler.compilercontrol.mixed.RandomValidCommandsTest
+ * @run driver/timeout=600 compiler.compilercontrol.mixed.RandomValidCommandsTest
  */
 
 package compiler.compilercontrol.mixed;
diff --git a/hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java b/hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java
index 1a77363f833..cb77918ff7e 100644
--- a/hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java
@@ -28,6 +28,7 @@
  *          java.base/jdk.internal.misc
  *          java.base/jdk.internal.vm.annotation
  * @library /testlibrary /test/lib / ../patches
+ * @requires vm.flavor != "minimal"
  * @build sun.hotspot.WhiteBox
  * @build java.base/java.lang.invoke.MethodHandleHelper
  * @build compiler.jsr292.NonInlinedCall.RedefineTest

From 6294f0770b0b31eace4b37a825d16f323b1b06b0 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann 
Date: Mon, 20 Jun 2016 09:32:44 +0200
Subject: [PATCH 029/111] 8159715: Fix for 8072422 is incorrect

Fixed several issues introduced by 8072422.

Reviewed-by: zmajo, kvn
---
 hotspot/src/share/vm/opto/loopTransform.cpp | 26 ++++++---------------
 hotspot/src/share/vm/opto/loopnode.cpp      |  4 +---
 hotspot/src/share/vm/opto/loopnode.hpp      |  3 ---
 hotspot/src/share/vm/opto/parse1.cpp        |  2 +-
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/hotspot/src/share/vm/opto/loopTransform.cpp b/hotspot/src/share/vm/opto/loopTransform.cpp
index 27b9ee63933..282c5c11de2 100644
--- a/hotspot/src/share/vm/opto/loopTransform.cpp
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp
@@ -868,7 +868,7 @@ bool IdealLoopTree::policy_range_check( PhaseIdealLoop *phase ) const {
       Node *bol = iff->in(1);
       if (bol->req() != 2) continue; // dead constant test
       if (!bol->is_Bool()) {
-        assert(UseLoopPredicate && bol->Opcode() == Op_Conv2B, "predicate check only");
+        assert(bol->Opcode() == Op_Conv2B, "predicate check only");
         continue;
       }
       if (bol->as_Bool()->_test._test == BoolTest::ne)
@@ -1760,14 +1760,6 @@ void PhaseIdealLoop::mark_reductions(IdealLoopTree *loop) {
   }
 }
 
-//------------------------------dominates_backedge---------------------------------
-// Returns true if ctrl is executed on every complete iteration
-bool IdealLoopTree::dominates_backedge(Node* ctrl) {
-  assert(ctrl->is_CFG(), "must be control");
-  Node* backedge = _head->as_Loop()->in(LoopNode::LoopBackControl);
-  return _phase->dom_lca_internal(ctrl, backedge) == ctrl;
-}
-
 //------------------------------adjust_limit-----------------------------------
 // Helper function for add_constraint().
 Node* PhaseIdealLoop::adjust_limit(int stride_con, Node * scale, Node *offset, Node *rc_limit, Node *loop_limit, Node *pre_ctrl) {
@@ -2187,10 +2179,8 @@ int PhaseIdealLoop::do_range_check( IdealLoopTree *loop, Node_List &old_new ) {
         if( b_test._test == BoolTest::lt ) { // Range checks always use lt
           // The underflow and overflow limits: 0 <= scale*I+offset < limit
           add_constraint( stride_con, scale_con, offset, zero, limit, pre_ctrl, &pre_limit, &main_limit );
-          if (!conditional_rc) {
-            // (0-offset)/scale could be outside of loop iterations range.
-            conditional_rc = !loop->dominates_backedge(iff);
-          }
+          // (0-offset)/scale could be outside of loop iterations range.
+          conditional_rc = true;
         } else {
           if (PrintOpto) {
             tty->print_cr("missed RCE opportunity");
@@ -2221,12 +2211,10 @@ int PhaseIdealLoop::do_range_check( IdealLoopTree *loop, Node_List &old_new ) {
           // Note: (MIN_INT+1 == -MAX_INT) is used instead of MIN_INT here
           // to avoid problem with scale == -1: MIN_INT/(-1) == MIN_INT.
           add_constraint( stride_con, scale_con, offset, mini, limit, pre_ctrl, &pre_limit, &main_limit );
-          if (!conditional_rc) {
-            // ((MIN_INT+1)-offset)/scale could be outside of loop iterations range.
-            // Note: negative offset is replaced with 0 but (MIN_INT+1)/scale could
-            // still be outside of loop range.
-            conditional_rc = !loop->dominates_backedge(iff);
-          }
+          // ((MIN_INT+1)-offset)/scale could be outside of loop iterations range.
+          // Note: negative offset is replaced with 0 but (MIN_INT+1)/scale could
+          // still be outside of loop range.
+          conditional_rc = true;
           break;
         default:
           if (PrintOpto) {
diff --git a/hotspot/src/share/vm/opto/loopnode.cpp b/hotspot/src/share/vm/opto/loopnode.cpp
index 4068e27bf90..7862a71a164 100644
--- a/hotspot/src/share/vm/opto/loopnode.cpp
+++ b/hotspot/src/share/vm/opto/loopnode.cpp
@@ -2225,9 +2225,7 @@ void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts)
   // Some parser-inserted loop predicates could never be used by loop
   // predication or they were moved away from loop during some optimizations.
   // For example, peeling. Eliminate them before next loop optimizations.
-  if (UseLoopPredicate) {
-    eliminate_useless_predicates();
-  }
+  eliminate_useless_predicates();
 
 #ifndef PRODUCT
   C->verify_graph_edges();
diff --git a/hotspot/src/share/vm/opto/loopnode.hpp b/hotspot/src/share/vm/opto/loopnode.hpp
index ba83e503178..1e215096c1e 100644
--- a/hotspot/src/share/vm/opto/loopnode.hpp
+++ b/hotspot/src/share/vm/opto/loopnode.hpp
@@ -468,9 +468,6 @@ public:
   // Check for Node being a loop-breaking test
   Node *is_loop_exit(Node *iff) const;
 
-  // Returns true if ctrl is executed on every complete iteration
-  bool dominates_backedge(Node* ctrl);
-
   // Remove simplistic dead code from loop body
   void DCE_loop_body();
 
diff --git a/hotspot/src/share/vm/opto/parse1.cpp b/hotspot/src/share/vm/opto/parse1.cpp
index b2044d3d5e1..3f0d9f65364 100644
--- a/hotspot/src/share/vm/opto/parse1.cpp
+++ b/hotspot/src/share/vm/opto/parse1.cpp
@@ -662,7 +662,7 @@ void Parse::do_all_blocks() {
         // (Note that dead locals do not get phis built, ever.)
         ensure_phis_everywhere();
 
-        if (block->is_SEL_head() && UseLoopPredicate) {
+        if (block->is_SEL_head()) {
           // Add predicate to single entry (not irreducible) loop head.
           assert(!block->has_merged_backedge(), "only entry paths should be merged for now");
           // Need correct bci for predicate.

From 14621ff60c583dc0abb7eb78be14a7ce41e56a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rickard=20B=C3=A4ckman?= 
Date: Wed, 15 Jun 2016 09:46:15 +0200
Subject: [PATCH 030/111] 8139379: Tests fail with 
 assert(nm->insts_contains(original_pc)) failed: original PC must be in
 nmethod

Reviewed-by: mgronlun, neliasso
---
 hotspot/src/share/vm/code/compiledMethod.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/code/compiledMethod.cpp b/hotspot/src/share/vm/code/compiledMethod.cpp
index 5ca594579ce..5031b364d18 100644
--- a/hotspot/src/share/vm/code/compiledMethod.cpp
+++ b/hotspot/src/share/vm/code/compiledMethod.cpp
@@ -63,7 +63,7 @@ bool CompiledMethod::is_method_handle_return(address return_pc) {
 bool CompiledMethod::is_deopt_entry(address pc) {
   return pc == deopt_handler_begin()
 #if INCLUDE_JVMCI
-    || pc == (deopt_handler_begin() + NativeCall::instruction_size)
+    || (is_compiled_by_jvmci() && pc == (deopt_handler_begin() + NativeCall::instruction_size))
 #endif
     ;
 }

From cc10eca0b07f03d4765713d86eae39959f555c1f Mon Sep 17 00:00:00 2001
From: Carsten Varming 
Date: Mon, 20 Jun 2016 08:11:22 -0400
Subject: [PATCH 031/111] 8159720: Failure of C2 compilation with tiered
 prevents some C1 compilations

If C2 fails to compile a method with tiered compilation, then it should mark the method as not compileable on the C2 tier only.

Reviewed-by: twisti, thartmann
---
 hotspot/src/share/vm/opto/compile.cpp |  2 +-
 hotspot/src/share/vm/opto/compile.hpp | 10 +++-------
 hotspot/src/share/vm/opto/matcher.cpp |  8 ++++----
 hotspot/src/share/vm/opto/parse1.cpp  |  4 ++--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index 0b73fe56736..9946071c5f0 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -778,7 +778,7 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr
     }
     if (failing())  return;
     if (cg == NULL) {
-      record_method_not_compilable_all_tiers("cannot parse method");
+      record_method_not_compilable("cannot parse method");
       return;
     }
     JVMState* jvms = build_start_state(start(), tf());
diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp
index f8743d86ba9..79575dc3e91 100644
--- a/hotspot/src/share/vm/opto/compile.hpp
+++ b/hotspot/src/share/vm/opto/compile.hpp
@@ -823,16 +823,12 @@ class Compile : public Phase {
   }
 
   void record_failure(const char* reason);
-  void record_method_not_compilable(const char* reason, bool all_tiers = false) {
-    // All bailouts cover "all_tiers" when TieredCompilation is off.
-    if (!TieredCompilation) all_tiers = true;
-    env()->record_method_not_compilable(reason, all_tiers);
+  void record_method_not_compilable(const char* reason) {
+    // Bailouts cover "all_tiers" when TieredCompilation is off.
+    env()->record_method_not_compilable(reason, !TieredCompilation);
     // Record failure reason.
     record_failure(reason);
   }
-  void record_method_not_compilable_all_tiers(const char* reason) {
-    record_method_not_compilable(reason, true);
-  }
   bool check_node_count(uint margin, const char* reason) {
     if (live_nodes() + margin > max_node_limit()) {
       record_method_not_compilable(reason);
diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/hotspot/src/share/vm/opto/matcher.cpp
index e2651559e3b..963c56fc833 100644
--- a/hotspot/src/share/vm/opto/matcher.cpp
+++ b/hotspot/src/share/vm/opto/matcher.cpp
@@ -124,7 +124,7 @@ OptoReg::Name Matcher::warp_incoming_stk_arg( VMReg reg ) {
       _in_arg_limit = OptoReg::add(warped, 1); // Bump max stack slot seen
     if (!RegMask::can_represent_arg(warped)) {
       // the compiler cannot represent this method's calling sequence
-      C->record_method_not_compilable_all_tiers("unsupported incoming calling sequence");
+      C->record_method_not_compilable("unsupported incoming calling sequence");
       return OptoReg::Bad;
     }
     return warped;
@@ -1120,7 +1120,7 @@ OptoReg::Name Matcher::warp_outgoing_stk_arg( VMReg reg, OptoReg::Name begin_out
     if( warped >= out_arg_limit_per_call )
       out_arg_limit_per_call = OptoReg::add(warped,1);
     if (!RegMask::can_represent_arg(warped)) {
-      C->record_method_not_compilable_all_tiers("unsupported calling sequence");
+      C->record_method_not_compilable("unsupported calling sequence");
       return OptoReg::Bad;
     }
     return warped;
@@ -1300,7 +1300,7 @@ MachNode *Matcher::match_sfpt( SafePointNode *sfpt ) {
     uint r_cnt = mcall->tf()->range()->cnt();
     MachProjNode *proj = new MachProjNode( mcall, r_cnt+10000, RegMask::Empty, MachProjNode::fat_proj );
     if (!RegMask::can_represent_arg(OptoReg::Name(out_arg_limit_per_call-1))) {
-      C->record_method_not_compilable_all_tiers("unsupported outgoing calling sequence");
+      C->record_method_not_compilable("unsupported outgoing calling sequence");
     } else {
       for (int i = begin_out_arg_area; i < out_arg_limit_per_call; i++)
         proj->_rout.Insert(OptoReg::Name(i));
@@ -1488,7 +1488,7 @@ Node *Matcher::Label_Root( const Node *n, State *svec, Node *control, const Node
   // out of stack space.  See bugs 6272980 & 6227033 for more info.
   LabelRootDepth++;
   if (LabelRootDepth > MaxLabelRootDepth) {
-    C->record_method_not_compilable_all_tiers("Out of stack space, increase MaxLabelRootDepth");
+    C->record_method_not_compilable("Out of stack space, increase MaxLabelRootDepth");
     return NULL;
   }
   uint care = 0;                // Edges matcher cares about
diff --git a/hotspot/src/share/vm/opto/parse1.cpp b/hotspot/src/share/vm/opto/parse1.cpp
index 3f0d9f65364..be1d82d7554 100644
--- a/hotspot/src/share/vm/opto/parse1.cpp
+++ b/hotspot/src/share/vm/opto/parse1.cpp
@@ -425,7 +425,7 @@ Parse::Parse(JVMState* caller, ciMethod* parse_method, float expected_uses)
   _iter.reset_to_method(method());
   _flow = method()->get_flow_analysis();
   if (_flow->failing()) {
-    C->record_method_not_compilable_all_tiers(_flow->failure_reason());
+    C->record_method_not_compilable(_flow->failure_reason());
   }
 
 #ifndef PRODUCT
@@ -1118,7 +1118,7 @@ SafePointNode* Parse::create_entry_map() {
   // Check for really stupid bail-out cases.
   uint len = TypeFunc::Parms + method()->max_locals() + method()->max_stack();
   if (len >= 32760) {
-    C->record_method_not_compilable_all_tiers("too many local variables");
+    C->record_method_not_compilable("too many local variables");
     return NULL;
   }
 

From 152f87ef6c604e5b8b60ccb1209f30070941a2ee Mon Sep 17 00:00:00 2001
From: Paul Sandoz 
Date: Mon, 20 Jun 2016 13:06:33 +0200
Subject: [PATCH 032/111] 8158039: VarHandle float/double field/array access
 should support CAS/set/add atomics

Reviewed-by: shade, vlivanov, darcy
---
 ...JdkInternalMiscUnsafeAccessTestDouble.java | 118 ++++++++++++++++++
 .../JdkInternalMiscUnsafeAccessTestFloat.java | 118 ++++++++++++++++++
 .../unsafe/generate-unsafe-access-tests.sh    |   4 +-
 3 files changed, 238 insertions(+), 2 deletions(-)

diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java
index 5304bc2c900..83874a55504 100644
--- a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java
+++ b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestDouble.java
@@ -173,7 +173,125 @@ public class JdkInternalMiscUnsafeAccessTestDouble {
         }
 
 
+        UNSAFE.putDouble(base, offset, 1.0d);
 
+        // Compare
+        {
+            boolean r = UNSAFE.compareAndSwapDouble(base, offset, 1.0d, 2.0d);
+            assertEquals(r, true, "success compareAndSwap double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 2.0d, "success compareAndSwap double value");
+        }
+
+        {
+            boolean r = UNSAFE.compareAndSwapDouble(base, offset, 1.0d, 3.0d);
+            assertEquals(r, false, "failing compareAndSwap double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 2.0d, "failing compareAndSwap double value");
+        }
+
+        // Advanced compare
+        {
+            double r = UNSAFE.compareAndExchangeDoubleVolatile(base, offset, 2.0d, 1.0d);
+            assertEquals(r, 2.0d, "success compareAndExchangeVolatile double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 1.0d, "success compareAndExchangeVolatile double value");
+        }
+
+        {
+            double r = UNSAFE.compareAndExchangeDoubleVolatile(base, offset, 2.0d, 3.0d);
+            assertEquals(r, 1.0d, "failing compareAndExchangeVolatile double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 1.0d, "failing compareAndExchangeVolatile double value");
+        }
+
+        {
+            double r = UNSAFE.compareAndExchangeDoubleAcquire(base, offset, 1.0d, 2.0d);
+            assertEquals(r, 1.0d, "success compareAndExchangeAcquire double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 2.0d, "success compareAndExchangeAcquire double value");
+        }
+
+        {
+            double r = UNSAFE.compareAndExchangeDoubleAcquire(base, offset, 1.0d, 3.0d);
+            assertEquals(r, 2.0d, "failing compareAndExchangeAcquire double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 2.0d, "failing compareAndExchangeAcquire double value");
+        }
+
+        {
+            double r = UNSAFE.compareAndExchangeDoubleRelease(base, offset, 2.0d, 1.0d);
+            assertEquals(r, 2.0d, "success compareAndExchangeRelease double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 1.0d, "success compareAndExchangeRelease double value");
+        }
+
+        {
+            double r = UNSAFE.compareAndExchangeDoubleRelease(base, offset, 2.0d, 3.0d);
+            assertEquals(r, 1.0d, "failing compareAndExchangeRelease double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 1.0d, "failing compareAndExchangeRelease double value");
+        }
+
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = UNSAFE.weakCompareAndSwapDouble(base, offset, 1.0d, 2.0d);
+            }
+            assertEquals(success, true, "weakCompareAndSwap double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 2.0d, "weakCompareAndSwap double value");
+        }
+
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = UNSAFE.weakCompareAndSwapDoubleAcquire(base, offset, 2.0d, 1.0d);
+            }
+            assertEquals(success, true, "weakCompareAndSwapAcquire double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 1.0d, "weakCompareAndSwapAcquire double");
+        }
+
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = UNSAFE.weakCompareAndSwapDoubleRelease(base, offset, 1.0d, 2.0d);
+            }
+            assertEquals(success, true, "weakCompareAndSwapRelease double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 2.0d, "weakCompareAndSwapRelease double");
+        }
+
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = UNSAFE.weakCompareAndSwapDoubleVolatile(base, offset, 2.0d, 1.0d);
+            }
+            assertEquals(success, true, "weakCompareAndSwapVolatile double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 1.0d, "weakCompareAndSwapVolatile double");
+        }
+
+        UNSAFE.putDouble(base, offset, 2.0d);
+
+        // Compare set and get
+        {
+            double o = UNSAFE.getAndSetDouble(base, offset, 1.0d);
+            assertEquals(o, 2.0d, "getAndSet double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, 1.0d, "getAndSet double value");
+        }
+
+        UNSAFE.putDouble(base, offset, 1.0d);
+
+        // get and add, add and get
+        {
+            double o = UNSAFE.getAndAddDouble(base, offset, 2.0d);
+            assertEquals(o, 1.0d, "getAndAdd double");
+            double x = UNSAFE.getDouble(base, offset);
+            assertEquals(x, (double)(1.0d + 2.0d), "getAndAdd double");
+        }
     }
 
     static void testAccess(long address) {
diff --git a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java
index f7c542ebd6f..f5191f00af3 100644
--- a/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java
+++ b/hotspot/test/compiler/unsafe/JdkInternalMiscUnsafeAccessTestFloat.java
@@ -173,7 +173,125 @@ public class JdkInternalMiscUnsafeAccessTestFloat {
         }
 
 
+        UNSAFE.putFloat(base, offset, 1.0f);
 
+        // Compare
+        {
+            boolean r = UNSAFE.compareAndSwapFloat(base, offset, 1.0f, 2.0f);
+            assertEquals(r, true, "success compareAndSwap float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 2.0f, "success compareAndSwap float value");
+        }
+
+        {
+            boolean r = UNSAFE.compareAndSwapFloat(base, offset, 1.0f, 3.0f);
+            assertEquals(r, false, "failing compareAndSwap float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 2.0f, "failing compareAndSwap float value");
+        }
+
+        // Advanced compare
+        {
+            float r = UNSAFE.compareAndExchangeFloatVolatile(base, offset, 2.0f, 1.0f);
+            assertEquals(r, 2.0f, "success compareAndExchangeVolatile float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 1.0f, "success compareAndExchangeVolatile float value");
+        }
+
+        {
+            float r = UNSAFE.compareAndExchangeFloatVolatile(base, offset, 2.0f, 3.0f);
+            assertEquals(r, 1.0f, "failing compareAndExchangeVolatile float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 1.0f, "failing compareAndExchangeVolatile float value");
+        }
+
+        {
+            float r = UNSAFE.compareAndExchangeFloatAcquire(base, offset, 1.0f, 2.0f);
+            assertEquals(r, 1.0f, "success compareAndExchangeAcquire float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 2.0f, "success compareAndExchangeAcquire float value");
+        }
+
+        {
+            float r = UNSAFE.compareAndExchangeFloatAcquire(base, offset, 1.0f, 3.0f);
+            assertEquals(r, 2.0f, "failing compareAndExchangeAcquire float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 2.0f, "failing compareAndExchangeAcquire float value");
+        }
+
+        {
+            float r = UNSAFE.compareAndExchangeFloatRelease(base, offset, 2.0f, 1.0f);
+            assertEquals(r, 2.0f, "success compareAndExchangeRelease float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 1.0f, "success compareAndExchangeRelease float value");
+        }
+
+        {
+            float r = UNSAFE.compareAndExchangeFloatRelease(base, offset, 2.0f, 3.0f);
+            assertEquals(r, 1.0f, "failing compareAndExchangeRelease float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 1.0f, "failing compareAndExchangeRelease float value");
+        }
+
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = UNSAFE.weakCompareAndSwapFloat(base, offset, 1.0f, 2.0f);
+            }
+            assertEquals(success, true, "weakCompareAndSwap float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 2.0f, "weakCompareAndSwap float value");
+        }
+
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = UNSAFE.weakCompareAndSwapFloatAcquire(base, offset, 2.0f, 1.0f);
+            }
+            assertEquals(success, true, "weakCompareAndSwapAcquire float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 1.0f, "weakCompareAndSwapAcquire float");
+        }
+
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = UNSAFE.weakCompareAndSwapFloatRelease(base, offset, 1.0f, 2.0f);
+            }
+            assertEquals(success, true, "weakCompareAndSwapRelease float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 2.0f, "weakCompareAndSwapRelease float");
+        }
+
+        {
+            boolean success = false;
+            for (int c = 0; c < WEAK_ATTEMPTS && !success; c++) {
+                success = UNSAFE.weakCompareAndSwapFloatVolatile(base, offset, 2.0f, 1.0f);
+            }
+            assertEquals(success, true, "weakCompareAndSwapVolatile float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 1.0f, "weakCompareAndSwapVolatile float");
+        }
+
+        UNSAFE.putFloat(base, offset, 2.0f);
+
+        // Compare set and get
+        {
+            float o = UNSAFE.getAndSetFloat(base, offset, 1.0f);
+            assertEquals(o, 2.0f, "getAndSet float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, 1.0f, "getAndSet float value");
+        }
+
+        UNSAFE.putFloat(base, offset, 1.0f);
+
+        // get and add, add and get
+        {
+            float o = UNSAFE.getAndAddFloat(base, offset, 2.0f);
+            assertEquals(o, 1.0f, "getAndAdd float");
+            float x = UNSAFE.getFloat(base, offset);
+            assertEquals(x, (float)(1.0f + 2.0f), "getAndAdd float");
+        }
     }
 
     static void testAccess(long address) {
diff --git a/hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh b/hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh
index 6c1dcae3cc7..ef75a79b8f3 100644
--- a/hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh
+++ b/hotspot/test/compiler/unsafe/generate-unsafe-access-tests.sh
@@ -55,12 +55,12 @@ function generate {
 
       if [ "$package" == "jdk.internal.misc" ]; then
         case $type in
-          boolean|byte|char|short)
+          boolean|byte|char|short|float|double)
             args="$args -KCAS"
             ;;
         esac
         case $type in
-          byte|char|short)
+          byte|char|short|float|double)
             args="$args -KAtomicAdd"
             ;;
         esac

From 2e16218e6d61fa971f638e111223786c28d7f023 Mon Sep 17 00:00:00 2001
From: George Triantafillou 
Date: Mon, 20 Jun 2016 07:45:03 -0400
Subject: [PATCH 033/111] 8157592: StackTraceLogging fails with stack overflow
 on 32-bit Windows

Reviewed-by: coleenp, dholmes, jiangli
---
 hotspot/test/runtime/Throwable/StackTraceLogging.java | 9 ++-------
 hotspot/test/runtime/Throwable/TestThrowable.java     | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/hotspot/test/runtime/Throwable/StackTraceLogging.java b/hotspot/test/runtime/Throwable/StackTraceLogging.java
index 9074ef4f709..053ab24511b 100644
--- a/hotspot/test/runtime/Throwable/StackTraceLogging.java
+++ b/hotspot/test/runtime/Throwable/StackTraceLogging.java
@@ -39,15 +39,10 @@ import jdk.test.lib.OutputAnalyzer;
 import jdk.test.lib.ProcessTools;
 
 public class StackTraceLogging {
-    static void updateEnvironment(ProcessBuilder pb, String environmentVariable, String value) {
-        Map env = pb.environment();
-        env.put(environmentVariable, value);
-    }
-
     static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        // These depths match the ones in TestThrowable.java
-        int[] depths = {10, 34, 100, 1024};
+        // These depths match the ones in TestThrowable.java, except the one greater than 1024
+        int[] depths = {10, 34, 100, 1023, 1024};
         for (int d : depths) {
             output.shouldContain("java.lang.RuntimeException, " + d);
         }
diff --git a/hotspot/test/runtime/Throwable/TestThrowable.java b/hotspot/test/runtime/Throwable/TestThrowable.java
index 9cdef2d4b89..052ed4604ed 100644
--- a/hotspot/test/runtime/Throwable/TestThrowable.java
+++ b/hotspot/test/runtime/Throwable/TestThrowable.java
@@ -38,7 +38,7 @@ public class TestThrowable {
   // Inner class that throws a lot of exceptions
   static class Thrower {
     static int MaxJavaStackTraceDepth = 1024; // as above
-    int[] depths = {10, 34, 100, 1024, 2042};
+    int[] depths = {10, 34, 100, 1023, 1024, 1025};
     int count = 0;
 
     int getDepth(Throwable t) throws Exception {

From d99735d9ea35c92f95a3f0a666cce041be8d3b5c Mon Sep 17 00:00:00 2001
From: Li Jiang 
Date: Mon, 20 Jun 2016 06:13:28 -0700
Subject: [PATCH 034/111] 8159324: JDK9 message drop 10 resource updates

JDK9 message drop resource updates - openjdk

Reviewed-by: rfield, alanb, joehw
---
 .../apache/xerces/internal/impl/msg/XMLMessages_de.properties | 1 +
 .../apache/xerces/internal/impl/msg/XMLMessages_es.properties | 1 +
 .../apache/xerces/internal/impl/msg/XMLMessages_fr.properties | 1 +
 .../apache/xerces/internal/impl/msg/XMLMessages_it.properties | 1 +
 .../apache/xerces/internal/impl/msg/XMLMessages_ja.properties | 1 +
 .../apache/xerces/internal/impl/msg/XMLMessages_ko.properties | 1 +
 .../xerces/internal/impl/msg/XMLMessages_pt_BR.properties     | 1 +
 .../apache/xerces/internal/impl/msg/XMLMessages_sv.properties | 1 +
 .../xerces/internal/impl/msg/XMLMessages_zh_CN.properties     | 1 +
 .../xerces/internal/impl/msg/XMLMessages_zh_TW.properties     | 3 ++-
 .../xerces/internal/impl/msg/XMLSchemaMessages_de.properties  | 4 ++--
 11 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
index ce72953de8c..695e08c7e7a 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Leerstelle nach "" enden.
+        DoctypedeclNotClosed = Dokumenttypdeklaration f\u00FCr Root-Elementtyp "{0}" muss mit '']'' enden.
         PEReferenceWithinMarkup = Parameterentityreferenz "%{0};" darf nicht in Markup in der internen Teilmenge der DTD vorkommen.
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Die Markup-Deklarationen, die in der Dokumenttypdeklaration enthalten sind bzw. auf die von der Dokumenttypdeklaration verwiesen wird, m\u00FCssen ordnungsgem\u00E4\u00DF formatiert sein.
 # 2.10 White Space Handling
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
index d784122bc1d..fb365c4cb19 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Es necesario un espacio en blanco despu\u00E9s de "''.
+        DoctypedeclNotClosed = La declaraci\u00F3n de tipo de documento para el tipo de elemento ra\u00EDz "{0}" debe finalizar en '']''.
         PEReferenceWithinMarkup = La referencia de entidad del par\u00E1metro "%{0};" no puede producirse en el marcador en el subconjunto interno del DTD.
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Las declaraciones de marcador que se incluyen o a las que apunta la declaraci\u00F3n de tipo de documento deben tener el formato correcto.
 # 2.10 White Space Handling
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
index c409487cd2f..7ad06f06bd7 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Un espace est obligatoire apr\u00E8s "''.
+        DoctypedeclNotClosed = La d\u00E9claration de type de document pour le type d''\u00E9l\u00E9ment racine "{0}" doit se terminer par '']''.
         PEReferenceWithinMarkup = La r\u00E9f\u00E9rence d''entit\u00E9 de param\u00E8tre "%{0};" ne peut pas survenir dans le balisage du sous-ensemble interne de la DTD.
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Les d\u00E9clarations de balisage contenues dans la d\u00E9claration de type de document ou sur lesquelles pointe cette derni\u00E8re doivent avoir un format correct.
 # 2.10 White Space Handling
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
index b2ed881e0a4..c6ba84c06b5 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u00C8 richiesto uno spazio dopo "''.
+        DoctypedeclNotClosed = La dichiarazione del tipo di documento per il tipo di elemento radice "{0}" deve terminare con '']''.
         PEReferenceWithinMarkup = Il riferimento di entit\u00E0 di parametro "%{0};" non pu\u00F2 essere presente nel markup del set secondario interno del DTD.
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Le dichiarazioni di markup contenute o indicate dalla dichiarazione del tipo di documento devono avere un formato corretto.
 # 2.10 White Space Handling
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
index aece337b30e..a6a356a6b5d 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u3067\u306F\u3001"''\u3067\u7D42\u4E86\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+        DoctypedeclNotClosed = \u30EB\u30FC\u30C8\u8981\u7D20\u30BF\u30A4\u30D7"{0}"\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306F'']''\u3067\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
         PEReferenceWithinMarkup = \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u53C2\u7167"%{0};"\u306F\u3001DTD\u306E\u5185\u90E8\u30B5\u30D6\u30BB\u30C3\u30C8\u306E\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5185\u306B\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u306B\u542B\u307E\u308C\u308B\u304B\u3001\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30FB\u30BF\u30A4\u30D7\u5BA3\u8A00\u304C\u6307\u3057\u3066\u3044\u308B\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u5BA3\u8A00\u306F\u6574\u5F62\u5F0F\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 # 2.10 White Space Handling
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
index f992166e355..690ff6804ff 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC5D0\uC11C\uB294 "''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
+        DoctypedeclNotClosed = \uB8E8\uD2B8 \uC694\uC18C \uC720\uD615 "{0}"\uC5D0 \uB300\uD55C \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC740 '']''\uB85C \uB05D\uB098\uC57C \uD569\uB2C8\uB2E4.
         PEReferenceWithinMarkup = \uB9E4\uAC1C\uBCC0\uC218 \uC5D4\uD2F0\uD2F0 \uCC38\uC870 "%{0};"\uC740 DTD\uC758 \uB0B4\uBD80 \uBD80\uBD84 \uC9D1\uD569\uC5D0 \uC788\uB294 \uB9C8\uD06C\uC5C5 \uC548\uC5D0 \uD45C\uC2DC\uB420 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC744 \uD3EC\uD568\uD558\uAC70\uB098 \uBB38\uC11C \uC720\uD615 \uC120\uC5B8\uC774 \uAC00\uB9AC\uD0A4\uB294 \uB9C8\uD06C\uC5C5 \uC120\uC5B8\uC740 \uC62C\uBC14\uB978 \uD615\uC2DD\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4.
 # 2.10 White Space Handling
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
index 473ca3e3583..e9767121a5f 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "''.
+        DoctypedeclNotClosed = A declara\u00E7\u00E3o do tipo de documento do tipo de elemento "{0}" deve terminar com '']''.
         PEReferenceWithinMarkup = A refer\u00EAncia da entidade do par\u00E2metro "%{0};" n\u00E3o pode ocorrer na marca\u00E7\u00E3o no subconjunto interno do DTD.
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = As declara\u00E7\u00F5es de marca\u00E7\u00E3o contidas ou apontadas pela declara\u00E7\u00E3o do tipo de documento devem estar corretas.
 # 2.10 White Space Handling
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
index 48fd780f44d..19cddc6928c 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = Tomt utrymme kr\u00E4vs efter "''.
+        DoctypedeclNotClosed = Dokumenttypsdeklarationen f\u00F6r rotelementtypen "{0}" m\u00E5ste st\u00E4ngas med '']''.
         PEReferenceWithinMarkup = Parameterreferensen "%{0};" f\u00E5r inte f\u00F6rekomma i kodtexten i den interna delm\u00E4ngden i DTD.
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = Kodtextdeklarationerna som finns med eller pekas till fr\u00E5n dokumenttypdeklarationen m\u00E5ste vara v\u00E4lformulerade.
 # 2.10 White Space Handling
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
index 904174dbd30..9b5de28d13c 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u6863\u7C7B\u578B\u58F0\u660E\u4E2D\u7684 "'' \u7ED3\u5C3E\u3002
+        DoctypedeclNotClosed = \u6839\u5143\u7D20\u7C7B\u578B "{0}" \u7684\u6587\u6863\u7C7B\u578B\u58F0\u660E\u5FC5\u987B\u4EE5 '']'' \u7ED3\u5C3E\u3002
         PEReferenceWithinMarkup = \u53C2\u6570\u5B9E\u4F53\u5F15\u7528 "%{0};" \u4E0D\u80FD\u51FA\u73B0\u5728 DTD \u7684\u5185\u90E8\u5B50\u96C6\u4E2D\u7684\u6807\u8BB0\u5185\u3002
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u6863\u7C7B\u578B\u58F0\u660E\u5305\u542B\u6216\u6307\u5411\u7684\u6807\u8BB0\u58F0\u660E\u5FC5\u987B\u683C\u5F0F\u6B63\u786E\u3002
 # 2.10 White Space Handling
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
index 9bdcdd4a069..31eafd355fb 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties
@@ -145,6 +145,7 @@
         MSG_SPACE_REQUIRED_BEFORE_ROOT_ELEMENT_TYPE_IN_DOCTYPEDECL = \u5728\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u4E2D "''\u3002
+        DoctypedeclNotClosed = \u6839\u5143\u7D20\u985E\u578B "{0}" \u7684\u6587\u4EF6\u985E\u578B\u5BA3\u544A\u7D50\u5C3E\u5FC5\u9808\u70BA '']''\u3002
         PEReferenceWithinMarkup = DTD \u5167\u90E8\u5B57\u96C6\u7684\u6A19\u8A18\u5167\u4E0D\u80FD\u51FA\u73FE\u53C3\u6578\u5BE6\u9AD4\u53C3\u7167 "%{0};"\u3002
         MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = \u6587\u4EF6\u985E\u578B\u5BA3\u544A\u5305\u542B\u6216\u6307\u5411\u7684\u6A19\u8A18\u5BA3\u544A\u5FC5\u9808\u683C\u5F0F\u6B63\u78BA\u3002
 # 2.10 White Space Handling
@@ -254,7 +255,7 @@
         RootElementTypeMustMatchDoctypedecl = \u6587\u4EF6\u6839\u5143\u7D20 "{1}" \u5FC5\u9808\u914D\u5C0D DOCTYPE \u6839 "{0}"\u3002
         UndeclaredElementInContentSpec = \u5143\u7D20 "{0}" \u7684\u5167\u5BB9\u6A21\u578B\u53C3\u7167\u672A\u5BA3\u544A\u7684\u5143\u7D20 "{1}"\u3002
         UniqueNotationName = \u8868\u793A\u6CD5 "{0}" \u7684\u5BA3\u544A\u4E26\u975E\u552F\u4E00\u3002\u6307\u5B9A\u7684 Name \u4E0D\u80FD\u5728\u4E00\u500B\u4EE5\u4E0A\u7684\u8868\u793A\u6CD5\u5BA3\u544A\u4E2D\u5BA3\u544A\u3002
-        ENTITYFailedInitializeGrammar =  ENTITYDatatype \u9A57\u8B49\u7A0B\u5F0F: \u5931\u6557\u3002\u9700\u8981\u4F7F\u7528\u6709\u6548\u7684\u6587\u6CD5\u53C3\u7167\u4F86\u547C\u53EB\u8D77\u59CB\u65B9\u6CD5\u3002 \t
+        ENTITYFailedInitializeGrammar =  ENTITYDatatype \u9A57\u8B49\u7A0B\u5F0F: \u5931\u6557\u3002\u9700\u8981\u4F7F\u7528\u6709\u6548\u7684\u6587\u6CD5\u53C3\u7167\u4F86\u547C\u53EB\u8D77\u59CB\u65B9\u6CD5\u3002\t
         ENTITYNotUnparsed = ENTITY "{0}" \u4E26\u975E\u672A\u7D93\u5256\u6790\u3002
         ENTITYNotValid = ENTITY "{0}" \u7121\u6548\u3002
         EmptyList = \u985E\u578B ENTITIES\u3001IDREFS \u8207 NMTOKENS \u7684\u503C\u4E0D\u53EF\u70BA\u7A7A\u767D\u6E05\u55AE\u3002
diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
index e56d93a16a7..dd6e309b21a 100644
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties
@@ -26,7 +26,7 @@
 # This file contains error and warning messages related to XML Schema
 # The messages are arranged in key and value tuples in a ListResourceBundle.
 #
-# @version $Id: XMLSchemaMessages_de.properties /st_wptg_1.9.0.0.0jdk/2 2016/04/13 06:43:54 gmolloy Exp $
+# @version $Id: XMLSchemaMessages_de.properties /st_wptg_1.9.dev.jdk/2 2016/06/08 01:51:09 gmolloy Exp $
 
         BadMessageKey = Die zum Meldungsschl\u00FCssel geh\u00F6rige Fehlermeldung kann nicht gefunden werden.
         FormatFailed = Beim Formatieren der folgenden Meldung ist ein interner Fehler aufgetreten:\n
@@ -309,7 +309,7 @@
         c-fields-xpaths = c-fields-xpaths: Feldwert = ''{0}'' ist ung\u00FCltig.
         c-general-xpath = c-general-xpath: Ausdruck ''{0}'' ist ung\u00FCltig in Bezug auf die vom XML-Schema unterst\u00FCtzte XPath-Teilmenge.
         c-general-xpath-ns = c-general-xpath-ns: Namespace-Pr\u00E4fix in XPath-Ausdruck ''{0}'' war an einen Namespace gebunden.
-        c-selector-xpath = c-selector-xpath: Selector-Wert = ''{0}'' ist ung\u00FCltig. Selektor-XPaths k\u00F6nnen keine Attribute enthalten.
+        c-selector-xpath = c-selector-xpath: Selektor-Wert = ''{0}'' ist ung\u00FCltig. Selektor-XPaths k\u00F6nnen keine Attribute enthalten.
         EmptyTargetNamespace = EmptyTargetNamespace: In Schemadokument ''{0}'' kann der Wert des ''targetNamespace''-Attributs keine leere Zeichenfolge sein.
         FacetValueFromBase = FacetValueFromBase: In der Deklaration von Typ ''{0}'' muss der Wert ''{1}'' von Facet ''{2}'' aus dem Wertebereich des Basistyps ''{3}'' stammen.
         FixedFacetValue = FixedFacetValue: In der Definition von {3} ist der Wert ''{1}'' f\u00FCr Facet ''{0}'' ung\u00FCltig, da der Wert f\u00FCr ''{0}'' in einem der Vorg\u00E4ngertypen auf ''{2}'' gesetzt wurde und ''{''fixed'}''' = true ist.

From 0aeecb0f7d9edb0f4aa3566fe8d9feac13e71dd3 Mon Sep 17 00:00:00 2001
From: Li Jiang 
Date: Mon, 20 Jun 2016 06:13:34 -0700
Subject: [PATCH 035/111] 8159324: JDK9 message drop 10 resource updates

JDK9 message drop resource updates - openjdk

Reviewed-by: rfield, alanb, joehw
---
 .../javac/resources/compiler_ja.properties    |  12 +-
 .../javac/resources/compiler_zh_CN.properties |  12 +-
 .../tools/javac/resources/javac_ja.properties |   9 +-
 .../javac/resources/javac_zh_CN.properties    |   9 +-
 .../tools/javah/resources/l10n_ja.properties  |   5 +
 .../javah/resources/l10n_zh_CN.properties     |   5 +
 .../html/resources/standard_ja.properties     |   2 +-
 .../html/resources/standard_zh_CN.properties  |   2 +-
 .../html/resources/standard_ja.properties     |   4 +-
 .../html/resources/standard_zh_CN.properties  |   4 +-
 .../toolkit/resources/doclets_ja.properties   |   1 +
 .../resources/doclets_zh_CN.properties        |   1 +
 .../tool/resources/javadoc_ja.properties      |  10 +-
 .../tool/resources/javadoc_zh_CN.properties   |   9 +-
 .../tools/jdeps/resources/jdeps_ja.properties |  65 +++++-----
 .../jdeps/resources/jdeps_zh_CN.properties    |  67 +++++-----
 .../jshell/tool/resources/l10n_ja.properties  | 110 +++++++++++------
 .../tool/resources/l10n_zh_CN.properties      | 116 +++++++++++-------
 .../jshell/resources/l10n_zh_CN.properties    |   2 +-
 19 files changed, 278 insertions(+), 167 deletions(-)

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
index 5d9c1c06764..9c83c878410 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
@@ -387,7 +387,8 @@ compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u30AF\u30E9\u30B9{0}\u306E\
 # 0: string
 compiler.err.illegal.char=''{0}''\u306F\u4E0D\u6B63\u306A\u6587\u5B57\u3067\u3059
 
-compiler.err.illegal.char.for.encoding=\u3053\u306E\u6587\u5B57\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{0}\u306B\u30DE\u30C3\u30D7\u3067\u304D\u307E\u305B\u3093
+# 0: string, 1: string
+compiler.err.illegal.char.for.encoding=\u3053\u306E\u6587\u5B57(0x{0})\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{1}\u306B\u30DE\u30C3\u30D7\u3067\u304D\u307E\u305B\u3093
 
 # 0: set of modifier, 1: set of modifier
 compiler.err.illegal.combination.of.modifiers=\u4FEE\u98FE\u5B50{0}\u3068{1}\u306E\u7D44\u5408\u305B\u306F\u4E0D\u6B63\u3067\u3059
@@ -564,6 +565,8 @@ compiler.misc.conditional.target.cant.be.void=\u6761\u4EF6\u5F0F\u306E\u30BF\u30
 # 0: type
 compiler.misc.incompatible.ret.type.in.lambda=\u30E9\u30E0\u30C0\u5F0F\u306E\u623B\u308A\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0}
 
+compiler.misc.stat.expr.expected=\u30E9\u30E0\u30C0\u30FB\u30DC\u30C7\u30A3\u304Cvoid\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3068\u4E92\u63DB\u6027\u304C\u3042\u308A\u307E\u305B\u3093\n(\u30D6\u30ED\u30C3\u30AF\u306E\u30E9\u30E0\u30C0\u30FB\u30DC\u30C7\u30A3\u306E\u4F7F\u7528\u3092\u691C\u8A0E\u3059\u308B\u304B\u3001\u304B\u308F\u308A\u306B\u6587\u306E\u5F0F\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044)
+
 # 0: type
 compiler.misc.incompatible.ret.type.in.mref=\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u623B\u308A\u578B\u304C\u4E0D\u6B63\u3067\u3059\n{0}
 
@@ -1918,12 +1921,17 @@ compiler.err.duplicate.uses=\u4F7F\u7528\u304C\u91CD\u8907\u3057\u3066\u3044\u30
 # 0: symbol
 compiler.err.service.implementation.is.abstract=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u304C\u62BD\u8C61\u30AF\u30E9\u30B9\u3067\u3059: {0}
 
+compiler.err.service.implementation.must.be.subtype.of.service.interface=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u30BF\u30A4\u30D7\u306F\u3001\u30B5\u30FC\u30D3\u30B9\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\u306E\u30B5\u30D6\u30BF\u30A4\u30D7\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+
 # 0: symbol
 compiler.err.service.implementation.is.inner=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u304C\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u3059: {0}
 
 # 0: symbol
 compiler.err.service.definition.is.inner=\u30B5\u30FC\u30D3\u30B9\u5B9A\u7FA9\u304C\u5185\u90E8\u30AF\u30E9\u30B9\u3067\u3059: {0}
 
+# 0: symbol
+compiler.err.service.definition.is.enum=\u30B5\u30FC\u30D3\u30B9\u5B9A\u7FA9\u304C\u5217\u6319\u578B\u3067\u3059: {0}
+
 # 0: symbol
 compiler.err.service.implementation.doesnt.have.a.no.args.constructor=\u30B5\u30FC\u30D3\u30B9\u5B9F\u88C5\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u3042\u308A\u307E\u305B\u3093: {0}
 
@@ -1942,8 +1950,6 @@ compiler.err.module.name.mismatch=\u30E2\u30B8\u30E5\u30FC\u30EB\u540D{0}\u306F\
 
 compiler.err.module.decl.sb.in.module-info.java=\u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306Fmodule-info.java\u3068\u3044\u3046\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306B\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 
-compiler.err.unexpected.after.module=\u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306E\u5F8C\u306B\u4E88\u671F\u3057\u306A\u3044\u5165\u529B\u304C\u3042\u308A\u307E\u3059
-
 compiler.err.module-info.with.xmodule.sourcepath=\u30BD\u30FC\u30B9\u30D1\u30B9\u306E-Xmodule\u3068module-info\u306E\u7D44\u5408\u305B\u304C\u4E0D\u6B63\u3067\u3059
 
 compiler.err.module-info.with.xmodule.classpath=\u30AF\u30E9\u30B9\u30D1\u30B9\u306E-Xmodule\u3068module-info\u306E\u7D44\u5408\u305B\u304C\u4E0D\u6B63\u3067\u3059
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
index 4076c8db133..da30e694dae 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
@@ -387,7 +387,8 @@ compiler.err.icls.cant.have.static.decl=\u5185\u90E8\u7C7B{0}\u4E2D\u7684\u9759\
 # 0: string
 compiler.err.illegal.char=\u975E\u6CD5\u5B57\u7B26: ''{0}''
 
-compiler.err.illegal.char.for.encoding=\u7F16\u7801{0}\u7684\u4E0D\u53EF\u6620\u5C04\u5B57\u7B26
+# 0: string, 1: string
+compiler.err.illegal.char.for.encoding=\u7F16\u7801 {1} \u7684\u4E0D\u53EF\u6620\u5C04\u5B57\u7B26 (0x{0})
 
 # 0: set of modifier, 1: set of modifier
 compiler.err.illegal.combination.of.modifiers=\u975E\u6CD5\u7684\u4FEE\u9970\u7B26\u7EC4\u5408: {0}\u548C{1}
@@ -564,6 +565,8 @@ compiler.misc.conditional.target.cant.be.void=\u6761\u4EF6\u8868\u8FBE\u5F0F\u76
 # 0: type
 compiler.misc.incompatible.ret.type.in.lambda=lambda \u8868\u8FBE\u5F0F\u4E2D\u7684\u8FD4\u56DE\u7C7B\u578B\u9519\u8BEF\n{0}
 
+compiler.misc.stat.expr.expected=lambda \u4E3B\u4F53\u4E0E void \u51FD\u6570\u63A5\u53E3\u4E0D\u517C\u5BB9\n(\u8BF7\u8003\u8651\u4F7F\u7528\u5757 lambda \u4E3B\u4F53, \u6216\u8005\u6539\u4E3A\u4F7F\u7528\u8BED\u53E5\u8868\u8FBE\u5F0F)
+
 # 0: type
 compiler.misc.incompatible.ret.type.in.mref=\u65B9\u6CD5\u5F15\u7528\u4E2D\u7684\u8FD4\u56DE\u7C7B\u578B\u9519\u8BEF\n{0}
 
@@ -1918,12 +1921,17 @@ compiler.err.duplicate.uses=\u91CD\u590D\u7684 uses \u6307\u4EE4: {0}
 # 0: symbol
 compiler.err.service.implementation.is.abstract=\u670D\u52A1\u5B9E\u73B0\u662F\u62BD\u8C61\u7C7B: {0}
 
+compiler.err.service.implementation.must.be.subtype.of.service.interface=\u670D\u52A1\u5B9E\u73B0\u7C7B\u578B\u5FC5\u987B\u662F\u670D\u52A1\u63A5\u53E3\u7C7B\u578B\u7684\u5B50\u7C7B\u578B
+
 # 0: symbol
 compiler.err.service.implementation.is.inner=\u670D\u52A1\u5B9E\u73B0\u662F\u5185\u90E8\u7C7B: {0}
 
 # 0: symbol
 compiler.err.service.definition.is.inner=\u670D\u52A1\u5B9A\u4E49\u662F\u5185\u90E8\u7C7B: {0}
 
+# 0: symbol
+compiler.err.service.definition.is.enum=\u670D\u52A1\u5B9A\u4E49\u662F\u679A\u4E3E: {0}
+
 # 0: symbol
 compiler.err.service.implementation.doesnt.have.a.no.args.constructor=\u670D\u52A1\u5B9E\u73B0\u6CA1\u6709\u9ED8\u8BA4\u7684\u6784\u9020\u5668: {0}
 
@@ -1942,8 +1950,6 @@ compiler.err.module.name.mismatch=\u6A21\u5757\u540D\u79F0 {0} \u4E0E\u9884\u671
 
 compiler.err.module.decl.sb.in.module-info.java=\u6A21\u5757\u58F0\u660E\u5E94\u8BE5\u5728\u540D\u4E3A module-info.java \u7684\u6587\u4EF6\u4E2D
 
-compiler.err.unexpected.after.module=\u5728\u6A21\u5757\u58F0\u660E\u4E4B\u540E\u51FA\u73B0\u610F\u5916\u7684\u8F93\u5165
-
 compiler.err.module-info.with.xmodule.sourcepath=\u6E90\u8DEF\u5F84\u4E0A\u7684 -Xmodule \u4E0E module-info \u7684\u7EC4\u5408\u975E\u6CD5
 
 compiler.err.module-info.with.xmodule.classpath=\u7C7B\u8DEF\u5F84\u4E0A\u7684 -Xmodule \u4E0E module-info \u7684\u7EC4\u5408\u975E\u6CD5
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
index ce032ce586e..9ed3167ccf9 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
@@ -39,9 +39,6 @@ javac.opt.modulesourcepath=\u8907\u6570\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u516
 javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
 javac.opt.system=\u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
 javac.opt.upgrademodulepath=\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B
-javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
-javac.opt.Xpatch=\u30D1\u30C3\u30C1\u3092\u9069\u7528\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
 javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
 javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u4F4D\u7F6E\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
 javac.opt.processorpath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
@@ -62,6 +59,7 @@ javac.opt.Werror=\u8B66\u544A\u304C\u767A\u751F\u3057\u305F\u5834\u5408\u306B\u3
 javac.opt.A=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306B\u6E21\u3055\u308C\u308B\u30AA\u30D7\u30B7\u30E7\u30F3
 javac.opt.implicit=\u6697\u9ED9\u7684\u306B\u53C2\u7167\u3055\u308C\u308B\u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u6307\u5B9A\u3059\u308B
 javac.opt.pkginfo=package-info\u30D5\u30A1\u30A4\u30EB\u306E\u51E6\u7406\u3092\u6307\u5B9A\u3059\u308B
+javac.opt.multi-release=\u30DE\u30EB\u30C1\u30EA\u30EA\u30FC\u30B9jar\u306E\u4F7F\u7528\u3059\u308B\u30EA\u30EA\u30FC\u30B9\u3092\u6307\u5B9A\u3059\u308B
 javac.opt.arg.class=
 javac.opt.arg.class.list=[,,...]
 javac.opt.arg.flag=
@@ -79,6 +77,7 @@ javac.opt.arg.release=
 javac.opt.arg.number=
 javac.opt.plugin=\u5B9F\u884C\u3055\u308C\u308B\u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u540D\u524D\u3068\u30AA\u30D7\u30B7\u30E7\u30F3\u5F15\u6570
 javac.opt.arg.plugin="name args"
+javac.opt.arg.multi-release=
 
 ## extended options
 
@@ -92,6 +91,8 @@ javac.opt.s=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u304B\u308F\u
 javac.opt.version=\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
 javac.opt.arg.pathname=
 javac.opt.arg.file=
+javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B
+javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
 javac.opt.Xlint=\u63A8\u5968\u306E\u8B66\u544A\u3092\u6709\u52B9\u306B\u3059\u308B
 javac.opt.Xlint.all=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u6709\u52B9\u306B\u3057\u307E\u3059
 javac.opt.Xlint.none=\u3059\u3079\u3066\u306E\u8B66\u544A\u3092\u7121\u52B9\u306B\u3057\u307E\u3059
@@ -164,6 +165,8 @@ javac.opt.addExports=\n        \u304CALL-UNNAMED\u3067\u3042\u308B
 javac.opt.arg.addExports=/=(,)*
 javac.opt.addReads=\n        \u6307\u5B9A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u5FC5\u9808\u3068\u307F\u306A\u3055\u308C\u308B\u3088\u3046\u306B\u8FFD\u52A0\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n        \u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5FC5\u8981\u3068\u3059\u308B\u5834\u5408\u3001\u306FALL-UNNAMED\u306B\u3057\u307E\u3059\u3002
 javac.opt.arg.addReads==(,)*
+javac.opt.patch=\n        JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n        \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059
+javac.opt.arg.patch==(:)*
 javac.opt.module=\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u308B\u30AF\u30E9\u30B9\u304C\u5C5E\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
 javac.opt.arg.module=
 javac.opt.addmods=\n        \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F\u304C\n        ALL-MODULE-PATH\u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3002
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
index 5b9083b3589..3e7641e1468 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
@@ -39,9 +39,6 @@ javac.opt.modulesourcepath=\u6307\u5B9A\u67E5\u627E\u591A\u4E2A\u6A21\u5757\u768
 javac.opt.bootclasspath=\u8986\u76D6\u5F15\u5BFC\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
 javac.opt.system=\u8986\u76D6\u7CFB\u7EDF\u6A21\u5757\u4F4D\u7F6E
 javac.opt.upgrademodulepath=\u8986\u76D6\u53EF\u5347\u7EA7\u6A21\u5757\u4F4D\u7F6E
-javac.opt.Xbootclasspath.p=\u7F6E\u4E8E\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u524D
-javac.opt.Xbootclasspath.a=\u7F6E\u4E8E\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u540E
-javac.opt.Xpatch=\u6307\u5B9A\u8981\u6253\u8865\u4E01\u7684\u6A21\u5757\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
 javac.opt.endorseddirs=\u8986\u76D6\u7B7E\u540D\u7684\u6807\u51C6\u8DEF\u5F84\u7684\u4F4D\u7F6E
 javac.opt.extdirs=\u8986\u76D6\u6240\u5B89\u88C5\u6269\u5C55\u7684\u4F4D\u7F6E
 javac.opt.processorpath=\u6307\u5B9A\u67E5\u627E\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u7684\u4F4D\u7F6E
@@ -62,6 +59,7 @@ javac.opt.Werror=\u51FA\u73B0\u8B66\u544A\u65F6\u7EC8\u6B62\u7F16\u8BD1
 javac.opt.A=\u4F20\u9012\u7ED9\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u7684\u9009\u9879
 javac.opt.implicit=\u6307\u5B9A\u662F\u5426\u4E3A\u9690\u5F0F\u5F15\u7528\u6587\u4EF6\u751F\u6210\u7C7B\u6587\u4EF6
 javac.opt.pkginfo=\u6307\u5B9A package-info \u6587\u4EF6\u7684\u5904\u7406
+javac.opt.multi-release=\u6307\u5B9A\u5728\u591A\u53D1\u884C\u7248 jar \u4E2D\u4F7F\u7528\u54EA\u4E2A\u53D1\u884C\u7248
 javac.opt.arg.class=
 javac.opt.arg.class.list=[,,...]
 javac.opt.arg.flag=
@@ -79,6 +77,7 @@ javac.opt.arg.release=
 javac.opt.arg.number=
 javac.opt.plugin=\u8981\u8FD0\u884C\u7684\u63D2\u4EF6\u7684\u540D\u79F0\u548C\u53EF\u9009\u53C2\u6570
 javac.opt.arg.plugin="\u540D\u79F0\u53C2\u6570"
+javac.opt.arg.multi-release=
 
 ## extended options
 
@@ -92,6 +91,8 @@ javac.opt.s=\u53D1\u51FA java \u6E90\u800C\u4E0D\u662F\u7C7B\u6587\u4EF6
 javac.opt.version=\u7248\u672C\u4FE1\u606F
 javac.opt.arg.pathname=
 javac.opt.arg.file=
+javac.opt.Xbootclasspath.p=\u7F6E\u4E8E\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u524D
+javac.opt.Xbootclasspath.a=\u7F6E\u4E8E\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u540E
 javac.opt.Xlint=\u542F\u7528\u5EFA\u8BAE\u7684\u8B66\u544A
 javac.opt.Xlint.all=\u542F\u7528\u6240\u6709\u8B66\u544A
 javac.opt.Xlint.none=\u7981\u7528\u6240\u6709\u8B66\u544A
@@ -164,6 +165,8 @@ javac.opt.addExports=\n        \u6307\u5B9A\u88AB\u89C6\u4E3A\u5DF2\u4ECE\u5176\
 javac.opt.arg.addExports=/=(,)*
 javac.opt.addReads=\n        \u6307\u5B9A\u88AB\u89C6\u4E3A\u7ED9\u5B9A\u6A21\u5757\u9700\u8981\u7684\u5176\u4ED6\u6A21\u5757\u3002\n         \u53EF\u80FD\u9700\u8981\u4E3A ALL-UNNAMED, \u4EE5\u4FBF\u8981\u6C42\u672A\u547D\u540D\u6A21\u5757\u3002
 javac.opt.arg.addReads==(,)*
+javac.opt.patch=\n        \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\u8986\u76D6\n        \u6216\u589E\u5F3A\u6A21\u5757
+javac.opt.arg.patch=<\u6A21\u5757>=<\u6587\u4EF6>(:<\u6587\u4EF6>)*
 javac.opt.module=\u6307\u5B9A\u6B63\u5728\u7F16\u8BD1\u7684\u7C7B\u6240\u5C5E\u7684\u6A21\u5757\u3002
 javac.opt.arg.module=
 javac.opt.addmods=\n        \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757; \u5982\u679C \n        \u4E3A ALL-MODULE-PATH, \u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\u3002
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
index 4dda18d443d..cf6737422ac 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
@@ -95,3 +95,8 @@ err.ioerror=\u5165\u51FA\u529B\u30A8\u30E9\u30FC: {0}
 err.missing.arg={0}\u306E\u5024\u304C\u3042\u308A\u307E\u305B\u3093
 err.no.classes.specified=\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
+
+#
+# miscellaneous strings
+#
+javah.misc.Deprecation=\n\u8B66\u544A: javah\u30C4\u30FC\u30EB\u306F\u6B21\u56DE\u306EJDK\u30E1\u30B8\u30E3\u30FC\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059\u3002\n\u3053\u306E\u30C4\u30FC\u30EB\u306FJDK 8\u3067javac\u306B\u8FFD\u52A0\u3055\u308C\u305F''-h''\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3088\u3063\u3066\u7F6E\u304D\u63DB\u3048\u3089\u308C\u307E\u3057\u305F\u3002\n\u30E6\u30FC\u30B6\u30FC\u306Fjavac ''-h''\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528\u306B\u79FB\u884C\u3059\u308B\u3053\u3068\u3092\u304A\u85A6\u3081\u3057\u307E\u3059\u3002\n\u8A73\u7D30\u306F\u3001javac man\u30DA\u30FC\u30B8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
index 7b12f266807..06784821891 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties
@@ -95,3 +95,8 @@ err.ioerror=IO \u9519\u8BEF: {0}
 err.missing.arg={0}\u7F3A\u5C11\u503C
 err.no.classes.specified=\u672A\u6307\u5B9A\u7C7B
 err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
+
+#
+# miscellaneous strings
+#
+javah.misc.Deprecation=\n\u8B66\u544A: \u5DF2\u8BA1\u5212\u5728\u4E0B\u4E00\u4E2A JDK \u4E3B\u53D1\u884C\u7248\u4E2D\u5220\u9664 javah\n\u5DE5\u5177\u3002\u8BE5\u5DE5\u5177\u5728 JDK 8 \u4E2D\u5DF2\u7531\u6DFB\u52A0\u5230 javac \u7684\n''-h'' \u9009\u9879\u53D6\u4EE3\u3002\u5EFA\u8BAE\u7528\u6237\u6539\u4E3A\u4F7F\u7528 javac ''-h''\n\u9009\u9879; \u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u67E5\u770B javac \u5E2E\u52A9\u9875\u3002\n
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
index 5897ca6ae35..6d690122fdf 100644
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
@@ -1,4 +1,4 @@
-doclet.build_version=\u6A19\u6E96Doclet\u30D0\u30FC\u30B8\u30E7\u30F3{0}
+doclet.build_version=\u6A19\u6E96Doclet (\u65E7)\u30D0\u30FC\u30B8\u30E7\u30F3{0}
 doclet.Contents=\u30B3\u30F3\u30C6\u30F3\u30C4
 doclet.Overview=\u6982\u8981
 doclet.Window_Overview=\u6982\u8981\u30EA\u30B9\u30C8
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
index fe858082ec3..c7ff3f3a203 100644
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
@@ -1,4 +1,4 @@
-doclet.build_version=\u6807\u51C6 Doclet \u7248\u672C {0}
+doclet.build_version=\u6807\u51C6 Doclet (\u65E7) \u7248\u672C {0}
 doclet.Contents=\u76EE\u5F55
 doclet.Overview=\u6982\u89C8
 doclet.Window_Overview=\u6982\u89C8\u5217\u8868
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
index 1149d439e7f..85883d09d8f 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties
@@ -1,4 +1,4 @@
-doclet.build_version=\u6A19\u6E96Doclet (\u6B21\u56DE)\u30D0\u30FC\u30B8\u30E7\u30F3{0}
+doclet.build_version=\u6A19\u6E96Doclet\u30D0\u30FC\u30B8\u30E7\u30F3{0}
 doclet.Contents=\u30B3\u30F3\u30C6\u30F3\u30C4
 doclet.Overview=\u6982\u8981
 doclet.Window_Overview=\u6982\u8981\u30EA\u30B9\u30C8
@@ -337,4 +337,4 @@ doclet.xusage.xdoclint-extended.description=javadoc\u30B3\u30E1\u30F3\u30C8\u518
 
 doclet.xusage.xdoclint-package.name=Xdoclint/package:
 doclet.xusage.xdoclint-package.parameters=([-])
-doclet.xusage.xdoclint-package.description=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\u306F\n        \u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306F\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n        \u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3001\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306E\u63A5\u982D\u8F9E\u306E\u5F8C\u306B.*'\u6307\u5B9A(\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n        \u3059\u3079\u3066\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u62E1\u5F35)\u3057\u305F\u3082\u306E\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u524D\u306B-\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\n        \u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u95A2\u3059\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u7121\u52B9\u306B\u3067\u304D\u307E\u3059\u3002\n
+doclet.xusage.xdoclint-package.description=\n        \u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\u306F\n        \u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306F\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n        \u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3001\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306E\u63A5\u982D\u8F9E\u306E\u5F8C\u306B.*'\u6307\u5B9A(\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n        \u3059\u3079\u3066\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u62E1\u5F35)\u3057\u305F\u3082\u306E\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u524D\u306B-\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\n        \u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u95A2\u3059\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u7121\u52B9\u306B\u3067\u304D\u307E\u3059\u3002\n
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
index d73285642c9..bfd92ba2a7a 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_zh_CN.properties
@@ -1,4 +1,4 @@
-doclet.build_version=\u6807\u51C6 Doclet (\u4E0B\u4E00\u4E2A) \u7248\u672C {0}
+doclet.build_version=\u6807\u51C6 Doclet \u7248\u672C {0}
 doclet.Contents=\u76EE\u5F55
 doclet.Overview=\u6982\u89C8
 doclet.Window_Overview=\u6982\u89C8\u5217\u8868
@@ -337,4 +337,4 @@ doclet.xusage.xdoclint-extended.description=\u4E3A javadoc \u6CE8\u91CA\u4E2D\u7
 
 doclet.xusage.xdoclint-package.name=Xdoclint/package:
 doclet.xusage.xdoclint-package.parameters=([-])
-doclet.xusage.xdoclint-package.description=\u5728\u7279\u5B9A\u7684\u7A0B\u5E8F\u5305\u4E2D\u542F\u7528\u6216\u7981\u7528\u68C0\u67E5\u3002 \u662F\u9017\u53F7\u5206\u9694\u7684\n        \u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u5217\u8868\u3002\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u662F\u7A0B\u5E8F\u5305\u7684\u9650\u5B9A\u540D\u79F0\n        \u6216\u7A0B\u5E8F\u5305\u540D\u79F0\u524D\u7F00\u540E\u8DDF .*, \u5B83\u6269\u5C55\u5230\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u7684\n        \u6240\u6709\u5B50\u7A0B\u5E8F\u5305\u3002\u5728\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u524D\u9762\u52A0\u4E0A - \u53EF\u4EE5\u4E3A\n        \u6307\u5B9A\u7A0B\u5E8F\u5305\u7981\u7528\u68C0\u67E5\u3002\n
+doclet.xusage.xdoclint-package.description=\n        \u5728\u7279\u5B9A\u7684\u7A0B\u5E8F\u5305\u4E2D\u542F\u7528\u6216\u7981\u7528\u68C0\u67E5\u3002<\u7A0B\u5E8F\u5305> \u662F\u9017\u53F7\u5206\u9694\u7684\n        \u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u5217\u8868\u3002\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u662F\u7A0B\u5E8F\u5305\u7684\u9650\u5B9A\u540D\u79F0\n        \u6216\u7A0B\u5E8F\u5305\u540D\u79F0\u524D\u7F00\u540E\u8DDF .*, \u5B83\u6269\u5C55\u5230\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u7684\n        \u6240\u6709\u5B50\u7A0B\u5E8F\u5305\u3002\u5728\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u524D\u9762\u52A0\u4E0A - \u53EF\u4EE5\u4E3A\n        \u6307\u5B9A\u7A0B\u5E8F\u5305\u7981\u7528\u68C0\u67E5\u3002\n
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
index 752e2cd7b63..fa2390b3b8c 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
@@ -131,6 +131,7 @@ doclet.Property_Detail=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8A73\u7D30
 doclet.Method_Detail=\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
 doclet.Constructor_Detail=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u8A73\u7D30
 doclet.Deprecated=\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+doclet.Hidden=\u975E\u8868\u793A
 doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u304A\u3044\u3066\u3001\u3059\u3067\u306B\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
 doclet.value_tag_invalid_reference={0}(@value\u30BF\u30B0\u306B\u3088\u308A\u53C2\u7167\u3055\u308C\u3066\u3044\u308B)\u306F\u4E0D\u660E\u306A\u53C2\u7167\u3067\u3059\u3002
 doclet.value_tag_invalid_constant=@value\u30BF\u30B0({0}\u3092\u53C2\u7167\u3057\u3066\u3044\u308B)\u306F\u5B9A\u6570\u5185\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
index 33930f0863c..2a508378e9b 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
@@ -131,6 +131,7 @@ doclet.Property_Detail=\u5C5E\u6027\u8BE6\u7EC6\u4FE1\u606F
 doclet.Method_Detail=\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599
 doclet.Constructor_Detail=\u6784\u9020\u5668\u8BE6\u7EC6\u8D44\u6599
 doclet.Deprecated=\u5DF2\u8FC7\u65F6\u3002
+doclet.Hidden=\u9690\u85CF
 doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0}
 doclet.value_tag_invalid_reference={0} (\u7531 @value \u6807\u8BB0\u5F15\u7528) \u4E3A\u672A\u77E5\u5F15\u7528\u3002
 doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u80FD\u5728\u5E38\u91CF\u4E2D\u4F7F\u7528\u3002
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
index fadd9797c24..30381c81a28 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_ja.properties
@@ -28,15 +28,15 @@ main.error=\u30A8\u30E9\u30FC{0}\u500B
 main.warnings=\u8B66\u544A{0}\u500B
 main.warning=\u8B66\u544A{0}\u500B
 
-main.usage=\u4F7F\u7528\u65B9\u6CD5: javadoc [options] [packagenames] [sourcefiles] [@files]\n  -overview           HTML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u6982\u8981\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u8AAD\u307F\u8FBC\u3080\n  -public                   public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u793A\u3059\n  -protected                protected/public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n  -package                  package/protected/public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059\n  -private                  \u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059\n  -help                     \u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3059\u308B\n  -doclet            \u4EE3\u66FFdoclet\u3092\u4ECB\u3057\u3066\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n  -docletpath         doclet\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u63A2\u3059\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -sourcepath     \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -classpath      \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -cp                    \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\r\n  -exclude         \u9664\u5916\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u6307\u5B9A\u3059\u308B\n  -subpackages  \u518D\u5E30\u7684\u306B\u30ED\u30FC\u30C9\u3059\u308B\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3059\u308B\n  -breakiterator            BreakIterator\u3067\u6700\u521D\u306E\u6587\u3092\u8A08\u7B97\u3059\u308B\n  -bootclasspath  \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u306B\u3088\u308A\u30ED\u30FC\u30C9\u3055\u308C\u305F\n                                   \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n  -source          \u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u3068\u30BD\u30FC\u30B9\u306E\u4E92\u63DB\u6027\u3092\u63D0\u4F9B\u3059\u308B\n  -extdirs         \u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n  -verbose                  Javadoc\u306E\u52D5\u4F5C\u306B\u3064\u3044\u3066\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n  -locale             en_US\u3084en_US_WIN\u306A\u3069\u306E\u4F7F\u7528\u3059\u308B\u30ED\u30B1\u30FC\u30EB\n  -encoding           \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D\n  -quiet                    \u72B6\u614B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u306A\u3044\n  -J                  \u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3059\n  -X                        \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3059\u308B\n
+main.usage=\u4F7F\u7528\u65B9\u6CD5: javadoc [options] [packagenames] [sourcefiles] [@files]\n  -overview           HTML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u6982\u8981\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u8AAD\u307F\u8FBC\u3080\n  -public                   public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u306E\u307F\u3092\u793A\u3059\n  -protected                protected/public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n  -package                  package/protected/public\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059\n  -private                  \u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u30E1\u30F3\u30D0\u30FC\u3092\u793A\u3059\n  -help                     \u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3059\u308B\n  -doclet            \u4EE3\u66FFdoclet\u3092\u4ECB\u3057\u3066\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n  -docletpath         doclet\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -modulesourcepath          \u8907\u6570\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -upgrademodulepath         \u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n  -modulepath                \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -mp                        \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -addmods (,)*    \u521D\u671F\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u52A0\u3048\u3066\u89E3\u6C7A\u3059\u308B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F\n                                   \u304CALL-MODULE-PATH\u3067\u3042\u308B\u5834\u5408\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u306E\u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n  -limitmods (,)*  \u76E3\u8996\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30E6\u30CB\u30D0\u30FC\u30B9\u3092\u5236\u9650\u3059\u308B\n  -sourcepath     \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -classpath      \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -cp                    \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n  -exclude         \u9664\u5916\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u6307\u5B9A\u3059\u308B\n  -subpackages  \u518D\u5E30\u7684\u306B\u30ED\u30FC\u30C9\u3059\u308B\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3059\u308B\n  -breakiterator            BreakIterator\u3067\u6700\u521D\u306E\u6587\u3092\u8A08\u7B97\u3059\u308B\n  -bootclasspath  \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30ED\u30FC\u30C0\u30FC\u306B\u3088\u308A\u30ED\u30FC\u30C9\u3055\u308C\u305F\n                                   \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n  -source          \u6307\u5B9A\u3055\u308C\u305F\u30EA\u30EA\u30FC\u30B9\u3068\u30BD\u30FC\u30B9\u306E\u4E92\u63DB\u6027\u3092\u63D0\u4F9B\u3059\u308B\n  -extdirs         \
+\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n  -verbose                  Javadoc\u306E\u52D5\u4F5C\u306B\u3064\u3044\u3066\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n  -locale             en_US\u3084en_US_WIN\u306A\u3069\u306E\u4F7F\u7528\u3059\u308B\u30ED\u30B1\u30FC\u30EB\n  -encoding           \u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u540D\n  -quiet                    \u72B6\u614B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u306A\u3044\n  -J                  \u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3059\n  -X                        \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u7D42\u4E86\u3059\u308B\n
 
-main.Xusage=\  -Xmaxerrs         \u51FA\u529B\u3059\u308B\u30A8\u30E9\u30FC\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B\n  -Xmaxwarns        \u51FA\u529B\u3059\u308B\u8B66\u544A\u306E\u6700\u5927\u6570\u3092\u8A2D\u5B9A\u3059\u308B\n
+main.Xusage=\  -Xmaxerrs                \u51FA\u529B\u3059\u308B\u6700\u5927\u30A8\u30E9\u30FC\u6570\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n  -Xmaxwarns               \u51FA\u529B\u3059\u308B\u6700\u5927\u8B66\u544A\u6570\u3092\u8A2D\u5B9A\u3057\u307E\u3059\n  -XaddExports:/=(,)*\n                                   \u305D\u306E\u5B9A\u7FA9\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\u3001\u8FFD\u52A0\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u307E\u305F\u306F\u304C\n                                   ALL-UNNAMED\u3067\u3042\u308B\u5834\u5408\u306F\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n                                   \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u6E08\u3068\u307F\u306A\u3055\u308C\u308B\u3088\u3046\u306B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n  -XaddReads:=(,)*\n                                   \u6307\u5B9A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u5FC5\u9808\u3068\u307F\u306A\u3055\u308C\u308B\u3088\u3046\u306B\u8FFD\u52A0\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n                                   \u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5FC5\u8981\u3068\u3059\u308B\u5834\u5408\u3001\u306FALL-UNNAMED\n                                   \u306B\u3057\u307E\u3059\u3002\n  -Xmodule:           \u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u308B\u30AF\u30E9\u30B9\u304C\u5C5E\u3059\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n  -Xpatch:=(:)*\n                                   JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n                                   \u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\n  -Xold                            \u65E7\u5F0F\u306Ejavadoc\u30C4\u30FC\u30EB\u3092\u8D77\u52D5\u3057\u307E\u3059\n
 
 main.Xusage.foot=\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
 
 main.doclet.usage.header={0} doclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:
 
-main.option.already.seen={0}\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u8907\u6570\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
 main.requires_argument=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
 main.invalid_flag={0}\u306F\u7121\u52B9\u306A\u30D5\u30E9\u30B0\u3067\u3059
 main.No_packages_or_classes_specified=\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
@@ -51,6 +51,7 @@ main.fatal.exception=\u81F4\u547D\u7684\u4F8B\u5916
 main.out.of.memory=java.lang.OutOfMemoryError: \u30E1\u30E2\u30EA\u30FC\u3092\u5897\u3084\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u305F\u3068\u3048\u3070\u3001JDK\u306Eclassic\u3082\u3057\u304F\u306Fhotspot VM\u3067\u306F\u3001-J-Xmx32m\u306E\u3088\u3046\u306B\n-J-Xmx\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
 main.done_in=[{0}\u30DF\u30EA\u79D2\u3067\u5B8C\u4E86]
 main.more_than_one_doclet_specified_0_and_1=\u8907\u6570\u306Edoclet({0}\u3068{1})\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+main.doclet_could_not_set_location={0}\u306E\u5834\u6240\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 main.doclet_no_classloader_found={0}\u3092\u30ED\u30FC\u30C9\u3059\u308B\u30AF\u30E9\u30B9\u30ED\u30FC\u30C0\u30FC\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 main.could_not_instantiate_class=\u30AF\u30E9\u30B9{0}\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 main.doclet_class_not_found=doclet\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
@@ -64,10 +65,11 @@ main.release.bootclasspath.conflict=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306F-rele
 main.unsupported.release.version=\u30EA\u30EA\u30FC\u30B9\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3{0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 main.release.not.standard.file.manager=-release\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u6307\u5B9A\u3055\u308C\u305FJavaFileManager\u306FStandardJavaFileManager\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
 main.unknown.error=\u4E0D\u660E\u306A\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+main.legacy_api=\u30D1\u30C3\u30B1\u30FC\u30B8com.sun.javadoc\u3001com.sun.tools.doclets\u304A\u3088\u3073\n\u305D\u308C\u3089\u306E\u5B9F\u88C5\u5185\u306E\u53E4\u3044Doclet\u304A\u3088\u3073Taglet API\u306F\u3001\n\u4ECA\u5F8C\u306EJDK\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059\u3002\u3053\u308C\u3089\u306E\n\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306Fjdk.javadoc.doclet\u306E\u65B0\u3057\u3044API\u306B\u3088\u3063\u3066\u7F6E\u304D\u63DB\u3048\u3089\u308C\u307E\u3057\u305F\u3002\n\u30E6\u30FC\u30B6\u30FC\u306B\u306F\u65B0\u3057\u3044API\u306B\u79FB\u884C\u3059\u308B\u3053\u3068\u3092\u5F37\u304F\u304A\u85A6\u3081\u3057\u307E\u3059\u3002\n
+
 javadoc.class_not_found=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 javadoc.error=\u30A8\u30E9\u30FC
 javadoc.warning=\u8B66\u544A
-
 javadoc.error.msg={0}: \u30A8\u30E9\u30FC - {1}
 javadoc.warning.msg={0}: \u8B66\u544A - {1}
 javadoc.note.msg = {1}
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
index 715e9e697a2..e1f9d6190bd 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc_zh_CN.properties
@@ -28,15 +28,14 @@ main.error={0} \u4E2A\u9519\u8BEF
 main.warnings={0} \u4E2A\u8B66\u544A
 main.warning={0} \u4E2A\u8B66\u544A
 
-main.usage=\u7528\u6CD5: javadoc [options] [packagenames] [sourcefiles] [@files]\n  -overview                  \u4ECE HTML \u6587\u4EF6\u8BFB\u53D6\u6982\u89C8\u6587\u6863\n  -public                          \u4EC5\u663E\u793A public \u7C7B\u548C\u6210\u5458\n  -protected                       \u663E\u793A protected/public \u7C7B\u548C\u6210\u5458 (\u9ED8\u8BA4\u503C)\n  -package                         \u663E\u793A package/protected/public \u7C7B\u548C\u6210\u5458\n  -private                         \u663E\u793A\u6240\u6709\u7C7B\u548C\u6210\u5458\n  -help                            \u663E\u793A\u547D\u4EE4\u884C\u9009\u9879\u5E76\u9000\u51FA\n  -doclet                   \u901A\u8FC7\u66FF\u4EE3 doclet \u751F\u6210\u8F93\u51FA\n  -docletpath                \u6307\u5B9A\u67E5\u627E doclet \u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -sourcepath            \u6307\u5B9A\u67E5\u627E\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -classpath             \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -cp                    \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -exclude                \u6307\u5B9A\u8981\u6392\u9664\u7684\u7A0B\u5E8F\u5305\u5217\u8868\n  -subpackages         \u6307\u5B9A\u8981\u9012\u5F52\u52A0\u8F7D\u7684\u5B50\u7A0B\u5E8F\u5305\n  -breakiterator                   \u8BA1\u7B97\u5E26\u6709 BreakIterator \u7684\u7B2C\u4E00\u4E2A\u8BED\u53E5\n  -bootclasspath         \u8986\u76D6\u7531\u5F15\u5BFC\u7C7B\u52A0\u8F7D\u5668\u6240\u52A0\u8F7D\u7684\n                                   \u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -source                 \u63D0\u4F9B\u4E0E\u6307\u5B9A\u53D1\u884C\u7248\u7684\u6E90\u517C\u5BB9\u6027\n  -extdirs                \u8986\u76D6\u6240\u5B89\u88C5\u6269\u5C55\u7684\u4F4D\u7F6E\n  -verbose                         \u8F93\u51FA\u6709\u5173 Javadoc \u6B63\u5728\u6267\u884C\u7684\u64CD\u4F5C\u7684\u4FE1\u606F\n  -locale                    \u8981\u4F7F\u7528\u7684\u533A\u57DF\u8BBE\u7F6E, \u4F8B\u5982 en_US \u6216 en_US_WIN\n  -encoding                  \u6E90\u6587\u4EF6\u7F16\u7801\u540D\u79F0\n  -quiet                           \u4E0D\u663E\u793A\u72B6\u6001\u6D88\u606F\n  -J                         \u76F4\u63A5\u5C06  \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\n  -X                               \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u63D0\u8981\n
+main.usage=\u7528\u6CD5: javadoc [options] [packagenames] [sourcefiles] [@files]\n  -overview <\u6587\u4EF6>                 \u4ECE HTML \u6587\u4EF6\u8BFB\u53D6\u6982\u89C8\u6587\u6863\n  -public                          \u4EC5\u663E\u793A public \u7C7B\u548C\u6210\u5458\n  -protected                       \u663E\u793A protected/public \u7C7B\u548C\u6210\u5458 (\u9ED8\u8BA4\u503C)\n  -package                         \u663E\u793A package/protected/public \u7C7B\u548C\u6210\u5458\n  -private                         \u663E\u793A\u6240\u6709\u7C7B\u548C\u6210\u5458\n  -help                            \u663E\u793A\u547D\u4EE4\u884C\u9009\u9879\u5E76\u9000\u51FA\n  -doclet <\u7C7B>                     \u901A\u8FC7\u66FF\u4EE3 doclet \u751F\u6210\u8F93\u51FA\n  -docletpath <\u8DEF\u5F84>               \u6307\u5B9A\u67E5\u627E doclet \u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -modulesourcepath <\u8DEF\u5F84>         \u6307\u5B9A\u67E5\u627E\u591A\u4E2A\u6A21\u5757\u7684\u8F93\u5165\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -upgrademodulepath <\u8DEF\u5F84>        \u8986\u76D6\u53EF\u5347\u7EA7\u6A21\u5757\u4F4D\u7F6E\n  -modulepath <\u8DEF\u5F84>               \u6307\u5B9A\u67E5\u627E\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u4F4D\u7F6E\n  -mp <\u8DEF\u5F84>                       \u6307\u5B9A\u67E5\u627E\u5E94\u7528\u7A0B\u5E8F\u6A21\u5757\u7684\u4F4D\u7F6E\n  -addmods <\u6A21\u5757>(,<\u6A21\u5757>)*        \u9664\u4E86\u521D\u59CB\u6A21\u5757\u4E4B\u5916\u8981\u89E3\u6790\u7684\u6839\u6A21\u5757; \u5982\u679C <\u6A21\u5757>\n                                   \u4E3A ALL-MODULE-PATH, \u5219\u4E3A\u6A21\u5757\u8DEF\u5F84\u4E2D\u7684\u6240\u6709\u6A21\u5757\u3002\n  -limitmods <\u6A21\u5757>(,<\u6A21\u5757>)*      \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n  -sourcepath <\u8DEF\u5F84\u5217\u8868>           \u6307\u5B9A\u67E5\u627E\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -classpath <\u8DEF\u5F84\u5217\u8868>            \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -cp <\u8DEF\u5F84\u5217\u8868>                   \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -exclude <\u7A0B\u5E8F\u5305\u5217\u8868>            \u6307\u5B9A\u8981\u6392\u9664\u7684\u7A0B\u5E8F\u5305\u5217\u8868\n  -subpackages <\u5B50\u7A0B\u5E8F\u5305\u5217\u8868>      \u6307\u5B9A\u8981\u9012\u5F52\u52A0\u8F7D\u7684\u5B50\u7A0B\u5E8F\u5305\n  -breakiterator                   \u8BA1\u7B97\u5E26\u6709 BreakIterator \u7684\u7B2C\u4E00\u4E2A\u8BED\u53E5\n  -bootclasspath <\u8DEF\u5F84\u5217\u8868>        \u8986\u76D6\u7531\u5F15\u5BFC\u7C7B\u52A0\u8F7D\u5668\u6240\u52A0\u8F7D\u7684\n                                   \u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n  -source <\u53D1\u884C\u7248>                 \u63D0\u4F9B\u4E0E\u6307\u5B9A\u53D1\u884C\u7248\u7684\u6E90\u517C\u5BB9\u6027\n  -extdirs <\u76EE\u5F55\u5217\u8868>              \u8986\u76D6\u6240\u5B89\u88C5\u6269\u5C55\u7684\u4F4D\u7F6E\n  -verbose                         \u8F93\u51FA\u6709\u5173 Javadoc \u6B63\u5728\u6267\u884C\u7684\u64CD\u4F5C\u7684\u4FE1\u606F\n  -locale <\u540D\u79F0>                   \u8981\u4F7F\u7528\u7684\u533A\u57DF\u8BBE\u7F6E, \u4F8B\u5982 en_US \u6216 en_US_WIN\n  -encoding <\u540D\u79F0>                 \u6E90\u6587\u4EF6\u7F16\u7801\u540D\u79F0\n  -quiet                           \u4E0D\u663E\u793A\u72B6\u6001\u6D88\u606F\n  -J<\u6807\u8BB0>                         \u76F4\u63A5\u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\n  -X                               \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u63D0\u8981\u5E76\u9000\u51FA\n
 
-main.Xusage=\  -Xmaxerrs                \u8BBE\u7F6E\u8981\u8F93\u51FA\u7684\u6700\u5927\u9519\u8BEF\u6570\n  -Xmaxwarns               \u8BBE\u7F6E\u8981\u8F93\u51FA\u7684\u6700\u5927\u8B66\u544A\u6570\n
+main.Xusage=\  -Xmaxerrs <\u6570\u5B57>                 \u8BBE\u7F6E\u8981\u8F93\u51FA\u7684\u9519\u8BEF\u7684\u6700\u5927\u6570\u76EE\n  -Xmaxwarns <\u6570\u5B57>                \u8BBE\u7F6E\u8981\u8F93\u51FA\u7684\u8B66\u544A\u7684\u6700\u5927\u6570\u76EE\n  -XaddExports:<\u6A21\u5757>/<\u7A0B\u5E8F\u5305>=<\u5176\u4ED6\u6A21\u5757>(,<\u5176\u4ED6\u6A21\u5757>)*\n                                   \u6307\u5B9A\u5C06\u7A0B\u5E8F\u5305\u89C6\u4E3A\u5DF2\u4ECE\u5176\u5B9A\u4E49\u6A21\u5757\u5BFC\u51FA\u5230\u5176\u4ED6\u6A21\u5757,\n                                   \u5982\u679C <\u5176\u4ED6\u6A21\u5757> \u4E3A ALL-UNNAMED, \u5219\u89C6\u4E3A\n                                   \u5BFC\u51FA\u5230\u6240\u6709\u672A\u547D\u540D\u6A21\u5757\u3002\n  -XaddReads:<\u6A21\u5757>=<\u5176\u4ED6\u6A21\u5757>(,<\u5176\u4ED6\u6A21\u5757>)*\n                                   \u6307\u5B9A\u88AB\u89C6\u4E3A\u7ED9\u5B9A\u6A21\u5757\u9700\u8981\u7684\u5176\u4ED6\u6A21\u5757\u3002\n                                   <\u5176\u4ED6\u6A21\u5757> \u53EF\u4EE5\u4E3A ALL-UNNAMED \u4EE5\u4FBF\u8981\u6C42\n                                   \u672A\u547D\u540D\u6A21\u5757\u3002\n  -Xmodule:<\u6A21\u5757\u540D\u79F0>              \u6307\u5B9A\u6B63\u5728\u7F16\u8BD1\u7684\u7C7B\u6240\u5C5E\u7684\u6A21\u5757\u3002\n  -Xpatch:<\u6A21\u5757>=<\u6587\u4EF6>(:<\u6587\u4EF6>)*\n                                   \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n                                   \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\n  -Xold                            \u8C03\u7528\u4F20\u7EDF javadoc \u5DE5\u5177\n
 
 main.Xusage.foot=\u8FD9\u4E9B\u9009\u9879\u90FD\u662F\u975E\u6807\u51C6\u9009\u9879, \u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002
 
 main.doclet.usage.header=\u7531 {0} doclet \u63D0\u4F9B:
 
-main.option.already.seen={0}\u9009\u9879\u53EA\u80FD\u6307\u5B9A\u4E00\u6B21\u3002
 main.requires_argument=\u9009\u9879{0}\u9700\u8981\u53C2\u6570\u3002
 main.invalid_flag=\u65E0\u6548\u7684\u6807\u8BB0: {0}
 main.No_packages_or_classes_specified=\u672A\u6307\u5B9A\u7A0B\u5E8F\u5305\u6216\u7C7B\u3002
@@ -51,6 +50,7 @@ main.fatal.exception=\u81F4\u547D\u5F02\u5E38\u9519\u8BEF
 main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216 HotSpot VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002
 main.done_in=[\u5728 {0} \u6BEB\u79D2\u5185\u5B8C\u6210]
 main.more_than_one_doclet_specified_0_and_1=\u6307\u5B9A\u4E86\u591A\u4E2A doclet ({0}\u548C{1})\u3002
+main.doclet_could_not_set_location=\u65E0\u6CD5\u8BBE\u7F6E {0} \u7684\u4F4D\u7F6E
 main.doclet_no_classloader_found=\u65E0\u6CD5\u83B7\u53D6\u7C7B\u52A0\u8F7D\u5668\u6765\u52A0\u8F7D {0}
 main.could_not_instantiate_class=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u7C7B {0}
 main.doclet_class_not_found=\u627E\u4E0D\u5230 doclet \u7C7B{0}
@@ -64,10 +64,11 @@ main.release.bootclasspath.conflict=\u9009\u9879{0}\u65E0\u6CD5\u4E0E -release \
 main.unsupported.release.version=\u4E0D\u652F\u6301\u53D1\u884C\u7248\u672C {0}
 main.release.not.standard.file.manager=\u6307\u5B9A\u4E86 -release \u9009\u9879, \u4F46\u63D0\u4F9B\u7684 JavaFileManager \u4E0D\u662F StandardJavaFileManager\u3002
 main.unknown.error=\u51FA\u73B0\u672A\u77E5\u9519\u8BEF
+main.legacy_api=\u5DF2\u8BA1\u5212\u5728\u672A\u6765\u7684 JDK \u53D1\u884C\u7248\u4E2D\u5220\u9664\u7A0B\u5E8F\u5305\ncom.sun.javadoc, com.sun.tools.doclets\n\u53CA\u5176\u5B9E\u73B0\u4E2D\u7684\u65E7 Doclet \u548C Taglet API\u3002\n\u8FD9\u4E9B\u7EC4\u4EF6\u5728 jdk.javadoc.doclet \u4E2D\u5DF2\u7531\u65B0 API \u53D6\u4EE3\u3002\n\u5F3A\u70C8\u5EFA\u8BAE\u7528\u6237\u79FB\u690D\u5230\u65B0 API\u3002\n
+
 javadoc.class_not_found=\u627E\u4E0D\u5230\u7C7B{0}\u3002
 javadoc.error=\u9519\u8BEF
 javadoc.warning=\u8B66\u544A
-
 javadoc.error.msg={0}: \u9519\u8BEF - {1}
 javadoc.warning.msg={0}: \u8B66\u544A - {1}
 javadoc.note.msg = {1}
diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
index 82df8ba060a..d18ad19006d 100644
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties
@@ -1,72 +1,77 @@
-main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0}  [-m  | ]\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001-h\u3001-?\u307E\u305F\u306F-help\u3092\u4F7F\u7528\u3057\u307E\u3059
+main.usage.summary=\u4F7F\u7528\u65B9\u6CD5: {0}  \n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30EA\u30B9\u30C8\u306B\u3064\u3044\u3066\u306F\u3001-h\u3001-?\u307E\u305F\u306F-help\u3092\u4F7F\u7528\u3057\u307E\u3059
 
-main.usage=\u4F7F\u7528\u65B9\u6CD5: {0}  [-m  | ]\n-m \u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u6307\u5B9A\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u5206\u6790\u3055\u308C\u307E\u3059\n\u305D\u3046\u3067\u306A\u3044\u5834\u5408\u3001\u306B\u306F\u3001.class\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u540D\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\n\u5B8C\u5168\u4FEE\u98FE\u30AF\u30E9\u30B9\u540D\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\n\n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:
+main.usage=\u4F7F\u7528\u65B9\u6CD5: {0}  ]\n\u306B\u306F\u3001.class\u30D5\u30A1\u30A4\u30EB\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30B9\u540D\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\n\n\u4F7F\u7528\u3067\u304D\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:
 
 error.prefix=\u30A8\u30E9\u30FC:
 warn.prefix=\u8B66\u544A:
 
-main.opt.h=\  -h -?        -help                   \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
+main.opt.h=\  -h -?        -help                \u3053\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059
 
-main.opt.version=\  -version                             \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
+main.opt.version=\  -version                          \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
 
-main.opt.v=\  -v           -verbose                \u30AF\u30E9\u30B9\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u3059\u3079\u3066\u51FA\u529B\u3057\u307E\u3059\n                                     -verbose:class -filter:none\u3068\u540C\u7B49\u3067\u3059\u3002\n  -verbose:package                     \u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u51FA\u529B\u3057\u307E\u3059\n                                     (\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u540C\u3058\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u9664\u304F)\n  -verbose:class                       \u30AF\u30E9\u30B9\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u51FA\u529B\u3057\u307E\u3059\n                                     (\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u540C\u3058\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u9664\u304F)
+main.opt.v=\  -v           -verbose             \u30AF\u30E9\u30B9\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u3059\u3079\u3066\u51FA\u529B\u3057\u307E\u3059\n                                     -verbose:class -filter:none\u3068\u540C\u7B49\u3067\u3059\u3002\n  -verbose:package                  \u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u51FA\u529B\u3057\u307E\u3059\n                                     (\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u540C\u3058\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u9664\u304F)\n  -verbose:class                    \u30AF\u30E9\u30B9\u30FB\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u51FA\u529B\u3057\u307E\u3059\n                                     (\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u540C\u3058\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u9664\u304F)
 
-main.opt.f=\  -f    -filter        \u6307\u5B9A\u306E\u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\n                                     \u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u305F\u5834\u5408\u3001\u6700\u5F8C\u306E\u3082\u306E\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n  -filter:package                    \u540C\u3058\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059(\u30C7\u30D5\u30A9\u30EB\u30C8)\n  -filter:module                       \u540C\u3058\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\n  -filter:archive                    \u540C\u3058\u30A2\u30FC\u30AB\u30A4\u30D6\u5185\u306E\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\n  -filter:none                       -filter:package\u304A\u3088\u3073-filter:archive\u306E\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u306F\u884C\u308F\u308C\u307E\u305B\u3093\n                                     -filter\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3057\u305F\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u304C\u5F15\u304D\u7D9A\u304D\u9069\u7528\u3055\u308C\u307E\u3059\u3002
+main.opt.s=\  -s           -summary             \u4F9D\u5B58\u6027\u306E\u30B5\u30DE\u30EA\u30FC\u306E\u307F\u51FA\u529B\u3057\u307E\u3059
 
-main.opt.s=\  -s           -summary                \u4F9D\u5B58\u6027\u306E\u6982\u8981\u306E\u307F\u51FA\u529B\u3057\u307E\u3059\u3002\n                                       -s\u30AA\u30D7\u30B7\u30E7\u30F3\u3092-m\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3059\u308B\u3068\u3001\u6307\u5B9A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u3092\n                                       \u8AAD\u307F\u53D6\u308A\u3001\u30B0\u30E9\u30D5\u3092\u751F\u6210\u3057\u307E\u3059\u3002
+main.opt.f=\  -f    -filter        \u6307\u5B9A\u306E\u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\n                                     \u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\u3002\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u305F\u5834\u5408\u3001\u6700\u5F8C\u306E\u3082\u306E\u304C\n                                    \u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n  -filter:package                    \u540C\u3058\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u306E\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\u3002\n                                    \u3053\u308C\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u3059\u3002\n  -filter:archive                    \u540C\u3058\u30A2\u30FC\u30AB\u30A4\u30D6\u5185\u306E\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\n  -filter:module                       \u540C\u3058\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3057\u307E\u3059\n  -filter:none                       -filter:package\u304A\u3088\u3073-filter:archive\u306E\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u306F\n                                    \u884C\u308F\u308C\u307E\u305B\u3093\u3002-filter\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3057\u305F\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u304C\n                                    \u5F15\u304D\u7D9A\u304D\u9069\u7528\u3055\u308C\u307E\u3059\u3002\n
+main.opt.p=\n\u4F9D\u5B58\u6027\u3092\u30D5\u30A3\u30EB\u30BF\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3:\n  -p  -package     \u6307\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\n                                     (\u8907\u6570\u56DE\u6307\u5B9A\u53EF\u80FD)\u3002
 
-main.opt.p=\  -p                          \u6307\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\n  -package                    (\u8907\u6570\u56DE\u6307\u5B9A\u53EF\u80FD)\u3002
+main.opt.e=\  -e  -regex          \u6307\u5B9A\u306E\u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\u3002
 
-main.opt.e=\  -e \n  -regex                        \u6307\u5B9A\u306E\u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\u3002
+main.opt.requires=\  -requires            \u6307\u5B9A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\n                                    (\u8907\u6570\u56DE\u6307\u5B9A\u53EF\u80FD)\u3002\n                                    -package\u3001-regex\u3001-requires\u306F\u76F8\u4E92\u306B\u6392\u4ED6\u7684\u3067\u3059\u3002
 
-main.opt.module=\  -module                 \u6307\u5B9A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u540D\u306B\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\n                                       (\u8907\u6570\u56DE\u6307\u5B9A\u53EF\u80FD)\u3002\n                                       -package\u3001-regex\u3001-requires\u306F\u76F8\u4E92\u306B\u6392\u4ED6\u7684\u3067\u3059\u3002
+main.opt.include=\n\u5206\u6790\u5BFE\u8C61\u30AF\u30E9\u30B9\u3092\u30D5\u30A3\u30EB\u30BF\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3:\n  -include                   \u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u30AF\u30E9\u30B9\u306B\u5206\u6790\u3092\u5236\u9650\u3057\u307E\u3059\n                                     \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u5206\u6790\u5BFE\u8C61\u30AF\u30E9\u30B9\u306E\n                                     \u30EA\u30B9\u30C8\u304C\u30D5\u30A3\u30EB\u30BF\u3055\u308C\u307E\u3059\u3002\u30D1\u30BF\u30FC\u30F3\u3092\u4F9D\u5B58\u6027\u306B\n                                     \u9069\u7528\u3059\u308B-p\u304A\u3088\u3073-e\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u3059
 
-main.opt.include=\  -include                      \u30D1\u30BF\u30FC\u30F3\u306B\u4E00\u81F4\u3059\u308B\u30AF\u30E9\u30B9\u306B\u5206\u6790\u3092\u5236\u9650\u3057\u307E\u3059\n                                       \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u5206\u6790\u5BFE\u8C61\u30AF\u30E9\u30B9\u306E\n                                       \u30EA\u30B9\u30C8\u304C\u30D5\u30A3\u30EB\u30BF\u3055\u308C\u307E\u3059\u3002\u30D1\u30BF\u30FC\u30F3\u3092\u4F9D\u5B58\u6027\u306B\n                                       \u9069\u7528\u3059\u308B-p\u304A\u3088\u3073-e\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u3059
+main.opt.P=\  -P           -profile             \u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u542B\u3080\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A\u3057\u307E\u3059
 
-main.opt.P=\  -P           -profile                \u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u542B\u3080\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A\u3057\u307E\u3059
+main.opt.cp=\  -cp    -classpath     \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059
 
-main.opt.M=\  -M                                   \u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u542B\u3080\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8868\u793A\u3057\u307E\u3059
-
-main.opt.cp=\  -cp    -classpath        \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059
-
-main.opt.mp=\  -mp ...\n  -modulepath ...         \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059
+main.opt.mp=\  -mp ...\n  -modulepath ...      \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059
 
 main.opt.upgrademodulepath=\  -upgrademodulepath ...  \u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059
 
-main.opt.m=\  -m                      \u5206\u6790\u3055\u308C\u308B\u30E2\u30B8\u30E5\u30FC\u30EB\u3068\u305D\u306E\u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u306E\n                                       \u540D\u524D\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
+main.opt.system=\  -system                \u4EE3\u66FF\u30B7\u30B9\u30C6\u30E0\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30D1\u30B9\u3092\u6307\u5B9A\u3057\u307E\u3059
+
+main.opt.addmods=\  -addmods [,...]\n                                    \u5206\u6790\u7528\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30EB\u30FC\u30C8\u30FB\u30BB\u30C3\u30C8\u306B\u8FFD\u52A0\u3057\u307E\u3059
+
+main.opt.m=\  -m                   \u5206\u6790\u7528\u306B\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u307E\u3059
 
 main.opt.R=\  -R           -recursive            \u3059\u3079\u3066\u306E\u30E9\u30F3\u30BF\u30A4\u30E0\u4F9D\u5B58\u6027\u3092\u518D\u5E30\u7684\u306B\u30C8\u30E9\u30D0\u30FC\u30B9\u3057\u307E\u3059\u3002\n                                     -R\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-filter:none\u3092\u610F\u5473\u3057\u307E\u3059\u3002-p\u3001-e\u3001-f\n                                     \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u4E00\u81F4\u3059\u308B\u4F9D\u5B58\u6027\u306E\u307F\n                                     \u5206\u6790\u3055\u308C\u307E\u3059\u3002
 
-main.opt.ct=\  -ct          -compile-time           \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306E\u8868\u793A\n                                       \u4F8B: -R\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306E\u8868\u793A\u3002\u4F9D\u5B58\u6027\u304C\n                                       \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\n                                       \u305D\u306E\u5305\u542B\u3059\u308B\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u5206\u6790\u3055\u308C\u307E\u3059\u3002
+main.opt.I=\  -I           -inverse             \u4ED6\u306E\u6307\u5B9A\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3054\u3068\u306B\u4F9D\u5B58\u6027\u3092\u5206\u6790\u3057\u3001\n                                    \u4E00\u81F4\u3059\u308B\u30CE\u30FC\u30C9\u306B\u76F4\u63A5\u304A\u3088\u3073\u9593\u63A5\u7684\u306B\u4F9D\u5B58\u3059\u308B\n                                    \u3059\u3079\u3066\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u3092\u691C\u51FA\u3057\u307E\u3059\u3002\n                                    \u3053\u308C\u306F\u3001\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306E\u8868\u793A\u5206\u6790\n                                    \u304A\u3088\u3073\u51FA\u529B\u4F9D\u5B58\u6027\u30B5\u30DE\u30EA\u30FC\u306E\u9006\u306B\u76F8\u5F53\u3057\u307E\u3059\u3002\n                                    \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-requires\u3001-package\u307E\u305F\u306F-regex\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\n                                    \u4E00\u7DD2\u306B\u4F7F\u7528\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 
-main.opt.apionly=\  -apionly                             \u5206\u6790\u3092API\u3001\u3064\u307E\u308A\u3001\u30D1\u30D6\u30EA\u30C3\u30AF\u30FB\u30AF\u30E9\u30B9\u306E\n                                     \u30D1\u30D6\u30EA\u30C3\u30AF\u30FB\u30E1\u30F3\u30D0\u30FC\u304A\u3088\u3073\u4FDD\u8B77\u3055\u308C\u305F\u30E1\u30F3\u30D0\u30FC\u306E\n                                     \u7F72\u540D\u306B\u304A\u3051\u308B\u4F9D\u5B58\u6027(\u30D5\u30A3\u30FC\u30EB\u30C9\u30FB\u30BF\u30A4\u30D7\u3001\u30E1\u30BD\u30C3\u30C9\u30FB\n                                     \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u3001\u623B\u3055\u308C\u305F\u30BF\u30A4\u30D7\u3001\u30C1\u30A7\u30C3\u30AF\u3055\u308C\u305F\n                                     \u4F8B\u5916\u30BF\u30A4\u30D7\u306A\u3069)\u306B\u5236\u9650\u3057\u307E\u3059
+main.opt.ct=\  -ct          -compile-time        \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306E\u8868\u793A\n                                    \u4F8B: -R\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u306E\u8868\u793A\u3002\n                                    \u4ED6\u306E\u6307\u5B9A\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3054\u3068\u306B\u4F9D\u5B58\u6027\u3092\u5206\u6790\u3057\u307E\u3059\n                                    \u4F9D\u5B58\u6027\u304C\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u3089\n                                    \u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\u305D\u306E\u5305\u542B\u3059\u308B\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\n                                    \u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u5206\u6790\u3055\u308C\u307E\u3059\u3002
 
-main.opt.genmoduleinfo=\  -genmoduleinfo                  \u6307\u5B9A\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Bmodule-info.java\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n                                       \u6307\u5B9A\u3057\u305FJAR\u30D5\u30A1\u30A4\u30EB\u3092\u5206\u6790\u3057\u307E\u3059\u3002\n                                       \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-dotoutput\u307E\u305F\u306F-cp\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
+main.opt.apionly=\  -apionly                          \u5206\u6790\u3092API\u3001\u3064\u307E\u308A\u3001\u30D1\u30D6\u30EA\u30C3\u30AF\u30FB\u30AF\u30E9\u30B9\u306E\n                                     \u30D1\u30D6\u30EA\u30C3\u30AF\u30FB\u30E1\u30F3\u30D0\u30FC\u304A\u3088\u3073\u4FDD\u8B77\u3055\u308C\u305F\u30E1\u30F3\u30D0\u30FC\u306E\n                                     \u7F72\u540D\u306B\u304A\u3051\u308B\u4F9D\u5B58\u6027(\u30D5\u30A3\u30FC\u30EB\u30C9\u30FB\u30BF\u30A4\u30D7\u3001\u30E1\u30BD\u30C3\u30C9\u30FB\n                                     \u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u3001\u623B\u3055\u308C\u305F\u30BF\u30A4\u30D7\u3001\u30C1\u30A7\u30C3\u30AF\u3055\u308C\u305F\n                                     \u4F8B\u5916\u30BF\u30A4\u30D7\u306A\u3069)\u306B\u5236\u9650\u3057\u307E\u3059
 
-main.opt.check=\  -check                               -m\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u6307\u5B9A\u3057\u305F\u6307\u5B9A\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u4F9D\u5B58\u6027\u3092\n                                       \u5206\u6790\u3057\u307E\u3059\u3002\u9077\u79FB\u524A\u6E1B\u5F8C\u306E\u7D50\u679C\u30E2\u30B8\u30E5\u30FC\u30EB\u4F9D\u5B58\u6027\u30B0\u30E9\u30D5\u3092\n                                       \u51FA\u529B\u3057\u3001\u672A\u4F7F\u7528\u306E\u4FEE\u98FE\u3055\u308C\u305F\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3082\n                                       \u8B58\u5225\u3057\u307E\u3059\u3002
+main.opt.genmoduleinfo=\  -genmoduleinfo               \u6307\u5B9A\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306Bmodule-info.java\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n                                    \u6307\u5B9A\u3057\u305FJAR\u30D5\u30A1\u30A4\u30EB\u3092\u5206\u6790\u3057\u307E\u3059\u3002\n                                    \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-dotoutput\u307E\u305F\u306F-cp\u3068\u4E00\u7DD2\u306B\n                                    \u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
+
+main.opt.check=\  -check [,...\n                                    \u6307\u5B9A\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u5206\u6790\u3057\u307E\u3059\n                                    \u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30C7\u30A3\u30B9\u30AF\u30EA\u30D7\u30BF\u3001\u5206\u6790\u5F8C\u306E\u7D50\u679C\u30E2\u30B8\u30E5\u30FC\u30EB\u4F9D\u5B58\u6027\n                                    \u304A\u3088\u3073\u9077\u79FB\u524A\u6E1B\u5F8C\u306E\u30B0\u30E9\u30D5\u3092\n                                    \u51FA\u529B\u3057\u307E\u3059\u3002\n                                    \u672A\u4F7F\u7528\u306E\u4FEE\u98FE\u3055\u308C\u305F\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3082\u8B58\u5225\u3057\u307E\u3059\u3002
 
 
-main.opt.dotoutput=\  -dotoutput                      DOT\u30D5\u30A1\u30A4\u30EB\u51FA\u529B\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+main.opt.dotoutput=\  -dotoutput                   DOT\u30D5\u30A1\u30A4\u30EB\u51FA\u529B\u306E\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
 
-main.opt.jdkinternals=\  -jdkinternals                        JDK\u5185\u90E8API\u306E\u30AF\u30E9\u30B9\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\u3002\n                                     \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001-include\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u306A\u3044\u3068\u3001\n                                     -classpath\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u5206\u6790\u3057\u307E\u3059\u3002\n                                     \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-p\u3001-e\u304A\u3088\u3073-s\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n                                     \u8B66\u544A: JDK\u5185\u90E8API\u306F\u3001\u6B21\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u304F\u306A\u308B\u53EF\u80FD\u6027\u304C\n                                     \u3042\u308A\u307E\u3059\u3002
+main.opt.jdkinternals=\  -jdkinternals                     JDK\u5185\u90E8API\u306E\u30AF\u30E9\u30B9\u30EC\u30D9\u30EB\u306E\u4F9D\u5B58\u6027\u3092\u691C\u51FA\u3057\u307E\u3059\u3002\n                                    \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001-include\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u306A\u3044\u3068\u3001\n                                     -classpath\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3068\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u3092\u5206\u6790\u3057\u307E\u3059\u3002\n                                     \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F-p\u3001-e\u304A\u3088\u3073-s\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\n                                    \u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n                                     \u8B66\u544A: JDK\u5185\u90E8API\u306F\u3001\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059\u3002
 
-main.opt.depth=\  -depth=                       \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u5206\u6790\u306E\u6DF1\u3055\u3092\n                                       \u6307\u5B9A\u3057\u307E\u3059
+main.opt.depth=\  -depth=                    \u63A8\u79FB\u7684\u306A\u4F9D\u5B58\u6027\u5206\u6790\u306E\u6DF1\u3055\u3092\n                                    \u6307\u5B9A\u3057\u307E\u3059
 
-main.opt.q=\  -q           -quiet                  -genmoduleinfo\u51FA\u529B\u3067\u6B20\u843D\u3057\u3066\u3044\u308B\u4F9D\u5B58\u6027\u3092\u8868\u793A\u3057\u307E\u305B\u3093\u3002
+main.opt.q=\  -q           -quiet               -genmoduleinfo\u51FA\u529B\u3067\u6B20\u843D\u3057\u3066\u3044\u308B\u4F9D\u5B58\u6027\u3092\u8868\u793A\u3057\u307E\u305B\u3093\u3002
 
 err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 err.missing.arg={0}\u306B\u5024\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 err.invalid.arg.for.option=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059: {0}
 err.option.after.class=\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30AF\u30E9\u30B9\u306E\u524D\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
-err.genmoduleinfo.not.jarfile=-genmoduleinfo\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3001{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093(JAR\u30D5\u30A1\u30A4\u30EB\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059)
+err.genmoduleinfo.not.jarfile=-genmoduleinfo\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3001{0}\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093(\u975E\u30E2\u30B8\u30E5\u30E9JAR\u30D5\u30A1\u30A4\u30EB\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059)
 err.profiles.msg=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u60C5\u5831\u304C\u3042\u308A\u307E\u305B\u3093
 err.exception.message={0}
 err.invalid.path=\u7121\u52B9\u306A\u30D1\u30B9: {0}
-err.invalid.module.option=-m {0}\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{1}\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+err.invalid.module.option={0}\u306F{1}\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
 err.invalid.filters=-package (-p)\u3001-regex (-e)\u3001-requires\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3044\u305A\u308C\u304B\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059
 err.module.not.found=\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-err.root.module.not.set=-m\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-warn.invalid.arg=\u7121\u52B9\u306A\u30AF\u30E9\u30B9\u540D\u307E\u305F\u306F\u30D1\u30B9\u540D\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
+err.root.module.not.set=\u30EB\u30FC\u30C8\u30FB\u30E2\u30B8\u30E5\u30FC\u30EB\u30FB\u30BB\u30C3\u30C8\u304C\u7A7A\u3067\u3059
+err.invalid.inverse.option={0}\u306F-inverse\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+err.inverse.filter.not.set={0}\u306F-inverse\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u4E00\u7DD2\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+warn.invalid.arg=\u30D1\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
 warn.split.package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306F{1} {2}\u3067\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
 warn.replace.useJDKInternals=JDK\u5185\u90E8API\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u304A\u3089\u305A\u3001JDK\u5B9F\u88C5\u5C02\u7528\u3067\u3059\u304C\u3001\u4E92\u63DB\u6027\u306A\u3057\u3067\n\u524A\u9664\u307E\u305F\u306F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u4E2D\u65AD\u3055\u305B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\nJDK\u5185\u90E8API\u306E\u4F9D\u5B58\u6027\u3092\u524A\u9664\u3059\u308B\u3088\u3046\u30B3\u30FC\u30C9\u3092\u5909\u66F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002\nJDK\u5185\u90E8API\u306E\u7F6E\u63DB\u306B\u95A2\u3059\u308B\u6700\u65B0\u306E\u66F4\u65B0\u306B\u3064\u3044\u3066\u306F\u3001\u6B21\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044:\n{0}
 
diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
index 132c039059a..ce453f99022 100644
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties
@@ -1,72 +1,77 @@
-main.usage.summary=\u7528\u6CD5: {0}  [-m  | ]\n\u4F7F\u7528 -h, -? \u6216 -help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
+main.usage.summary=\u7528\u6CD5: {0} <\u9009\u9879> <\u8DEF\u5F84...>]\n\u4F7F\u7528 -h, -? \u6216 -help \u5217\u51FA\u53EF\u80FD\u7684\u9009\u9879
 
-main.usage=\u7528\u6CD5: {0}  [-m  | ]\n\u5982\u679C\u6307\u5B9A -m , \u5219\u5C06\u5BF9\u6307\u5B9A\u7684\u6A21\u5757\u8FDB\u884C\u5206\u6790,\n\u5426\u5219  \u53EF\u4EE5\u662F .class \u6587\u4EF6, \u76EE\u5F55\u6216\nJAR \u6587\u4EF6\u7684\u8DEF\u5F84\u540D, \u4E5F\u53EF\u4EE5\u662F\u5168\u9650\u5B9A\u7C7B\u540D\u3002\n\n\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
+main.usage=\u7528\u6CD5: {0} <\u9009\u9879> <\u8DEF\u5F84...>]\n\u5176\u4E2D <\u8DEF\u5F84> \u53EF\u4EE5\u662F .class \u6587\u4EF6, \u76EE\u5F55, JAR \u6587\u4EF6\u7684\u8DEF\u5F84\u540D\u3002\n\n\u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:
 
 error.prefix=\u9519\u8BEF:
 warn.prefix=\u8B66\u544A:
 
-main.opt.h=\  -h -?        -help                   \u8F93\u51FA\u6B64\u7528\u6CD5\u6D88\u606F
+main.opt.h=\  -h -?        -help                \u8F93\u51FA\u6B64\u7528\u6CD5\u6D88\u606F
 
-main.opt.version=\  -version                             \u7248\u672C\u4FE1\u606F
+main.opt.version=\  -version                          \u7248\u672C\u4FE1\u606F
 
-main.opt.v=\  -v           -verbose                \u8F93\u51FA\u6240\u6709\u7C7B\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                     \u7B49\u540C\u4E8E -verbose:class -filter:none\u3002\n  -verbose:package                     \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u8F93\u51FA\u7A0B\u5E8F\u5305\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61, \n                                     \u4E0D\u5305\u62EC\u540C\u4E00\u7A0B\u5E8F\u5305\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n  -verbose:class                       \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u8F93\u51FA\u7C7B\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61, \n                                     \u4E0D\u5305\u62EC\u540C\u4E00\u7A0B\u5E8F\u5305\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61
+main.opt.v=\  -v           -verbose             \u8F93\u51FA\u6240\u6709\u7C7B\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                     \u7B49\u540C\u4E8E -verbose:class -filter:none\u3002\n  -verbose:package                  \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u8F93\u51FA\u7A0B\u5E8F\u5305\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61, \n                                     \u4E0D\u5305\u62EC\u540C\u4E00\u7A0B\u5E8F\u5305\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n  -verbose:class                    \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u8F93\u51FA\u7C7B\u7EA7\u522B\u88AB\u4F9D\u8D56\u5BF9\u8C61, \n                                     \u4E0D\u5305\u62EC\u540C\u4E00\u7A0B\u5E8F\u5305\u4E2D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61
 
-main.opt.f=\  -f   -filter           \u7B5B\u9009\u4E0E\u6307\u5B9A\u6A21\u5F0F\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                       \u5982\u679C\u591A\u6B21\u6307\u5B9A, \u5219\u5C06\u4F7F\u7528\u6700\u540E\u4E00\u4E2A\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n  -filter:package                      \u7B5B\u9009\u4F4D\u4E8E\u540C\u4E00\u7A0B\u5E8F\u5305\u5185\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61 (\u9ED8\u8BA4)\n  -filter:module                       \u7B5B\u9009\u4F4D\u4E8E\u540C\u4E00\u6A21\u5757\u5185\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n  -filter:archive                      \u7B5B\u9009\u4F4D\u4E8E\u540C\u4E00\u6863\u6848\u5185\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n  -filter:none                         \u4E0D\u4F7F\u7528 -filter:package \u548C -filter:archive \u7B5B\u9009\n                                       \u901A\u8FC7 -filter \u9009\u9879\u6307\u5B9A\u7684\u7B5B\u9009\u4ECD\u65E7\u9002\u7528\u3002
+main.opt.s=\  -s           -summary             \u4EC5\u8F93\u51FA\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6982\u8981\u3002
 
-main.opt.s=\  -s           -summary                \u4EC5\u8F93\u51FA\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6982\u8981\u3002\n                                       \u5982\u679C\u5C06 -s \u9009\u9879\u4E0E -m \u4E00\u8D77\u4F7F\u7528, \u5219\u5C06\u8BFB\u53D6\n                                       \u6307\u5B9A\u6A21\u5757\u7684\u6A21\u5757\u63CF\u8FF0\u7B26\u6765\u751F\u6210\u56FE\u5F62\u3002
+main.opt.f=\  -f <\u6B63\u5219\u8868\u8FBE\u5F0F>  -filter <\u6B63\u5219\u8868\u8FBE\u5F0F>       \u7B5B\u9009\u4E0E\u6307\u5B9A\u6A21\u5F0F\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                    \u5982\u679C\u591A\u6B21\u6307\u5B9A, \u5219\u5C06\u4F7F\u7528\u6700\u540E\u4E00\u4E2A\n                                    \u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n  -filter:package                   \u7B5B\u9009\u4F4D\u4E8E\u540C\u4E00\u7A0B\u5E8F\u5305\u5185\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                    \u8FD9\u662F\u9ED8\u8BA4\u503C\u3002\n  -filter:archive                   \u7B5B\u9009\u4F4D\u4E8E\u540C\u4E00\u6863\u6848\u5185\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n  -filter:module                    \u7B5B\u9009\u4F4D\u4E8E\u540C\u4E00\u6A21\u5757\u5185\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n  -filter:none                      \u4E0D\u4F7F\u7528 -filter:package \u548C -filter:archive \u7B5B\u9009\u3002\n                                    \u901A\u8FC7 -filter \u9009\u9879\u6307\u5B9A\u7684\u7B5B\u9009\n                                    \u4ECD\u65E7\u9002\u7528\u3002\n
+main.opt.p=\n\u7528\u4E8E\u7B5B\u9009\u88AB\u4F9D\u8D56\u5BF9\u8C61\u7684\u9009\u9879:\n  -p <\u7A0B\u5E8F\u5305\u540D> -package <\u7A0B\u5E8F\u5305\u540D> \u67E5\u627E\u4E0E\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u540D\u79F0\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                    (\u53EF\u591A\u6B21\u6307\u5B9A)\u3002
 
-main.opt.p=\  -p                          \u67E5\u627E\u4E0E\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u540D\u79F0\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n  -package                    (\u53EF\u591A\u6B21\u6307\u5B9A)\u3002
+main.opt.e=\  -e <\u6B63\u5219\u8868\u8FBE\u5F0F> -regex <\u6B63\u5219\u8868\u8FBE\u5F0F>         \u67E5\u627E\u4E0E\u6307\u5B9A\u6A21\u5F0F\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
 
-main.opt.e=\  -e \n  -regex                        \u67E5\u627E\u4E0E\u6307\u5B9A\u6A21\u5F0F\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.requires=\  -requires <\u6A21\u5757\u540D\u79F0>              \u67E5\u627E\u4E0E\u7ED9\u5B9A\u6A21\u5757\u540D\u79F0\u5339\u914D\u7684\n                                    \u88AB\u4F9D\u8D56\u5BF9\u8C61 (\u53EF\u591A\u6B21\u6307\u5B9A)\u3002\n                                    -package, -regex, -requires \u662F\u4E92\u65A5\u7684\u3002
 
-main.opt.module=\  -module                 \u67E5\u627E\u4E0E\u7ED9\u5B9A\u6A21\u5757\u540D\u79F0\u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                       (\u53EF\u591A\u6B21\u6307\u5B9A)\u3002\n                                       -package, -regex, -requires \u662F\u4E92\u65A5\u7684\u3002
+main.opt.include=\n\u7528\u4E8E\u7B5B\u9009\u8981\u5206\u6790\u7684\u7C7B\u7684\u9009\u9879:\n  -include <\u6B63\u5219\u8868\u8FBE\u5F0F>             \u5C06\u5206\u6790\u9650\u5236\u4E3A\u4E0E\u6A21\u5F0F\u5339\u914D\u7684\u7C7B\n                                    \u6B64\u9009\u9879\u7B5B\u9009\u8981\u5206\u6790\u7684\u7C7B\u7684\u5217\u8868\u3002\n                                    \u5B83\u53EF\u4EE5\u4E0E\u5411\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5E94\u7528\u6A21\u5F0F\u7684\n                                    -p \u548C -e \u7ED3\u5408\u4F7F\u7528
 
-main.opt.include=\  -include                      \u5C06\u5206\u6790\u9650\u5236\u4E3A\u4E0E\u6A21\u5F0F\u5339\u914D\u7684\u7C7B\n                                       \u6B64\u9009\u9879\u7B5B\u9009\u8981\u5206\u6790\u7684\u7C7B\u7684\u5217\u8868\u3002\n                                       \u5B83\u53EF\u4EE5\u4E0E\u5411\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5E94\u7528\u6A21\u5F0F\u7684\n                                       -p \u548C -e \u7ED3\u5408\u4F7F\u7528
+main.opt.P=\  -P           -profile             \u663E\u793A\u5305\u542B\u7A0B\u5E8F\u5305\u7684\u914D\u7F6E\u6587\u4EF6
 
-main.opt.P=\  -P           -profile                \u663E\u793A\u5305\u542B\u7A0B\u5E8F\u5305\u7684\u914D\u7F6E\u6587\u4EF6
+main.opt.cp=\  -cp <\u8DEF\u5F84>   -classpath <\u8DEF\u5F84>    \u6307\u5B9A\u67E5\u627E\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
 
-main.opt.M=\  -M                                   \u663E\u793A\u5305\u542B\u7A0B\u5E8F\u5305\u7684\u6A21\u5757
-
-main.opt.cp=\  -cp    -classpath        \u6307\u5B9A\u67E5\u627E\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
-
-main.opt.mp=\  -mp ...\n  -modulepath ...         \u6307\u5B9A\u6A21\u5757\u8DEF\u5F84
+main.opt.mp=\  -mp ...\n  -modulepath ...      \u6307\u5B9A\u6A21\u5757\u8DEF\u5F84
 
 main.opt.upgrademodulepath=\  -upgrademodulepath ...  \u6307\u5B9A\u5347\u7EA7\u6A21\u5757\u8DEF\u5F84
 
-main.opt.m=\  -m                      \u6307\u5B9A\u8981\u5206\u6790\u7684\u6A21\u5757\u540D\u79F0\n                                       \u53CA\u5176\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.system=\  -system                \u6307\u5B9A\u66FF\u4EE3\u7CFB\u7EDF\u6A21\u5757\u8DEF\u5F84
 
-main.opt.R=\  -R           -recursive              \u9012\u5F52\u904D\u5386\u6240\u6709\u8FD0\u884C\u65F6\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                       -R \u9009\u9879\u8868\u793A -filter:none\u3002\u5982\u679C\n                                       \u6307\u5B9A\u4E86 -p, -e, -f \u9009\u9879, \u5219\u53EA\u5206\u6790\n                                       \u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.addmods=\  -addmods <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n                                    \u5C06\u6A21\u5757\u6DFB\u52A0\u5230\u6839\u96C6\u4EE5\u8FDB\u884C\u5206\u6790
 
-main.opt.ct=\  -ct          -compile-time           \u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u7684\u7F16\u8BD1\u65F6\u89C6\u56FE, \u4F8B\u5982\n                                       -R \u9009\u9879\u7684\u7F16\u8BD1\u65F6\u89C6\u56FE\u3002\u5982\u679C\u4ECE\u76EE\u5F55,\n                                       JAR \u6587\u4EF6\u6216\u6A21\u5757\u4E2D\u627E\u5230\u88AB\u4F9D\u8D56\u5BF9\u8C61,\n                                       \u5219\u5C06\u5206\u6790\u8BE5\u6240\u5728\u6863\u6848\u4E2D\u7684\u6240\u6709\u7C7B\u6587\u4EF6\u3002
+main.opt.m=\  -m <\u6A21\u5757\u540D\u79F0>                  \u6307\u5B9A\u7528\u4E8E\u5206\u6790\u7684\u6839\u6A21\u5757
 
-main.opt.apionly=\  -apionly                             \u901A\u8FC7\u516C\u5171\u7C7B (\u5305\u62EC\u5B57\u6BB5\u7C7B\u578B, \u65B9\u6CD5\u53C2\u6570\n                                     \u7C7B\u578B, \u8FD4\u56DE\u7C7B\u578B, \u53D7\u63A7\u5F02\u5E38\u9519\u8BEF\u7C7B\u578B\n                                     \u7B49) \u7684\u516C\u5171\u548C\u53D7\u4FDD\u62A4\u6210\u5458\u7684\u7B7E\u540D\n                                     \u9650\u5236\u5BF9 API (\u5373\u88AB\u4F9D\u8D56\u5BF9\u8C61)\n                                     \u8FDB\u884C\u5206\u6790
+main.opt.R=\  -R           -recursive           \u9012\u5F52\u904D\u5386\u6240\u6709\u8FD0\u884C\u65F6\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                    -R \u9009\u9879\u8868\u793A -filter:none\u3002\u5982\u679C\n                                    \u6307\u5B9A\u4E86 -p, -e, -f \u9009\u9879, \u5219\u53EA\u5206\u6790\n                                    \u5339\u914D\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
 
-main.opt.genmoduleinfo=\  -genmoduleinfo                  \u5728\u6307\u5B9A\u76EE\u5F55\u4E0B\u751F\u6210 module-info.java\u3002\n                                       \u5C06\u5206\u6790\u6307\u5B9A\u7684 JAR \u6587\u4EF6\u3002\n                                       \u6B64\u9009\u9879\u4E0D\u80FD\u4E0E -dotoutput \u6216 -cp \u4E00\u8D77\u4F7F\u7528\u3002
+main.opt.I=\  -I           -inverse             \u6839\u636E\u5176\u4ED6\u6307\u5B9A\u9009\u9879\u5206\u6790\u88AB\u4F9D\u8D56\u5BF9\u8C61,\n                                    \u7136\u540E\u67E5\u627E\u76F4\u63A5\u548C\u95F4\u63A5\u4F9D\u8D56\u4E8E\u5339\u914D\n                                    \u8282\u70B9\u7684\u6240\u6709 Artifact\u3002\n                                    \u8FD9\u76F8\u5F53\u4E8E\u7F16\u8BD1\u65F6\u89C6\u56FE\u5206\u6790\u7684\n                                    \u9006\u5411, \u8F93\u51FA\u88AB\u4F9D\u8D56\u5BF9\u8C61\u6982\u8981\u3002\n                                    \u6B64\u9009\u9879\u5FC5\u987B\u4E0E -requires, \n                                    -package \u6216 -regex \u9009\u9879\u4E00\u8D77\u4F7F\u7528\u3002
 
-main.opt.check=\  -check                               \u5206\u6790\u901A\u8FC7 -m \u9009\u9879\u6307\u5B9A\u7684\u6A21\u5757\u7684\n                                       \u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\u5B83\u8F93\u51FA\u5728\u8F6C\u6362\u51CF\u5C11\u540E\n                                       \u751F\u6210\u7684\u6A21\u5757\u4F9D\u8D56\u5173\u7CFB\u56FE\u5F62, \u8FD8\n                                       \u6807\u8BC6\u4EFB\u4F55\u672A\u4F7F\u7528\u7684\u5408\u683C\u5BFC\u51FA\u3002
+main.opt.ct=\  -ct          -compile-time        \u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u7684\u7F16\u8BD1\u65F6\u89C6\u56FE,\n                                    \u4F8B\u5982 -R \u9009\u9879\u7684\u7F16\u8BD1\u65F6\u89C6\u56FE\u3002\n                                    \u6839\u636E\u5176\u4ED6\u6307\u5B9A\u9009\u9879\u5206\u6790\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                    \u5982\u679C\u4ECE\u76EE\u5F55, JAR \u6587\u4EF6\u6216\u6A21\u5757\u4E2D\n                                    \u627E\u5230\u88AB\u4F9D\u8D56\u5BF9\u8C61, \u5219\u5C06\u5206\u6790\n                                    \u8BE5\u6240\u5728\u6863\u6848\u4E2D\u7684\u6240\u6709\u7C7B\u3002
+
+main.opt.apionly=\  -apionly                          \u901A\u8FC7\u516C\u5171\u7C7B (\u5305\u62EC\u5B57\u6BB5\u7C7B\u578B, \u65B9\u6CD5\u53C2\u6570\n                                     \u7C7B\u578B, \u8FD4\u56DE\u7C7B\u578B, \u53D7\u63A7\u5F02\u5E38\u9519\u8BEF\u7C7B\u578B\n                                     \u7B49) \u7684\u516C\u5171\u548C\u53D7\u4FDD\u62A4\u6210\u5458\u7684\u7B7E\u540D\n                                     \u9650\u5236\u5BF9 API (\u5373\u88AB\u4F9D\u8D56\u5BF9\u8C61)\n                                     \u8FDB\u884C\u5206\u6790\u3002
+
+main.opt.genmoduleinfo=\  -genmoduleinfo <\u76EE\u5F55>             \u5728\u6307\u5B9A\u76EE\u5F55\u4E0B\u751F\u6210 module-info.java\u3002\n                                    \u5C06\u5206\u6790\u6307\u5B9A\u7684 JAR \u6587\u4EF6\u3002\n                                    \u6B64\u9009\u9879\u4E0D\u80FD\u4E0E -dotoutput \n                                    \u6216 -cp \u4E00\u8D77\u4F7F\u7528\u3002
+
+main.opt.check=\  -check <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...\n                                    \u5206\u6790\u6307\u5B9A\u6A21\u5757\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\n                                    \u5B83\u8F93\u51FA\u6A21\u5757\u63CF\u8FF0\u7B26, \u5206\u6790\u4E4B\u540E\n                                    \u751F\u6210\u7684\u6A21\u5757\u88AB\u4F9D\u8D56\u5BF9\u8C61\u4EE5\u53CA\n                                    \u8F6C\u6362\u51CF\u5C11\u4E4B\u540E\u7684\u56FE\u5F62\u3002\u5B83\u8FD8\n                                    \u6807\u8BC6\u4EFB\u4F55\u672A\u4F7F\u7528\u7684\u5408\u683C\u5BFC\u51FA\u3002
 
 
-main.opt.dotoutput=\  -dotoutput                      DOT \u6587\u4EF6\u8F93\u51FA\u7684\u76EE\u6807\u76EE\u5F55
+main.opt.dotoutput=\  -dotoutput <\u76EE\u5F55>                  DOT \u6587\u4EF6\u8F93\u51FA\u7684\u76EE\u6807\u76EE\u5F55
 
-main.opt.jdkinternals=\  -jdkinternals                        \u5728 JDK \u5185\u90E8 API \u4E0A\u67E5\u627E\u7C7B\u7EA7\u522B\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                     \u9ED8\u8BA4\u60C5\u51B5\u4E0B, \u5B83\u5206\u6790 -classpath \u4E0A\u7684\u6240\u6709\u7C7B\n                                     \u548C\u8F93\u5165\u6587\u4EF6, \u9664\u975E\u6307\u5B9A\u4E86 -include \u9009\u9879\u3002\n                                     \u6B64\u9009\u9879\u4E0D\u80FD\u4E0E -p, -e \u548C -s \u9009\u9879\u4E00\u8D77\u4F7F\u7528\u3002\n                                     \u8B66\u544A: \u5728\u4E0B\u4E00\u4E2A\u53D1\u884C\u7248\u4E2D\u53EF\u80FD\u65E0\u6CD5\u8BBF\u95EE\n                                     JDK \u5185\u90E8 API\u3002
+main.opt.jdkinternals=\  -jdkinternals                     \u5728 JDK \u5185\u90E8 API \u4E0A\u67E5\u627E\u7C7B\u7EA7\u522B\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002\n                                    \u9664\u975E\u6307\u5B9A\u4E86 -include \u9009\u9879, \u5426\u5219\u9ED8\u8BA4\u60C5\u51B5\u4E0B,\n                                    \u5B83\u5206\u6790 -classpath \u4E0A\u7684\u6240\u6709\u7C7B\u548C\u8F93\u5165\u6587\u4EF6\u3002\n                                    \u6B64\u9009\u9879\u4E0D\u80FD\u4E0E -p, -e \u548C -s \u9009\u9879\n                                    \u4E00\u8D77\u4F7F\u7528\u3002\n                                    \u8B66\u544A: \u65E0\u6CD5\u8BBF\u95EE JDK \u5185\u90E8 API\u3002
 
-main.opt.depth=\  -depth=                       \u6307\u5B9A\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\n                                       \u7684\u6DF1\u5EA6
+main.opt.depth=\  -depth=<\u6DF1\u5EA6>                     \u6307\u5B9A\u8FC7\u6E21\u88AB\u4F9D\u8D56\u5BF9\u8C61\u5206\u6790\n                                    \u7684\u6DF1\u5EA6
 
-main.opt.q=\  -q           -quiet                  \u5728 -genmoduleinfo \u8F93\u51FA\u4E2D\u4E0D\u663E\u793A\u7F3A\u5C11\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
+main.opt.q=\  -q           -quiet               \u5728 \n                                    -genmoduleinfo \u8F93\u51FA\u4E2D\u4E0D\u663E\u793A\u7F3A\u5C11\u7684\u88AB\u4F9D\u8D56\u5BF9\u8C61\u3002
 
 err.unknown.option=\u672A\u77E5\u9009\u9879: {0}
 err.missing.arg=\u6CA1\u6709\u4E3A{0}\u6307\u5B9A\u503C
 err.invalid.arg.for.option=\u9009\u9879\u7684\u53C2\u6570\u65E0\u6548: {0}
 err.option.after.class=\u5FC5\u987B\u5728\u7C7B\u4E4B\u524D\u6307\u5B9A\u9009\u9879: {0}
-err.genmoduleinfo.not.jarfile={0} \u5BF9 -genmoduleinfo \u9009\u9879\u65E0\u6548 (\u5FC5\u987B\u4E3A JAR \u6587\u4EF6)
+err.genmoduleinfo.not.jarfile={0} \u5BF9 -genmoduleinfo \u9009\u9879\u65E0\u6548 (\u5FC5\u987B\u4E3A\u975E\u6A21\u5757\u5316 JAR \u6587\u4EF6)
 err.profiles.msg=\u6CA1\u6709\u914D\u7F6E\u6587\u4EF6\u4FE1\u606F
 err.exception.message={0}
 err.invalid.path=\u65E0\u6548\u8DEF\u5F84: {0}
-err.invalid.module.option=\u5DF2\u8BBE\u7F6E -m {0}, \u4F46\u5DF2\u6307\u5B9A {1}\u3002
+err.invalid.module.option=\u65E0\u6CD5\u4F7F\u7528 {1} \u9009\u9879\u8BBE\u7F6E {0}\u3002
 err.invalid.filters=\u53EA\u80FD\u8BBE\u7F6E -package (-p), -regex (-e), -requires \u9009\u9879\u4E2D\u7684\u4E00\u4E2A
 err.module.not.found=\u627E\u4E0D\u5230\u6A21\u5757: {0}
-err.root.module.not.set=-m \u672A\u8BBE\u7F6E
-warn.invalid.arg=\u7C7B\u540D\u65E0\u6548\u6216\u8DEF\u5F84\u540D\u4E0D\u5B58\u5728: {0}
+err.root.module.not.set=\u6839\u6A21\u5757\u96C6\u4E3A\u7A7A
+err.invalid.inverse.option={0} \u4E0D\u80FD\u4E0E -inverse \u9009\u9879\u4E00\u8D77\u4F7F\u7528
+err.inverse.filter.not.set={0} \u4E0D\u80FD\u4E0E -inverse \u9009\u9879\u4E00\u8D77\u4F7F\u7528
+warn.invalid.arg=\u8DEF\u5F84\u4E0D\u5B58\u5728: {0}
 warn.split.package=\u5DF2\u5728{1} {2}\u4E2D\u5B9A\u4E49\u7A0B\u5E8F\u5305{0}
 warn.replace.useJDKInternals=\u4E0D\u652F\u6301 JDK \u5185\u90E8 API, \u5B83\u4EEC\u4E13\u7528\u4E8E\u901A\u8FC7\u4E0D\u517C\u5BB9\u65B9\u5F0F\u6765\u5220\u9664\n\u6216\u66F4\u6539\u7684 JDK \u5B9E\u73B0, \u53EF\u80FD\u4F1A\u635F\u574F\u60A8\u7684\u5E94\u7528\u7A0B\u5E8F\u3002\n\u8BF7\u4FEE\u6539\u60A8\u7684\u4EE3\u7801, \u6D88\u9664\u4E0E\u4EFB\u4F55 JDK \u5185\u90E8 API \u7684\u76F8\u5173\u6027\u3002\n\u6709\u5173 JDK \u5185\u90E8 API \u66FF\u6362\u7684\u6700\u65B0\u66F4\u65B0, \u8BF7\u67E5\u770B:\n{0}
 
diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
index ffeab7331a2..71e99089976 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties
@@ -26,19 +26,19 @@
 jshell.msg.welcome =JShell\u3078\u3088\u3046\u3053\u305D -- \u30D0\u30FC\u30B8\u30E7\u30F3{0}\n\u6982\u8981\u306B\u3064\u3044\u3066\u306F\u3001\u6B21\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: /help intro\n
 jshell.err.opt.classpath.conflict = -classpath\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059\u3002
 jshell.err.opt.classpath.arg = -classpath\u3078\u306E\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-jshell.err.opt.startup.conflict = -startup\u307E\u305F\u306F-nostartup\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059\u3002
+jshell.err.opt.feedback.arg = -feedback\u306E\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30E2\u30FC\u30C9\u306F\u5FC5\u9808\u3067\u3059\u3002
+jshell.err.opt.startup.one = -startup\u307E\u305F\u306F-nostartup\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u3069\u3061\u3089\u304B\u4E00\u65B9\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
 jshell.err.opt.unknown = \u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0}
 
-jshell.msg.terminated =\u72B6\u614B\u30A8\u30F3\u30B8\u30F3\u304C\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002\n\u6B21\u3092\u6307\u5B9A\u3057\u3066\u5B9A\u7FA9\u3092\u5FA9\u5143\u3057\u3066\u304F\u3060\u3055\u3044: /reload restore
+jshell.msg.terminated =\u72B6\u614B\u30A8\u30F3\u30B8\u30F3\u304C\u7D42\u4E86\u3057\u307E\u3057\u305F\u3002\n\u6B21\u3092\u6307\u5B9A\u3057\u3066\u5B9A\u7FA9\u3092\u5FA9\u5143\u3057\u3066\u304F\u3060\u3055\u3044: /reload -restore
 
 jshell.msg.use.one.of = \u6B21\u306E\u3044\u305A\u308C\u304B\u3092\u4F7F\u7528\u3057\u307E\u3059: {0}
-jshell.err.def.or.id.not.found = \u6307\u5B9A\u306E\u5B9A\u7FA9\u307E\u305F\u306FID\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-jshell.msg.see.classes.etc = /classes\u3001/methods\u3001/vars\u307E\u305F\u306F/list\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
+jshell.msg.see.classes.etc = /types\u3001/methods\u3001/vars\u307E\u305F\u306F/list\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
 jshell.err.arg = \u7121\u52B9\u306A''{0}''\u5F15\u6570: {1}
 jshell.msg.see = \u8A73\u7D30\u306F\u3001{0}\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 jshell.err.file.not.accessible = ''{0}''\u306E\u30D5\u30A1\u30A4\u30EB''{1}''\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {2}
-jshell.err.file.not.found = ''{0}''\u306E\u30D5\u30A1\u30A4\u30EB''{1}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {2}
+jshell.err.file.not.found = ''{0}''\u306E\u30D5\u30A1\u30A4\u30EB''{1}''\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 jshell.err.file.exception = ''{0}''\u306E\u30D5\u30A1\u30A4\u30EB''{1}''\u304C\u4F8B\u5916\u3092\u30B9\u30ED\u30FC\u3057\u307E\u3057\u305F: {2}
 jshell.err.file.filename = ''{0}''\u306B\u306F\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
 
@@ -49,8 +49,10 @@ jshell.err.no.such.command.or.snippet.id = \u6307\u5B9A\u3055\u308C\u305F\u30B3\
 jshell.err.command.ambiguous = \u30B3\u30DE\u30F3\u30C9: ''{0}''\u306F\u3042\u3044\u307E\u3044\u3067\u3059: {1}
 jshell.err.set.editor.arg = ''/set editor''\u30B3\u30DE\u30F3\u30C9\u306B\u306F\u30D1\u30B9\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059
 jshell.msg.set.editor.set = \u30A8\u30C7\u30A3\u30BF\u306F\u6B21\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059: {0}
+jshell.err.cant.launch.editor = \u30A8\u30C7\u30A3\u30BF\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093 -- \u4E88\u671F\u3057\u306A\u3044\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {0}
+jshell.msg.try.set.editor = \u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u3092\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001/set editor\u3092\u5B9F\u884C\u3057\u3066\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
-jshell.msg.try.list.without.args = \u5F15\u6570\u3092\u6307\u5B9A\u305B\u305A\u306B''/list''\u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+jshell.msg.try.command.without.args = \u5F15\u6570\u3092\u6307\u5B9A\u305B\u305A\u306B''{0}''\u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 jshell.msg.no.active = \u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u5B9A\u7FA9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 
 jshell.msg.resetting = \u30EA\u30BB\u30C3\u30C8\u4E2D...
@@ -67,8 +69,8 @@ jshell.err.out.of.range = \u7BC4\u56F2\u5916
 jshell.msg.error = \u30A8\u30E9\u30FC:
 jshell.msg.warning = \u8B66\u544A:
 
-jshell.err.set.arg = ''/set''\u30B3\u30DE\u30F3\u30C9\u306B\u306F\u3001\u30B5\u30D6\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002''/help /set''\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
-jshell.err.set.ambiguous = ''/set''\u3078\u306E\u30B5\u30D6\u30B3\u30DE\u30F3\u30C9\u5F15\u6570\u304C\u3042\u3044\u307E\u3044\u3067\u3059: {0}
+jshell.err.sub.arg = ''{0}''\u30B3\u30DE\u30F3\u30C9\u306B\u306F\u30B5\u30D6\u30B3\u30DE\u30F3\u30C9\u304C\u5FC5\u8981\u3067\u3059\u3002''/help {0}''\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044
+jshell.err.sub.ambiguous = ''{0}''\u3078\u306E\u30B5\u30D6\u30B3\u30DE\u30F3\u30C9\u5F15\u6570\u304C\u3042\u3044\u307E\u3044\u3067\u3059: {1}
 
 jshell.err.classpath.arg = /classpath\u30B3\u30DE\u30F3\u30C9\u306B\u306F\u30D1\u30B9\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002
 jshell.msg.classpath = \u30D1\u30B9''{0}''\u304C\u30AF\u30E9\u30B9\u30D1\u30B9\u306B\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F
@@ -78,7 +80,6 @@ jshell.msg.help.begin =Java\u8A00\u8A9E\u306E\u5F0F\u3001\u6587\u307E\u305F\u306
 jshell.msg.help.subject =\n\u8A73\u7D30\u306F\u3001''/help''\u306E\u5F8C\u306B\u30B3\u30DE\u30F3\u30C9\u307E\u305F\u306F\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u540D\u524D\u3092\u7D9A\u3051\u3066\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u305F\u3068\u3048\u3070\u3001''/help /list''\u307E\u305F\u306F''/help intro''\u306A\u3069\u3067\u3059\u3002\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8:\n
 
 jshell.err.drop.arg =/drop\u5F15\u6570\u306B\u306F\u3001\u524A\u9664\u3059\u308B\u30A4\u30F3\u30DD\u30FC\u30C8\u3001\u5909\u6570\u3001\u30E1\u30BD\u30C3\u30C9\u307E\u305F\u306F\u30AF\u30E9\u30B9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\nID\u307E\u305F\u306F\u540D\u524D\u3067\u6307\u5B9A\u3057\u307E\u3059\u3002ID\u3092\u53C2\u7167\u3059\u308B\u306B\u306F/list\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u72B6\u614B\u3092\u30EA\u30BB\u30C3\u30C8\u3059\u308B\u306B\u306F/reset\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
-jshell.msg.drop.not.active = \u5F15\u6570\u306B\u3001\u524A\u9664\u3059\u308B\u30A4\u30F3\u30DD\u30FC\u30C8\u3001\u5909\u6570\u3001\u30E1\u30BD\u30C3\u30C9\u307E\u305F\u306F\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 jshell.err.drop.ambiguous = \u5F15\u6570\u304C\u3001\u8907\u6570\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u3001\u5909\u6570\u3001\u30E1\u30BD\u30C3\u30C9\u307E\u305F\u306F\u30AF\u30E9\u30B9\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002
 jshell.err.failed = \u5931\u6557\u3057\u307E\u3057\u305F\u3002
 jshell.msg.native.method = Native\u30E1\u30BD\u30C3\u30C9
@@ -87,11 +88,12 @@ jshell.msg.goodbye = \u7D42\u4E86\u3057\u307E\u3059
 
 jshell.msg.help.for.help = \u30D8\u30EB\u30D7\u3092\u53C2\u7167\u3059\u308B\u306B\u306F\u3001/help\u3068\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
-jshell.err.feedback.expected.new.feedback.mode = \u65B0\u898F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u304C\u5FC5\u8981\u3067\u3059 -- {0}
-jshell.err.feedback.expected.mode.name = \u65B0\u898F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002''{0}''\u306F\u65E2\u77E5\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3067\u3059 -- {1}
-jshell.err.feedback.command.quiet = ''command''\u307E\u305F\u306F''quiet''\u3092\u6307\u5B9A\u3057\u307E\u3059 -- {0}
-jshell.err.feedback.expected.field = \u5FC5\u8981\u306A\u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u304C\u3042\u308A\u307E\u305B\u3093 -- {0}
-jshell.err.feedback.expected.mode = \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u304C\u5FC5\u8981\u3067\u3059 -- {0}
+jshell.err.mode.name = \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u540D\u304C\u5FC5\u8981\u3067\u3059: {0}
+jshell.err.missing.mode = \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093 -- {0}
+jshell.err.field.name = \u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u304C\u5FC5\u8981\u3067\u3059: {0} -- {1}
+jshell.err.missing.field = \u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u304C\u3042\u308A\u307E\u305B\u3093 -- {0}
+jshell.err.mode.unknown = \u540D\u524D{0}\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093 -- {1}
+
 jshell.err.feedback.does.not.match.mode = \u73FE\u5728\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093: {0} -- {1}
 jshell.err.feedback.ambiguous.mode = \u8907\u6570\u306E\u73FE\u5728\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3068\u4E00\u81F4\u3057\u307E\u3059: {0} -- {1}
 jshell.err.feedback.expected.format = \u5FC5\u8981\u306A\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u3042\u308A\u307E\u305B\u3093 -- {0}
@@ -104,6 +106,24 @@ jshell.msg.feedback.new.mode = \u65B0\u898F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\
 jshell.msg.feedback.mode = \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9: {0}
 jshell.msg.feedback.mode.following = \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306F\u6B21\u306E\u3044\u305A\u308C\u304B\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059:
 
+jshell.err.truncation.expected.length = \u5207\u6368\u3066\u9577\u304C\u5FC5\u8981\u3067\u3059 -- {0}
+jshell.err.truncation.length.not.integer = \u5207\u6368\u3066\u9577\u306F\u6574\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0} -- {1}
+
+jshell.err.not.valid.with.predefined.mode = \u4E8B\u524D\u5B9A\u7FA9\u6E08\u30E2\u30FC\u30C9\u3067\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093: {0} -- {1}
+jshell.err.retained.feedback.mode.must.be.retained.or.predefined = ''/retain feedback ''\u3067\u306F\u3001\u304C\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u304B\u3001''/retain mode''\u3067\u4FDD\u6301\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 -- {0}
+
+jshell.err.unknown.option = \u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0} -- {1}
+jshell.err.default.option.or.program = -default\u30AA\u30D7\u30B7\u30E7\u30F3\u307E\u305F\u306F\u30D7\u30ED\u30B0\u30E9\u30E0\u306E\u3044\u305A\u308C\u304B\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044 -- {0}
+jshell.err.option.or.filename = 1\u3064\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u307E\u305F\u306F\u8D77\u52D5\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044 -- {0}
+jshell.err.unexpected.at.end = \u30B3\u30DE\u30F3\u30C9\u306E\u7D42\u308F\u308A\u306B\u4E88\u671F\u3057\u306A\u3044\u5F15\u6570\u304C\u3042\u308A\u307E\u3059: {0} -- {1}
+jshell.err.conflicting.options = \u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059 -- {0}
+jshell.err.cannot.delete.current.mode = \u73FE\u5728\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9''{0}''\u306F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\u6700\u521D\u306B''/set feedback''\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044 -- {1}
+jshell.err.cannot.delete.retained.mode = \u4FDD\u6301\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9''{0}''\u306F\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\u6700\u521D\u306B''/retain feedback''\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044 -- {1}
+jshell.err.may.not.specify.options.and.snippets = \u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u4E21\u65B9\u3092\u4F7F\u7528\u3057\u3066\u306F\u3044\u3051\u307E\u305B\u3093: {0}
+jshell.err.no.such.snippets = \u6307\u5B9A\u3055\u308C\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
+jshell.err.the.snippet.cannot.be.used.with.this.command = \u3053\u306E\u30B3\u30DE\u30F3\u30C9\u306F\u30B9\u30CB\u30DA\u30C3\u30C8''{0}''\u3092\u53D7\u3051\u5165\u308C\u307E\u305B\u3093: {1}
+jshell.err.retained.mode.failure = \u4FDD\u6301\u3055\u308C\u305F\u30E2\u30FC\u30C9\u3067\u5931\u6557\u3057\u307E\u3057\u305F(\u30E2\u30FC\u30C9\u306F\u30AF\u30EA\u30A2\u3055\u308C\u307E\u3057\u305F) -- {0} {1}
+
 jshell.console.see.more = <\u8A73\u7D30\u306F\u3001\u30BF\u30D6\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044>
 jshell.console.do.nothing = \u4F55\u3082\u3057\u306A\u3044
 jshell.console.choice = \u9078\u629E: 
@@ -113,11 +133,11 @@ jshell.console.no.candidate = \n\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u5019
 jshell.console.incomplete = \n\u7D50\u679C\u304C\u4E0D\u5B8C\u5168\u3067\u3042\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u7D50\u679C\u3092\u5B8C\u5168\u306B\u3059\u308B\u306B\u306F\u3001\u5F8C\u3067\u518D\u8A66\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 
-help.usage = \u4F7F\u7528\u65B9\u6CD5:   jshell  \n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n\t-classpath           \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u51FA\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n\t-cp                  \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u51FA\u3059\u308B\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B\n\t-startup             \u8D77\u52D5\u5B9A\u7FA9\u306E\u4EE3\u66FF\u3068\u3057\u3066\u5B9F\u884C\u3055\u308C\u308B\n\t-nostartup                 \u8D77\u52D5\u5B9A\u7FA9\u3092\u5B9F\u884C\u3057\u306A\u3044\n\t-help                      \u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3059\u308B\n\t-version                   \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\n
+help.usage = \u4F7F\u7528\u65B9\u6CD5:   jshell  \n\u4F7F\u7528\u53EF\u80FD\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059:\n    -classpath           \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    -cp                  \u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u3042\u308B\u5834\u6240\u3092\u6307\u5B9A\u3057\u307E\u3059\n    -startup             \u8D77\u52D5\u5B9A\u7FA9\u306E\u4EE3\u66FF\u3068\u3057\u3066\u5B9F\u884C\u3055\u308C\u307E\u3059\n    -nostartup                 \u8D77\u52D5\u5B9A\u7FA9\u3092\u5B9F\u884C\u3057\u307E\u305B\u3093\n    -feedback      \u521D\u671F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u30E2\u30FC\u30C9\u306F\n                         \u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B(silent\u3001concise\u3001normal\u307E\u305F\u306Fverbose)\u304B\u3001\n                         \u4E8B\u524D\u306B\u30E6\u30FC\u30B6\u30FC\u304C\u5B9A\u7FA9\u3067\u304D\u307E\u3059\n    -q                   \u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002-feedback concise\u3068\u540C\u3058\n    -qq                  \u975E\u5E38\u306B\u7C21\u6F54\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002-feedback silent\u3068\u540C\u3058\n    -v                   \u8A73\u7D30\u306A\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3002-feedback verbose\u3068\u540C\u3058\n    -J             \u3092\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u76F4\u63A5\u6E21\u3057\u307E\u3059\u3002\n                         \u5B9F\u884C\u6642\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-J\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -R             \u3092\u30EA\u30E2\u30FC\u30C8\u5B9F\u884C\u6642\u30B7\u30B9\u30C6\u30E0\u306B\u6E21\u3057\u307E\u3059\u3002\n                         \u30EA\u30E2\u30FC\u30C8\u30FB\u30D5\u30E9\u30B0\u307E\u305F\u306F\u30D5\u30E9\u30B0\u5F15\u6570\u3054\u3068\u306B1\u3064\u306E-R\u3092\u4F7F\u7528\u3057\u307E\u3059\n    -help                      \u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3057\u307E\u3059\n    -version                   \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\n
 
 help.list.summary = \u5165\u529B\u3057\u305F\u30BD\u30FC\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
-help.list.args = [all|start|]
-help.list =\u30B9\u30CB\u30DA\u30C3\u30C8ID\u304C\u4ED8\u304F\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30BD\u30FC\u30B9\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\n/list\n\t\u5165\u529B\u3057\u305F\u3001\u307E\u305F\u306F/open\u3067\u8AAD\u307F\u53D6\u3063\u305F\u30B3\u30FC\u30C9\u306E\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/list start\n\t\u81EA\u52D5\u7684\u306B\u8A55\u4FA1\u3055\u308C\u305F\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/list all\n\t\u5931\u6557\u3001\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/list \n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/list \n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+help.list.args = [|-all|-start]
+help.list =\u30B9\u30CB\u30DA\u30C3\u30C8ID\u304C\u4ED8\u304F\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30BD\u30FC\u30B9\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\n/list\n\t\u5165\u529B\u3057\u305F\u3001\u307E\u305F\u306F/open\u3067\u8AAD\u307F\u53D6\u3063\u305F\u30B3\u30FC\u30C9\u306E\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/list -start\n\t\u81EA\u52D5\u7684\u306B\u8A55\u4FA1\u3055\u308C\u305F\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/list -all\n\t\u5931\u6557\u3001\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/list \n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/list \n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
 
 help.edit.summary = \u540D\u524D\u307E\u305F\u306FID\u3067\u53C2\u7167\u3055\u308C\u308B\u30BD\u30FC\u30B9\u30FB\u30A8\u30F3\u30C8\u30EA\u3092\u7DE8\u96C6\u3057\u307E\u3059
 help.edit.args = 
@@ -128,24 +148,24 @@ help.drop.args = 
 help.drop =\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059 -- \u975E\u30A2\u30AF\u30C6\u30A3\u30D6\u306B\u3057\u307E\u3059\u3002\n\n/drop \n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\n\n/drop \n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059
 
 help.save.summary = \u30D5\u30A1\u30A4\u30EB\u306B\u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30BD\u30FC\u30B9\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
-help.save.args = [all|history|start] 
-help.save =\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u307E\u305F\u306F\u30B3\u30DE\u30F3\u30C9(\u3042\u308B\u3044\u306F\u305D\u306E\u4E21\u65B9)\u3092\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\n/save \n\t\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30BD\u30FC\u30B9\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\n/save all \n\t\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30BD\u30FC\u30B9\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\t\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u6E08\u3001\u5931\u6557\u304A\u3088\u3073\u8D77\u52D5\u30B3\u30FC\u30C9\u3092\u542B\u3080\u30BD\u30FC\u30B9\u304C\u542B\u307E\u308C\u307E\u3059\u3002\n\n/save history \n\tjshell\u306E\u8D77\u52D5\u4EE5\u964D\u5165\u529B\u3055\u308C\u305F\u3001\u3059\u3079\u3066\u306E\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u9806\u6B21\u5C65\u6B74\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\n/save start \n\t\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8D77\u52D5\u5B9A\u7FA9\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002
+help.save.args = [-all|-history|-start] 
+help.save =\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u307E\u305F\u306F\u30B3\u30DE\u30F3\u30C9(\u3042\u308B\u3044\u306F\u305D\u306E\u4E21\u65B9)\u3092\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\n/save \n\t\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30BD\u30FC\u30B9\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\n/save all  \n\t\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u30BD\u30FC\u30B9\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\t\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u6E08\u3001\u5931\u6557\u304A\u3088\u3073\u8D77\u52D5\u30B3\u30FC\u30C9\u3092\u542B\u3080\u30BD\u30FC\u30B9\u304C\u542B\u307E\u308C\u307E\u3059\u3002\n\n/save history  \n\tjshell\u306E\u8D77\u52D5\u4EE5\u964D\u5165\u529B\u3055\u308C\u305F\u3001\u3059\u3079\u3066\u306E\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u9806\u6B21\u5C65\u6B74\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002\n\n/save -start  \n\t\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8D77\u52D5\u5B9A\u7FA9\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3059\u3002
 
 help.open.summary = \u30BD\u30FC\u30B9\u306E\u5165\u529B\u3068\u3057\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059
 help.open.args = 
 help.open =\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u3068\u3057\u3066\u305D\u306E\u5185\u5BB9\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002\n\n/open \n\tjshell\u306E\u5165\u529B\u3068\u3057\u3066\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002
 
 help.vars.summary = \u5BA3\u8A00\u3055\u308C\u305F\u5909\u6570\u304A\u3088\u3073\u305D\u306E\u5024\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
-help.vars.args =
-help.vars =\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306Ajshell\u5909\u6570\u306E\u30BF\u30A4\u30D7\u3001\u540D\u524D\u304A\u3088\u3073\u5024\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002
+help.vars.args = [|-all|-start]
+help.vars =jshell\u5909\u6570\u306E\u578B\u3001\u540D\u524D\u304A\u3088\u3073\u5024\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\n/vars\n\t\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306Ajshell\u5909\u6570\u306E\u578B\u3001\u540D\u524D\u304A\u3088\u3073\u5024\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/vars \n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306Ejshell\u5909\u6570\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u5909\u6570\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/vars \n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306Ejshell\u5909\u6570\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/vars -start\n\t\u81EA\u52D5\u7684\u306B\u8FFD\u52A0\u3055\u308C\u305F\u8D77\u52D5jshell\u5909\u6570\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/vars -all\n\t\u5931\u6557\u3001\u4E0A\u66F8\u304D\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306Ejshell\u5909\u6570\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
 
 help.methods.summary = \u5BA3\u8A00\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u305D\u306E\u7F72\u540D\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
-help.methods.args =
-help.methods =\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306Ajshell\u30E1\u30BD\u30C3\u30C9\u306E\u540D\u524D\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\u304A\u3088\u3073\u623B\u308A\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002
+help.methods.args = [|-all|-start]
+help.methods =jshell\u30E1\u30BD\u30C3\u30C9\u306E\u540D\u524D\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u578B\u304A\u3088\u3073\u623B\u308A\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\n/methods\n\t\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306Ajshell\u30E1\u30BD\u30C3\u30C9\u306E\u540D\u524D\u3001\u30D1\u30E9\u30E1\u30FC\u30BF\u578B\u304A\u3088\u3073\u623B\u308A\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/methods \n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306Ejshell\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30E1\u30BD\u30C3\u30C9\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/methods \n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306Ejshell\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/methods -start\n\t\u81EA\u52D5\u7684\u306B\u8FFD\u52A0\u3055\u308C\u305F\u8D77\u52D5jshell\u30E1\u30BD\u30C3\u30C9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/methods -all\n\t\u5931\u6557\u3001\u4E0A\u66F8\u304D\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
 
-help.classes.summary = \u5BA3\u8A00\u3055\u308C\u305F\u30AF\u30E9\u30B9\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
-help.classes.args =
-help.classes =\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306Ajshell\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304A\u3088\u3073\u5217\u6319\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002
+help.types.summary = \u5BA3\u8A00\u3055\u308C\u305F\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
+help.types.args =[|-all|-start]
+help.types =jshell\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304A\u3088\u3073\u5217\u6319\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\n/types\n\t\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306Ajshell\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304A\u3088\u3073\u5217\u6319\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\n/types \n\t\u6307\u5B9A\u3057\u305F\u540D\u524D\u306Ejshell\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059(\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u578B\u306E\u30D7\u30EA\u30D5\u30A1\u30EC\u30F3\u30B9)\n\n/types \n\t\u6307\u5B9A\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8ID\u306Ejshell\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/types -start\n\t\u81EA\u52D5\u7684\u306B\u8FFD\u52A0\u3055\u308C\u305F\u8D77\u52D5jshell\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\n\n/types -all\n\t\u5931\u6557\u3001\u4E0A\u66F8\u304D\u6E08\u3001\u524A\u9664\u6E08\u304A\u3088\u3073\u8D77\u52D5\u3092\u542B\u3080\u3059\u3079\u3066\u306Ejshell\u578B\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
 
 help.imports.summary = \u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059
 help.imports.args =
@@ -159,9 +179,9 @@ help.reset.summary = reset jshell
 help.reset.args =
 help.reset =jshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30FC\u30C9\u304A\u3088\u3073\u5B9F\u884C\u72B6\u614B\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3059:\n\t* \u5165\u529B\u3057\u305F\u3059\u3079\u3066\u306E\u30B3\u30FC\u30C9\u304C\u5931\u308F\u308C\u307E\u3059\u3002\n\t* \u8D77\u52D5\u30B3\u30FC\u30C9\u304C\u518D\u5B9F\u884C\u3055\u308C\u307E\u3059\u3002\n\t* \u5B9F\u884C\u72B6\u614B\u306F\u518D\u5EA6\u958B\u59CB\u3055\u308C\u307E\u3059\u3002\n\t* \u30AF\u30E9\u30B9\u30D1\u30B9\u306F\u30AF\u30EA\u30A2\u3055\u308C\u307E\u3059\u3002\n\u30C4\u30FC\u30EB\u8A2D\u5B9A\u306F\u6B21\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u3088\u3046\u306B\u4FDD\u6301\u3055\u308C\u307E\u3059: /set ...\n\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306B\u3059\u3079\u3066\u306E\u4F5C\u696D\u3092\u4FDD\u5B58\u3057\u3066\u304F\u3060\u3055\u3044
 
-help.reload.summary = \u30EA\u30BB\u30C3\u30C8\u3057\u3066\u95A2\u9023\u3059\u308B\u5C65\u6B74\u3092\u30EA\u30D7\u30EC\u30A4\u3057\u307E\u3059 -- \u73FE\u5728\u307E\u305F\u306F\u4EE5\u524D(restore)
-help.reload.args = [restore] [quiet]
-help.reload =jshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30FC\u30C9\u304A\u3088\u3073\u5B9F\u884C\u72B6\u614B\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u3001\u5404jshell\u6709\u52B9\u30B3\u30DE\u30F3\u30C9\n\u304A\u3088\u3073\u6709\u52B9\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u5165\u529B\u3055\u308C\u305F\u9806\u756A\u3067\u30EA\u30D7\u30EC\u30A4\u3057\u307E\u3059\u3002\n\n/reload\n\t\u30EA\u30BB\u30C3\u30C8\u3055\u308C\u3001jshell\u304C\u5165\u529B\u3055\u308C\u305F\u3001\u3042\u308B\u3044\u306F/reset\u307E\u305F\u306F\n\t/reload\u30B3\u30DE\u30F3\u30C9\u304C\u5B9F\u884C\u3055\u308C\u305F(\u6700\u65B0\u306E\u3044\u305A\u308C\u304B)\u4EE5\u964D\u306E\u6709\u52B9\u306A\u5C65\u6B74\u304C\n\t\u30EA\u30D7\u30EC\u30A4\u3055\u308C\u307E\u3059\u3002\n\n/reload restore\n\t\u30EA\u30BB\u30C3\u30C8\u3055\u308C\u3001jshell\u304C\u5B9F\u884C\u3055\u308C\u305F\u3001\u3042\u308B\u3044\u306F/reset\u307E\u305F\u306F/reload\u30B3\u30DE\u30F3\u30C9\u304C\n\t\u5B9F\u884C\u3055\u308C\u305F\u4EE5\u524D\u3068\u6700\u65B0\u306E\u6642\u9593\u306E\u9593\u306E\u6709\u52B9\u306A\u5C65\u6B74\u304C\u30EA\u30D7\u30EC\u30A4\u3055\u308C\u307E\u3059\u3002\n\t\u305D\u306E\u305F\u3081\u3001\u3053\u308C\u306F\u4EE5\u524D\u306Ejshell\u30C4\u30FC\u30EB\u30FB\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u5FA9\u5143\u306B\n\t\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\n/reload [restore] quiet\n\t'quiet'\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u30EA\u30D7\u30EC\u30A4\u304C\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002\u30A8\u30E9\u30FC\u306F\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+help.reload.summary = \u30EA\u30BB\u30C3\u30C8\u3057\u3066\u95A2\u9023\u3059\u308B\u5C65\u6B74\u3092\u30EA\u30D7\u30EC\u30A4\u3057\u307E\u3059 -- \u73FE\u5728\u307E\u305F\u306F\u4EE5\u524D(-restore)
+help.reload.args = [-restore] [-quiet]
+help.reload =jshell\u30C4\u30FC\u30EB\u30FB\u30B3\u30FC\u30C9\u304A\u3088\u3073\u5B9F\u884C\u72B6\u614B\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u3001\u5404jshell\u6709\u52B9\u30B3\u30DE\u30F3\u30C9\n\u304A\u3088\u3073\u6709\u52B9\u30B9\u30CB\u30DA\u30C3\u30C8\u3092\u5165\u529B\u3055\u308C\u305F\u9806\u756A\u3067\u30EA\u30D7\u30EC\u30A4\u3057\u307E\u3059\u3002\n\n/reload\n\t\u30EA\u30BB\u30C3\u30C8\u3055\u308C\u3001jshell\u304C\u5165\u529B\u3055\u308C\u305F\u3001\u3042\u308B\u3044\u306F/reset\u307E\u305F\u306F\n\t/reload\u30B3\u30DE\u30F3\u30C9\u304C\u5B9F\u884C\u3055\u308C\u305F(\u6700\u65B0\u306E\u3044\u305A\u308C\u304B)\u4EE5\u964D\u306E\u6709\u52B9\u306A\u5C65\u6B74\u304C\n\t\u30EA\u30D7\u30EC\u30A4\u3055\u308C\u307E\u3059\u3002\n\n/reload -restore\n\t\u30EA\u30BB\u30C3\u30C8\u3055\u308C\u3001jshell\u304C\u5B9F\u884C\u3055\u308C\u305F\u3001\u3042\u308B\u3044\u306F/reset\u307E\u305F\u306F/reload\u30B3\u30DE\u30F3\u30C9\u304C\n\t\u5B9F\u884C\u3055\u308C\u305F\u4EE5\u524D\u3068\u6700\u65B0\u306E\u6642\u9593\u306E\u9593\u306E\u6709\u52B9\u306A\u5C65\u6B74\u304C\u30EA\u30D7\u30EC\u30A4\u3055\u308C\u307E\u3059\u3002\n\t\u305D\u306E\u305F\u3081\u3001\u3053\u308C\u306F\u4EE5\u524D\u306Ejshell\u30C4\u30FC\u30EB\u30FB\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u5FA9\u5143\u306B\n\t\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\n/reload [-restore] -quiet\n\t'-quiet'\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u30EA\u30D7\u30EC\u30A4\u304C\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002\u30A8\u30E9\u30FC\u306F\u8868\u793A\u3055\u308C\u307E\u3059\u3002
 
 help.classpath.summary = \u30AF\u30E9\u30B9\u30D1\u30B9\u306B\u30D1\u30B9\u3092\u8FFD\u52A0\u3057\u307E\u3059
 help.classpath.args = 
@@ -180,8 +200,12 @@ help.help.args = [|]
 help.help =jshell\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n/help\n\tjshell\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073\u30D8\u30EB\u30D7\u306E\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059\u3002\n\n/help \n\t\u6307\u5B9A\u3057\u305F\u30B3\u30DE\u30F3\u30C9\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u30B9\u30E9\u30C3\u30B7\u30E5\u3092\u542B\u3081\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\t\u5FC5\u8981\u306A\u306E\u306F\u30B3\u30DE\u30F3\u30C9\u306E\u6700\u521D\u306E\u6570\u6587\u5B57\u306E\u307F\u3067\u3059 -- \u8907\u6570\u3042\u308B\u5834\u5408\u306F\n\t\u305D\u308C\u305E\u308C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4F8B:  /help /li\n\n/help \n\t\u6307\u5B9A\u3057\u305F\u30D8\u30EB\u30D7\u306E\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u4F8B: /help intro
 
 help.set.summary = jshell\u69CB\u6210\u60C5\u5831\u3092\u8A2D\u5B9A\u3057\u307E\u3059
-help.set.args = editor|start|feedback|newmode|prompt|format ...
-help.set =\u6B21\u306E\u3088\u3046\u306Ajshell\u69CB\u6210\u60C5\u5831\u3092\u8A2D\u5B9A\u3057\u307E\u3059:\n\u4F7F\u7528\u3059\u308B\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u3001\u4F7F\u7528\u3059\u308B\u8D77\u52D5\u5B9A\u7FA9\u3001\u65B0\u898F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3001\n\u30B3\u30DE\u30F3\u30C9\u30FB\u30D7\u30ED\u30F3\u30D7\u30C8\u3001\u4F7F\u7528\u3059\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u307E\u305F\u306F\u51FA\u529B\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3002\n\n/set editor  ...\n\t/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\t\u306F\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u4F9D\u5B58\u6587\u5B57\u5217\u3067\u3059\u3002\n\n/set start \n\t\u6307\u5B9A\u3057\u305F\u306E\u5185\u5BB9\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u306A\u308A\u307E\u3059\u3002\n\n/set feedback \n\t\u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u793A\u3059\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n/set newmode  [command|quiet []]\n\t\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u65E2\u5B58\u306E\u30E2\u30FC\u30C9\u3092\u30B3\u30D4\u30FC\u3057\u307E\u3059\u3002\n\n/set prompt  "" ""\n\t\u6307\u5B9A\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n/set format   "" ...\n\t\u30BB\u30EC\u30AF\u30BF\u304C\u4E00\u81F4\u3057\u305F\u969B\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u3053\u3068\u3067\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u69CB\u6210\u3057\u307E\u3059\u3002\n\n\u3053\u308C\u3089\u306E\u5F62\u5F0F\u306E\u8A73\u7D30\u306F\u3001\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u3066/help\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B:   /help /set format
+help.set.args = editor|start|feedback|mode|prompt|truncation|format ...
+help.set =\u6B21\u306E\u3088\u3046\u306Ajshell\u69CB\u6210\u60C5\u5831\u3092\u8A2D\u5B9A\u3057\u307E\u3059:\n\u4F7F\u7528\u3059\u308B\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u3001\u4F7F\u7528\u3059\u308B\u8D77\u52D5\u5B9A\u7FA9\u3001\u65B0\u898F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3001\n\u30B3\u30DE\u30F3\u30C9\u30FB\u30D7\u30ED\u30F3\u30D7\u30C8\u3001\u4F7F\u7528\u3059\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u307E\u305F\u306F\u51FA\u529B\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3002\n\n/set editor  ...\n\t/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\t\u306F\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u4F9D\u5B58\u6587\u5B57\u5217\u3067\u3059\u3002\n\n/set start \n\t\u6307\u5B9A\u3057\u305F\u306E\u5185\u5BB9\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u306A\u308A\u307E\u3059\u3002\n\n/set feedback \n\t\u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u793A\u3059\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n/set mode  [] [-command|-quiet|-delete]\n\t\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u307E\u305F\u306F\u66F4\u65B0\u3057\u307E\u3059\u3002\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u65E2\u5B58\u306E\u30E2\u30FC\u30C9\u304B\u3089\u30B3\u30D4\u30FC\u3057\u307E\u3059\u3002\n\n/set prompt  "" ""\n\t\u6307\u5B9A\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n/set truncation   ...\n\t\u8868\u793A\u3055\u308C\u308B\u5024\u306E\u6700\u5927\u9577\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n/set format   "" ...\n\t\u30BB\u30EC\u30AF\u30BF\u304C\u4E00\u81F4\u3057\u305F\u969B\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u3053\u3068\u3067\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u69CB\u6210\u3057\u307E\u3059\u3002\n\n\u3053\u308C\u3089\u306E\u5F62\u5F0F\u306E\u8A73\u7D30\u306F\u3001\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u3066/help\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B:   /help /set format
+
+help.retain.summary = \u5F8C\u7D9A\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306B\u5BFE\u3057\u3066jshell\u69CB\u6210\u60C5\u5831\u3092\u4FDD\u6301\u3057\u307E\u3059
+help.retain.args = editor|start|feedback|mode
+help.retain =jshell\u30C4\u30FC\u30EB\u306E\u4ECA\u5F8C\u306E\u547C\u51FA\u3057\u306B\u5BFE\u3057\u3066\u3001\u6B21\u306E\u3088\u3046\u306Ajshell\u69CB\u6210\u60C5\u5831\u3092\u4FDD\u6301\u3057\u307E\u3059:\n\u4F7F\u7528\u3059\u308B\u5916\u90E8\u30A8\u30C7\u30A3\u30BF\u3001\u4F7F\u7528\u3059\u308B\u8D77\u52D5\u5B9A\u7FA9\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u69CB\u6210\u3001\n\u307E\u305F\u306F\u4F7F\u7528\u3059\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3002\n\n/retain editor  ...\n\t/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\t\u306F\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u4F9D\u5B58\u6587\u5B57\u5217\u3067\u3059\u3002\n\n/retain start \n\t\u6307\u5B9A\u3057\u305F\u306E\u5185\u5BB9\u304C\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u306A\u308A\u307E\u3059\u3002\n\n/retain feedback \n\t\u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u793A\u3059\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n/retain mode \n\t\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u65E2\u5B58\u306E\u30E2\u30FC\u30C9\u304B\u3089\u30B3\u30D4\u30FC\u3057\u307E\u3059\u3002\n\n\u3053\u308C\u3089\u306E\u5F62\u5F0F\u306E\u8A73\u7D30\u306F\u3001\u5F62\u5F0F\u3092\u6307\u5B9A\u3057\u3066/help\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B:    /help /retain feedback
 
 help.quest.summary = jshell\u306B\u95A2\u3059\u308B\u60C5\u5831\u3092\u53D6\u5F97\u3057\u307E\u3059
 help.quest.args = [|]
@@ -205,18 +229,28 @@ help.intro =jshell\u30C4\u30FC\u30EB\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001Ja
 help.shortcuts.summary = \u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u306E\u8AAC\u660E
 help.shortcuts =\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\n\n\t\tJava\u8B58\u5225\u5B50\u3001jshell\u30B3\u30DE\u30F3\u30C9\u3001\u5834\u5408\u306B\u3088\u3063\u3066\u306F\n\t\tjshell\u30B3\u30DE\u30F3\u30C9\u5F15\u6570\u306E\u6700\u521D\u306E\u6570\u6587\u5B57\u3092\u5165\u529B\u3057\u305F\u5F8C\u306B\u3001\n\t\t\u30AD\u30FC\u3092\u62BC\u3059\u3068\u3001\u5165\u529B\u304C\u5B8C\u6210\u3057\u307E\u3059\u3002\n\t\t\u5B8C\u6210\u7D50\u679C\u304C\u8907\u6570\u3042\u308B\u5834\u5408\u3001\u4F7F\u7528\u53EF\u80FD\u306A\u5B8C\u6210\u7D50\u679C\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\nShift-\n\t\t\u30E1\u30BD\u30C3\u30C9\u307E\u305F\u306F\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u547C\u51FA\u3057\u306E\u540D\u524D\u3068\u5DE6\u4E38\u30AB\u30C3\u30B3\u306E\u5F8C\u306B\n\t\t\u30AD\u30FC\u3092\u62BC\u3057\u306A\u304C\u3089\u3092\u62BC\u3059\u3068\u3001\u4E00\u81F4\u3059\u308B\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9/\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\n\t\t\u30B7\u30CE\u30D7\u30B7\u30B9\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\n\n v\n\t\t\u5B8C\u5168\u306A\u5F0F\u306E\u5F8C\u306B\u3001\u300C v\u300D\u3092\u62BC\u3059\u3068\u3001\u5F0F\u306E\u30BF\u30A4\u30D7\u306B\u57FA\u3065\u3044\u305F\u30BF\u30A4\u30D7\u306E\n\t\t\u65B0\u3057\u3044\u5909\u6570\u304C\u5C0E\u5165\u3055\u308C\u307E\u3059\u3002\n\t\t\u300C\u300D\u306F[Alt]+[F1]\u307E\u305F\u306F[Alt]+[Enter]\u3067\u3001\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306B\u3088\u3063\u3066\u7570\u306A\u308A\u307E\u3059\u3002\n\n i\n\t\t\u89E3\u6C7A\u3067\u304D\u306A\u3044\u8B58\u5225\u5B50\u306E\u5F8C\u306B\u3001\u300C i\u300D\u3092\u62BC\u3059\u3068\u3001jshell\u306F\u6307\u5B9A\u3057\u305F\n\t\t\u30AF\u30E9\u30B9\u30D1\u30B9\u306E\u5185\u5BB9\u306B\u57FA\u3065\u3044\u3066\u4F7F\u7528\u53EF\u80FD\u306A\u5B8C\u5168\u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3092\u63D0\u793A\u3057\u307E\u3059\u3002\n\t\t\u300C\u300D\u306F[Alt]+[F1]\u307E\u305F\u306F[Alt]+[Enter]\u3067\u3001\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u306B\u3088\u3063\u3066\u7570\u306A\u308A\u307E\u3059\u3002
 
-help.set.format = \u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u30EC\u30DD\u30FC\u30C8\u3059\u308B\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\t/set format   "" ...\n\n\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059 -- '/help /set newmode'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u306F\u5B9A\u7FA9\u3059\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u56FA\u6709\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u540D\u524D\u3067\u3059\u3002\n\u306F\u5F15\u7528\u7B26\u306B\u56F2\u307E\u308C\u305F\u6587\u5B57\u5217\u3067\u3001\u6B21\u306E\u5834\u5408\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5024\u3067\u3059: \n\u30BB\u30EC\u30AF\u30BF\u304C\u4E00\u81F4\u3059\u308B(\u307E\u305F\u306F\u30BB\u30EC\u30AF\u30BF\u304C\u306A\u3044)\u3002\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u4F7F\u7528\u3055\u308C\u308B\u5834\u5408\u3001\n\u4E2D\u30AB\u30C3\u30B3\u3067\u56F2\u307E\u308C\u3066\u3044\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u304C\u305D\u306E\u3068\u304D\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5024\u3067\u7F6E\u63DB\u3055\u308C\u307E\u3059\n\u3053\u308C\u3089\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u3001\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u3067\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3082\u3001\n\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u56FA\u6709\u306E\u3053\u308C\u3089\u306E\u4E8B\u524D\u5B9A\u7FA9\u6E08\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u3044\u305A\u308C\u304B\u3067\u3042\u308B\u5834\u5408\u3082\u3042\u308A\u307E\u3059:\n\t{name}       == \u540D\u524D\u3001\u4F8B: \u5909\u6570\u540D\u3001 ...\n\t{type}       == \u30BF\u30A4\u30D7\u540D\u3002\u5909\u6570\u307E\u305F\u306F\u5F0F\u306E\u30BF\u30A4\u30D7\u3001\n\t\t\t\u30E1\u30BD\u30C3\u30C9\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\n\t{value}      == \u5F0F\u307E\u305F\u306F\u5909\u6570\u306E\u521D\u671F\u5316\u306E\u7D50\u679C\u5024\n\t{unresolved} == \u672A\u89E3\u6C7A\u306E\u53C2\u7167\u306E\u30EA\u30B9\u30C8\n\t{errors}     == \u30EA\u30AB\u30D0\u30EA\u53EF\u80FD\u306A\u30A8\u30E9\u30FC\u306E\u30EA\u30B9\u30C8(\u51E6\u7406\u6642-\n\t\t\t"display"\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u307F)\n\t{err}        == \u672A\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u30FB\u30A8\u30E9\u30FC\u884C(\u51E6\u7406\u6642-\n\t\t\t"errorline"\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u307F)\n\u6B21\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u30C4\u30FC\u30EB\u306B\u3088\u3063\u3066\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u3001\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u6C7A\u5B9A\u3057\u307E\u3059:\n\t{display}    == \u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30A4\u30D9\u30F3\u30C8\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30E1\u30C3\u30BB\u30FC\u30B8\n\t{errorline}  == \u300Cerrors\u300D\u30D5\u30A3\u30FC\u30EB\u30C9\u5185\u306E\u30A8\u30E9\u30FC\u884C\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\n\t{pre}        == \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u63A5\u982D\u8F9E(\u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u958B\u59CB\u3059\u308B)\n\t{post}       == \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u63A5\u5C3E\u8F9E(\u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u7D42\u4E86\u3059\u308B)\n\t{errorpre}   == \u30A8\u30E9\u30FC\u63A5\u982D\u8F9E(\u30A8\u30E9\u30FC\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u958B\u59CB\u3059\u308B)\n\t{errorpost}  == \
+help.set.format = \u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30A4\u30D9\u30F3\u30C8\u3092\u30EC\u30DD\u30FC\u30C8\u3059\u308B\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\t/set format   "" ...\n\n\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059 -- '/help /set mode'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u306F\u5B9A\u7FA9\u3059\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u56FA\u6709\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u540D\u524D\u3067\u3059\u3002\n\u306F\u5F15\u7528\u7B26\u306B\u56F2\u307E\u308C\u305F\u6587\u5B57\u5217\u3067\u3001\u6B21\u306E\u5834\u5408\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5024\u3067\u3059: \n\u30BB\u30EC\u30AF\u30BF\u304C\u4E00\u81F4\u3059\u308B(\u307E\u305F\u306F\u30BB\u30EC\u30AF\u30BF\u304C\u306A\u3044)\u3002\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u4F7F\u7528\u3055\u308C\u308B\u5834\u5408\u3001\n\u4E2D\u30AB\u30C3\u30B3\u3067\u56F2\u307E\u308C\u3066\u3044\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u304C\u305D\u306E\u3068\u304D\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5024\u3067\u7F6E\u63DB\u3055\u308C\u307E\u3059\n\u3053\u308C\u3089\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u3001\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u3067\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3082\u3001\n\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u56FA\u6709\u306E\u3053\u308C\u3089\u306E\u4E8B\u524D\u5B9A\u7FA9\u6E08\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u3044\u305A\u308C\u304B\u3067\u3042\u308B\u5834\u5408\u3082\u3042\u308A\u307E\u3059:\n\t{name}       == \u540D\u524D\u3001\u4F8B: \u5909\u6570\u540D\u3001 ...\n\t{type}       == \u30BF\u30A4\u30D7\u540D\u3002\u5909\u6570\u307E\u305F\u306F\u5F0F\u306E\u30BF\u30A4\u30D7\u3001\n\t\t\t\u30E1\u30BD\u30C3\u30C9\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FB\u30BF\u30A4\u30D7\n\t{value}      == \u5F0F\u307E\u305F\u306F\u5909\u6570\u306E\u521D\u671F\u5316\u306E\u7D50\u679C\u5024\n\t{unresolved} == \u672A\u89E3\u6C7A\u306E\u53C2\u7167\u306E\u30EA\u30B9\u30C8\n\t{errors}     == \u30EA\u30AB\u30D0\u30EA\u53EF\u80FD\u306A\u30A8\u30E9\u30FC\u306E\u30EA\u30B9\u30C8(\u51E6\u7406\u6642-\n\t\t\t"display"\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u307F)\n\t{err}        == \u672A\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u30FB\u30A8\u30E9\u30FC\u884C(\u51E6\u7406\u6642-\n\t\t\t"errorline"\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u307F)\n\u6B21\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u30C4\u30FC\u30EB\u306B\u3088\u3063\u3066\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u3001\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u6C7A\u5B9A\u3057\u307E\u3059:\n\t{display}    == \u30B9\u30CB\u30DA\u30C3\u30C8\u30FB\u30A4\u30D9\u30F3\u30C8\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30E1\u30C3\u30BB\u30FC\u30B8\n\t{errorline}  == \u300Cerrors\u300D\u30D5\u30A3\u30FC\u30EB\u30C9\u5185\u306E\u30A8\u30E9\u30FC\u884C\u306E\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\n\t{pre}        == \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u63A5\u982D\u8F9E(\u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u958B\u59CB\u3059\u308B)\n\t{post}       == \u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u63A5\u5C3E\u8F9E(\u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u7D42\u4E86\u3059\u308B)\n\t{errorpre}   == \u30A8\u30E9\u30FC\u63A5\u982D\u8F9E(\u30A8\u30E9\u30FC\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u958B\u59CB\u3059\u308B)\n\t{errorpost}  == \
 \u30A8\u30E9\u30FC\u63A5\u5C3E\u8F9E(\u30A8\u30E9\u30FC\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u7D42\u4E86\u3059\u308B)\n\u3053\u308C\u3089\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u306F\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8A2D\u5B9A\u304C\u3042\u308A\u307E\u3059(\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059)\u3002\n\u306F\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u9069\u7528\u3055\u308C\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u69CB\u9020\u306F\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306E\u30CF\u30A4\u30D5\u30F3\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306F\u30011\u3064\u306E\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306E\u5024\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u306F\u5404\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u304C\u4E00\u81F4\u3059\u308C\u3070\u4E00\u81F4\u3068\u306A\u308A\u307E\u3059\u3002\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306F\n\u3044\u305A\u308C\u304B\u306E\u5024\u304C\u4E00\u81F4\u3059\u308C\u3070\u4E00\u81F4\u3068\u306A\u308A\u307E\u3059\u3002\n\n\u30B1\u30FC\u30B9\u30FB\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u7A2E\u985E\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\timport     -- \u30A4\u30F3\u30DD\u30FC\u30C8\u5BA3\u8A00\n\tclass      -- \u30AF\u30E9\u30B9\u5BA3\u8A00\n\tinterface  -- \u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\n\tenum       -- \u5217\u6319\u578B\u306E\u5BA3\u8A00\n\tannotation -- \u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5BA3\u8A00\n\tmethod     -- \u30E1\u30BD\u30C3\u30C9\u5BA3\u8A00 -- \u6CE8\u610F: {type}==parameter-types\n\tvardecl    -- \u521D\u671F\u5316\u3057\u306A\u3044\u5909\u6570\u5BA3\u8A00\n\tvarinit    -- \u521D\u671F\u5316\u3059\u308B\u5909\u6570\u5BA3\u8A00\n\texpression -- \u5F0F -- \u6CE8\u610F: {name}==scratch-variable-name\n\tvarvalue   -- \u5909\u6570\u5024\u5F0F\n\tassignment -- \u5909\u6570\u3092\u5272\u308A\u5F53\u3066\u307E\u3059\n\tstatement  -- \u6587\n\u30A2\u30AF\u30B7\u30E7\u30F3\u30FB\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306B\u767A\u751F\u3057\u305F\u5185\u5BB9\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tadded     -- \u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\n\tmodified  -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u5909\u66F4\u3055\u308C\u307E\u3057\u305F\n\treplaced  -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u65B0\u898F\u30B9\u30CB\u30DA\u30C3\u30C8\u3067\u7F6E\u63DB\u3055\u308C\u307E\u3057\u305F\n\toverwrote -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u307E\u3057\u305F\n\tdropped   -- \u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F\n\tused      -- \u4F7F\u7528\u3067\u304D\u306A\u3044\u3068\u304D\u306B\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u4F7F\u7528\u3055\u308C\u307E\u3057\u305F\n\u767A\u751F\u6642\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u3053\u308C\u304C\u76F4\u63A5\u307E\u305F\u306F\u9593\u63A5\u30A2\u30AF\u30B7\u30E7\u30F3\u3067\u3042\u308B\u304B\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tprimary -- \u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\n\tupdate  -- \u4F9D\u5B58\u30B9\u30CB\u30DA\u30C3\u30C8\u3078\u306E\u66F4\u65B0\n\u89E3\u6C7A\u72B6\u614B\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u89E3\u6C7A/\u5B9A\u7FA9\u306E\u72B6\u614B\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tok         -- \
 \u6B63\u3057\u304F\u89E3\u6C7A\u3055\u308C\u307E\u3057\u305F\n\tdefined    -- \u5FA9\u5143\u53EF\u80FD\u3067\u672A\u89E3\u6C7A\u306E\u53C2\u7167\u306B\u3082\u304B\u304B\u308F\u3089\u305A\u5B9A\u7FA9\u3055\u308C\u307E\u3057\u305F\n\tnotdefined -- \u5FA9\u5143\u53EF\u80FD\u3067\u672A\u89E3\u6C7A\u306E\u53C2\u7167\u306E\u305F\u3081\u5B9A\u7FA9\u3055\u308C\u307E\u305B\u3093\n\u672A\u89E3\u6C7A\u6570\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u672A\u89E3\u6C7A\u306E\u53C2\u7167\u306E\u6570\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tunresolved0 -- \u672A\u89E3\u6C7A\u306E\u540D\u524D\u306F\u3042\u308A\u307E\u305B\u3093\n\tunresolved1 -- 1\u3064\u306E\u540D\u524D\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n\tunresolved2 -- 2\u3064\u4EE5\u4E0A\u306E\u540D\u524D\u304C\u89E3\u6C7A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\n\u30A8\u30E9\u30FC\u6570\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30A8\u30E9\u30FC\u306E\u6570\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\terror0 -- \u30A8\u30E9\u30FC\u306A\u3057\n\terror1 -- 1\u3064\u306E\u30A8\u30E9\u30FC\n\terror2 -- 2\u3064\u4EE5\u4E0A\u306E\u30A8\u30E9\u30FC\n\n\u4F8B:\n\t/set format myformat action 'Created' added-primary\n\t/set format myformat action 'Update replaced' replaced-update\n\t/set format myformat display '{pre}{action} class {name}{post}' class-ok\n\t/set format myformat display '{pre}{action} variable {name}, reset to null{post}' replaced-vardecl,varinit-ok-update\n\n\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u5BFE\u3059\u308B\u5F8C\u7D9A\u306E\u30BB\u30EC\u30AF\u30BF\u306B\u3088\u308A\u3001\u4EE5\u524D\u306B\u4F7F\u7528\u3055\u308C\u305F\u30BB\u30EC\u30AF\u30C8\u306E\u4E00\u90E8\u307E\u305F\u306F\u3059\u3079\u3066\u304C\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059 -- \u6700\u5F8C\u306E\u30BB\u30EC\u30AF\u30BF\u304C\u6709\u52B9\u306B\u306A\u308A\u307E\u3059\n
 
-help.set.feedback = \u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u793A\u3059\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\t/set feedback \n\n\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u4E00\u610F\u306B\u3059\u308B\u305F\u3081\u306B\u5FC5\u8981\u306A\u6587\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30E2\u30FC\u30C9\u306F\u8FFD\u52A0\u3067\u304D\u307E\u3059\u3002'/help /set newmode'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u73FE\u5728\u5B9A\u7FA9\u6E08\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9:\n
+help.set.truncation = \u8868\u793A\u3055\u308C\u308B\u5024\u306E\u6700\u5927\u9577\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\t/set truncation   ...\n\n\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059 -- '/help /set mode'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\n\u306F\u6700\u5927\u9577\u3092\u8868\u3059\u7B26\u53F7\u306A\u3057\u6574\u6570\u3067\u3059\u3002\n\u306F\u5F15\u7528\u7B26\u306B\u56F2\u307E\u308C\u305F\u6587\u5B57\u5217\u3067\u3001\u6B21\u306E\u5834\u5408\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u5024\u3067\u3059:\n\u306F\u3001\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u3088\u3063\u3066\u5207\u6368\u3066\u9577\u306E\u5024\u3092\u5FAE\u8ABF\u6574\u3059\u308B\u5834\u5408\u306B\u306E\u307F\n\u5FC5\u8981\u3067\u3059\u3002\u306F\u3001\u5207\u6368\u3066\u304C\u9069\u7528\u3055\u308C\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u69CB\u9020\u306F\u3001\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306E\u30CF\u30A4\u30D5\u30F3\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306F\u30011\u3064\u306E\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306E\u5024\u306E\u30AB\u30F3\u30DE\u533A\u5207\u308A\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\u30BB\u30EC\u30AF\u30BF\u306F\u5404\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u304C\u4E00\u81F4\u3059\u308C\u3070\u4E00\u81F4\u3068\u306A\u308A\u307E\u3059\u3002\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u30EA\u30B9\u30C8\u306F\n\u3044\u305A\u308C\u304B\u306E\u5024\u304C\u4E00\u81F4\u3059\u308C\u3070\u4E00\u81F4\u3068\u306A\u308A\u307E\u3059\u3002\n\n\u6B21\u306B\u793A\u3059\u306E\u306F\u3001\u5207\u6368\u3066\u306B\u95A2\u9023\u3059\u308B\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u3067\u3059\u3002\n\n\u30B1\u30FC\u30B9\u30FB\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306E\u7A2E\u985E\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tvardecl    -- \u521D\u671F\u5316\u3057\u306A\u3044\u5909\u6570\u5BA3\u8A00\n\tvarinit    -- \u521D\u671F\u5316\u3057\u306A\u3044\u5909\u6570\u5BA3\u8A00\n\texpression -- \u5F0F -- \u6CE8\u610F: {name}==scratch-variable-name\n\tvarvalue   -- \u5909\u6570\u5024\u5F0F\n\tassignment -- \u5909\u6570\u3092\u5272\u308A\u5F53\u3066\u307E\u3059\n\t\u30A2\u30AF\u30B7\u30E7\u30F3\u30FB\u30BB\u30EC\u30AF\u30BF\u7A2E\u985E\u306F\u3001\u30B9\u30CB\u30DA\u30C3\u30C8\u306B\u767A\u751F\u3057\u305F\u5185\u5BB9\u3092\u793A\u3057\u307E\u3059\u3002\u5024\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n\tadded     -- \u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\n\tmodified  -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u5909\u66F4\u3055\u308C\u307E\u3057\u305F\n\treplaced  -- \u65E2\u5B58\u306E\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\u65B0\u898F\u30B9\u30CB\u30DA\u30C3\u30C8\u3067\u7F6E\u63DB\u3055\u308C\u307E\u3057\u305F\n\u4F8B:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\n\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u5BFE\u3059\u308B\u5F8C\u7D9A\u306E\u30BB\u30EC\u30AF\u30BF\u306B\u3088\u308A\u3001\u4EE5\u524D\u306B\u4F7F\u7528\u3055\u308C\u305F\u30BB\u30EC\u30AF\u30BF\u306E\u4E00\u90E8\u307E\u305F\u306F\u3059\u3079\u3066\u304C\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059 -- \u6700\u5F8C\u306E\u30BB\u30EC\u30AF\u30BF\u304C\u6709\u52B9\u306B\u306A\u308A\u307E\u3059\n
 
-help.set.newmode = \u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u65E2\u5B58\u306E\u30E2\u30FC\u30C9\u3092\u30B3\u30D4\u30FC\u3057\u307E\u3059\u3002\n\n\t/set newmode  [command|quiet []]\n\n\u306F\u4F5C\u6210\u3059\u308B\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u304C\u3042\u308B\u5834\u5408\u3001\u305D\u306E\u8A2D\u5B9A\u304C\u65B0\u898F\u30E2\u30FC\u30C9\u306B\u30B3\u30D4\u30FC\u3055\u308C\u307E\u3059\u3002\n'command'\u307E\u305F\u306F'quiet'\u306B\u3088\u308A\u3001\u60C5\u5831/\u691C\u8A3C\u4E2D\u306E\u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u8868\u793A\u3059\u308B\u304B\u3069\u3046\u304B\u304C\u6C7A\u5B9A\u3057\u307E\u3059\u3002\n\n\u65B0\u898F\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u305F\u3089\u3001'/set format'\u304A\u3088\u3073'/set prompt'\u3092\u4F7F\u7528\u3057\u3066\u69CB\u6210\u3057\u307E\u3059\u3002\n\u65B0\u898F\u30E2\u30FC\u30C9\u3092\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001'/set feedback'\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n
+help.set.feedback = \u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u793A\u3059\u3001\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\n\n\t/set feedback \n\n\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u4E00\u610F\u306B\u3059\u308B\u305F\u3081\u306B\u5FC5\u8981\u306A\u6587\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30E2\u30FC\u30C9\u306F\u8FFD\u52A0\u3067\u304D\u307E\u3059\u3002'/help /set mode'\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u73FE\u5728\u5B9A\u7FA9\u6E08\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9:\n
+
+help.set.mode = \u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u65E2\u5B58\u306E\u30E2\u30FC\u30C9\u304B\u3089\u30B3\u30D4\u30FC\u3057\u307E\u3059\u3002\n\n\t/set mode  [] [-command|-quiet|-delete]\n\n\u306F\u4F5C\u6210\u3059\u308B\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u304C\u3042\u308B\u5834\u5408\u3001\u305D\u306E\u8A2D\u5B9A\u304C\u65B0\u898F\u30E2\u30FC\u30C9\u306B\u30B3\u30D4\u30FC\u3055\u308C\u307E\u3059\u3002\n'-command'\u307E\u305F\u306F'-quiet'\u306B\u3088\u308A\u3001\u60C5\u5831/\u691C\u8A3C\u4E2D\u306E\u30B3\u30DE\u30F3\u30C9\u30FB\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3092\u8868\u793A\u3059\u308B\u304B\u3069\u3046\u304B\u304C\u6C7A\u5B9A\u3057\u307E\u3059\u3002\n\n\u65B0\u898F\u30E2\u30FC\u30C9\u3092\u4F5C\u6210\u3057\u305F\u3089\u3001'/set format'\u304A\u3088\u3073'/set prompt'\u3092\u4F7F\u7528\u3057\u3066\u69CB\u6210\u3057\u307E\u3059\u3002\n\u65B0\u898F\u30E2\u30FC\u30C9\u3092\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001'/set feedback'\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n
 help.set.prompt = \u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002\u6A19\u6E96\u30D7\u30ED\u30F3\u30D7\u30C8\u3068\u7D9A\u884C\u30D7\u30ED\u30F3\u30D7\u30C8\u306E\u4E21\u65B9\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\n\t/set prompt  "" ""\n\n\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u304A\u3088\u3073\u306F\u5165\u529B\u30D7\u30ED\u30F3\u30D7\u30C8\u3068\u3057\u3066\u51FA\u529B\u3055\u308C\u308B\u5F15\u7528\u7B26\u3067\u56F2\u307E\u308C\u305F\u6587\u5B57\u5217\u3067\u3059\u3002\n\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3001\u4E21\u65B9\u3068\u3082\u3001\u6B21\u306E\u30B9\u30CB\u30DA\u30C3\u30C8ID\u3067\u7F6E\u304D\u63DB\u3048\u3089\u308C\u308B'%s'\u3092\u542B\u3080\u3053\u3068\u304C\u3067\u304D\u307E\u3059 --\n\u5165\u529B\u3057\u305F\u5185\u5BB9\u304C\u305D\u306EID\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u306A\u3044\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30A8\u30E9\u30FC\u307E\u305F\u306F\u30B3\u30DE\u30F3\u30C9\u3067\u3042\u308B\u5834\u5408\u306A\u3069\u3067\u3059\u3002\n\u7D9A\u884C\u30D7\u30ED\u30F3\u30D7\u30C8\u306F\u8907\u6570\u884C\u30B9\u30CB\u30DA\u30C3\u30C8\u306E2\u884C\u76EE\u4EE5\u964D\u3067\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n
 
-help.set.editor =/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\n\t/set editor  ...\n\n\u306F\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u4F9D\u5B58\u6587\u5B57\u5217\u3067\u3059\u3002\n\u306B\u306F\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u5F15\u6570(\u30D5\u30E9\u30B0\u306A\u3069)\u304C\u542B\u307E\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059 -- ....\n/edit\u3092\u4F7F\u7528\u3059\u308B\u969B\u306B\u3001\u7DE8\u96C6\u3059\u308B\u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u304C\u6700\u5F8C\u306E\u5F15\u6570\u3068\u3057\u3066\u8FFD\u52A0\u3055\u308C\u307E\u3059\u3002
+help.set.editor =/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\n\n\t/set editor |-default\n\n\u306F\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u4F9D\u5B58\u6587\u5B57\u5217\u3067\u3059\u3002\n\u306B\u306F\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u5F15\u6570(\u30D5\u30E9\u30B0\u306A\u3069)\u304C\u542B\u307E\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n/edit\u3092\u4F7F\u7528\u3059\u308B\u969B\u306B\u3001\u7DE8\u96C6\u3059\u308B\u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u304C\u6700\u5F8C\u306E\u5F15\u6570\u3068\u3057\u3066\u8FFD\u52A0\u3055\u308C\u307E\u3059\u3002\n\u304B\u308F\u308A\u306B-default\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u7D44\u8FBC\u307F\u30A8\u30C7\u30A3\u30BF\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
 
-help.set.start =\u8D77\u52D5\u69CB\u6210\u3092\u8A2D\u5B9A\u3057\u307E\u3059 -- \u8D77\u52D5\u6642\u306B\u8AAD\u307F\u53D6\u3089\u308C\u308B\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306E\u30B7\u30FC\u30B1\u30F3\u30B9\u3002\n\n\t/set start \n\n\u6307\u5B9A\u3057\u305F\u306E\u5185\u5BB9\u304C\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\n(jshell\u30C4\u30FC\u30EB\u306E\u8D77\u52D5\u6642\u307E\u305F\u306F\u30EA\u30BB\u30C3\u30C8\u6642\u306B\u5B9F\u884C\u3055\u308C\u308B)\u306B\u306A\u308A\u307E\u3059\u3002
+help.set.start =\u8D77\u52D5\u69CB\u6210\u3092\u8A2D\u5B9A\u3057\u307E\u3059 -- \u8D77\u52D5\u6642\u306B\u8AAD\u307F\u53D6\u3089\u308C\u308B\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306E\u30B7\u30FC\u30B1\u30F3\u30B9\u3002\n\n\t/set start |-default|-none\n\n\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u3067/reset\u307E\u305F\u306F/reload\u30B3\u30DE\u30F3\u304C\u4F7F\u7528\u3055\u308C\u308B\u5834\u5408\u3001\n\u6307\u5B9A\u3057\u305F\u306E\u5185\u5BB9\u304C\u3001\u4F7F\u7528\u3055\u308C\u308B\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u306A\u308A\u307E\u3059\u3002\n\u304B\u308F\u308A\u306B-default\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\n\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n-none\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u8D77\u52D5\u304C\u7A7A\u306B\u306A\u308A\u307E\u3059 -- \u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u307E\u305F\u306F\n\u30B3\u30DE\u30F3\u30C9\u304C\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\n\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u306F\u8D77\u52D5\u8A2D\u5B9A\u3092\u30C6\u30B9\u30C8\u3059\u308B\u306E\u306B\u6709\u52B9\u3067\u3059\u3002jshell\u30C4\u30FC\u30EB\u306E\u4ECA\u5F8C\u306E\u5B9F\u884C\u306E\u305F\u3081\u306B\n\u305D\u308C\u3089\u3092\u4FDD\u6301\u3059\u308B\u306B\u306F\u3001\u6B21\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3057\u307E\u3059:\n\t/retain start\n
 
-startup.feedback = /set newmode normal command    \n/set prompt normal '\\n-> ' '>> '    \n/set format normal pre '|  '    \n/set format normal post '%n'    \n/set format normal errorpre '|  '    \n/set format normal errorpost '%n'    \n\n/set format normal errorline '{post}{pre}    {err}'    \n\n/set format normal action 'Added' added-primary    \n/set format normal action 'Modified' modified-primary    \n/set format normal action 'Replaced' replaced-primary    \n/set format normal action 'Overwrote' overwrote-primary    \n/set format normal action 'Dropped' dropped-primary    \n/set format normal action '  Update added' added-update    \n/set format normal action '  Update modified' modified-update    \n/set format normal action '  Update replaced' replaced-update    \n/set format normal action '  Update overwrote' overwrote-update    \n/set format normal action '  Update dropped' dropped-update    \n\n/set format normal until ', however, it cannot be instanciated or its methods invoked until'  defined-class-primary    \n/set format normal until ', however, its methods cannot be invoked until'                     defined-interface-primary    \n/set format normal until ', however, it cannot be used until'                                 defined-enum,annotation-primary    \n/set format normal until ', however, it cannot be invoked until'                              defined-method-primary    \n/set format normal until ', however, it cannot be referenced until'                           notdefined-primary    \n/set format normal until ' which cannot be instanciated or its methods invoked until'         defined-class-update    \n/set format normal until ' whose methods cannot be invoked until'                             defined-interface-update    \n/set format normal until ' which cannot be invoked until'                                     defined-method-update    \n/set format normal until ' which cannot be referenced until'                                  notdefined-update    \n\n/set format normal unrerr '{unresolved} is declared'                                           unresolved1-error0    \n/set format normal unrerr '{unresolved} are declared'                                          unresolved2-error0    \n/set format normal unrerr ' this error is corrected: {errors}'                                 unresolved0-error1    \n/set format normal unrerr '{unresolved} is declared and this error is corrected: {errors}'     unresolved1-error1    \n/set format normal unrerr '{unresolved} are declared and this error is corrected: {errors}'    unresolved2-error1    \n/set format normal unrerr ' these errors are corrected: {errors}'                              unresolved0-error2    \n/set format normal unrerr '{unresolved} is declared and these errors are corrected: {errors}'  unresolved1-error2    \n/set format normal unrerr '{unresolved} are declared and these errors are corrected: {errors}' unresolved2-error2    \n\n/set format normal resolve '{until}{unrerr}'                                                added,modified,replaced,used    \n\n/set format normal typeKind 'class'                  class    \n/set format normal typeKind 'interface'              interface    \n/set format normal typeKind 'enum'                   enum    \n/set format normal typeKind 'annotation interface'   annotation    \n\n/set format normal display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation    \n/set format normal display '{pre}{action} method {name}({type}){resolve}{post}'             method    \n\n/set format normal display '{pre}{action} variable {name} of type {type}{resolve}{post}'    vardecl    \n/set format normal display '{pre}{action} variable {name} of type {type} with initial value {value}{resolve}{post}'    varinit    \n/set format normal display '{pre}{action} variable {name}, reset to null{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display \
-'{pre}{action} variable {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format normal display '{pre}{action} variable {name}{post}'                            overwrote,dropped-vardecl,varinit    \n\n/set format normal display '{pre}Expression value is: {value}{post}{pre}  assigned to temporary variable {name} of type {type}{post}' expression    \n/set format normal display '{pre}Variable {name} of type {type} has value {value}{post}'    varvalue    \n/set format normal display '{pre}Variable {name} has been assigned the value {value}{post}' assignment    \n\n/set format normal display '{pre}Attempted to use {typeKind} {name}{resolve}{post}'         used-class,interface,enum,annotation    \n/set format normal display '{pre}Attempted to call method {name}({type}){resolve}{post}'    used-method    \n\n/set feedback normal    \n\n/set newmode off quiet    \n/set prompt off '-> ' '>> '    \n/set format off pre '|  '    \n/set format off post '%n'    \n/set format off errorpre '|  '    \n/set format off errorpost '%n'    \n/set format off display ''    \n
+help.retain.feedback = \u5165\u529B\u3057\u305F\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\u5BFE\u3057\u3066\u8868\u793A\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u306B\u4F7F\u7528\u3059\u308B\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u3092\u4FDD\u6301\u3057\u307E\u3059\u3002\n\u3053\u306E\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306F\u73FE\u5728\u304A\u3088\u3073\u4ECA\u5F8C\u306Ejshell\u30C4\u30FC\u30EB\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u3067\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\n\t/retain feedback []\n\n\u306F\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u4E00\u610F\u306B\u3059\u308B\u305F\u3081\u306B\u5FC5\u8981\u306A\u6587\u5B57\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\n\u3092\u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u306F\u73FE\u5728\u306E\u30E2\u30FC\u30C9(\u6700\u65B0\u306E/set feedback\u307E\u305F\u306F/retain feedback\n\u30B3\u30DE\u30F3\u30C9\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u3068\u304A\u308A)\u3092\u4FDD\u6301\u3057\u307E\u3059:\n
+help.retain.mode = \u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u30FB\u30E2\u30FC\u30C9\u306E\u5B58\u5728\u304A\u3088\u3073\u69CB\u6210\u3092\u4FDD\u6301\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E2\u30FC\u30C9\u306F\u73FE\u5728\u304A\u3088\u3073\u4ECA\u5F8C\u306Ejshell\u30C4\u30FC\u30EB\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u3067\u4F7F\u7528\u53EF\u80FD\u3067\u3059\u3002
+\n\t/retain mode \n\n\u306F\u4FDD\u6301\u3059\u308B\u30E2\u30FC\u30C9\u306E\u540D\u524D\u3067\u3059\u3002\n\u306F\u4E8B\u524D\u306B/set mode\u3067\u4F5C\u6210\u3057\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066\n/set prompt\u3001/set format\u304A\u3088\u3073/set truncation\u3067\u69CB\u6210\u3057\u3066\u304A\u304F\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n
+
+help.retain.editor =/edit\u30B3\u30DE\u30F3\u30C9\u3067\u8D77\u52D5\u3059\u308B\u30B3\u30DE\u30F3\u30C9\u3092\u4FDD\u6301\u3057\u307E\u3059\u3002\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u306F\u3001\u73FE\u5728\u304A\u3088\u3073\u4ECA\u5F8C\u306E\njshell\u30C4\u30FC\u30EB\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u3067/edit\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u969B\u306B\u8D77\u52D5\u3055\u308C\u307E\u3059\u3002\n\n\t/retain editor |-default\n\n\u306F\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0\u4F9D\u5B58\u6587\u5B57\u5217\u3067\u3059\u3002\n\u306B\u306F\u30B9\u30DA\u30FC\u30B9\u3067\u533A\u5207\u3089\u308C\u305F\u5F15\u6570(\u30D5\u30E9\u30B0\u306A\u3069)\u304C\u542B\u307E\u308C\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\n/edit\u3092\u4F7F\u7528\u3059\u308B\u969B\u306B\u3001\u7DE8\u96C6\u3059\u308B\u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u304C\u6700\u5F8C\u306E\u5F15\u6570\u3068\u3057\u3066\u8FFD\u52A0\u3055\u308C\u307E\u3059\u3002\n\u304B\u308F\u308A\u306B-default\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u7D44\u8FBC\u307F\u30A8\u30C7\u30A3\u30BF\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\u4F55\u3082\u6307\u5B9A\u3057\u306A\u3044\u3068\u3001\u6700\u5F8C\u306E/set editor\u307E\u305F\u306F/retain editor\u30B3\u30DE\u30F3\u30C9\u3067\u8A2D\u5B9A\u3055\u308C\u305F\n\u30A8\u30C7\u30A3\u30BF\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\u30A8\u30C7\u30A3\u30BF\u306F\u4FDD\u6301\u3055\u308C\u3001\u73FE\u5728\u304A\u3088\u3073\u4ECA\u5F8C\u306Ejshell\u30C4\u30FC\u30EB\u306E\u5B9F\u884C\u3067\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
+
+help.retain.start =\u8D77\u52D5\u69CB\u6210\u3092\u8A2D\u5B9A\u3057\u307E\u3059 -- \u8D77\u52D5\u6642\u306B\u8AAD\u307F\u53D6\u3089\u308C\u308B\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306E\n\u30B7\u30FC\u30B1\u30F3\u30B9\u3002\n\n\t/retain start [|-default|-none]\n\n\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u6307\u5B9A\u3057\u305F\u306E\u5185\u5BB9\u304C\n\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304A\u3088\u3073\u30B3\u30DE\u30F3\u30C9\u306B\n\u306A\u308A\u307E\u3059\u3002\n\u304B\u308F\u308A\u306B-default\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u304C\n\u8D77\u52D5\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n-none\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3059\u308B\u3068\u3001\u8D77\u52D5\u304C\u7A7A\u306B\u306A\u308A\u307E\u3059 -- \u8D77\u52D5\u30B9\u30CB\u30DA\u30C3\u30C8\u307E\u305F\u306F\n\u30B3\u30DE\u30F3\u30C9\u304C\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\n\u3053\u308C\u3089\u3092\u4F55\u3082\u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001\u8D77\u52D5\u306F'/set start''\u307E\u305F\u306F''/retain start'\u30B3\u30DE\u30F3\u30C9\u3067\n\u6700\u5F8C\u306B\u6307\u5B9A\u3055\u308C\u305F\u3082\u306E\u304C\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002\n\u8D77\u52D5\u306F\u4FDD\u6301\u3055\u308C\u3001jshell\u30C4\u30FC\u30EB\u304C\u8D77\u52D5\u307E\u305F\u306F\u30EA\u30BB\u30C3\u30C8\u3055\u308C\u305F\u3068\u304D\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059
+
+startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action '\u4F5C\u6210\u6E08' added-primary    \n/set format verbose action '\u5909\u66F4\u6E08' modified-primary    \n/set format verbose action '\u7F6E\u63DB\u6E08' replaced-primary    \n/set format verbose action '\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u6E08' overwrote-primary    \n/set format verbose action '\u524A\u9664\u6E08' dropped-primary    \n/set format verbose action '  \u66F4\u65B0\u4F5C\u6210\u6E08' added-update    \n/set format verbose action '  \u66F4\u65B0\u5909\u66F4\u6E08' modified-update    \n/set format verbose action '  \u66F4\u65B0\u7F6E\u63DB\u6E08' replaced-update    \n/set format verbose action '  \u66F4\u65B0\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u6E08' overwrote-update    \n/set format verbose action '  \u66F4\u65B0\u524A\u9664\u6E08' dropped-update    \n\n/set format verbose until '\u3001\u305F\u3060\u3057\u3001\u6B21\u307E\u3067\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u306A\u3044\u304B\u3001\u305D\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093:'   defined-class-primary    \n/set format verbose until '\u3001\u305F\u3060\u3057\u3001\u6B21\u307E\u3067\u305D\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093:'                      defined-interface-primary    \n/set format verbose until '\u3001\u305F\u3060\u3057\u3001\u6B21\u307E\u3067\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093:'                                  defined-enum,annotation-primary    \n/set format verbose until '\u3001\u305F\u3060\u3057\u3001\u6B21\u307E\u3067\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093:'                               defined-method-primary    \n/set format verbose until '\u3001\u305F\u3060\u3057\u3001\u6B21\u307E\u3067\u53C2\u7167\u3067\u304D\u307E\u305B\u3093:'                            notdefined-primary    \n/set format verbose until ' \u6B21\u307E\u3067\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u306A\u3044\u304B\u3001\u305D\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093:'          defined-class-update    \n/set format verbose until ' \u6B21\u307E\u3067\u30E1\u30BD\u30C3\u30C9\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093:'                              defined-interface-update    \n/set format verbose until ' \u6B21\u307E\u3067\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093:'                                      defined-method-update    \n/set format verbose until ' \u6B21\u307E\u3067\u53C2\u7167\u3067\u304D\u307E\u305B\u3093:'                                   notdefined-update    \n\n/set format verbose unrerr '{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u307E\u3057\u305F'                                           unresolved1-error0    \n/set format verbose unrerr '{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u307E\u3057\u305F'                                          unresolved2-error0    \n/set format verbose unrerr ' \u3053\u306E\u30A8\u30E9\u30FC\u306F\u4FEE\u6B63\u3055\u308C\u307E\u3057\u305F: {errors}'                                 unresolved0-error1    \n/set format verbose unrerr '{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u3001\u3053\u306E\u30A8\u30E9\u30FC\u306F\u4FEE\u6B63\u3055\u308C\u307E\u3057\u305F: {errors}'     unresolved1-error1    \n/set format verbose unrerr '{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u3001\u3053\u306E\u30A8\u30E9\u30FC\u306F\u4FEE\u6B63\u3055\u308C\u307E\u3057\u305F: {errors}'    unresolved2-error1    \n/set format verbose unrerr ' \u3053\u308C\u3089\u306E\u30A8\u30E9\u30FC\u306F\u4FEE\u6B63\u3055\u308C\u307E\u3057\u305F: {errors}'                              unresolved0-error2    \n/set format verbose unrerr \
+'{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u3001\u3053\u308C\u3089\u306E\u30A8\u30E9\u30FC\u306F\u4FEE\u6B63\u3055\u308C\u307E\u3057\u305F: {errors}'  unresolved1-error2    \n/set format verbose unrerr '{unresolved}\u304C\u5BA3\u8A00\u3055\u308C\u3001\u3053\u308C\u3089\u306E\u30A8\u30E9\u30FC\u306F\u4FEE\u6B63\u3055\u308C\u307E\u3057\u305F: {errors}' unresolved2-error2    \n\n/set format verbose resolve '{until}{unrerr}'                                                   added,modified,replaced,used    \n\n/set format verbose typeKind '\u30AF\u30E9\u30B9'                  class    \n/set format verbose typeKind '\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9'              interface    \n/set format verbose typeKind '\u5217\u6319\u578B'                   enum    \n/set format verbose typeKind '\u6CE8\u91C8\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9'   annotation    \n\n/set format verbose result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}\u30B9\u30AF\u30E9\u30C3\u30C1\u5909\u6570{name}\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F : {type}{post}'    expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}{name}\u306E\u5024 : {type}{post}'                    varvalue-primary    \n/set format verbose display '{result}{pre}{name}\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u307E\u3057\u305F : {type}{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} \u5909\u6570 {name} : {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} \u5909\u6570 {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} \u5909\u6570 {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} \u5909\u6570 {name}\u3001null\u306B\u30EA\u30BB\u30C3\u30C8\u3055\u308C\u307E\u3057\u305F{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation    \n/set format verbose display '{pre}{action} \u30E1\u30BD\u30C3\u30C9 {name}({type})\u3092\u547C\u3073\u51FA\u305D\u3046\u3068\u3057\u307E\u3057\u305F{resolve}{post}'             method    \n\n/set format verbose display '{pre}{typeKind} {name}\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F{resolve}{post}'         used-class,interface,enum,annotation    \n/set format verbose display '{pre}\u30E1\u30BD\u30C3\u30C9{name}({type})\u3092\u547C\u3073\u51FA\u305D\u3046\u3068\u3057\u307E\u3057\u305F{resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} variable {name}, reset to null{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format concise display ''                                                              class,interface,enum,annotation,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
index dd70aaac4a0..a33e19a07e9 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_zh_CN.properties
@@ -26,19 +26,19 @@
 jshell.msg.welcome =\u6B22\u8FCE\u4F7F\u7528 JShell -- \u7248\u672C {0}\n\u8981\u5927\u81F4\u4E86\u89E3\u8BE5\u7248\u672C, \u8BF7\u952E\u5165: /help intro\n
 jshell.err.opt.classpath.conflict = \u51B2\u7A81\u7684 -classpath \u9009\u9879\u3002
 jshell.err.opt.classpath.arg = \u7F3A\u5C11 -classpath \u7684\u53C2\u6570\u3002
-jshell.err.opt.startup.conflict = \u51B2\u7A81\u7684 -startup \u6216 -nostartup \u9009\u9879\u3002
+jshell.err.opt.feedback.arg = -feedback \u7F3A\u5C11\u53C2\u6570\u3002\u9700\u8981\u6A21\u5F0F\u3002
+jshell.err.opt.startup.one = \u53EA\u80FD\u4F7F\u7528\u4E00\u4E2A -startup \u6216 -nostartup \u9009\u9879\u3002
 jshell.err.opt.unknown = \u672A\u77E5\u9009\u9879: {0}
 
-jshell.msg.terminated =\u72B6\u6001\u5F15\u64CE\u5DF2\u7EC8\u6B62\u3002\n\u4F7F\u7528 /reload restore \u53EF\u8FD8\u539F\u5B9A\u4E49
+jshell.msg.terminated =\u72B6\u6001\u5F15\u64CE\u5DF2\u7EC8\u6B62\u3002\n\u4F7F\u7528 /reload -restore \u53EF\u8FD8\u539F\u5B9A\u4E49
 
 jshell.msg.use.one.of = \u4F7F\u7528\u4EE5\u4E0B\u4E4B\u4E00: {0}
-jshell.err.def.or.id.not.found = \u672A\u627E\u5230\u5177\u6709\u4EE5\u4E0B\u540D\u79F0\u7684\u5B9A\u4E49\u6216 ID: {0}
-jshell.msg.see.classes.etc = \u8BF7\u53C2\u9605 /classes, /methods, /vars \u6216 /list
+jshell.msg.see.classes.etc = \u8BF7\u53C2\u9605 /types, /methods, /vars \u6216 /list
 jshell.err.arg = \u65E0\u6548\u7684 ''{0}'' \u53C2\u6570: {1}
 jshell.msg.see = \u6709\u5173\u5E2E\u52A9\u4FE1\u606F, \u8BF7\u53C2\u9605{0}\u3002
 
 jshell.err.file.not.accessible = \u65E0\u6CD5\u8BBF\u95EE ''{0}'' \u7684\u6587\u4EF6 ''{1}'': {2}
-jshell.err.file.not.found = \u627E\u4E0D\u5230 ''{0}'' \u7684\u6587\u4EF6 ''{1}'': {2}
+jshell.err.file.not.found = \u627E\u4E0D\u5230 ''{0}'' \u7684\u6587\u4EF6 ''{1}''\u3002
 jshell.err.file.exception = ''{0}'' \u7684\u6587\u4EF6 ''{1}'' \u5F15\u53D1\u4E86\u5F02\u5E38\u9519\u8BEF: {2}
 jshell.err.file.filename = ''{0}'' \u9700\u8981\u6587\u4EF6\u540D\u53C2\u6570\u3002
 
@@ -49,8 +49,10 @@ jshell.err.no.such.command.or.snippet.id = \u6CA1\u6709\u8FD9\u6837\u7684\u547D\
 jshell.err.command.ambiguous = \u547D\u4EE4 ''{0}'' \u4E0D\u660E\u786E: {1}
 jshell.err.set.editor.arg = ''/set editor'' \u547D\u4EE4\u8981\u6C42\u8DEF\u5F84\u53C2\u6570
 jshell.msg.set.editor.set = \u7F16\u8F91\u5668\u8BBE\u7F6E\u4E3A: {0}
+jshell.err.cant.launch.editor = \u65E0\u6CD5\u542F\u52A8\u7F16\u8F91\u5668 -- \u610F\u5916\u7684\u5F02\u5E38\u9519\u8BEF: {0}
+jshell.msg.try.set.editor = \u8BF7\u5C1D\u8BD5\u901A\u8FC7 /set editor \u6765\u4F7F\u7528\u5916\u90E8\u7F16\u8F91\u5668\u3002
 
-jshell.msg.try.list.without.args = \u5C1D\u8BD5\u4F7F\u7528\u4E0D\u5E26\u53C2\u6570\u7684 ''/list''\u3002
+jshell.msg.try.command.without.args = \u5C1D\u8BD5\u4F7F\u7528\u4E0D\u5E26\u53C2\u6570\u7684 ''{0}''\u3002
 jshell.msg.no.active = \u6CA1\u6709\u6D3B\u52A8\u5B9A\u4E49\u3002
 
 jshell.msg.resetting = \u6B63\u5728\u91CD\u7F6E...
@@ -67,8 +69,8 @@ jshell.err.out.of.range = \u8D85\u51FA\u8303\u56F4
 jshell.msg.error = \u9519\u8BEF:
 jshell.msg.warning = \u8B66\u544A:
 
-jshell.err.set.arg = ''/set'' \u547D\u4EE4\u8981\u6C42\u5B50\u547D\u4EE4\u548C\u53C2\u6570\u3002\u8BF7\u53C2\u9605: ''/help /set''
-jshell.err.set.ambiguous = ''/set'' \u7684\u5B50\u547D\u4EE4\u53C2\u6570\u4E0D\u660E\u786E: {0}
+jshell.err.sub.arg = ''{0}'' \u547D\u4EE4\u9700\u8981\u5B50\u547D\u4EE4\u3002\u8BF7\u53C2\u9605: ''/help {0}''
+jshell.err.sub.ambiguous = ''{0}'' \u7684\u5B50\u547D\u4EE4\u53C2\u6570\u4E0D\u660E\u786E: {1}
 
 jshell.err.classpath.arg = /classpath \u547D\u4EE4\u8981\u6C42\u8DEF\u5F84\u53C2\u6570\u3002
 jshell.msg.classpath = \u8DEF\u5F84 ''{0}'' \u5DF2\u6DFB\u52A0\u5230\u7C7B\u8DEF\u5F84
@@ -78,7 +80,6 @@ jshell.msg.help.begin =\u952E\u5165 Java \u8BED\u8A00\u8868\u8FBE\u5F0F, \u8BED\
 jshell.msg.help.subject =\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u952E\u5165 ''/help'', \u540E\u8DDF\u547D\u4EE4\u6216\u4E3B\u9898\u7684\u540D\u79F0\u3002\n\u4F8B\u5982 ''/help /list'' \u6216 ''/help intro''\u3002\u4E3B\u9898:\n
 
 jshell.err.drop.arg =\u5728 /drop \u53C2\u6570\u4E2D, \u8BF7\u6307\u5B9A\u8981\u5220\u9664\u7684\u5BFC\u5165, \u53D8\u91CF, \u65B9\u6CD5\u6216\u7C7B\u3002\n\u6309 id \u6216\u540D\u79F0\u6307\u5B9A\u3002\u4F7F\u7528 /list \u53EF\u67E5\u770B id\u3002\u4F7F\u7528 /reset \u53EF\u91CD\u7F6E\u6240\u6709\u72B6\u6001\u3002
-jshell.msg.drop.not.active = \u53C2\u6570\u672A\u6307\u5B9A\u8981\u5220\u9664\u7684\u6D3B\u52A8\u5BFC\u5165, \u53D8\u91CF, \u65B9\u6CD5\u6216\u7C7B\u3002
 jshell.err.drop.ambiguous = \u53C2\u6570\u5F15\u7528\u4E86\u591A\u4E2A\u5BFC\u5165, \u53D8\u91CF, \u65B9\u6CD5\u6216\u7C7B\u3002
 jshell.err.failed = \u5931\u8D25\u3002
 jshell.msg.native.method = \u672C\u673A\u65B9\u6CD5
@@ -87,11 +88,12 @@ jshell.msg.goodbye = \u518D\u89C1
 
 jshell.msg.help.for.help = \u952E\u5165 /help \u4EE5\u83B7\u53D6\u5E2E\u52A9\u4FE1\u606F\u3002
 
-jshell.err.feedback.expected.new.feedback.mode = \u9884\u671F\u65B0\u7684\u53CD\u9988\u6A21\u5F0F -- {0}
-jshell.err.feedback.expected.mode.name = \u9884\u671F\u65B0\u7684\u53CD\u9988\u6A21\u5F0F\u540D\u79F0\u3002''{0}'' \u662F\u5DF2\u77E5\u7684\u53CD\u9988\u6A21\u5F0F -- {1}
-jshell.err.feedback.command.quiet = \u6307\u5B9A ''command'' \u6216 ''quiet'' -- {0}
-jshell.err.feedback.expected.field = \u7F3A\u5C11\u9884\u671F\u7684\u5B57\u6BB5\u540D -- {0}
-jshell.err.feedback.expected.mode = \u9884\u671F\u53CD\u9988\u6A21\u5F0F -- {0}
+jshell.err.mode.name = \u9884\u671F\u53CD\u9988\u6A21\u5F0F\u540D\u79F0: {0}
+jshell.err.missing.mode = \u7F3A\u5C11\u53CD\u9988\u6A21\u5F0F -- {0}
+jshell.err.field.name = \u9884\u671F\u5B57\u6BB5\u540D: {0} -- {1}
+jshell.err.missing.field = \u7F3A\u5C11\u5B57\u6BB5\u540D -- {0}
+jshell.err.mode.unknown = \u672A\u6307\u5B9A\u53CD\u9988\u6A21\u5F0F: {0} -- {1}
+
 jshell.err.feedback.does.not.match.mode = \u4E0D\u5339\u914D\u4EFB\u4F55\u5F53\u524D\u53CD\u9988\u6A21\u5F0F: {0} -- {1}
 jshell.err.feedback.ambiguous.mode = \u5339\u914D\u4E86\u591A\u4E2A\u5F53\u524D\u53CD\u9988\u6A21\u5F0F: {0} -- {1}
 jshell.err.feedback.expected.format = \u7F3A\u5C11\u9884\u671F\u683C\u5F0F -- {0}
@@ -104,6 +106,24 @@ jshell.msg.feedback.new.mode = \u5DF2\u521B\u5EFA\u65B0\u7684\u53CD\u9988\u6A21\
 jshell.msg.feedback.mode = \u53CD\u9988\u6A21\u5F0F: {0}
 jshell.msg.feedback.mode.following = \u53CD\u9988\u6A21\u5F0F\u5E94\u8BE5\u4E3A\u4EE5\u4E0B\u4E4B\u4E00:
 
+jshell.err.truncation.expected.length = \u9884\u671F\u622A\u65AD\u957F\u5EA6 -- {0}
+jshell.err.truncation.length.not.integer = \u622A\u65AD\u957F\u5EA6\u5FC5\u987B\u4E3A\u6574\u6570: {0} -- {1}
+
+jshell.err.not.valid.with.predefined.mode = \u5BF9\u4E8E\u9884\u5B9A\u4E49\u7684\u6A21\u5F0F\u65E0\u6548: {0} -- {1}
+jshell.err.retained.feedback.mode.must.be.retained.or.predefined = ''/retain feedback <\u6A21\u5F0F>'' \u8981\u6C42 <\u6A21\u5F0F> \u4E3A\u9884\u5B9A\u4E49\u6216\u8005\u5DF2\u7ECF\u4F7F\u7528 ''/retain mode'' \u4FDD\u7559 -- {0}
+
+jshell.err.unknown.option = \u672A\u77E5\u9009\u9879: {0} -- {1}
+jshell.err.default.option.or.program = \u6307\u5B9A -default \u9009\u9879\u6216\u7A0B\u5E8F, \u4F46\u4E0D\u80FD\u540C\u65F6\u6307\u5B9A -- {0}
+jshell.err.option.or.filename = \u6307\u5B9A\u4E00\u4E2A\u9009\u9879\u6216\u8005\u4E00\u4E2A\u542F\u52A8\u6587\u4EF6\u540D -- {0}
+jshell.err.unexpected.at.end = \u547D\u4EE4\u7ED3\u5C3E\u5904\u9047\u5230\u610F\u5916\u7684\u53C2\u6570: {0} -- {1}
+jshell.err.conflicting.options = \u51B2\u7A81\u7684\u9009\u9879 -- {0}
+jshell.err.cannot.delete.current.mode = \u65E0\u6CD5\u5220\u9664\u5F53\u524D\u53CD\u9988\u6A21\u5F0F ''{0}'', \u8BF7\u5148\u4F7F\u7528 ''/set feedback'' -- {1}
+jshell.err.cannot.delete.retained.mode = \u65E0\u6CD5\u5220\u9664\u4FDD\u7559\u7684\u53CD\u9988\u6A21\u5F0F ''{0}'', \u8BF7\u5148\u4F7F\u7528 ''/retain feedback'' -- {1}
+jshell.err.may.not.specify.options.and.snippets = \u4E0D\u80FD\u540C\u65F6\u4F7F\u7528\u9009\u9879\u548C\u7247\u6BB5: {0}
+jshell.err.no.such.snippets = \u6CA1\u6709\u6B64\u7C7B\u7247\u6BB5: {0}
+jshell.err.the.snippet.cannot.be.used.with.this.command = \u6B64\u547D\u4EE4\u4E0D\u63A5\u53D7\u7247\u6BB5 ''{0}'' : {1}
+jshell.err.retained.mode.failure = \u4FDD\u7559\u6A21\u5F0F\u4E2D\u51FA\u73B0\u6545\u969C (\u5DF2\u6E05\u9664\u6A21\u5F0F) -- {0} {1}
+
 jshell.console.see.more = <\u6309 Tab \u53EF\u67E5\u770B\u66F4\u591A\u5185\u5BB9>
 jshell.console.do.nothing = \u4E0D\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C
 jshell.console.choice = \u9009\u9879: 
@@ -113,39 +133,39 @@ jshell.console.no.candidate = \n\u6CA1\u6709\u627E\u5230\u53EF\u5BFC\u5165\u7684
 jshell.console.incomplete = \n\u7ED3\u679C\u53EF\u80FD\u4E0D\u5B8C\u6574; \u8BF7\u7A0D\u5019\u91CD\u8BD5\u4EE5\u83B7\u53D6\u5B8C\u6574\u7ED3\u679C\u3002
 
 
-help.usage = \u7528\u6CD5:   jshell  \n\u5176\u4E2D, \u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:\n\t-classpath           \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\t-cp                  \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\t-startup             \u5BF9\u542F\u52A8\u5B9A\u4E49\u6267\u884C\u5355\u6B21\u66FF\u6362\n\t-nostartup                 \u4E0D\u8FD0\u884C\u542F\u52A8\u5B9A\u4E49\n\t-help                      \u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u63D0\u8981\n\t-version                   \u7248\u672C\u4FE1\u606F\n
+help.usage = \u7528\u6CD5:   jshell <\u9009\u9879> <\u52A0\u8F7D\u6587\u4EF6>\n\u5176\u4E2D, \u53EF\u80FD\u7684\u9009\u9879\u5305\u62EC:\n    -classpath <\u8DEF\u5F84>    \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n    -cp <\u8DEF\u5F84>           \u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n    -startup <\u6587\u4EF6>      \u5BF9\u542F\u52A8\u5B9A\u4E49\u6267\u884C\u5355\u6B21\u66FF\u6362\n    -nostartup           \u4E0D\u8FD0\u884C\u542F\u52A8\u5B9A\u4E49\n    -feedback <\u6A21\u5F0F>     \u6307\u5B9A\u521D\u59CB\u53CD\u9988\u6A21\u5F0F\u3002\u8BE5\u6A21\u5F0F\u53EF\u4EE5\u662F\n                         \u9884\u5B9A\u4E49\u7684 (silent, concise, normal \u6216 verbose), \n                         \u4E5F\u53EF\u662F\u4EE5\u524D\u7528\u6237\u5B9A\u4E49\u7684\n    -q                   \u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E: -feedback concise\n    -qq                  \u771F\u6B63\u65E0\u63D0\u793A\u53CD\u9988\u3002\u7B49\u540C\u4E8E: -feedback silent\n    -v                   \u8BE6\u7EC6\u53CD\u9988\u3002\u7B49\u540C\u4E8E: -feedback verbose\n    -J<\u6807\u8BB0>             \u76F4\u63A5\u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                         \u4E3A\u6BCF\u4E2A\u8FD0\u884C\u65F6\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -J\n    -R<\u6807\u8BB0>             \u5C06 <\u6807\u8BB0> \u4F20\u9012\u5230\u8FDC\u7A0B\u8FD0\u884C\u65F6\u7CFB\u7EDF\u3002\n                         \u4E3A\u6BCF\u4E2A\u8FDC\u7A0B\u6807\u8BB0\u6216\u6807\u8BB0\u53C2\u6570\u4F7F\u7528\u4E00\u4E2A -R\n    -help                \u8F93\u51FA\u6B64\u6807\u51C6\u9009\u9879\u7684\u63D0\u8981\n    -version             \u7248\u672C\u4FE1\u606F\n
 
 help.list.summary = \u5217\u51FA\u60A8\u952E\u5165\u7684\u6E90
-help.list.args = [all|start|]
-help.list =\u663E\u793A\u524D\u9762\u5E26\u6709\u7247\u6BB5 ID \u7684\u7247\u6BB5\u6E90\u3002\n\n/list\n\t\u5217\u51FA\u60A8\u952E\u5165\u7684\u6216\u4F7F\u7528 /open \u8BFB\u53D6\u7684\u5F53\u524D\u6D3B\u52A8\u7684\u4EE3\u7801\u7247\u6BB5\n\n/list start\n\t\u5217\u51FA\u81EA\u52A8\u8BC4\u4F30\u7684\u542F\u52A8\u7247\u6BB5\n\n/list all\n\t\u5217\u51FA\u6240\u6709\u7247\u6BB5, \u5305\u62EC\u5931\u8D25\u7684\u7247\u6BB5, \u8986\u76D6\u7684\u7247\u6BB5, \u5220\u9664\u7684\u7247\u6BB5\u548C\u542F\u52A8\u7247\u6BB5\n\n/list \n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u7247\u6BB5 (\u7279\u522B\u662F\u6D3B\u52A8\u7247\u6BB5)\n\n/list \n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u7247\u6BB5 id \u7684\u7247\u6BB5
+help.list.args = [<\u540D\u79F0\u6216 id>|-all|-start]
+help.list =\u663E\u793A\u524D\u9762\u5E26\u6709\u7247\u6BB5 ID \u7684\u7247\u6BB5\u6E90\u3002\n\n/list\n\t\u5217\u51FA\u60A8\u952E\u5165\u7684\u6216\u4F7F\u7528 /open \u8BFB\u53D6\u7684\u5F53\u524D\u6D3B\u52A8\u7684\u4EE3\u7801\u7247\u6BB5\n\n/list -start\n\t\u5217\u51FA\u81EA\u52A8\u8BC4\u4F30\u7684\u542F\u52A8\u7247\u6BB5\n\n/list -all\n\t\u5217\u51FA\u6240\u6709\u7247\u6BB5, \u5305\u62EC\u5931\u8D25\u7684\u7247\u6BB5, \u8986\u76D6\u7684\u7247\u6BB5, \u5220\u9664\u7684\u7247\u6BB5\u548C\u542F\u52A8\u7247\u6BB5\n\n/list <\u540D\u79F0>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u7247\u6BB5 (\u7279\u522B\u662F\u6D3B\u52A8\u7247\u6BB5)\n\n/list \n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684\u7247\u6BB5
 
 help.edit.summary = \u7F16\u8F91\u6309\u540D\u79F0\u6216 id \u5F15\u7528\u7684\u6E90\u6761\u76EE
 help.edit.args = <\u540D\u79F0\u6216 id>
-help.edit =\u5728\u5916\u90E8\u7F16\u8F91\u5668\u4E2D\u7F16\u8F91\u6E90\u7684\u7247\u6BB5\u3002\n\u4F7F\u7528 /set editor \u53EF\u4EE5\u8BBE\u7F6E\u8981\u4F7F\u7528\u7684\u7F16\u8F91\u5668\u3002\n\u5982\u679C\u5C1A\u672A\u8BBE\u7F6E\u7F16\u8F91\u5668, \u5219\u5C06\u542F\u52A8\u4E00\u4E2A\u7B80\u5355\u7684\u7F16\u8F91\u5668\u3002\n\n/edit \n\t\u7F16\u8F91\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u7247\u6BB5 (\u7279\u522B\u662F\u6D3B\u52A8\u7247\u6BB5)\n\n/edit \n\t\u7F16\u8F91\u5177\u6709\u6307\u5B9A\u7247\u6BB5 id \u7684\u7247\u6BB5\n\n/edit\n\t\u7F16\u8F91\u60A8\u952E\u5165\u6216\u4F7F\u7528 /open \u8BFB\u53D6\u7684\u5F53\u524D\u6D3B\u52A8\u7684\u4EE3\u7801\u7247\u6BB5
+help.edit =\u5728\u5916\u90E8\u7F16\u8F91\u5668\u4E2D\u7F16\u8F91\u6E90\u7684\u7247\u6BB5\u3002\n\u4F7F\u7528 /set editor \u53EF\u4EE5\u8BBE\u7F6E\u8981\u4F7F\u7528\u7684\u7F16\u8F91\u5668\u3002\n\u5982\u679C\u5C1A\u672A\u8BBE\u7F6E\u7F16\u8F91\u5668, \u5219\u5C06\u542F\u52A8\u4E00\u4E2A\u7B80\u5355\u7684\u7F16\u8F91\u5668\u3002\n\n/edit <\u540D\u79F0>\n\t\u7F16\u8F91\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u7247\u6BB5 (\u7279\u522B\u662F\u6D3B\u52A8\u7247\u6BB5)\n\n/edit \n\t\u7F16\u8F91\u5177\u6709\u6307\u5B9A\u7247\u6BB5 id \u7684\u7247\u6BB5\n\n/edit\n\t\u7F16\u8F91\u60A8\u952E\u5165\u6216\u4F7F\u7528 /open \u8BFB\u53D6\u7684\u5F53\u524D\u6D3B\u52A8\u7684\u4EE3\u7801\u7247\u6BB5
 
 help.drop.summary = \u5220\u9664\u6309\u540D\u79F0\u6216 id \u5F15\u7528\u7684\u6E90\u6761\u76EE
 help.drop.args = <\u540D\u79F0\u6216 id>
 help.drop =\u5220\u9664\u7247\u6BB5 -- \u4F7F\u7247\u6BB5\u5904\u4E8E\u4E0D\u6D3B\u52A8\u72B6\u6001\u3002\n\n/drop \n\t\u5220\u9664\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684\u7247\u6BB5\n\n/drop \n\t\u5220\u9664\u5177\u6709\u6307\u5B9A\u7247\u6BB5 id \u7684\u7247\u6BB5
 
 help.save.summary = \u5C06\u7247\u6BB5\u6E90\u4FDD\u5B58\u5230\u6587\u4EF6\u3002
-help.save.args = [all|history|start] 
-help.save =\u5C06\u6307\u5B9A\u7684\u7247\u6BB5\u548C/\u6216\u547D\u4EE4\u4FDD\u5B58\u5230\u6307\u5B9A\u6587\u4EF6\u3002\n\n/save \n\t\u5C06\u5F53\u524D\u6D3B\u52A8\u7247\u6BB5\u7684\u6E90\u4FDD\u5B58\u5230\u6587\u4EF6\u3002\n\n/save all \n\t\u5C06\u6240\u6709\u7247\u6BB5\u7684\u6E90\u4FDD\u5B58\u5230\u6587\u4EF6\u3002\n\t\u8FD9\u5305\u62EC\u8986\u76D6\u7684\u6E90, \u5931\u8D25\u7684\u6E90\u4EE5\u53CA\u542F\u52A8\u4EE3\u7801\u3002\n\n/save history \n\t\u4FDD\u5B58\u81EA\u542F\u52A8 jshell \u4EE5\u6765\u8F93\u5165\u7684\u6240\u6709\u547D\u4EE4\u548C\u7247\u6BB5\u7684\u987A\u5E8F\u5386\u53F2\u8BB0\u5F55\u3002\n\n/save start \n\t\u5C06\u9ED8\u8BA4\u7684\u542F\u52A8\u5B9A\u4E49\u4FDD\u5B58\u5230\u6587\u4EF6\u3002
+help.save.args = [-all|-history|-start] <\u6587\u4EF6>
+help.save =\u5C06\u6307\u5B9A\u7684\u7247\u6BB5\u548C/\u6216\u547D\u4EE4\u4FDD\u5B58\u5230\u6307\u5B9A\u6587\u4EF6\u3002\n\n/save <\u6587\u4EF6>\n\t\u5C06\u5F53\u524D\u6D3B\u52A8\u7247\u6BB5\u7684\u6E90\u4FDD\u5B58\u5230\u6587\u4EF6\u3002\n\n/save all <\u6587\u4EF6>\n\t\u5C06\u6240\u6709\u7247\u6BB5\u7684\u6E90\u4FDD\u5B58\u5230\u6587\u4EF6\u3002\n\t\u8FD9\u5305\u62EC\u8986\u76D6\u7684\u6E90, \u5931\u8D25\u7684\u6E90\u4EE5\u53CA\u542F\u52A8\u4EE3\u7801\u3002\n\n/save history <\u6587\u4EF6>\n\t\u4FDD\u5B58\u81EA\u542F\u52A8 jshell \u4EE5\u6765\u8F93\u5165\u7684\u6240\u6709\u547D\u4EE4\u548C\u7247\u6BB5\u7684\u987A\u5E8F\u5386\u53F2\u8BB0\u5F55\u3002\n\n/save -start <\u6587\u4EF6>\n\t\u5C06\u9ED8\u8BA4\u7684\u542F\u52A8\u5B9A\u4E49\u4FDD\u5B58\u5230\u6587\u4EF6\u3002
 
 help.open.summary = \u6253\u5F00\u6587\u4EF6\u4F5C\u4E3A\u6E90\u8F93\u5165
 help.open.args = 
 help.open =\u6253\u5F00\u6587\u4EF6\u5E76\u8BFB\u53D6\u5176\u5185\u5BB9\u4F5C\u4E3A\u7247\u6BB5\u548C\u547D\u4EE4\u3002\n\n/open \n\t\u8BFB\u53D6\u6307\u5B9A\u7684\u6587\u4EF6\u4F5C\u4E3A jshell \u8F93\u5165\u3002
 
 help.vars.summary = \u5217\u51FA\u5DF2\u58F0\u660E\u53D8\u91CF\u53CA\u5176\u503C
-help.vars.args =
-help.vars =\u5217\u51FA\u5F53\u524D\u6D3B\u52A8\u7684 jshell \u53D8\u91CF\u7684\u7C7B\u578B, \u540D\u79F0\u548C\u503C\u3002
+help.vars.args = [<\u540D\u79F0\u6216 id>|-all|-start]
+help.vars =\u5217\u51FA jshell \u53D8\u91CF\u7684\u7C7B\u578B, \u540D\u79F0\u548C\u503C\u3002\n\n/vars\n\t\u5217\u51FA\u5F53\u524D\u6D3B\u52A8\u7684 jshell \u53D8\u91CF\u7684\u7C7B\u578B, \u540D\u79F0\u548C\u503C\n\n/vars <\u540D\u79F0>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684 jshell \u53D8\u91CF (\u7279\u522B\u662F\u6D3B\u52A8\u53D8\u91CF)\n\n/vars \n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684 jshell \u53D8\u91CF\n\n/vars -start\n\t\u5217\u51FA\u81EA\u52A8\u6DFB\u52A0\u7684\u542F\u52A8 jshell \u53D8\u91CF\n\n/vars -all\n\t\u5217\u51FA\u6240\u6709 jshell \u53D8\u91CF, \u5305\u62EC\u5DF2\u5931\u8D25\u53D8\u91CF, \u5DF2\u8986\u76D6\u53D8\u91CF, \u5DF2\u5220\u9664\u53D8\u91CF\u548C\u542F\u52A8\u53D8\u91CF
 
 help.methods.summary = \u5217\u51FA\u5DF2\u58F0\u660E\u65B9\u6CD5\u53CA\u5176\u7B7E\u540D
-help.methods.args =
-help.methods =\u5217\u51FA\u5F53\u524D\u6D3B\u52A8\u7684 jshell \u65B9\u6CD5\u7684\u540D\u79F0, \u53C2\u6570\u7C7B\u578B\u548C\u8FD4\u56DE\u503C\u3002
+help.methods.args = [<\u540D\u79F0\u6216 id>|-all|-start]
+help.methods =\u5217\u51FA jshell \u65B9\u6CD5\u7684\u540D\u79F0, \u53C2\u6570\u7C7B\u578B\u4EE5\u53CA\u8FD4\u56DE\u7C7B\u578B\u3002\n\n/methods\n\t\u5217\u51FA\u5F53\u524D\u6D3B\u52A8 jshell \u65B9\u6CD5\u540D\u79F0, \u53C2\u6570\u7C7B\u578B\u548C\u8FD4\u56DE\u7C7B\u578B\n\n/methods <\u540D\u79F0>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684 jshell \u65B9\u6CD5 (\u7279\u522B\u662F\u6D3B\u52A8\u65B9\u6CD5)\n\n/methods \n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684 jshell \u65B9\u6CD5\n\n/methods -start\n\t\u5217\u51FA\u81EA\u52A8\u6DFB\u52A0\u7684\u542F\u52A8 jshell \u65B9\u6CD5\n\n/methods -all\n\t\u5217\u51FA\u6240\u6709\u7247\u6BB5, \u5305\u62EC\u5DF2\u5931\u8D25\u7247\u6BB5, \u5DF2\u8986\u76D6\u7247\u6BB5, \u5DF2\u5220\u9664\u7247\u6BB5\u548C\u542F\u52A8\u7247\u6BB5
 
-help.classes.summary = \u5217\u51FA\u5DF2\u58F0\u660E\u7684\u7C7B
-help.classes.args =
-help.classes =\u5217\u51FA\u5F53\u524D\u6D3B\u52A8\u7684 jshell \u7C7B, \u63A5\u53E3\u548C\u679A\u4E3E\u3002
+help.types.summary = \u5217\u51FA\u5DF2\u58F0\u660E\u7684\u7C7B\u578B
+help.types.args =[<\u540D\u79F0\u6216 id>|-all|-start]
+help.types =\u5217\u51FA jshell \u7C7B, \u63A5\u53E3\u548C\u679A\u4E3E\u3002\n\n/types\n\t\u5217\u51FA\u5F53\u524D\u6D3B\u52A8 jshell \u7C7B, \u63A5\u53E3\u548C\u679A\u4E3E\u3002\n\n/types <\u540D\u79F0>\n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u540D\u79F0\u7684 jshell \u7C7B\u578B (\u7279\u522B\u662F\u6D3B\u52A8\u7C7B\u578B)\n\n/types \n\t\u5217\u51FA\u5177\u6709\u6307\u5B9A\u7247\u6BB5 ID \u7684 jshell \u7C7B\u578B\n\n/types -start\n\t\u5217\u51FA\u81EA\u52A8\u6DFB\u52A0\u7684\u542F\u52A8 jshell \u7C7B\u578B\n\n/types -all\n\t\u5217\u51FA\u6240\u6709 jshell \u7C7B\u578B, \u5305\u62EC\u5DF2\u5931\u8D25, \u5DF2\u8986\u76D6, \u5DF2\u5220\u9664\u548C\u542F\u52A8\u7C7B\u578B
 
 help.imports.summary = \u5217\u51FA\u5BFC\u5165\u7684\u9879
 help.imports.args =
@@ -159,9 +179,9 @@ help.reset.summary = \u91CD\u542F jshell
 help.reset.args =
 help.reset =\u91CD\u542F jshell \u5DE5\u5177\u4EE3\u7801\u548C\u6267\u884C\u72B6\u6001:\n\t* \u6240\u6709\u8F93\u5165\u7684\u4EE3\u7801\u90FD\u5C06\u4E22\u5931\u3002\n\t* \u91CD\u65B0\u6267\u884C\u542F\u52A8\u4EE3\u7801\u3002\n\t* \u91CD\u65B0\u542F\u52A8\u6267\u884C\u72B6\u6001\u3002\n\t* \u6E05\u9664\u7C7B\u8DEF\u5F84\u3002\n\u5C06\u5DE5\u5177\u8BBE\u7F6E\u4FDD\u6301\u4E3A\u901A\u8FC7\u4EE5\u4E0B\u547D\u4EE4\u6267\u884C\u7684\u8BBE\u7F6E: /set ...\n\u5728\u4F7F\u7528\u6B64\u547D\u4EE4\u524D\u5E94\u8BE5\u5148\u4FDD\u5B58\u4EFB\u4F55\u5DE5\u4F5C
 
-help.reload.summary = \u91CD\u542F\u548C\u91CD\u653E\u76F8\u5173\u5386\u53F2\u8BB0\u5F55 -- \u5F53\u524D\u5386\u53F2\u8BB0\u5F55\u6216\u4E0A\u4E00\u4E2A\u5386\u53F2\u8BB0\u5F55 (restore)
-help.reload.args = [restore] [quiet]
-help.reload =\u91CD\u542F jshell \u5DE5\u5177\u4EE3\u7801\u548C\u6267\u884C\u72B6\u6001, \u7136\u540E\u6309\u7167 jshell \u6709\u6548\n\u547D\u4EE4\u548C\u6709\u6548\u7247\u6BB5\u7684\u8F93\u5165\u987A\u5E8F\u91CD\u653E\u6BCF\u4E2A\u547D\u4EE4\u548C\u6BCF\u4E2A\u7247\u6BB5\u3002\n\n/reload\n\t\u91CD\u542F\u548C\u91CD\u653E\u81EA\u8FDB\u5165 jshell \u4EE5\u6765\u7684\u6709\u6548\u5386\u53F2\u8BB0\u5F55,\n\t\u6216\u8005\u6267\u884C /reset \u6216 /reload \u547D\u4EE4\u4E2D\u6700\u8FD1\u7684\u90A3\u4E2A\n\t\u547D\u4EE4\u3002\n\n/reload restore\n\t\u91CD\u542F\u5E76\u91CD\u653E\u4E0A\u4E00\u6B21\u8FDB\u5165 jshell \u4EE5\u53CA\u6700\u8FD1\u8FDB\u5165 jshell\n\t\u4E4B\u95F4\u7684\u6709\u6548\u5386\u53F2\u8BB0\u5F55, \u6216\u8005\u6267\u884C /reset \u6216 /reload\n\t\u547D\u4EE4\u3002\u8FD9\u8FDB\u800C\u53EF\u7528\u4E8E\u8FD8\u539F\u4E0A\u4E00\u4E2A\n\tjshell \u5DE5\u5177\u4F1A\u8BDD\u3002\n\n/reload [restore] quiet\n\t\u4F7F\u7528 'quiet' \u53C2\u6570\u65F6, \u4E0D\u663E\u793A\u91CD\u653E\u3002\u5C06\u663E\u793A\u9519\u8BEF\u3002
+help.reload.summary = \u91CD\u542F\u548C\u91CD\u653E\u76F8\u5173\u5386\u53F2\u8BB0\u5F55 -- \u5F53\u524D\u5386\u53F2\u8BB0\u5F55\u6216\u4E0A\u4E00\u4E2A\u5386\u53F2\u8BB0\u5F55 (-restore)
+help.reload.args = [-restore] [-quiet]
+help.reload =\u91CD\u542F jshell \u5DE5\u5177\u4EE3\u7801\u548C\u6267\u884C\u72B6\u6001, \u7136\u540E\u6309\u7167 jshell \u6709\u6548\n\u547D\u4EE4\u548C\u6709\u6548\u7247\u6BB5\u7684\u8F93\u5165\u987A\u5E8F\u91CD\u653E\u6BCF\u4E2A\u547D\u4EE4\u548C\u6BCF\u4E2A\u7247\u6BB5\u3002\n\n/reload\n\t\u91CD\u542F\u548C\u91CD\u653E\u81EA\u8FDB\u5165 jshell \u4EE5\u6765\u7684\u6709\u6548\u5386\u53F2\u8BB0\u5F55,\n\t\u6216\u8005\u6267\u884C /reset \u6216 /reload \u547D\u4EE4\u4E2D\u6700\u8FD1\u7684\u90A3\u4E2A\n\t\u547D\u4EE4\u3002\n\n/reload -restore\n\t\u91CD\u542F\u5E76\u91CD\u653E\u4E0A\u4E00\u6B21\u8FDB\u5165 jshell \u4EE5\u53CA\u6700\u8FD1\u8FDB\u5165 jshell\n\t\u4E4B\u95F4\u7684\u6709\u6548\u5386\u53F2\u8BB0\u5F55, \u6216\u8005\u6267\u884C /reset \u6216 /reload\n\t\u547D\u4EE4\u3002\u8FD9\u8FDB\u800C\u53EF\u7528\u4E8E\u8FD8\u539F\u4E0A\u4E00\u4E2A\n\tjshell \u5DE5\u5177\u4F1A\u8BDD\u3002\n\n/reload [-restore] -quiet\n\t\u4F7F\u7528 '-quiet' \u53C2\u6570\u65F6, \u4E0D\u663E\u793A\u91CD\u653E\u3002\u5C06\u663E\u793A\u9519\u8BEF\u3002
 
 help.classpath.summary = \u5C06\u8DEF\u5F84\u6DFB\u52A0\u5230\u7C7B\u8DEF\u5F84
 help.classpath.args = 
@@ -180,8 +200,12 @@ help.help.args = [|]
 help.help =\u663E\u793A\u6709\u5173 jshell \u7684\u4FE1\u606F\u3002\n/help\n\t\u5217\u51FA jshell \u547D\u4EE4\u548C\u5E2E\u52A9\u4E3B\u9898\u3002\n\n/help \n\t\u663E\u793A\u6709\u5173\u6307\u5B9A\u547D\u4EE4\u7684\u4FE1\u606F\u3002\u5FC5\u987B\u5305\u542B\u659C\u6760\u3002\n\t\u53EA\u9700\u8981\u547D\u4EE4\u7684\u524D\u51E0\u4E2A\u5B57\u6BCD -- \u5982\u679C\u6709\u591A\u4E2A\u5339\u914D\u9879,\n\t\u5219\u5C06\u663E\u793A\u6240\u6709\u5B57\u6BCD\u3002\u793A\u4F8B: /help /li\n\n/help \n\t\u663E\u793A\u6709\u5173\u6307\u5B9A\u5E2E\u52A9\u4E3B\u9898\u7684\u4FE1\u606F\u3002\u793A\u4F8B: /help intro
 
 help.set.summary = \u8BBE\u7F6E jshell \u914D\u7F6E\u4FE1\u606F
-help.set.args = editor|start|feedback|newmode|prompt|format ...
-help.set =\u8BBE\u7F6E jshell \u914D\u7F6E\u4FE1\u606F, \u5305\u62EC:\n\u8981\u4F7F\u7528\u7684\u5916\u90E8\u7F16\u8F91\u5668, \u8981\u4F7F\u7528\u7684\u542F\u52A8\u5B9A\u4E49, \u65B0\u7684\u53CD\u9988\u6A21\u5F0F,\n\u547D\u4EE4\u63D0\u793A\u7B26, \u8981\u4F7F\u7528\u7684\u53CD\u9988\u6A21\u5F0F\u6216\u8F93\u51FA\u7684\u683C\u5F0F\u3002\n\n/set editor  ...\n\t\u6307\u5B9A\u8981\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4\u3002\n\t \u662F\u4E0E\u64CD\u4F5C\u7CFB\u7EDF\u76F8\u5173\u7684\u5B57\u7B26\u4E32\u3002\n\n/set start \n\t\u6307\u5B9A  \u7684\u5185\u5BB9\u5C06\u6210\u4E3A\u9ED8\u8BA4\u542F\u52A8\u7247\u6BB5\u548C\u547D\u4EE4\u3002\n\n/set feedback \n\t\u8BBE\u7F6E\u7528\u4E8E\u63CF\u8FF0\u4E3A\u6240\u8F93\u5165\u7684\u7247\u6BB5\u548C\u547D\u4EE4\u663E\u793A\u7684\u53CD\u9988\u7684\u53CD\u9988\u6A21\u5F0F\u3002\n\n/set newmode  [command|quiet []]\n\t\u521B\u5EFA\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F, \u4E5F\u53EF\u4EE5\u9009\u62E9\u4ECE\u73B0\u6709\u6A21\u5F0F\u590D\u5236\u3002\n\n/set prompt  "" ""\n\t\u8BBE\u7F6E\u4E3A\u7ED9\u5B9A\u53CD\u9988\u6A21\u5F0F\u663E\u793A\u7684\u63D0\u793A\u7B26\u3002\n\n/set format   "" ...\n\t\u901A\u8FC7\u8BBE\u7F6E\u5F53\u9009\u62E9\u5668\u5339\u914D\u65F6\u5B57\u6BB5\u7684\u683C\u5F0F\u6765\u914D\u7F6E\u53CD\u9988\u6A21\u5F0F\u3002\n\n\u8981\u83B7\u53D6\u6709\u5173\u5176\u4E2D\u4E00\u4E2A\u683C\u5F0F\u7684\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u5BF9\u6307\u5B9A\u7684\u683C\u5F0F\u4F7F\u7528 /help\u3002\n\u4F8B\u5982:   /help /set format
+help.set.args = editor|start|feedback|mode|prompt|truncation|format ...
+help.set =\u8BBE\u7F6E jshell \u914D\u7F6E\u4FE1\u606F, \u5305\u62EC:\n\u8981\u4F7F\u7528\u7684\u5916\u90E8\u7F16\u8F91\u5668, \u8981\u4F7F\u7528\u7684\u542F\u52A8\u5B9A\u4E49, \u65B0\u7684\u53CD\u9988\u6A21\u5F0F,\n\u547D\u4EE4\u63D0\u793A\u7B26, \u8981\u4F7F\u7528\u7684\u53CD\u9988\u6A21\u5F0F\u6216\u8F93\u51FA\u7684\u683C\u5F0F\u3002\n\n/set editor <\u547D\u4EE4> <\u53EF\u9009\u53C2\u6570>...\n\t\u6307\u5B9A\u8981\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4\u3002\n\t<\u547D\u4EE4> \u662F\u4E0E\u64CD\u4F5C\u7CFB\u7EDF\u76F8\u5173\u7684\u5B57\u7B26\u4E32\u3002\n\n/set start <\u6587\u4EF6>\n\t\u6307\u5B9A <\u6587\u4EF6> \u7684\u5185\u5BB9\u5C06\u6210\u4E3A\u9ED8\u8BA4\u542F\u52A8\u7247\u6BB5\u548C\u547D\u4EE4\u3002\n\n/set feedback <\u6A21\u5F0F>\n\t\u8BBE\u7F6E\u7528\u4E8E\u63CF\u8FF0\u4E3A\u6240\u8F93\u5165\u7247\u6BB5\u548C\u547D\u4EE4\u663E\u793A\u7684\u53CD\u9988\u7684\u53CD\u9988\u6A21\u5F0F\u3002\n\n/set mode <\u6A21\u5F0F> [<\u65E7\u6A21\u5F0F>] [-command|-quiet|-delete]\n\t\u521B\u5EFA\u6216\u66F4\u65B0\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F, \u53EF\u4EE5\u9009\u62E9\u4ECE\u73B0\u6709\u6A21\u5F0F\u590D\u5236\u3002\n\n/set prompt <\u6A21\u5F0F> "<\u63D0\u793A>" "<\u66F4\u591A\u63D0\u793A>"\n\t\u8BBE\u7F6E\u4E3A\u7ED9\u5B9A\u53CD\u9988\u6A21\u5F0F\u663E\u793A\u7684\u63D0\u793A\u7B26\u3002\n\n/set truncation <\u6A21\u5F0F> <\u957F\u5EA6> <\u9009\u62E9\u5668>...\n\t\u8BBE\u7F6E\u663E\u793A\u503C\u7684\u6700\u5927\u957F\u5EA6\n/set format <\u6A21\u5F0F> <\u5B57\u6BB5> "<\u683C\u5F0F>" <\u9009\u62E9\u5668>...\n\t\u901A\u8FC7\u8BBE\u7F6E\u5F53\u9009\u62E9\u5668\u5339\u914D\u65F6\u5B57\u6BB5\u7684\u683C\u5F0F\u6765\u914D\u7F6E\u53CD\u9988\u6A21\u5F0F\u3002\n\n\u8981\u83B7\u53D6\u6709\u5173\u5176\u4E2D\u4E00\u4E2A\u683C\u5F0F\u7684\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u5BF9\u6307\u5B9A\u7684\u683C\u5F0F\u4F7F\u7528 /help\u3002\n\u4F8B\u5982:   /help /set format
+
+help.retain.summary = \u4E3A\u540E\u7EED\u4F1A\u8BDD\u4FDD\u7559 jshell \u914D\u7F6E\u4FE1\u606F
+help.retain.args = editor|start|feedback|mode
+help.retain =\u4FDD\u7559 jshell \u914D\u7F6E\u4FE1\u606F\u4EE5\u4F9B jshell \u5DE5\u5177\u5728\u4EE5\u540E\u8C03\u7528,\n\u8FD9\u4E9B\u4FE1\u606F\u5305\u62EC: \u8981\u4F7F\u7528\u7684\u5916\u90E8\u7F16\u8F91\u5668, \u8981\u4F7F\u7528\u7684\u542F\u52A8\u5B9A\u4E49, \n\u53CD\u9988\u6A21\u5F0F\u7684\u914D\u7F6E, \u6216\u8005\u8981\u4F7F\u7528\u7684\u53CD\u9988\u6A21\u5F0F\u3002\n\n/retain editor [<\u547D\u4EE4> <\u53EF\u9009\u53C2\u6570>...]\n\t\u6307\u5B9A\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4\u3002\n\t<\u547D\u4EE4> \u662F\u4E0E\u64CD\u4F5C\u7CFB\u7EDF\u76F8\u5173\u7684\u5B57\u7B26\u4E32\u3002\n\n/retain start [<\u6587\u4EF6>]\n\t\u6307\u5B9A <\u6587\u4EF6> \u7684\u5185\u5BB9\u5C06\u6210\u4E3A\u9ED8\u8BA4\u542F\u52A8\u7247\u6BB5\u548C\u547D\u4EE4\u3002\n\n/retain feedback [<\u6A21\u5F0F>]\n\t\u8BBE\u7F6E\u7528\u4E8E\u63CF\u8FF0\u4E3A\u6240\u8F93\u5165\u7247\u6BB5\u548C\u547D\u4EE4\u663E\u793A\u7684\u53CD\u9988\u7684\u53CD\u9988\u6A21\u5F0F\u3002\n\n/retain mode <\u6A21\u5F0F>\n\t\u521B\u5EFA\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F, \u53EF\u4EE5\u9009\u62E9\u4ECE\u73B0\u6709\u6A21\u5F0F\u590D\u5236\u3002\n\n\u8981\u83B7\u53D6\u6709\u5173\u5176\u4E2D\u4E00\u4E2A\u683C\u5F0F\u7684\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u5BF9\u6307\u5B9A\u7684\u683C\u5F0F\u4F7F\u7528 /help\u3002\n\u4F8B\u5982:   /help /retain feedback
 
 help.quest.summary = \u83B7\u53D6 jshell \u7684\u76F8\u5173\u4FE1\u606F
 help.quest.args = [|]
@@ -205,17 +229,27 @@ help.intro =\u4F7F\u7528 jshell \u5DE5\u5177\u53EF\u4EE5\u6267\u884C Java \u4EE3
 help.shortcuts.summary = \u5FEB\u6377\u65B9\u5F0F\u7684\u8BF4\u660E
 help.shortcuts =\u652F\u6301\u7684\u5FEB\u6377\u65B9\u5F0F\u5305\u62EC:\n\n\n\t\t\u5728\u8F93\u5165 Java \u6807\u8BC6\u7B26, jshell \u547D\u4EE4\u6216 jshell\n\t\t\u547D\u4EE4\u53C2\u6570 (\u5728\u67D0\u4E9B\u60C5\u51B5\u4E0B) \u7684\u524D\u51E0\u4E2A\u5B57\u6BCD\u540E,\n\t\t\u6309  \u952E\u53EF\u4EE5\u5B8C\u6210\u8F93\u5165\u3002\n\t\t\u5982\u679C\u6709\u591A\u4E2A\u8F93\u5165\u63D0\u793A, \u5219\u663E\u793A\u53EF\u80FD\u7684\u8F93\u5165\u63D0\u793A\u3002\n\nShift-\n\t\t\u5728\u65B9\u6CD5\u6216\u6784\u9020\u5668\u8C03\u7528\u7684\u540D\u79F0\u548C\u5DE6\u62EC\u53F7\u540E\u9762,\n\t\t\u6309\u4F4F  \u952E\u5E76\u6309  \u53EF\u67E5\u770B\u6240\u6709\n\t\t\u5339\u914D\u7684\u65B9\u6CD5/\u6784\u9020\u5668\u7684\u63D0\u8981\u3002\n\n v\n\t\t\u5728\u5B8C\u6574\u7684\u8868\u8FBE\u5F0F\u540E\u9762, \u6309 " v" \u53EF\u4EE5\u5F15\u5165\u65B0\u7684\u53D8\u91CF,\n\t\t\u5176\u7C7B\u578B\u57FA\u4E8E\u8868\u8FBE\u5F0F\u7684\u7C7B\u578B\u3002\n\t\t"" \u53EF\u4EE5\u662F Alt-F1 \u6216 Alt-Enter, \u5177\u4F53\u53D6\u51B3\u4E8E\u5E73\u53F0\u3002\n\n i\n\t\t\u5728\u4E0D\u53EF\u89E3\u6790\u7684\u6807\u8BC6\u7B26\u540E\u9762, \u6309 " i", \u6B64\u65F6 jshell \u5C06\u4F1A\n\t\t\u6839\u636E\u6307\u5B9A\u7C7B\u8DEF\u5F84\u7684\u5185\u5BB9\u63D0\u8BAE\u53EF\u80FD\u7684\u5168\u9650\u5B9A\u540D\u79F0\u3002\n\t\t"" \u53EF\u4EE5\u662F Alt-F1 \u6216 Alt-Enter, \u5177\u4F53\u53D6\u51B3\u4E8E\u5E73\u53F0\u3002
 
-help.set.format = \u8BBE\u7F6E\u7528\u4E8E\u62A5\u544A\u7247\u6BB5\u4E8B\u4EF6\u7684\u683C\u5F0F\u3002\n\n\t/set format   "" ...\n\n\u5176\u4E2D  \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0 -- \u8BF7\u53C2\u9605 '/help /set newmode'\u3002\n\u5176\u4E2D  \u662F\u8981\u5B9A\u4E49\u7684\u4E0A\u4E0B\u6587\u7279\u5B9A\u683C\u5F0F\u7684\u540D\u79F0\u3002\n\u5176\u4E2D  \u662F\u4E00\u4E2A\u5E26\u5F15\u53F7\u7684\u5B57\u7B26\u4E32, \u8BE5\u5B57\u7B26\u4E32\u5C06\u4E3A\n\u5B57\u6BB5\u7684\u503C (\u5982\u679C\u9009\u62E9\u5668\u5339\u914D, \u6216\u8005\u6CA1\u6709\u4EFB\u4F55\u9009\u62E9\u5668)\u3002\n\u5728\u4F7F\u7528\u683C\u5F0F\u65F6, \u7528\u5927\u62EC\u53F7\u62EC\u8D77\u7684\u5B57\u6BB5\u540D\u5C06\u4F1A\u5728\u76F8\u5E94\u65F6\u95F4\n\u4F7F\u7528\u5B57\u6BB5\u503C\u66FF\u6362\u3002\u8FD9\u4E9B\u5B57\u6BB5\u53EF\u80FD\u5DF2\u4F7F\u7528\u6B64\u547D\u4EE4\u5B9A\u4E49, \n\u4E5F\u53EF\u80FD\u662F\u7279\u5B9A\u4E8E\u4E0A\u4E0B\u6587\u7684\u4EE5\u4E0B\u9884\u5B9A\u4E49\u5B57\u6BB5\u4E4B\u4E00:\n\t{name}       == \u540D\u79F0, \u4F8B\u5982: \u53D8\u91CF\u7684\u540D\u79F0, ...\n\t{type}       == \u7C7B\u578B\u540D\u79F0\u3002\u53D8\u91CF\u6216\u8868\u8FBE\u5F0F\u7684\u7C7B\u578B,\n\t\t\t\u65B9\u6CD5\u7684\u53C2\u6570\u7C7B\u578B\n\t{value}      == \u8868\u8FBE\u5F0F\u6216\u53D8\u91CF\u521D\u59CB\u5316\u7684\u7ED3\u679C\u503C\n\t{unresolved} == \u672A\u89E3\u6790\u5F15\u7528\u7684\u5217\u8868\n\t{errors}     == \u53EF\u6062\u590D\u9519\u8BEF\u7684\u5217\u8868 (\u53EA\u5728\u5904\u7406\n\t\t\t"display" \u5B57\u6BB5\u671F\u95F4)\n\t{err}        == \u65E0\u683C\u5F0F\u7684\u9519\u8BEF\u884C (\u53EA\u5728\u5904\u7406\n\t\t\t"errorline" \u5B57\u6BB5\u671F\u95F4)\n\u8BE5\u5DE5\u5177\u8BBF\u95EE\u4EE5\u4E0B\u5B57\u6BB5\u6765\u786E\u5B9A\u6240\u663E\u793A\u7684\u53CD\u9988:\n\t{display}    == \u4E3A\u7247\u6BB5\u4E8B\u4EF6\u663E\u793A\u7684\u6D88\u606F\n\t{errorline}  == "errors" \u5B57\u6BB5\u4E2D\u7684\u4E00\u4E2A\u9519\u8BEF\u884C\u7684\u683C\u5F0F\n\t{pre}        == \u53CD\u9988\u524D\u7F00 (\u4F5C\u4E3A\u547D\u4EE4\u53CD\u9988\u7684\u5F00\u5934)\n\t{post}       == \u53CD\u9988\u540E\u7F00 (\u4F5C\u4E3A\u547D\u4EE4\u53CD\u9988\u7684\u7ED3\u5C3E)\n\t{errorpre}   == \u9519\u8BEF\u524D\u7F00 (\u4F5C\u4E3A\u9519\u8BEF\u53CD\u9988\u7684\u5F00\u5934)\n\t{errorpost}  == \u9519\u8BEF\u540E\u7F00 (\u4F5C\u4E3A\u9519\u8BEF\u53CD\u9988\u7684\u7ED3\u5C3E)\n\u8FD9\u4E9B\u5B57\u6BB5\u5177\u6709\u9ED8\u8BA4\u8BBE\u7F6E (\u53EF\u8986\u76D6)\u3002\n\u5176\u4E2D  \u662F\u5E94\u7528\u683C\u5F0F\u7684\u4E0A\u4E0B\u6587\u3002\n\u9009\u62E9\u5668\u7ED3\u6784\u662F\u4E00\u4E2A\u7531\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u6784\u6210\u7684\u5217\u8868, \u4F7F\u7528\u8FDE\u5B57\u7B26\u5206\u9694\u3002\n\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u662F\u5355\u4E2A\u9009\u62E9\u5668\u7C7B\u578B\u7684\u503C\u7684\u5217\u8868, \u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n\u5982\u679C\u6BCF\u4E2A\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u5339\u914D, \u5219\u9009\u62E9\u5668\u5339\u914D; \u5982\u679C\u5176\u4E2D\u67D0\u4E2A\u503C\n\u5339\u914D, \u5219\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u5339\u914D\u3002\n\ncase \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u7247\u6BB5\u7684\u7C7B\u578B\u3002\u503C\u5305\u62EC:\n\timport     -- \u5BFC\u5165\u58F0\u660E\n\tclass      -- \u7C7B\u58F0\u660E\n\tinterface  -- \u63A5\u53E3\u58F0\u660E\n\tenum       -- \u679A\u4E3E\u58F0\u660E\n\tannotation -- \u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\n\tmethod     -- \u65B9\u6CD5\u58F0\u660E -- \u6CE8: {type}==parameter-types\n\tvardecl    -- \u4E0D\u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\tvardecl    -- \u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\texpression -- \u8868\u8FBE\u5F0F -- \u6CE8: {name}==scratch-variable-name\n\tvarvalue   -- \u53D8\u91CF\u503C\u8868\u8FBE\u5F0F\n\tassignment -- \u5206\u914D\u53D8\u91CF\n\tstatement  -- \
-\u8BED\u53E5\n\u64CD\u4F5C\u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u5BF9\u7247\u6BB5\u6267\u884C\u7684\u64CD\u4F5C\u3002\u503C\u5305\u62EC:\n\tadded     -- \u7247\u6BB5\u5DF2\u6DFB\u52A0\n\tmodified  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u4FEE\u6539\n\treplaced  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u66FF\u6362\u4E3A\u65B0\u7247\u6BB5\n\toverwrote -- \u73B0\u6709\u7247\u6BB5\u5DF2\u8986\u76D6\n\tdropped   -- \u7247\u6BB5\u5DF2\u5220\u9664\n\tused      -- \u7247\u6BB5\u5728\u4E0D\u80FD\u4F7F\u7528\u7684\u65F6\u5019\u5DF2\u88AB\u4F7F\u7528\nwhen-did-it-occur \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u8FD9\u662F\u76F4\u63A5\u64CD\u4F5C\u8FD8\u662F\u95F4\u63A5\u64CD\u4F5C\u3002\u503C\u5305\u62EC:\n\tprimary -- \u8F93\u5165\u7684\u7247\u6BB5\n\tupdate  -- \u5BF9\u76F8\u5173\u7247\u6BB5\u7684\u66F4\u65B0\nresolution-state \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u7247\u6BB5\u7684\u89E3\u6790/\u5B9A\u4E49\u72B6\u6001\u3002\u503C\u5305\u62EC:\n\tok         -- \u5DF2\u6B63\u786E\u89E3\u6790\n\tdefined    -- \u5DF2\u5B9A\u4E49, \u4F46\u5B58\u5728\u53EF\u6062\u590D\u7684\u672A\u89E3\u6790\u5F15\u7528\n\tnotdefined -- \u7531\u4E8E\u5B58\u5728\u53EF\u6062\u590D\u7684\u672A\u89E3\u6790\u5F15\u7528\u800C\u672A\u5B9A\u4E49\nunresolved-count \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u672A\u89E3\u6790\u5F15\u7528\u7684\u6570\u91CF\u3002\u503C\u5305\u62EC:\n\tunresolved0 -- \u4E0D\u5B58\u5728\u672A\u89E3\u6790\u7684\u540D\u79F0\n\tunresolved1 -- \u4E00\u4E2A\u540D\u79F0\u672A\u89E3\u6790\n\tunresolved2 -- \u4E24\u4E2A\u6216\u66F4\u591A\u540D\u79F0\u672A\u89E3\u6790\nerrors-count \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u9519\u8BEF\u7684\u6570\u91CF\u3002\u503C\u5305\u62EC:\n\terror0 -- \u65E0\u9519\u8BEF\n\terror1 -- \u4E00\u4E2A\u9519\u8BEF\n\terror2 -- \u4E24\u4E2A\u6216\u66F4\u591A\u9519\u8BEF\n\n\u793A\u4F8B:\n\t/set format myformat action 'Created' added-primary\n\t/set format myformat action 'Update replaced' replaced-update\n\t/set format myformat display '{pre}{action} class {name}{post}' class-ok\n\t/set format myformat display '{pre}{action} variable {name}, reset to null{post}' replaced-vardecl,varinit-ok-update\n\n\u8BF7\u6CE8\u610F, \u67D0\u4E2A\u5B57\u6BB5\u7684\u540E\u7EED\u9009\u62E9\u5668\u53EF\u80FD\u4F1A\u8986\u76D6\u90E8\u5206\u6216\u5168\u90E8\u4EE5\u524D\u4F7F\u7528\u7684\u9009\u62E9\u5668 -- \u91C7\u7528\u6700\u540E\u4E00\u4E2A\u9009\u62E9\u5668\n
+help.set.format = \u8BBE\u7F6E\u7528\u4E8E\u62A5\u544A\u7247\u6BB5\u4E8B\u4EF6\u7684\u683C\u5F0F\u3002\n\n\t/set format <\u6A21\u5F0F> <\u5B57\u6BB5> "<\u683C\u5F0F>" <\u9009\u62E9\u5668>...\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0 -- \u8BF7\u53C2\u9605 '/help /set mode'\u3002\n\u5176\u4E2D <\u5B57\u6BB5> \u662F\u8981\u5B9A\u4E49\u7684\u4E0A\u4E0B\u6587\u7279\u5B9A\u683C\u5F0F\u7684\u540D\u79F0\u3002\n\u5176\u4E2D <\u683C\u5F0F> \u662F\u4E00\u4E2A\u5E26\u5F15\u53F7\u7684\u5B57\u7B26\u4E32, \u8BE5\u5B57\u7B26\u4E32\u5C06\u4E3A\n\u5B57\u6BB5\u7684\u503C (\u5982\u679C\u9009\u62E9\u5668\u5339\u914D, \u6216\u8005\u6CA1\u6709\u4EFB\u4F55\u9009\u62E9\u5668)\u3002\n\u5728\u4F7F\u7528\u683C\u5F0F\u65F6, \u7528\u5927\u62EC\u53F7\u62EC\u8D77\u7684\u5B57\u6BB5\u540D\u5C06\u4F1A\u5728\u76F8\u5E94\u65F6\u95F4\n\u4F7F\u7528\u5B57\u6BB5\u503C\u66FF\u6362\u3002\u8FD9\u4E9B\u5B57\u6BB5\u53EF\u80FD\u5DF2\u4F7F\u7528\u6B64\u547D\u4EE4\u5B9A\u4E49, \n\u4E5F\u53EF\u80FD\u662F\u7279\u5B9A\u4E8E\u4E0A\u4E0B\u6587\u7684\u4EE5\u4E0B\u9884\u5B9A\u4E49\u5B57\u6BB5\u4E4B\u4E00:\n\t{name}       == \u540D\u79F0, \u4F8B\u5982: \u53D8\u91CF\u7684\u540D\u79F0, ...\n\t{type}       == \u7C7B\u578B\u540D\u79F0\u3002\u53D8\u91CF\u6216\u8868\u8FBE\u5F0F\u7684\u7C7B\u578B,\n\t\t\t\u65B9\u6CD5\u7684\u53C2\u6570\u7C7B\u578B\n\t{value}      == \u8868\u8FBE\u5F0F\u6216\u53D8\u91CF\u521D\u59CB\u5316\u7684\u7ED3\u679C\u503C\n\t{unresolved} == \u672A\u89E3\u6790\u5F15\u7528\u7684\u5217\u8868\n\t{errors}     == \u53EF\u6062\u590D\u9519\u8BEF\u7684\u5217\u8868 (\u53EA\u5728\u5904\u7406\n\t\t\t"display" \u5B57\u6BB5\u671F\u95F4)\n\t{err}        == \u65E0\u683C\u5F0F\u7684\u9519\u8BEF\u884C (\u53EA\u5728\u5904\u7406\n\t\t\t"errorline" \u5B57\u6BB5\u671F\u95F4)\n\u8BE5\u5DE5\u5177\u8BBF\u95EE\u4EE5\u4E0B\u5B57\u6BB5\u6765\u786E\u5B9A\u6240\u663E\u793A\u7684\u53CD\u9988:\n\t{display}    == \u4E3A\u7247\u6BB5\u4E8B\u4EF6\u663E\u793A\u7684\u6D88\u606F\n\t{errorline}  == "errors" \u5B57\u6BB5\u4E2D\u7684\u4E00\u4E2A\u9519\u8BEF\u884C\u7684\u683C\u5F0F\n\t{pre}        == \u53CD\u9988\u524D\u7F00 (\u4F5C\u4E3A\u547D\u4EE4\u53CD\u9988\u7684\u5F00\u5934)\n\t{post}       == \u53CD\u9988\u540E\u7F00 (\u4F5C\u4E3A\u547D\u4EE4\u53CD\u9988\u7684\u7ED3\u5C3E)\n\t{errorpre}   == \u9519\u8BEF\u524D\u7F00 (\u4F5C\u4E3A\u9519\u8BEF\u53CD\u9988\u7684\u5F00\u5934)\n\t{errorpost}  == \u9519\u8BEF\u540E\u7F00 (\u4F5C\u4E3A\u9519\u8BEF\u53CD\u9988\u7684\u7ED3\u5C3E)\n\u8FD9\u4E9B\u5B57\u6BB5\u5177\u6709\u9ED8\u8BA4\u8BBE\u7F6E (\u53EF\u8986\u76D6)\u3002\n\u5176\u4E2D  \u662F\u5E94\u7528\u683C\u5F0F\u7684\u4E0A\u4E0B\u6587\u3002\n\u9009\u62E9\u5668\u7ED3\u6784\u662F\u4E00\u4E2A\u7531\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u6784\u6210\u7684\u5217\u8868, \u4F7F\u7528\u8FDE\u5B57\u7B26\u5206\u9694\u3002\n\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u662F\u5355\u4E2A\u9009\u62E9\u5668\u7C7B\u578B\u7684\u503C\u7684\u5217\u8868, \u4F7F\u7528\u9017\u53F7\u5206\u9694\u3002\n\u5982\u679C\u6BCF\u4E2A\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u5339\u914D, \u5219\u9009\u62E9\u5668\u5339\u914D; \u5982\u679C\u5176\u4E2D\u67D0\u4E2A\u503C\n\u5339\u914D, \u5219\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u5339\u914D\u3002\n\ncase \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u7247\u6BB5\u7684\u7C7B\u578B\u3002\u503C\u5305\u62EC:\n\timport     -- \u5BFC\u5165\u58F0\u660E\n\tclass      -- \u7C7B\u58F0\u660E\n\tinterface  -- \u63A5\u53E3\u58F0\u660E\n\tenum       -- \u679A\u4E3E\u58F0\u660E\n\tannotation -- \u6CE8\u91CA\u63A5\u53E3\u58F0\u660E\n\tmethod     -- \u65B9\u6CD5\u58F0\u660E -- \u6CE8: {type}==parameter-types\n\tvardecl    -- \u4E0D\u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\tvardecl    -- \u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\texpression -- \u8868\u8FBE\u5F0F -- \u6CE8: {name}==scratch-variable-name\n\tvarvalue   -- \u53D8\u91CF\u503C\u8868\u8FBE\u5F0F\n\tassignment -- \
+\u5206\u914D\u53D8\u91CF\n\tstatement  -- \u8BED\u53E5\n\u64CD\u4F5C\u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u5BF9\u7247\u6BB5\u6267\u884C\u7684\u64CD\u4F5C\u3002\u503C\u5305\u62EC:\n\tadded     -- \u7247\u6BB5\u5DF2\u6DFB\u52A0\n\tmodified  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u4FEE\u6539\n\treplaced  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u66FF\u6362\u4E3A\u65B0\u7247\u6BB5\n\toverwrote -- \u73B0\u6709\u7247\u6BB5\u5DF2\u8986\u76D6\n\tdropped   -- \u7247\u6BB5\u5DF2\u5220\u9664\n\tused      -- \u7247\u6BB5\u5728\u4E0D\u80FD\u4F7F\u7528\u7684\u65F6\u5019\u5DF2\u88AB\u4F7F\u7528\nwhen-did-it-occur \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u8FD9\u662F\u76F4\u63A5\u64CD\u4F5C\u8FD8\u662F\u95F4\u63A5\u64CD\u4F5C\u3002\u503C\u5305\u62EC:\n\tprimary -- \u8F93\u5165\u7684\u7247\u6BB5\n\tupdate  -- \u5BF9\u76F8\u5173\u7247\u6BB5\u7684\u66F4\u65B0\nresolution-state \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u7247\u6BB5\u7684\u89E3\u6790/\u5B9A\u4E49\u72B6\u6001\u3002\u503C\u5305\u62EC:\n\tok         -- \u5DF2\u6B63\u786E\u89E3\u6790\n\tdefined    -- \u5DF2\u5B9A\u4E49, \u4F46\u5B58\u5728\u53EF\u6062\u590D\u7684\u672A\u89E3\u6790\u5F15\u7528\n\tnotdefined -- \u7531\u4E8E\u5B58\u5728\u53EF\u6062\u590D\u7684\u672A\u89E3\u6790\u5F15\u7528\u800C\u672A\u5B9A\u4E49\nunresolved-count \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u672A\u89E3\u6790\u5F15\u7528\u7684\u6570\u91CF\u3002\u503C\u5305\u62EC:\n\tunresolved0 -- \u4E0D\u5B58\u5728\u672A\u89E3\u6790\u7684\u540D\u79F0\n\tunresolved1 -- \u4E00\u4E2A\u540D\u79F0\u672A\u89E3\u6790\n\tunresolved2 -- \u4E24\u4E2A\u6216\u66F4\u591A\u540D\u79F0\u672A\u89E3\u6790\nerrors-count \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u9519\u8BEF\u7684\u6570\u91CF\u3002\u503C\u5305\u62EC:\n\terror0 -- \u65E0\u9519\u8BEF\n\terror1 -- \u4E00\u4E2A\u9519\u8BEF\n\terror2 -- \u4E24\u4E2A\u6216\u66F4\u591A\u9519\u8BEF\n\n\u793A\u4F8B:\n\t/set format myformat action '\u5DF2\u521B\u5EFA' added-primary\n\t/set format myformat action '\u66F4\u65B0\u5DF2\u66FF\u6362' replaced-update\n\t/set format myformat display '{pre}{action} \u7C7B {name}{post}' class-ok\n\t/set format myformat display '{pre}{action} \u53D8\u91CF {name}, \u91CD\u7F6E\u4E3A\u7A7A\u503C{post}' replaced-vardecl,varinit-ok-update\n\n\u8BF7\u6CE8\u610F, \u67D0\u4E2A\u5B57\u6BB5\u7684\u540E\u7EED\u9009\u62E9\u5668\u53EF\u80FD\u4F1A\u8986\u76D6\u90E8\u5206\u6216\u5168\u90E8\u4EE5\u524D\u4F7F\u7528\u7684\u9009\u62E9\u5668 -- \u91C7\u7528\u6700\u540E\u4E00\u4E2A\u9009\u62E9\u5668\n
 
-help.set.feedback = \u8BBE\u7F6E\u7528\u4E8E\u63CF\u8FF0\u4E3A\u6240\u8F93\u5165\u7684\u7247\u6BB5\u548C\u547D\u4EE4\u663E\u793A\u7684\u53CD\u9988\u7684\u53CD\u9988\u6A21\u5F0F\u3002\n\n\t/set feedback \n\n\u5176\u4E2D  \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u60A8\u53EF\u4EE5\u4F7F\u7528\u8DB3\u591F\u591A\u7684\u5B57\u6BCD\u6765\u63D0\u4F9B\u552F\u4E00\u7684\u540D\u79F0\u3002\n\u53EF\u4EE5\u6DFB\u52A0\u7528\u6237\u5B9A\u4E49\u7684\u6A21\u5F0F, \u5177\u4F53\u8BF7\u53C2\u9605 '/help /set newmode'\n\u5F53\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F:\n
+help.set.truncation = \u8BBE\u7F6E\u663E\u793A\u503C\u7684\u6700\u5927\u957F\u5EA6\u3002\n\n\t/set truncation <\u6A21\u5F0F> <\u957F\u5EA6> <\u9009\u62E9\u5668>...\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0 -- \u8BF7\u53C2\u9605 '/help /set mode'\u3002\n<\u957F\u5EA6> \u662F\u65E0\u7B26\u53F7\u6574\u6570, \u8868\u793A\u6700\u5927\u957F\u5EA6\u3002\n<\u683C\u5F0F> \u662F\u5F15\u53F7\u62EC\u8D77\u7684\u5B57\u7B26\u4E32, \u8BE5\u5B57\u7B26\u4E32\u5C06\u4E3A\u5B57\u6BB5\u7684\u503C\n<\u9009\u62E9\u5668> \u53EA\u6709\u5728\u60A8\u5E0C\u671B\u6839\u636E\u4E0A\u4E0B\u6587\u5FAE\u8C03\u503C\u622A\u65AD\u957F\u5EA6\u65F6\u624D\u9700\u8981,\n<\u9009\u62E9\u5668> \u662F\u5728\u5176\u4E2D\u5E94\u7528\u622A\u65AD\u7684\u4E0A\u4E0B\u6587\u3002\n\u9009\u62E9\u5668\u7ED3\u6784\u662F\u4E00\u4E2A\u8FDE\u5B57\u7B26\u5206\u9694\u7684\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u3002\n\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u662F\u4E00\u4E2A\u5305\u542B\u67D0\u79CD\u9009\u62E9\u5668\u7C7B\u578B\u7684\u503C\u7684\u9017\u53F7\u5206\u9694\u5217\u8868\u3002\n\u9009\u62E9\u5668\u5728\u6240\u6709\u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\u5339\u914D\u65F6\u5339\u914D; \u9009\u62E9\u5668\u7C7B\u578B\u5217\u8868\n\u5219\u5728\u5176\u4E2D\u4E00\u4E2A\u503C\u5339\u914D\u65F6\u5339\u914D\u3002\n\n\u4E0B\u9762\u662F\u7528\u4E8E\u622A\u65AD\u7684\u76F8\u5173\u9009\u62E9\u5668\u7C7B\u578B\u3002\n\ncase \u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u7247\u6BB5\u7684\u7C7B\u578B\u3002\u503C\u5305\u62EC:\n\tvardecl    -- \u4E0D\u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\tvarinit    -- \u5E26\u521D\u59CB\u5316\u7684\u53D8\u91CF\u58F0\u660E\n\texpression -- \u8868\u8FBE\u5F0F -- \u6CE8: {name}==\u6682\u5B58\u53D8\u91CF\u540D\u79F0\n\tvarvalue   -- \u53D8\u91CF\u503C\u8868\u8FBE\u5F0F\n\tassignment -- \u5206\u914D\u53D8\u91CF\n\t\u64CD\u4F5C\u9009\u62E9\u5668\u7C7B\u578B\u63CF\u8FF0\u4E86\u5BF9\u7247\u6BB5\u6267\u884C\u7684\u64CD\u4F5C\u3002\u503C\u5305\u62EC:\n\tadded     -- \u7247\u6BB5\u5DF2\u6DFB\u52A0\n\tmodified  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u4FEE\u6539\n\treplaced  -- \u73B0\u6709\u7247\u6BB5\u5DF2\u66FF\u6362\u4E3A\u65B0\u7247\u6BB5\n\u793A\u4F8B:\n\t/set trunc mymode 80\n\t/set truncation mymode 45 expression\n\t/set truncation mymode 0 vardecl-modified,replaced\n\n\u8BF7\u6CE8\u610F, \u67D0\u4E2A\u5B57\u6BB5\u7684\u540E\u7EED\u9009\u62E9\u5668\u53EF\u80FD\u4F1A\u8986\u76D6\u90E8\u5206\u6216\u5168\u90E8\u4EE5\u524D\u4F7F\u7528\u7684\u9009\u62E9\u5668 -- \u91C7\u7528\u6700\u540E\u4E00\u4E2A\u9009\u62E9\u5668\n
 
-help.set.newmode = \u521B\u5EFA\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F, \u4E5F\u53EF\u4EE5\u9009\u62E9\u4ECE\u73B0\u6709\u6A21\u5F0F\u590D\u5236\u3002\n\n\t/set newmode  [command|quiet []]\n\n\u5176\u4E2D  \u662F\u60A8\u5E0C\u671B\u521B\u5EFA\u7684\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u800C  \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u5982\u679C\u5B58\u5728 , \u5176\u8BBE\u7F6E\u5C06\u88AB\u590D\u5236\u5230\u65B0\u6A21\u5F0F\u3002\n'command' \u4E0E 'quiet' \u51B3\u5B9A\u4E86\u662F\u5426\u663E\u793A\u4FE1\u606F\u6027/\u9A8C\u8BC1\u547D\u4EE4\u53CD\u9988\u3002\n\n\u4E00\u65E6\u521B\u5EFA\u65B0\u6A21\u5F0F, \u5373\u53EF\u4F7F\u7528 '/set format' \u548C '/set prompt' \u8FDB\u884C\u914D\u7F6E\u3002\n\u4F7F\u7528 '/set feedback' \u53EF\u4F7F\u7528\u65B0\u6A21\u5F0F\u3002\n
-help.set.prompt = \u8BBE\u7F6E\u63D0\u793A\u7B26\u3002\u5FC5\u987B\u540C\u65F6\u8BBE\u7F6E\u6B63\u5E38\u63D0\u793A\u7B26\u548C continuation-prompt\u3002\n\n\t/set prompt  "" ""\n\n\u5176\u4E2D  \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u800C  \u548C  \u662F\u4F5C\u4E3A\u8F93\u5165\u63D0\u793A\u7B26\u8F93\u51FA\u7684\u5E26\u5F15\u53F7\u7684\u5B57\u7B26\u4E32;\n\u5B83\u4EEC\u5747\u53EF\u9009\u62E9\u6027\u5730\u5305\u542B '%s', \u8BE5\u53D8\u91CF\u5C06\u88AB\u66FF\u6362\u4E3A\u4E0B\u4E00\u4E2A\u7247\u6BB5 id --\n\u8BF7\u6CE8\u610F, \u53EF\u80FD\u65E0\u6CD5\u5411\u6240\u8F93\u5165\u5185\u5BB9\u5206\u914D\u8BE5 id, \u4F8B\u5982\u8FD9\u53EF\u80FD\u662F\u4E00\u4E2A\u9519\u8BEF\u6216\u547D\u4EE4\u3002\ncontinuation-prompt \u5728\u591A\u884C\u7247\u6BB5\u7684\u7B2C\u4E8C\u884C\u4EE5\u53CA\u540E\u7EED\u884C\u4E0A\u4F7F\u7528\u3002\n
+help.set.feedback = \u8BBE\u7F6E\u7528\u4E8E\u63CF\u8FF0\u4E3A\u6240\u8F93\u5165\u7247\u6BB5\u548C\u547D\u4EE4\u663E\u793A\u7684\u53CD\u9988\u7684\u53CD\u9988\u6A21\u5F0F\u3002\n\n\t/set feedback <\u6A21\u5F0F>\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u60A8\u53EF\u4EE5\u4F7F\u7528\u8DB3\u591F\u591A\u7684\u5B57\u6BCD\u6765\u63D0\u4F9B\u552F\u4E00\u7684\u540D\u79F0\u3002\n\u53EF\u4EE5\u6DFB\u52A0\u7528\u6237\u5B9A\u4E49\u7684\u6A21\u5F0F, \u5177\u4F53\u8BF7\u53C2\u9605 '/help /set mode'\n\u5F53\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F:\n
 
-help.set.editor =\u6307\u5B9A\u8981\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4\u3002\n\n\t/set editor  ...\n\n \u662F\u4E00\u4E2A\u64CD\u4F5C\u7CFB\u7EDF\u76F8\u5173\u5B57\u7B26\u4E32\u3002\n \u53EF\u4EE5\u5305\u542B\u7528\u7A7A\u683C\u5206\u9694\u7684\u53C2\u6570 (\u4F8B\u5982\u6807\u8BB0) -- ....\n\u5728\u4F7F\u7528 /edit \u65F6, \u8981\u7F16\u8F91\u7684\u4E34\u65F6\u6587\u4EF6\u5C06\u4F5C\u4E3A\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u9644\u52A0\u3002
+help.set.mode = \u521B\u5EFA\u7528\u6237\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F, \u4E5F\u53EF\u4EE5\u9009\u62E9\u4ECE\u73B0\u6709\u6A21\u5F0F\u590D\u5236\u3002\n\n\t/set mode <\u6A21\u5F0F> [<\u65E7\u6A21\u5F0F>] [-command|-quiet|-delete]\n\n\u5176\u4E2D <\u65B0\u6A21\u5F0F> \u662F\u60A8\u5E0C\u671B\u521B\u5EFA\u7684\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u800C <\u65E7\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u5982\u679C\u5B58\u5728 <\u65E7\u6A21\u5F0F>, \u5219\u5176\u8BBE\u7F6E\u5C06\u590D\u5236\u5230\u65B0\u6A21\u5F0F\u3002\n'-command' \u4E0E '-quiet' \u51B3\u5B9A\u4E86\u662F\u5426\u663E\u793A\u4FE1\u606F\u6027/\u9A8C\u8BC1\u547D\u4EE4\u53CD\u9988\u3002\n\n\u4E00\u65E6\u521B\u5EFA\u65B0\u6A21\u5F0F, \u5373\u53EF\u4F7F\u7528 '/set format' \u548C '/set prompt' \u8FDB\u884C\u914D\u7F6E\u3002\n\u4F7F\u7528 '/set feedback' \u53EF\u4F7F\u7528\u65B0\u6A21\u5F0F\u3002\n
+help.set.prompt = \u8BBE\u7F6E\u63D0\u793A\u7B26\u3002\u5FC5\u987B\u540C\u65F6\u8BBE\u7F6E\u6B63\u5E38\u63D0\u793A\u548C\u66F4\u591A\u63D0\u793A\u3002\n\n\t/set prompt <\u6A21\u5F0F> "<\u63D0\u793A>" "<\u66F4\u591A\u63D0\u793A>"\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u800C <\u63D0\u793A> \u548C <\u66F4\u591A\u63D0\u793A> \u662F\u4F5C\u4E3A\u8F93\u5165\u63D0\u793A\u7B26\u8F93\u51FA\u7684\u5E26\u5F15\u53F7\u7684\u5B57\u7B26\u4E32;\n\u5B83\u4EEC\u5747\u53EF\u9009\u62E9\u6027\u5730\u5305\u542B '%s', \u8BE5\u53D8\u91CF\u5C06\u88AB\u66FF\u6362\u4E3A\u4E0B\u4E00\u4E2A\u7247\u6BB5 id --\n\u8BF7\u6CE8\u610F, \u53EF\u80FD\u65E0\u6CD5\u5411\u6240\u8F93\u5165\u5185\u5BB9\u5206\u914D\u8BE5 id, \u4F8B\u5982\u8FD9\u53EF\u80FD\u662F\u4E00\u4E2A\u9519\u8BEF\u6216\u547D\u4EE4\u3002\n\u66F4\u591A\u63D0\u793A\u5728\u591A\u884C\u7247\u6BB5\u7684\u7B2C\u4E8C\u884C\u4EE5\u53CA\u540E\u7EED\u884C\u4E0A\u4F7F\u7528\u3002\n
 
-help.set.start =\u8BBE\u7F6E\u542F\u52A8\u914D\u7F6E -- \u5728\u542F\u52A8\u65F6\u8BFB\u53D6\u7684\u4E00\u7CFB\u5217\u7247\u6BB5\u548C\u547D\u4EE4\u3002\n\n\t/set start \n\n\u6307\u5B9A  \u7684\u5185\u5BB9\u5C06\u6210\u4E3A\u9ED8\u8BA4\u542F\u52A8\u7247\u6BB5\u548C\u547D\u4EE4 --\n\u5B83\u4EEC\u5C06\u5728\u542F\u52A8\u6216\u91CD\u542F jshell \u5DE5\u5177\u65F6\u8FD0\u884C\u3002
+help.set.editor =\u6307\u5B9A\u8981\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4\u3002\n\n\t/set editor <\u547D\u4EE4>|-default\n\n<\u547D\u4EE4> \u662F\u4E00\u4E2A\u64CD\u4F5C\u7CFB\u7EDF\u76F8\u5173\u5B57\u7B26\u4E32\u3002\n<\u547D\u4EE4> \u53EF\u4EE5\u5305\u542B\u7528\u7A7A\u683C\u5206\u9694\u7684\u53C2\u6570 (\u4F8B\u5982\u6807\u8BB0)\n\u5728\u4F7F\u7528 /edit \u65F6, \u8981\u7F16\u8F91\u7684\u4E34\u65F6\u6587\u4EF6\u5C06\u4F5C\u4E3A\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u9644\u52A0\u3002\n\u5982\u679C\u6539\u4E3A\u6307\u5B9A -default \u9009\u9879, \u5219\u5C06\u4F7F\u7528\u9ED8\u8BA4\u7684\u5185\u7F6E\u7F16\u8F91\u5668\u3002
 
-startup.feedback = /set newmode normal command    \n/set prompt normal '\\n-> ' '>> '    \n/set format normal pre '|  '    \n/set format normal post '%n'    \n/set format normal errorpre '|  '    \n/set format normal errorpost '%n'    \n\n/set format normal errorline '{post}{pre}    {err}'    \n\n/set format normal action 'Added' added-primary    \n/set format normal action 'Modified' modified-primary    \n/set format normal action 'Replaced' replaced-primary    \n/set format normal action 'Overwrote' overwrote-primary    \n/set format normal action 'Dropped' dropped-primary    \n/set format normal action '  Update added' added-update    \n/set format normal action '  Update modified' modified-update    \n/set format normal action '  Update replaced' replaced-update    \n/set format normal action '  Update overwrote' overwrote-update    \n/set format normal action '  Update dropped' dropped-update    \n\n/set format normal until ', however, it cannot be instanciated or its methods invoked until'  defined-class-primary    \n/set format normal until ', however, its methods cannot be invoked until'                     defined-interface-primary    \n/set format normal until ', however, it cannot be used until'                                 defined-enum,annotation-primary    \n/set format normal until ', however, it cannot be invoked until'                              defined-method-primary    \n/set format normal until ', however, it cannot be referenced until'                           notdefined-primary    \n/set format normal until ' which cannot be instanciated or its methods invoked until'         defined-class-update    \n/set format normal until ' whose methods cannot be invoked until'                             defined-interface-update    \n/set format normal until ' which cannot be invoked until'                                     defined-method-update    \n/set format normal until ' which cannot be referenced until'                                  notdefined-update    \n\n/set format normal unrerr '{unresolved} is declared'                                           unresolved1-error0    \n/set format normal unrerr '{unresolved} are declared'                                          unresolved2-error0    \n/set format normal unrerr ' this error is corrected: {errors}'                                 unresolved0-error1    \n/set format normal unrerr '{unresolved} is declared and this error is corrected: {errors}'     unresolved1-error1    \n/set format normal unrerr '{unresolved} are declared and this error is corrected: {errors}'    unresolved2-error1    \n/set format normal unrerr ' these errors are corrected: {errors}'                              unresolved0-error2    \n/set format normal unrerr '{unresolved} is declared and these errors are corrected: {errors}'  unresolved1-error2    \n/set format normal unrerr '{unresolved} are declared and these errors are corrected: {errors}' unresolved2-error2    \n\n/set format normal resolve '{until}{unrerr}'                                                added,modified,replaced,used    \n\n/set format normal typeKind 'class'                  class    \n/set format normal typeKind 'interface'              interface    \n/set format normal typeKind 'enum'                   enum    \n/set format normal typeKind 'annotation interface'   annotation    \n\n/set format normal display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation    \n/set format normal display '{pre}{action} method {name}({type}){resolve}{post}'             method    \n\n/set format normal display '{pre}{action} variable {name} of type {type}{resolve}{post}'    vardecl    \n/set format normal display '{pre}{action} variable {name} of type {type} with initial value {value}{resolve}{post}'    varinit    \n/set format normal display '{pre}{action} variable {name}, reset to null{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display \
-'{pre}{action} variable {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format normal display '{pre}{action} variable {name}{post}'                            overwrote,dropped-vardecl,varinit    \n\n/set format normal display '{pre}Expression value is: {value}{post}{pre}  assigned to temporary variable {name} of type {type}{post}' expression    \n/set format normal display '{pre}Variable {name} of type {type} has value {value}{post}'    varvalue    \n/set format normal display '{pre}Variable {name} has been assigned the value {value}{post}' assignment    \n\n/set format normal display '{pre}Attempted to use {typeKind} {name}{resolve}{post}'         used-class,interface,enum,annotation    \n/set format normal display '{pre}Attempted to call method {name}({type}){resolve}{post}'    used-method    \n\n/set feedback normal    \n\n/set newmode off quiet    \n/set prompt off '-> ' '>> '    \n/set format off pre '|  '    \n/set format off post '%n'    \n/set format off errorpre '|  '    \n/set format off errorpost '%n'    \n/set format off display ''    \n
+help.set.start =\u8BBE\u7F6E\u542F\u52A8\u914D\u7F6E -- \u5728\u542F\u52A8\u65F6\u8BFB\u53D6\u7684\u4E00\u7CFB\u5217\u7247\u6BB5\u548C\u547D\u4EE4\u3002\n\n\t/set start <\u6587\u4EF6>|-default|-none\n\n\u5728\u6B64\u4F1A\u8BDD\u4E2D\u4F7F\u7528 /reset \u6216 /reload \u547D\u4EE4\u65F6, \n\u6307\u5B9A <\u6587\u4EF6> \u7684\u5185\u5BB9\u5C06\u6210\u4E3A\u6240\u7528\u7684\u542F\u52A8\u7247\u6BB5\u548C\u547D\u4EE4\u3002\n\u5982\u679C\u6539\u4E3A\u6307\u5B9A -default \u9009\u9879, \u5219\u5C06\u4F7F\u7528\u9884\u5B9A\u4E49\u7684\n\u542F\u52A8\u7247\u6BB5\u3002\n\u5982\u679C\u4F7F\u7528 -none \u9009\u9879, \u5219\u542F\u52A8\u5C06\u4E3A\u7A7A -- \u5C06\u4E0D\u4F7F\u7528\n\u542F\u52A8\u7247\u6BB5\u6216\u547D\u4EE4\u3002\n\u6B64\u547D\u4EE4\u5BF9\u4E8E\u6D4B\u8BD5\u542F\u52A8\u8BBE\u7F6E\u975E\u5E38\u6709\u7528\u3002\u8981\u4FDD\u7559\u8FD9\u4E9B\u5185\u5BB9\n\u4F9B\u4EE5\u540E\u8FD0\u884C jshell \u5DE5\u5177, \u8BF7\u4F7F\u7528\u547D\u4EE4:\n\t/retain start\n
+
+help.retain.feedback = \u4FDD\u7559\u4E3A\u6240\u8F93\u5165\u7247\u6BB5\u548C\u547D\u4EE4\u663E\u793A\u7684\u53CD\u9988\u4F7F\u7528\u7684\u53CD\u9988\u6A21\u5F0F\u3002\n\u6B64\u53CD\u9988\u6A21\u5F0F\u5C06\u5728 jshell \u5DE5\u5177\u7684\u6B64\u4F1A\u8BDD\u548C\u672A\u6765\u4F1A\u8BDD\u4E2D\u4F7F\u7528\u3002\n\n\t/retain feedback [<\u6A21\u5F0F>]\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u4EE5\u524D\u5B9A\u4E49\u7684\u53CD\u9988\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n\u60A8\u53EF\u4EE5\u4F7F\u7528\u8DB3\u591F\u591A\u7684\u5B57\u6BCD\u6765\u63D0\u4F9B\u552F\u4E00\u7684\u540D\u79F0\u3002\n\u5982\u679C\u672A\u6307\u5B9A <\u6A21\u5F0F>, \u5219\u6B64\u547D\u4EE4\u4FDD\u7559\u5F53\u524D\u6A21\u5F0F (\u7531\n\u6700\u65B0 /set feedback \u6216 /retain feedback \u547D\u4EE4\u6240\u8BBE\u7F6E)\u3002\n
+help.retain.mode = \u7EE7\u7EED\u4F7F\u7528\u7528\u6237\u5B9A\u4E49\u53CD\u9988\u6A21\u5F0F\u5E76\u4FDD\u7559\u5176\u914D\u7F6E\u3002\n\u6B64\u6A21\u5F0F\u5C06\u5728 jshell \u5DE5\u5177\u7684\u6B64\u4F1A\u8BDD\u548C\u672A\u6765\u4F1A\u8BDD\u4E2D\u53EF\u7528\u3002
+\n\t/retain mode <\u6A21\u5F0F>\n\n\u5176\u4E2D <\u6A21\u5F0F> \u662F\u8981\u4FDD\u7559\u7684\u6A21\u5F0F\u7684\u540D\u79F0\u3002\n<\u6A21\u5F0F> \u5FC5\u987B\u662F\u4EE5\u524D\u5DF2\u4F7F\u7528 /set mode \u521B\u5EFA\u5E76\u6839\u636E\u9700\u8981\n\u4F7F\u7528 /set prompt, /set format \u548C /set truncation \u914D\u7F6E\u7684\u6A21\u5F0F\u3002\n
+
+help.retain.editor =\u4FDD\u7559\u4E3A /edit \u547D\u4EE4\u542F\u52A8\u7684\u547D\u4EE4\u3002\u5728 jshell \u5DE5\u5177\u7684\u6B64\u4F1A\u8BDD\u548C\n\u672A\u6765\u4F1A\u8BDD\u4E2D\u4F7F\u7528 /edit \u547D\u4EE4\u65F6\u5C06\u8C03\u7528\u6B64\u547D\u4EE4\u3002\n\n\t/retain editor [<\u547D\u4EE4>|-default]\n\n\u5982\u679C\u6307\u5B9A <\u547D\u4EE4>, \u5219\u5B83\u662F\u4E00\u4E2A\u64CD\u4F5C\u7CFB\u7EDF\u76F8\u5173\u5B57\u7B26\u4E32,\n\u53EF\u4EE5\u5305\u542B\u7528\u7A7A\u683C\u5206\u9694\u7684\u53C2\u6570 (\u4F8B\u5982\u6807\u8BB0)\u3002\u5728\u4F7F\u7528 /edit \u65F6,\n\u8981\u7F16\u8F91\u7684\u4E34\u65F6\u6587\u4EF6\u5C06\u4F5C\u4E3A\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u9644\u52A0\u3002\n\u5982\u679C\u6539\u4E3A\u6307\u5B9A -default \u9009\u9879, \u5219\u5C06\u4F7F\u7528\u9ED8\u8BA4\u7684\u5185\u7F6E\u7F16\u8F91\u5668\u3002\n\u5982\u679C\u672A\u6307\u5B9A\u4EFB\u4F55\u9009\u9879, \u5219\u5C06\u4F7F\u7528\u5728\u4E0A\u4E00\u4E2A /set editor \u6216 /retain editor\n\u547D\u4EE4\u4E2D\u6307\u5B9A\u7684\u7F16\u8F91\u5668\u8BBE\u7F6E\u3002\n\u8BE5\u7F16\u8F91\u5668\u5C06\u4F1A\u4FDD\u7559\u5E76\u7528\u4E8E jshell \u5DE5\u5177\u7684\u6B64\u4F1A\u8BDD\u548C\u672A\u6765\u4F1A\u8BDD\u3002
+
+help.retain.start =\u4FDD\u7559\u542F\u52A8\u914D\u7F6E -- \u5728\u542F\u52A8\u65F6\u8BFB\u53D6\u7684\u4E00\u7CFB\u5217\u7247\u6BB5\u548C\n\u547D\u4EE4\u3002\n\n\t/retain start [<\u6587\u4EF6>|-default|-none]\n\n\u5982\u679C\u6307\u5B9A <\u6587\u4EF6>, \u5219\u6307\u5B9A <\u6587\u4EF6> \u7684\u5185\u5BB9\u5C06\u6210\u4E3A\n\u542F\u52A8\u7247\u6BB5\u548C\n\u547D\u4EE4\u3002\n\u5982\u679C\u6539\u4E3A\u6307\u5B9A\u4E86 -default \u9009\u9879, \u5219\u9884\u5B9A\u4E49\u7684\u542F\u52A8\u7247\u6BB5\n\u5C06\u6210\u4E3A\u542F\u52A8\u7247\u6BB5\u3002\n\u5982\u679C\u4F7F\u7528 -none \u9009\u9879, \u5219\u542F\u52A8\u5C06\u4E3A\u7A7A -- \u5C06\u4E0D\u4F7F\u7528\n\u542F\u52A8\u7247\u6BB5\u6216\u547D\u4EE4\u3002\n\u5982\u679C\u672A\u6307\u5B9A\u4EFB\u4F55\u8FD9\u4E9B\u9009\u9879, \u5219\u542F\u52A8\u5C06\u4E3A\u4E0A\u4E00\u6B21\u5728\n''/set start'' \u6216 ''/retain start'' \u547D\u4EE4\u4E2D\u6307\u5B9A\u7684\u5185\u5BB9\u3002\n\u542F\u52A8\u8BBE\u7F6E\u5C06\u4F1A\u4FDD\u7559, \u5E76\u5728\u542F\u52A8\u6216\u91CD\u542F jshell \u5DE5\u5177\u65F6\u4F7F\u7528
+
+startup.feedback = /set mode verbose -command    \n\n/set prompt verbose '\\njshell> '   '   ...> '    \n\n/set format verbose pre '|  '    \n/set format verbose post '%n'    \n/set format verbose errorpre '|  '    \n/set format verbose errorpost '%n'    \n\n/set format verbose errorline '{post}{pre}    {err}'    \n\n/set format verbose action '\u5DF2\u521B\u5EFA' added-primary    \n/set format verbose action '\u5DF2\u4FEE\u6539' modified-primary    \n/set format verbose action '\u5DF2\u66FF\u6362' replaced-primary    \n/set format verbose action '\u5DF2\u8986\u76D6' overwrote-primary    \n/set format verbose action '\u5DF2\u5220\u9664' dropped-primary    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u521B\u5EFA' added-update    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u4FEE\u6539' modified-update    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u66FF\u6362' replaced-update    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u8986\u76D6' overwrote-update    \n/set format verbose action '  \u66F4\u65B0\u5DF2\u5220\u9664' dropped-update    \n\n/set format verbose until ', \u4E0D\u8FC7, \u5B83\u65E0\u6CD5\u5B9E\u4F8B\u5316\u6216\u8005\u5176\u65B9\u6CD5\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'   defined-class-primary    \n/set format verbose until ', \u4E0D\u8FC7, \u5176\u65B9\u6CD5\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'                      defined-interface-primary    \n/set format verbose until ', \u4E0D\u8FC7, \u5B83\u65E0\u6CD5\u4F7F\u7528, \u76F4\u81F3'                                  defined-enum,annotation-primary    \n/set format verbose until ', \u4E0D\u8FC7, \u5B83\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'                               defined-method-primary    \n/set format verbose until ', \u4E0D\u8FC7, \u5B83\u65E0\u6CD5\u5F15\u7528, \u76F4\u81F3'                            notdefined-primary    \n/set format verbose until ' \u5B83\u65E0\u6CD5\u5B9E\u4F8B\u5316\u6216\u8005\u5176\u65B9\u6CD5\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'          defined-class-update    \n/set format verbose until ' \u5176\u65B9\u6CD5\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'                              defined-interface-update    \n/set format verbose until ' \u5B83\u65E0\u6CD5\u8C03\u7528, \u76F4\u81F3'                                      defined-method-update    \n/set format verbose until ' \u5B83\u65E0\u6CD5\u5F15\u7528, \u76F4\u81F3'                                   notdefined-update    \n\n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E'                                           unresolved1-error0    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E'                                          unresolved2-error0    \n/set format verbose unrerr ' \u6B64\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'                                 unresolved0-error1    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E, \u5E76\u4E14\u6B64\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'     unresolved1-error1    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E, \u5E76\u4E14\u6B64\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'    unresolved2-error1    \n/set format verbose unrerr ' \u8FD9\u4E9B\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'                              unresolved0-error2    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E\u5E76\u4E14\u8FD9\u4E9B\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}'  unresolved1-error2    \n/set format verbose unrerr '{unresolved} \u5DF2\u58F0\u660E\u5E76\u4E14\u8FD9\u4E9B\u9519\u8BEF\u5DF2\u66F4\u6B63: {errors}' unresolved2-error2    \n\n/set format verbose resolve '{until}{unrerr}'                                                   added,modified,replaced,used    \n\n/set format verbose typeKind '\u7C7B'                  class    \n/set format verbose typeKind '\u63A5\u53E3'              interface    \n/set format verbose typeKind '\u679A\u4E3E'                   enum    \n/set format verbose typeKind '\u6CE8\u91CA\u63A5\u53E3'   annotation    \n\n/set format verbose \
+result '{name} ==> {value}{post}'                                        added,modified,replaced-ok-primary    \n\n/set format verbose display '{result}{pre}\u5DF2\u521B\u5EFA\u6682\u5B58\u53D8\u91CF {name} : {type}{post}'    expression-added,modified,replaced-primary    \n/set format verbose display '{result}{pre}{name} \u7684\u503C: {type}{post}'                    varvalue-primary    \n/set format verbose display '{result}{pre}\u5DF2\u5206\u914D\u7ED9 {name} : {type}{post}'                 assignment-primary    \n/set format verbose display '{result}{pre}{action} \u53D8\u91CF {name} : {type}{resolve}{post}'  varinit,vardecl    \n/set format verbose display '{pre}{action} \u53D8\u91CF {name}{resolve}{post}'                   vardecl,varinit-notdefined    \n/set format verbose display '{pre}{action} \u53D8\u91CF {name}{post}'                            dropped-vardecl,varinit,expression    \n/set format verbose display '{pre}{action} \u53D8\u91CF {name}, \u91CD\u7F6E\u4E3A\u7A7A\u503C{post}'             replaced-vardecl,varinit-ok-update    \n\n/set format verbose display '{pre}{action} {typeKind} {name}{resolve}{post}'                 class,interface,enum,annotation    \n/set format verbose display '{pre}{action} \u65B9\u6CD5 {name}({type}){resolve}{post}'             method    \n\n/set format verbose display '{pre}\u5DF2\u5C1D\u8BD5\u4F7F\u7528 {typeKind} {name}{resolve}{post}'         used-class,interface,enum,annotation    \n/set format verbose display '{pre}\u5DF2\u5C1D\u8BD5\u8C03\u7528\u65B9\u6CD5 {name}({type}){resolve}{post}'    used-method    \n\n/set truncation verbose 80\n/set truncation verbose 1000                                                                  varvalue,expression\n\n/set mode normal -command verbose    \n/set format normal display ''                                                               added,modified,replaced,overwrote,dropped-update    \n/set format normal display '{pre}{action} \u53D8\u91CF {name}, \u91CD\u7F6E\u4E3A\u7A7A\u503C{post}'             replaced-vardecl,varinit-ok-update    \n/set format normal display '{result}'                                                       added,modified,replaced-expression,varvalue,assignment,varinit,vardecl-ok-primary    \n/set mode concise -quiet normal    \n\n/set prompt concise 'jshell> '   '   ...> '    \n\n/set format concise display ''                                                              class,interface,enum,annotation,method,assignment,varinit,vardecl-ok    \n\n/set feedback normal    \n\n/set mode silent -quiet    \n/set prompt silent '-> ' '>> '    \n/set format silent pre '|  '    \n/set format silent post '%n'    \n/set format silent errorpre '|  '    \n/set format silent errorpost '%n'    \n/set format silent display ''    \n
diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties b/langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
index 21f107c8cd3..f0f9c1740cf 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/resources/l10n_zh_CN.properties
@@ -31,4 +31,4 @@ jshell.diag.modifier.single.ignore = \u4FEE\u9970\u7B26 {0} \u4E0D\u5141\u8BB8\u
 jshell.exc.null = \u7247\u6BB5\u4E0D\u80FD\u4E3A\u7A7A\u503C
 jshell.exc.alien = \u7247\u6BB5\u4E0D\u6765\u81EA\u4E8E\u6B64 JShell
 jshell.exc.closed = JShell ({0}) \u5DF2\u5173\u95ED\u3002
-jshell.exc.var.not.valid = varValue() {0} \u7684\u7247\u6BB5\u53C2\u6570\u5FC5\u987B\u4E3AVALID, \u8BE5\u53C2\u6570\u4E3A: {1}
+jshell.exc.var.not.valid = varValue() {0} \u7684\u7247\u6BB5\u53C2\u6570\u5FC5\u987B\u4E3A VALID, \u8BE5\u53C2\u6570\u4E3A: {1}

From 00314964d645ea9f42a8c28cbcd6d49ce98fa3a1 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore 
Date: Mon, 20 Jun 2016 12:28:14 -0400
Subject: [PATCH 036/111] 8159470: Error message for ICCE for MethodHandle
 constant pool not helpful

Reworded message and added test.

Reviewed-by: hseigel, gtriantafill, dholmes
---
 hotspot/src/share/vm/oops/constantPool.cpp    |  21 ++-
 .../TestMethodHandleConstant.java             |  45 +++++
 .../ConstantPool/WithConfiguration.jcod       | 170 ++++++++++++++++++
 3 files changed, 228 insertions(+), 8 deletions(-)
 create mode 100644 hotspot/test/runtime/ConstantPool/TestMethodHandleConstant.java
 create mode 100644 hotspot/test/runtime/ConstantPool/WithConfiguration.jcod

diff --git a/hotspot/src/share/vm/oops/constantPool.cpp b/hotspot/src/share/vm/oops/constantPool.cpp
index 29110089d3b..d50351e1b9e 100644
--- a/hotspot/src/share/vm/oops/constantPool.cpp
+++ b/hotspot/src/share/vm/oops/constantPool.cpp
@@ -691,16 +691,21 @@ oop ConstantPool::resolve_constant_at_impl(const constantPoolHandle& this_cp, in
                               ref_kind, index, this_cp->method_handle_index_at(index),
                               callee_index, name->as_C_string(), signature->as_C_string());
       }
-      KlassHandle callee;
-      { Klass* k = klass_at_impl(this_cp, callee_index, true, CHECK_NULL);
-        callee = KlassHandle(THREAD, k);
-      }
+
+      Klass* k = klass_at_impl(this_cp, callee_index, true, CHECK_NULL);
+      KlassHandle callee(THREAD, k);
+
+      // Check constant pool method consistency
       if ((callee->is_interface() && m_tag.is_method()) ||
-          (!callee->is_interface() && m_tag.is_interface_method())) {
+          ((!callee->is_interface() && m_tag.is_interface_method()))) {
         ResourceMark rm(THREAD);
-        char buf[200];
-        jio_snprintf(buf, sizeof(buf), "Inconsistent constant data for %s.%s%s at index %d",
-          callee->name()->as_C_string(), name->as_C_string(), signature->as_C_string(), index);
+        char buf[400];
+        jio_snprintf(buf, sizeof(buf),
+          "Inconsistent constant pool data in classfile for class %s. "
+          "Method %s%s at index %d is %s and should be %s",
+          callee->name()->as_C_string(), name->as_C_string(), signature->as_C_string(), index,
+          callee->is_interface() ? "CONSTANT_MethodRef" : "CONSTANT_InterfaceMethodRef",
+          callee->is_interface() ? "CONSTANT_InterfaceMethodRef" : "CONSTANT_MethodRef");
         THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
       }
 
diff --git a/hotspot/test/runtime/ConstantPool/TestMethodHandleConstant.java b/hotspot/test/runtime/ConstantPool/TestMethodHandleConstant.java
new file mode 100644
index 00000000000..0ed640992be
--- /dev/null
+++ b/hotspot/test/runtime/ConstantPool/TestMethodHandleConstant.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8159470
+ * @summary Test that MethodHandle constants are checked
+ * @modules java.base/jdk.internal.misc
+ * @compile WithConfiguration.jcod
+ * @run main/othervm TestMethodHandleConstant
+ */
+public class TestMethodHandleConstant {
+
+    public static void main(String[] args) {
+        try {
+          // This interface has bad constant pool entry for MethodHandle -> Method
+          String URI_DEFAULT
+            = WithConfiguration.autoDetect().getLocation();
+          throw new RuntimeException("FAILED, ICCE not thrown");
+        } catch (BootstrapMethodError icce) {
+          System.out.println("PASSED, expecting ICCE" + icce.getMessage());
+        }
+    }
+}
+
diff --git a/hotspot/test/runtime/ConstantPool/WithConfiguration.jcod b/hotspot/test/runtime/ConstantPool/WithConfiguration.jcod
new file mode 100644
index 00000000000..7bb55bc1af1
--- /dev/null
+++ b/hotspot/test/runtime/ConstantPool/WithConfiguration.jcod
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// This class has a MethodHandle constant that points to an incompatible Methodref constant
+// (should be InterfaceMethodref)
+// Throws ICCE/BootstrapMethodError
+
+// public interface WithConfiguration {
+//     String getLocation();
+//     static WithConfiguration autoDetect() {
+//         return () -> "$Default$";
+//     }
+// }
+
+class WithConfiguration {
+  0xCAFEBABE;
+  0; // minor version
+  53; // version
+  [] { // Constant Pool
+    ; // first element is empty
+    InvokeDynamic 0s #18; // #1    
+    String #19; // #2    
+    class #20; // #3    
+    class #21; // #4    
+    Utf8 "getLocation"; // #5    
+    Utf8 "()Ljava/lang/String;"; // #6    
+    Utf8 "autoDetect"; // #7    
+    Utf8 "()LWithConfiguration;"; // #8    
+    Utf8 "Code"; // #9    
+    Utf8 "LineNumberTable"; // #10    
+    Utf8 "lambda$autoDetect$0"; // #11    
+    Utf8 "SourceFile"; // #12    
+    Utf8 "WithConfiguration.java"; // #13    
+    Utf8 "BootstrapMethods"; // #14    
+    MethodHandle 6b #22; // #15    
+    MethodType #6; // #16    
+    MethodHandle 6b #23; // #17    
+    NameAndType #5 #8; // #18    
+    Utf8 "$Default$"; // #19    
+    Utf8 "WithConfiguration"; // #20    
+    Utf8 "java/lang/Object"; // #21    
+    Method #24 #25; // #22    
+    Method #3 #26; // #23      THIS IS WRONG!!
+    class #27; // #24    
+    NameAndType #28 #32; // #25    
+    NameAndType #11 #6; // #26    
+    Utf8 "java/lang/invoke/LambdaMetafactory"; // #27    
+    Utf8 "metafactory"; // #28    
+    class #34; // #29    
+    Utf8 "Lookup"; // #30    
+    Utf8 "InnerClasses"; // #31    
+    Utf8 "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;"; // #32    
+    class #35; // #33    
+    Utf8 "java/lang/invoke/MethodHandles$Lookup"; // #34    
+    Utf8 "java/lang/invoke/MethodHandles"; // #35    
+  } // Constant Pool
+
+  0x0601; // access
+  #3;// this_cpx
+  #4;// super_cpx
+
+  [] { // Interfaces
+  } // Interfaces
+
+  [] { // fields
+  } // fields
+
+  [] { // methods
+    { // Member
+      0x0401; // access
+      #5; // name_cpx
+      #6; // sig_cpx
+      [] { // Attributes
+      } // Attributes
+    } // Member
+    ;
+    { // Member
+      0x0009; // access
+      #7; // name_cpx
+      #8; // sig_cpx
+      [] { // Attributes
+        Attr(#9) { // Code
+          1; // max_stack
+          0; // max_locals
+          Bytes[]{
+            0xBA00010000B0;
+          };
+          [] { // Traps
+          } // end Traps
+          [] { // Attributes
+            Attr(#10) { // LineNumberTable
+              [] { // LineNumberTable
+                0  26;
+              }
+            } // end LineNumberTable
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+    ;
+    { // Member
+      0x100A; // access
+      #11; // name_cpx
+      #6; // sig_cpx
+      [] { // Attributes
+        Attr(#9) { // Code
+          1; // max_stack
+          0; // max_locals
+          Bytes[]{
+            0x1202B0;
+          };
+          [] { // Traps
+          } // end Traps
+          [] { // Attributes
+            Attr(#10) { // LineNumberTable
+              [] { // LineNumberTable
+                0  26;
+              }
+            } // end LineNumberTable
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+  } // methods
+
+  [] { // Attributes
+    Attr(#12) { // SourceFile
+      #13;
+    } // end SourceFile
+    ;
+    Attr(#31) { // InnerClasses
+      [] { // InnerClasses
+        #29 #33 #30 25;
+      }
+    } // end InnerClasses
+    ;
+    Attr(#14) { // BootstrapMethods
+      [] { // bootstrap_methods
+        {  //  bootstrap_method
+          #15; // bootstrap_method_ref
+          [] { // bootstrap_arguments
+            #16;
+            #17;
+            #16;
+          }  //  bootstrap_arguments
+        }  //  bootstrap_method
+      }
+    } // end BootstrapMethods
+  } // Attributes
+} // end class WithConfiguration

From 79377a1bf102ba1d0c54baed24fa03ee18793630 Mon Sep 17 00:00:00 2001
From: Ioi Lam 
Date: Mon, 20 Jun 2016 22:02:20 -0700
Subject: [PATCH 037/111] 8159666: Better CDS support for Event-based tracing

Reviewed-by: jiangli, mgronlun
---
 hotspot/src/share/vm/oops/instanceKlass.cpp | 5 +++++
 hotspot/src/share/vm/oops/klass.cpp         | 4 +++-
 hotspot/src/share/vm/trace/traceMacros.hpp  | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index eb2d48e8900..7d15ab37c49 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -1961,6 +1961,11 @@ void InstanceKlass::remove_unshareable_info() {
     m->remove_unshareable_info();
   }
 
+  // cached_class_file might be pointing to a malloc'ed buffer allocated by
+  // event-based tracing code at CDS dump time. It's not usable at runtime
+  // so let's clear it.
+  set_cached_class_file(NULL);
+
   // do array classes also.
   array_klasses_do(remove_unshareable_in_class);
 }
diff --git a/hotspot/src/share/vm/oops/klass.cpp b/hotspot/src/share/vm/oops/klass.cpp
index d31e9e5706c..d7fb8924e71 100644
--- a/hotspot/src/share/vm/oops/klass.cpp
+++ b/hotspot/src/share/vm/oops/klass.cpp
@@ -482,6 +482,7 @@ void Klass::oops_do(OopClosure* cl) {
 
 void Klass::remove_unshareable_info() {
   assert (DumpSharedSpaces, "only called for DumpSharedSpaces");
+  TRACE_REMOVE_KLASS_ID(this);
 
   set_subklass(NULL);
   set_next_sibling(NULL);
@@ -494,7 +495,8 @@ void Klass::remove_unshareable_info() {
 }
 
 void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
-  TRACE_INIT_KLASS_ID(this);
+  TRACE_RESTORE_KLASS_ID(this);
+
   // If an exception happened during CDS restore, some of these fields may already be
   // set.  We leave the class on the CLD list, even if incomplete so that we don't
   // modify the CLD list outside a safepoint.
diff --git a/hotspot/src/share/vm/trace/traceMacros.hpp b/hotspot/src/share/vm/trace/traceMacros.hpp
index 63c49630473..a69acef1f70 100644
--- a/hotspot/src/share/vm/trace/traceMacros.hpp
+++ b/hotspot/src/share/vm/trace/traceMacros.hpp
@@ -33,6 +33,9 @@ typedef u8 traceid;
 #define TRACE_KLASS_DEFINITION(k, t)
 
 #define TRACE_INIT_KLASS_ID(k)
+#define TRACE_REMOVE_KLASS_ID(k)
+#define TRACE_RESTORE_KLASS_ID(k)
+
 #define TRACE_INIT_MODULE_ID(m)
 #define TRACE_INIT_PACKAGE_ID(p)
 #define TRACE_INIT_THREAD_ID(td)

From 5ae683a18fe93e541256429a5388fd61ec56f9c9 Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga 
Date: Tue, 21 Jun 2016 09:19:53 +0200
Subject: [PATCH 038/111] 8155730: HeapInfoDCmd should get Heap_lock

Reviewed-by: tschatzl, jprovino
---
 hotspot/src/share/vm/memory/universe.cpp            | 2 +-
 hotspot/src/share/vm/services/diagnosticCommand.cpp | 1 +
 hotspot/src/share/vm/utilities/vmError.cpp          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/memory/universe.cpp b/hotspot/src/share/vm/memory/universe.cpp
index 9c17574bed9..a3dff52548f 100644
--- a/hotspot/src/share/vm/memory/universe.cpp
+++ b/hotspot/src/share/vm/memory/universe.cpp
@@ -1070,13 +1070,13 @@ void Universe::compute_base_vtable_size() {
 }
 
 void Universe::print_on(outputStream* st) {
+  GCMutexLocker hl(Heap_lock); // Heap_lock might be locked by caller thread.
   st->print_cr("Heap");
   heap()->print_on(st);
 }
 
 void Universe::print_heap_at_SIGBREAK() {
   if (PrintHeapAtSIGBREAK) {
-    MutexLocker hl(Heap_lock);
     print_on(tty);
     tty->cr();
     tty->flush();
diff --git a/hotspot/src/share/vm/services/diagnosticCommand.cpp b/hotspot/src/share/vm/services/diagnosticCommand.cpp
index 6ed19904a78..c90bf08e39e 100644
--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp
@@ -413,6 +413,7 @@ void RunFinalizationDCmd::execute(DCmdSource source, TRAPS) {
 }
 
 void HeapInfoDCmd::execute(DCmdSource source, TRAPS) {
+  MutexLocker hl(Heap_lock);
   Universe::heap()->print_on(output());
 }
 
diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
index 12ed963d17f..d2c9cadb504 100644
--- a/hotspot/src/share/vm/utilities/vmError.cpp
+++ b/hotspot/src/share/vm/utilities/vmError.cpp
@@ -908,6 +908,7 @@ void VMError::print_vm_info(outputStream* st) {
   // STEP("printing heap information")
 
   if (Universe::is_fully_initialized()) {
+    MutexLocker hl(Heap_lock);
     Universe::heap()->print_on_error(st);
     st->cr();
     st->print_cr("Polling page: " INTPTR_FORMAT, p2i(os::get_polling_page()));

From 038bf7d79006396ec54d3438793850122fd3bc60 Mon Sep 17 00:00:00 2001
From: Claes Redestad 
Date: Tue, 21 Jun 2016 12:09:36 +0200
Subject: [PATCH 039/111] 8159590: Remove deprecated methods from
 jdk.internal.misc.VM

Reviewed-by: chegar, dholmes
---
 hotspot/src/share/vm/classfile/javaClasses.cpp | 7 -------
 hotspot/src/share/vm/classfile/javaClasses.hpp | 3 ---
 hotspot/src/share/vm/classfile/vmSymbols.hpp   | 1 -
 3 files changed, 11 deletions(-)

diff --git a/hotspot/src/share/vm/classfile/javaClasses.cpp b/hotspot/src/share/vm/classfile/javaClasses.cpp
index 4ea507532ea..9924eac1422 100644
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp
@@ -1377,7 +1377,6 @@ int java_lang_ThreadGroup::_groups_offset = 0;
 int java_lang_ThreadGroup::_maxPriority_offset = 0;
 int java_lang_ThreadGroup::_destroyed_offset = 0;
 int java_lang_ThreadGroup::_daemon_offset = 0;
-int java_lang_ThreadGroup::_vmAllowSuspension_offset = 0;
 int java_lang_ThreadGroup::_nthreads_offset = 0;
 int java_lang_ThreadGroup::_ngroups_offset = 0;
 
@@ -1435,11 +1434,6 @@ bool java_lang_ThreadGroup::is_daemon(oop java_thread_group) {
   return java_thread_group->bool_field(_daemon_offset) != 0;
 }
 
-bool java_lang_ThreadGroup::is_vmAllowSuspension(oop java_thread_group) {
-  assert(java_thread_group->is_oop(), "thread group must be oop");
-  return java_thread_group->bool_field(_vmAllowSuspension_offset) != 0;
-}
-
 void java_lang_ThreadGroup::compute_offsets() {
   assert(_parent_offset == 0, "offsets should be initialized only once");
 
@@ -1452,7 +1446,6 @@ void java_lang_ThreadGroup::compute_offsets() {
   compute_offset(_maxPriority_offset, k, vmSymbols::maxPriority_name(), vmSymbols::int_signature());
   compute_offset(_destroyed_offset,   k, vmSymbols::destroyed_name(),   vmSymbols::bool_signature());
   compute_offset(_daemon_offset,      k, vmSymbols::daemon_name(),      vmSymbols::bool_signature());
-  compute_offset(_vmAllowSuspension_offset, k, vmSymbols::vmAllowSuspension_name(), vmSymbols::bool_signature());
   compute_offset(_nthreads_offset,    k, vmSymbols::nthreads_name(),    vmSymbols::int_signature());
   compute_offset(_ngroups_offset,     k, vmSymbols::ngroups_name(),     vmSymbols::int_signature());
 }
diff --git a/hotspot/src/share/vm/classfile/javaClasses.hpp b/hotspot/src/share/vm/classfile/javaClasses.hpp
index d9113adc4e7..0d39a32a70d 100644
--- a/hotspot/src/share/vm/classfile/javaClasses.hpp
+++ b/hotspot/src/share/vm/classfile/javaClasses.hpp
@@ -413,7 +413,6 @@ class java_lang_ThreadGroup : AllStatic {
   static int _maxPriority_offset;
   static int _destroyed_offset;
   static int _daemon_offset;
-  static int _vmAllowSuspension_offset;
   static int _nthreads_offset;
   static int _ngroups_offset;
 
@@ -439,8 +438,6 @@ class java_lang_ThreadGroup : AllStatic {
   static bool is_destroyed(oop java_thread_group);
   // Daemon
   static bool is_daemon(oop java_thread_group);
-  // vmAllowSuspension
-  static bool is_vmAllowSuspension(oop java_thread_group);
   // Debugging
   friend class JavaClasses;
 };
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp
index 585c8b5382e..31b996373ab 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp
@@ -354,7 +354,6 @@
   template(groups_name,                               "groups")                                   \
   template(maxPriority_name,                          "maxPriority")                              \
   template(destroyed_name,                            "destroyed")                                \
-  template(vmAllowSuspension_name,                    "vmAllowSuspension")                        \
   template(nthreads_name,                             "nthreads")                                 \
   template(ngroups_name,                              "ngroups")                                  \
   template(shutdown_method_name,                      "shutdown")                                 \

From 3895ad9e00c90ff9b3c63af6cb4d3b68bb789d3b Mon Sep 17 00:00:00 2001
From: Erik Helin 
Date: Tue, 21 Jun 2016 15:02:45 +0200
Subject: [PATCH 040/111] 8159370: Add FlagGuard for easier modification of
 flags for unit tests

Reviewed-by: kbarrett, jwilhelm
---
 hotspot/src/share/vm/runtime/globals.hpp     | 23 ++++++
 hotspot/test/native/runtime/test_globals.cpp | 74 ++++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 hotspot/test/native/runtime/test_globals.cpp

diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index 54cd9c01956..05db32809b4 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -463,6 +463,29 @@ class SizeTFlagSetting {
   ~SizeTFlagSetting()                           { *flag = val; }
 };
 
+// Helper class for temporarily saving the value of a flag during a scope.
+template 
+class FlagGuard {
+  unsigned char _value[SIZE];
+  void* const _addr;
+
+  // Hide operator new, this class should only be allocated on the stack.
+  // NOTE: Cannot include memory/allocation.hpp here due to circular
+  //       dependencies.
+  void* operator new(size_t size) throw();
+  void* operator new [](size_t size) throw();
+
+ public:
+  FlagGuard(void* flag_addr) : _addr(flag_addr) {
+    memcpy(_value, _addr, SIZE);
+  }
+
+  ~FlagGuard() {
+    memcpy(_addr, _value, SIZE);
+  }
+};
+
+#define FLAG_GUARD(f) FlagGuard f ## _guard(&f)
 
 class CommandLineFlags {
 public:
diff --git a/hotspot/test/native/runtime/test_globals.cpp b/hotspot/test/native/runtime/test_globals.cpp
new file mode 100644
index 00000000000..3741b8edd8c
--- /dev/null
+++ b/hotspot/test/native/runtime/test_globals.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/globals.hpp"
+#include "unittest.hpp"
+
+#define TEST_FLAG(f, type, value)                     \
+  do {                                                \
+    ASSERT_TRUE(Flag::find_flag(#f)->is_ ## type());  \
+    type original_value = f;                          \
+    {                                                 \
+      FLAG_GUARD(f);                                  \
+      f = value;                                      \
+    }                                                 \
+    ASSERT_EQ(original_value, f);                     \
+  } while (0)
+
+TEST_VM(FlagGuard, bool_flag) {
+  TEST_FLAG(AlwaysActAsServerClassMachine, bool, true);
+}
+
+TEST_VM(FlagGuard, int_flag) {
+  TEST_FLAG(ParGCArrayScanChunk, int, 1337);
+}
+
+TEST_VM(FlagGuard, intx_flag) {
+  TEST_FLAG(RefDiscoveryPolicy, intx, 1337);
+}
+
+TEST_VM(FlagGuard, uint_flag) {
+  TEST_FLAG(ConcGCThreads, uint, 1337);
+}
+
+TEST_VM(FlagGuard, uintx_flag) {
+  TEST_FLAG(GCTaskTimeStampEntries, uintx, 1337);
+}
+
+TEST_VM(FlagGuard, size_t_flag) {
+  TEST_FLAG(HeapSizePerGCThread, size_t, 1337);
+}
+
+TEST_VM(FlagGuard, uint64_t_flag) {
+  TEST_FLAG(MaxRAM, uint64_t, 1337);
+}
+
+TEST_VM(FlagGuard, double_flag) {
+  TEST_FLAG(CompileThresholdScaling, double, 3.141569);
+}
+
+TEST_VM(FlagGuard, ccstr_flag) {
+  TEST_FLAG(PerfDataSaveFile, ccstr, "/a/random/path");
+}

From b66265312cc95cd5e736466bb8975c3bee54de43 Mon Sep 17 00:00:00 2001
From: Dmitry Fazunenko 
Date: Tue, 21 Jun 2016 18:36:37 +0400
Subject: [PATCH 041/111] 8151283: Implement setting jtreg @requires property
 vm.isG1Supported

Reviewed-by: tschatzl, iignatyev, mchernov
---
 test/jtreg-ext/requires/VMProps.java | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 7bb67f32828..945d754199e 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -34,6 +34,7 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import sun.hotspot.gc.GC;
 
 /**
  * The Class to be invoked by jtreg prior Test Suite execution to
@@ -56,11 +57,12 @@ public class VMProps implements Callable> {
         map.put("vm.bits", vmBits());
         map.put("vm.flightRecorder", vmFlightRecorder());
         map.put("vm.simpleArch", vmArch());
+        vmGC(map); // vm.gc.X = true/false
+
         dump(map);
         return map;
     }
 
-
     /**
      * @return vm.simpleArch value of "os.simpleArch" property of tested JDK.
      */
@@ -146,6 +148,24 @@ public class VMProps implements Callable> {
         return "false";
     }
 
+    /**
+     * For all existing GC sets vm.gc.X property.
+     * Example vm.gc.G1=true means:
+     *    VM supports G1
+     *    User either set G1 explicitely (-XX:+UseG1GC) or did not set any GC
+     * @param map - property-value pairs
+     */
+    protected void vmGC(Map map){
+        GC currentGC = GC.current();
+        boolean isByErgo = GC.currentSetByErgo();
+        List supportedGC = GC.allSupported();
+        for (GC gc: GC.values()) {
+            boolean isSupported = supportedGC.contains(gc);
+            boolean isAcceptable = isSupported && (gc == currentGC || isByErgo);
+            map.put("vm.gc." + gc.name(), "" + isAcceptable);
+        }
+    }
+
     /**
      * Dumps the map to the file if the file name is given as the property.
      * This functionality could be helpful to know context in the real

From 708c94be94d2e00a6115cdbb2cc5fc41085ec45e Mon Sep 17 00:00:00 2001
From: Dmitry Fazunenko 
Date: Tue, 21 Jun 2016 18:37:04 +0400
Subject: [PATCH 042/111] 8151283: Implement setting jtreg @requires property
 vm.isG1Supported

Reviewed-by: tschatzl, iignatyev, mchernov
---
 hotspot/test/TEST.ROOT | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/hotspot/test/TEST.ROOT b/hotspot/test/TEST.ROOT
index 00a177ae6b4..d604c52e930 100644
--- a/hotspot/test/TEST.ROOT
+++ b/hotspot/test/TEST.ROOT
@@ -33,8 +33,18 @@ groups=TEST.groups [closed/TEST.groups]
 
 # Source files for classes that will be used at the beginning of each test suite run,
 # to determine additional characteristics of the system for use with the @requires tag.
+# Note: compiled bootlibs code will be located in the folder 'bootClasses'
 requires.extraPropDefns = ../../test/jtreg-ext/requires/VMProps.java
-requires.properties=sun.arch.data.model vm.simpleArch vm.flightRecorder
+requires.extraPropDefns.bootlibs = ../../test/lib/sun
+requires.extraPropDefns.vmOpts = -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:bootClasses
+requires.properties= \
+    sun.arch.data.model \
+    vm.simpleArch \
+    vm.flightRecorder \
+    vm.gc.G1 \
+    vm.gc.Serial \
+    vm.gc.Parallel \
+    vm.gc.ConcMarkSweep
 
 # Tests using jtreg 4.2 b02 features
 requiredVersion=4.2 b02

From f842de1dd29f2f8b4395446dbb21def4114f9035 Mon Sep 17 00:00:00 2001
From: Vladimir Kvashin 
Date: Tue, 21 Jun 2016 18:10:22 +0300
Subject: [PATCH 043/111] 8028162: Update Netbeans / Solaris Studio project
 files on Mac 8028163: Update Netbeans / Solaris Studio project files on Linux
 8028164: Update Netbeans / Solaris Studio project files on Solaris

Reviewed-by: jwilhelm, erikj
---
 common/nb_native/nbproject/configurations.xml | 80132 ++++++++++------
 common/nb_native/nbproject/project.xml        |     5 +-
 2 files changed, 52724 insertions(+), 27413 deletions(-)

diff --git a/common/nb_native/nbproject/configurations.xml b/common/nb_native/nbproject/configurations.xml
index 983e6bf47ec..8b23549b276 100644
--- a/common/nb_native/nbproject/configurations.xml
+++ b/common/nb_native/nbproject/configurations.xml
@@ -1,41 +1,59 @@
 
-
+
   
-    
+    
       
-        
-          
-            
-              
-                
-                  ad_x86_64.cpp
-                  ad_x86_64_clone.cpp
-                  ad_x86_64_expand.cpp
-                  ad_x86_64_format.cpp
-                  ad_x86_64_gen.cpp
-                  ad_x86_64_misc.cpp
-                  ad_x86_64_peephole.cpp
-                  ad_x86_64_pipeline.cpp
-                  dfa_x86_64.cpp
-                
-                
-                  bytecodeInterpreterWithChecks.cpp
-                  jvmtiEnter.cpp
-                  jvmtiEnterTrace.cpp
-                
+        
+          
+            
+              
+                ad_x86_64.cpp
+                ad_x86_64_clone.cpp
+                ad_x86_64_expand.cpp
+                ad_x86_64_format.cpp
+                ad_x86_64_gen.cpp
+                ad_x86_64_misc.cpp
+                ad_x86_64_peephole.cpp
+                ad_x86_64_pipeline.cpp
+                dfa_x86_64.cpp
+              
+              
+                bytecodeInterpreterWithChecks.cpp
+                jvmtiEnter.cpp
+                jvmtiEnterTrace.cpp
               
             
           
-          
-            
-              sizer.64.c
+          
+            
+              
+                ad_x86_64.cpp
+                ad_x86_64_clone.cpp
+                ad_x86_64_expand.cpp
+                ad_x86_64_format.cpp
+                ad_x86_64_gen.cpp
+                ad_x86_64_misc.cpp
+                ad_x86_64_peephole.cpp
+                ad_x86_64_pipeline.cpp
+                dfa_x86_64.cpp
+              
+              
+                bytecodeInterpreterWithChecks.cpp
+                jvmtiEnter.cpp
+                jvmtiEnterTrace.cpp
+              
+            
+            
+              
+                JvmOffsets.cpp
+              
             
           
         
         
           
-            
-              
+            
+              
                 
                   ad_x86_64.cpp
                   ad_x86_64_clone.cpp
@@ -55,77 +73,24 @@
               
             
           
-          
-            
-              sizer.64.c
-            
-          
         
-        
-          
-            
-              
-                
-                  ad_x86_64.cpp
-                  ad_x86_64_clone.cpp
-                  ad_x86_64_expand.cpp
-                  ad_x86_64_format.cpp
-                  ad_x86_64_gen.cpp
-                  ad_x86_64_misc.cpp
-                  ad_x86_64_peephole.cpp
-                  ad_x86_64_pipeline.cpp
-                  dfa_x86_64.cpp
-                
-                
-                  bytecodeInterpreterWithChecks.cpp
-                  jvmtiEnter.cpp
-                  jvmtiEnterTrace.cpp
-                
+        
+          
+            
+              
+                sizer.64.c
               
-              
-                JvmOffsets.cpp
-              
-            
-          
-          
-            
-              sizer.64.c
             
           
         
       
       
-        
-          
-            
-              
-                LinuxDebuggerLocal.c
-                libproc_impl.c
-                ps_core.c
-                ps_proc.c
-                salibelf.c
-                symtab.c
-              
-              
-                
-                  saproc.cpp
-                
-              
-            
-            
-              
-                sadis.c
-              
-            
-          
-        
         
           
             
               
+                abstractInterpreter_x86.cpp
                 assembler_x86.cpp
-                bytecodeInterpreter_x86.cpp
-                bytecodes_x86.cpp
                 c1_CodeStubs_x86.cpp
                 c1_FpuStackSim_x86.cpp
                 c1_FrameMap_x86.cpp
@@ -135,42 +100,92 @@
                 c1_MacroAssembler_x86.cpp
                 c1_Runtime1_x86.cpp
                 c2_init_x86.cpp
-                cppInterpreter_x86.cpp
+                compiledIC_x86.cpp
                 debug_x86.cpp
                 depChecker_x86.cpp
                 frame_x86.cpp
                 icBuffer_x86.cpp
                 icache_x86.cpp
-                interp_masm_x86_64.cpp
+                interp_masm_x86.cpp
                 interpreterRT_x86_64.cpp
-                interpreter_x86_64.cpp
                 jniFastGetField_x86_64.cpp
+                jvmciCodeInstaller_x86.cpp
+                macroAssembler_libm_x86_64.cpp
                 macroAssembler_x86.cpp
+                macroAssembler_x86_cos.cpp
+                macroAssembler_x86_exp.cpp
+                macroAssembler_x86_log.cpp
+                macroAssembler_x86_log10.cpp
+                macroAssembler_x86_pow.cpp
+                macroAssembler_x86_sha.cpp
+                macroAssembler_x86_sin.cpp
+                macroAssembler_x86_tan.cpp
                 metaspaceShared_x86_64.cpp
                 methodHandles_x86.cpp
                 nativeInst_x86.cpp
+                registerMap_x86.cpp
                 register_definitions_x86.cpp
                 register_x86.cpp
                 relocInfo_x86.cpp
                 runtime_x86_64.cpp
+                sharedRuntime_x86.cpp
                 sharedRuntime_x86_64.cpp
                 stubGenerator_x86_64.cpp
+                stubRoutines_x86.cpp
                 stubRoutines_x86_64.cpp
-                templateInterpreter_x86_64.cpp
-                templateTable_x86_64.cpp
+                templateInterpreterGenerator_x86.cpp
+                templateInterpreterGenerator_x86_64.cpp
+                templateTable_x86.cpp
                 vm_version_x86.cpp
                 vmreg_x86.cpp
                 vtableStubs_x86_64.cpp
               
             
           
+          
+            
+              
+                
+                  LinuxDebuggerLocal.c
+                  libproc_impl.c
+                  ps_core.c
+                  ps_proc.c
+                  salibelf.c
+                  symtab.c
+                
+              
+            
+            
+              
+                
+                  MacosxDebuggerLocal.m
+                  libproc_impl.c
+                  ps_core.c
+                  symtab.c
+                
+              
+            
+            
+              
+                
+                  sadis.c
+                
+              
+            
+            
+              
+                
+                  saproc.cpp
+                
+              
+            
+          
           
             
               
                 attachListener_bsd.cpp
-                chaitin_bsd.cpp
                 decoder_machO.cpp
-                dtraceJSDT_bsd.cpp
+                jsig.c
                 jvm_bsd.cpp
                 mutex_bsd.cpp
                 osThread_bsd.cpp
@@ -178,15 +193,12 @@
                 perfMemory_bsd.cpp
                 stubRoutines_bsd.cpp
                 threadCritical_bsd.cpp
-                vmError_bsd.cpp
               
             
             
               
                 attachListener_linux.cpp
-                chaitin_linux.cpp
                 decoder_linux.cpp
-                dtraceJSDT_linux.cpp
                 jsig.c
                 jvm_linux.cpp
                 mutex_linux.cpp
@@ -195,35 +207,25 @@
                 perfMemory_linux.cpp
                 stubRoutines_linux.cpp
                 threadCritical_linux.cpp
-                vmError_linux.cpp
               
             
             
-              
-                java_md.c
-              
               
                 os_posix.cpp
+                threadLocalStorage_posix.cpp
+                vmError_posix.cpp
               
             
             
-              
-                add_gnu_debuglink.c
-              
               
                 generateJvmOffsets.cpp
                 generateJvmOffsetsMain.c
                 jvm_dtrace.c
                 libjvm_db.c
               
-              
-                fix_empty_sec_hdr_flags.c
-              
               
                 attachListener_solaris.cpp
-                chaitin_solaris.cpp
                 decoder_solaris.cpp
-                dtraceJSDT_solaris.cpp
                 jsig.c
                 jvm_solaris.cpp
                 mutex_solaris.cpp
@@ -232,7 +234,6 @@
                 perfMemory_solaris.cpp
                 stubRoutines_solaris.cpp
                 threadCritical_solaris.cpp
-                vmError_solaris.cpp
               
             
           
@@ -241,7 +242,6 @@
               
                 assembler_bsd_x86.cpp
                 os_bsd_x86.cpp
-                threadLS_bsd_x86.cpp
                 thread_bsd_x86.cpp
                 vm_version_bsd_x86.cpp
               
@@ -250,7 +250,6 @@
               
                 assembler_linux_x86.cpp
                 os_linux_x86.cpp
-                threadLS_linux_x86.cpp
                 thread_linux_x86.cpp
                 vm_version_linux_x86.cpp
               
@@ -259,20 +258,12 @@
               
                 assembler_solaris_x86.cpp
                 os_solaris_x86.cpp
-                threadLS_solaris_x86.cpp
                 thread_solaris_x86.cpp
                 vm_version_solaris_x86.cpp
               
             
           
           
-            
-              
-                java.c
-                jli_util.c
-                wildcard.c
-              
-            
             
               
                 adlparse.cpp
@@ -359,19 +350,28 @@
                 classFileError.cpp
                 classFileParser.cpp
                 classFileStream.cpp
+                classListParser.cpp
                 classLoader.cpp
                 classLoaderData.cpp
+                classLoaderExt.cpp
+                classLoaderStats.cpp
+                compactHashtable.cpp
                 defaultMethods.cpp
                 dictionary.cpp
-                genericSignatures.cpp
                 javaAssertions.cpp
                 javaClasses.cpp
+                klassFactory.cpp
                 loaderConstraints.cpp
                 metadataOnStackMark.cpp
+                moduleEntry.cpp
+                modules.cpp
+                packageEntry.cpp
                 placeholders.cpp
                 resolutionErrors.cpp
+                sharedPathsMiscInfo.cpp
                 stackMapFrame.cpp
                 stackMapTable.cpp
+                stringTable.cpp
                 symbolTable.cpp
                 systemDictionary.cpp
                 verificationType.cpp
@@ -382,10 +382,12 @@
                 codeBlob.cpp
                 codeCache.cpp
                 compiledIC.cpp
+                compiledMethod.cpp
                 compressedStream.cpp
                 debugInfo.cpp
                 debugInfoRec.cpp
                 dependencies.cpp
+                dependencyContext.cpp
                 exceptionHandlerTable.cpp
                 icBuffer.cpp
                 location.cpp
@@ -402,65 +404,121 @@
                 abstractCompiler.cpp
                 compileBroker.cpp
                 compileLog.cpp
+                compileTask.cpp
+                compilerDirectives.cpp
                 compilerOracle.cpp
+                directivesParser.cpp
                 disassembler.cpp
                 methodLiveness.cpp
+                methodMatcher.cpp
                 oopMap.cpp
               
-              
-                
+              
+                
                   adaptiveFreeList.cpp
-                  cmsAdaptiveSizePolicy.cpp
+                  allocationStats.cpp
                   cmsCollectorPolicy.cpp
-                  cmsGCAdaptivePolicyCounters.cpp
                   cmsLockVerifier.cpp
+                  cmsOopClosures.cpp
                   compactibleFreeListSpace.cpp
                   concurrentMarkSweepGeneration.cpp
                   concurrentMarkSweepThread.cpp
                   freeChunk.cpp
+                  gSpaceCounters.cpp
+                  parCardTableModRefBS.cpp
+                  parNewGeneration.cpp
+                  parOopClosures.cpp
                   promotionInfo.cpp
                   vmCMSOperations.cpp
+                  yieldingWorkgroup.cpp
                 
                 
+                  bufferingOopClosure.cpp
                   collectionSetChooser.cpp
                   concurrentG1Refine.cpp
                   concurrentG1RefineThread.cpp
-                  concurrentMark.cpp
                   concurrentMarkThread.cpp
                   dirtyCardQueue.cpp
                   g1AllocRegion.cpp
+                  g1Allocator.cpp
+                  g1Allocator_ext.cpp
+                  g1Analytics.cpp
+                  g1BiasedArray.cpp
                   g1BlockOffsetTable.cpp
+                  g1CardCounts.cpp
+                  g1CardLiveData.cpp
+                  g1CodeBlobClosure.cpp
+                  g1CodeCacheRemSet.cpp
                   g1CollectedHeap.cpp
+                  g1CollectedHeap_ext.cpp
+                  g1CollectionSet.cpp
                   g1CollectorPolicy.cpp
-                  g1ErgoVerbose.cpp
+                  g1ConcurrentMark.cpp
+                  g1DefaultPolicy.cpp
+                  g1EvacFailure.cpp
+                  g1EvacStats.cpp
+                  g1FromCardCache.cpp
                   g1GCPhaseTimes.cpp
-                  g1HRPrinter.cpp
-                  g1Log.cpp
+                  g1HeapSizingPolicy.cpp
+                  g1HeapSizingPolicy_ext.cpp
+                  g1HeapTransition.cpp
+                  g1HeapVerifier.cpp
+                  g1HotCardCache.cpp
+                  g1IHOPControl.cpp
                   g1MMUTracker.cpp
                   g1MarkSweep.cpp
+                  g1MarkSweep_ext.cpp
                   g1MonitoringSupport.cpp
+                  g1OopClosures.cpp
+                  g1PageBasedVirtualSpace.cpp
+                  g1ParScanThreadState.cpp
+                  g1ParScanThreadState_ext.cpp
+                  g1Predictions.cpp
+                  g1RegionToSpaceMapper.cpp
                   g1RemSet.cpp
+                  g1RemSetSummary.cpp
+                  g1RootClosures.cpp
+                  g1RootClosures_ext.cpp
+                  g1RootProcessor.cpp
                   g1SATBCardTableModRefBS.cpp
+                  g1StringDedup.cpp
+                  g1StringDedupQueue.cpp
+                  g1StringDedupStat.cpp
+                  g1StringDedupTable.cpp
+                  g1StringDedupThread.cpp
+                  g1SurvivorRegions.cpp
+                  g1YoungGenSizer.cpp
+                  g1YoungRemSetSamplingThread.cpp
                   g1_globals.cpp
+                  hSpaceCounters.cpp
                   heapRegion.cpp
+                  heapRegionManager.cpp
                   heapRegionRemSet.cpp
-                  heapRegionSeq.cpp
                   heapRegionSet.cpp
-                  heapRegionSets.cpp
+                  heapRegionTracer.cpp
+                  heapRegionType.cpp
                   ptrQueue.cpp
-                  satbQueue.cpp
+                  satbMarkQueue.cpp
                   sparsePRT.cpp
                   survRateGroup.cpp
+                  suspendibleThreadSet.cpp
                   vm_operations_g1.cpp
+                  workerDataArray.cpp
+                  youngList.cpp
                 
-                
+                
                   adjoiningGenerations.cpp
                   adjoiningVirtualSpaces.cpp
                   asPSOldGen.cpp
                   asPSYoungGen.cpp
                   cardTableExtension.cpp
+                  gcAdaptivePolicyCounters.cpp
                   gcTaskManager.cpp
                   gcTaskThread.cpp
+                  generationSizer.cpp
+                  immutableSpace.cpp
+                  mutableNUMASpace.cpp
+                  mutableSpace.cpp
                   objectStartArray.cpp
                   parMarkBitMap.cpp
                   parallelScavengeHeap.cpp
@@ -479,42 +537,64 @@
                   psTasks.cpp
                   psVirtualspace.cpp
                   psYoungGen.cpp
+                  spaceCounters.cpp
                   vmPSOperations.cpp
                 
-                
-                  asParNewGeneration.cpp
-                  parCardTableModRefBS.cpp
-                  parNewGeneration.cpp
+                
+                  cSpaceCounters.cpp
+                  defNewGeneration.cpp
+                  genMarkSweep.cpp
+                  markSweep.cpp
+                  tenuredGeneration.cpp
                 
                 
                   adaptiveSizePolicy.cpp
                   ageTable.cpp
-                  allocationStats.cpp
-                  cSpaceCounters.cpp
+                  ageTableTracer.cpp
+                  allocTracer.cpp
+                  barrierSet.cpp
+                  blockOffsetTable.cpp
+                  cardGeneration.cpp
+                  cardTableModRefBS.cpp
+                  cardTableModRefBSForCTRS.cpp
+                  cardTableRS.cpp
+                  collectedHeap.cpp
                   collectorCounters.cpp
+                  collectorPolicy.cpp
                   concurrentGCThread.cpp
-                  gSpaceCounters.cpp
-                  gcAdaptivePolicyCounters.cpp
+                  gcCause.cpp
+                  gcId.cpp
+                  gcLocker.cpp
                   gcPolicyCounters.cpp
                   gcStats.cpp
+                  gcTimer.cpp
+                  gcTrace.cpp
+                  gcTraceSend.cpp
+                  gcTraceTime.cpp
                   gcUtil.cpp
+                  genCollectedHeap.cpp
+                  genOopClosures.cpp
+                  generation.cpp
                   generationCounters.cpp
-                  hSpaceCounters.cpp
-                  immutableSpace.cpp
-                  markSweep.cpp
-                  mutableNUMASpace.cpp
-                  mutableSpace.cpp
-                  parGCAllocBuffer.cpp
-                  spaceCounters.cpp
+                  generationSpec.cpp
+                  memset_with_concurrent_readers.cpp
+                  objectCountEventSender.cpp
+                  plab.cpp
+                  preservedMarks.cpp
+                  referencePendingListLocker.cpp
+                  referencePolicy.cpp
+                  referenceProcessor.cpp
+                  space.cpp
                   spaceDecorator.cpp
+                  strongRootsScope.cpp
+                  taskqueue.cpp
+                  threadLocalAllocBuffer.cpp
                   vmGCOperations.cpp
+                  workgroup.cpp
                 
               
-              
-                collectedHeap.cpp
-                gcCause.cpp
-              
               
+                abstractInterpreter.cpp
                 bytecode.cpp
                 bytecodeHistogram.cpp
                 bytecodeInterpreter.cpp
@@ -522,6 +602,7 @@
                 bytecodeTracer.cpp
                 bytecodes.cpp
                 cppInterpreter.cpp
+                cppInterpreterGenerator.cpp
                 interpreter.cpp
                 interpreterRuntime.cpp
                 invocationCounter.cpp
@@ -529,51 +610,65 @@
                 oopMapCache.cpp
                 rewriter.cpp
                 templateInterpreter.cpp
+                templateInterpreterGenerator.cpp
                 templateTable.cpp
               
+              
+                commandLineFlagConstraintsJVMCI.cpp
+                jvmciCodeInstaller.cpp
+                jvmciCompiler.cpp
+                jvmciCompilerToVM.cpp
+                jvmciEnv.cpp
+                jvmciJavaClasses.cpp
+                jvmciRuntime.cpp
+                jvmci_globals.cpp
+                vmStructs_jvmci.cpp
+              
               
                 dict.cpp
-                port.cpp
                 set.cpp
                 vectset.cpp
               
+              
+                log.cpp
+                logConfiguration.cpp
+                logDecorations.cpp
+                logDecorators.cpp
+                logDiagnosticCommand.cpp
+                logFileOutput.cpp
+                logFileStreamOutput.cpp
+                logLevel.cpp
+                logMessageBuffer.cpp
+                logOutput.cpp
+                logOutputList.cpp
+                logStream.cpp
+                logTag.cpp
+                logTagLevelExpression.cpp
+                logTagSet.cpp
+                logTagSetDescriptions.cpp
+              
               
                 allocation.cpp
-                barrierSet.cpp
                 binaryTreeDictionary.cpp
-                blockOffsetTable.cpp
-                cardTableModRefBS.cpp
-                cardTableRS.cpp
-                collectorPolicy.cpp
-                defNewGeneration.cpp
                 filemap.cpp
                 freeBlockDictionary.cpp
                 freeList.cpp
-                gcLocker.cpp
-                genCollectedHeap.cpp
-                genMarkSweep.cpp
-                genRemSet.cpp
-                generation.cpp
-                generationSpec.cpp
+                guardedMemory.cpp
                 heap.cpp
                 heapInspection.cpp
                 iterator.cpp
                 memRegion.cpp
-                metablock.cpp
                 metachunk.cpp
                 metaspace.cpp
                 metaspaceCounters.cpp
                 metaspaceShared.cpp
+                metaspaceTracer.cpp
                 oopFactory.cpp
-                referencePolicy.cpp
-                referenceProcessor.cpp
+                operator_new.cpp
                 resourceArea.cpp
-                sharedHeap.cpp
-                space.cpp
-                specialized_oop_closures.cpp
-                tenuredGeneration.cpp
-                threadLocalAllocBuffer.cpp
                 universe.cpp
+                universe_ext.cpp
+                virtualspace.cpp
               
               
                 annotations.cpp
@@ -584,7 +679,6 @@
                 constantPool.cpp
                 cpCache.cpp
                 generateOopMap.cpp
-                instanceClassLoaderKlass.cpp
                 instanceKlass.cpp
                 instanceMirrorKlass.cpp
                 instanceOop.cpp
@@ -594,6 +688,7 @@
                 markOop.cpp
                 metadata.cpp
                 method.cpp
+                methodCounters.cpp
                 methodData.cpp
                 objArrayKlass.cpp
                 objArrayOop.cpp
@@ -601,10 +696,10 @@
                 oopsHierarchy.cpp
                 symbol.cpp
                 typeArrayKlass.cpp
-                typeArrayOop.cpp
               
               
                 addnode.cpp
+                arraycopynode.cpp
                 block.cpp
                 buildOopMap.cpp
                 bytecodeInfo.cpp
@@ -612,12 +707,15 @@
                 c2compiler.cpp
                 callGenerator.cpp
                 callnode.cpp
+                castnode.cpp
                 cfgnode.cpp
                 chaitin.cpp
                 classes.cpp
                 coalesce.cpp
                 compile.cpp
                 connode.cpp
+                convertnode.cpp
+                countbitsnode.cpp
                 divnode.cpp
                 doCall.cpp
                 domgraph.cpp
@@ -630,6 +728,7 @@
                 ifg.cpp
                 ifnode.cpp
                 indexSet.cpp
+                intrinsicnode.cpp
                 lcm.cpp
                 library_call.cpp
                 live.cpp
@@ -641,11 +740,16 @@
                 loopopts.cpp
                 machnode.cpp
                 macro.cpp
+                macroArrayCopy.cpp
                 matcher.cpp
+                mathexactnode.cpp
                 memnode.cpp
+                movenode.cpp
                 mulnode.cpp
                 multnode.cpp
+                narrowptrnode.cpp
                 node.cpp
+                opaquenode.cpp
                 opcodes.cpp
                 output.cpp
                 parse1.cpp
@@ -658,6 +762,7 @@
                 reg_split.cpp
                 regalloc.cpp
                 regmask.cpp
+                replacednodes.cpp
                 rootnode.cpp
                 runtime.cpp
                 split_if.cpp
@@ -667,9 +772,6 @@
                 type.cpp
                 vectornode.cpp
               
-              
-                precompiled.hpp
-              
               
                 
                   parserTests.cpp
@@ -702,19 +804,25 @@
                 nativeLookup.cpp
                 perf.cpp
                 privilegedStack.cpp
+                stackwalk.cpp
                 unsafe.cpp
                 whitebox.cpp
+                whitebox_ext.cpp
               
               
                 advancedThresholdPolicy.cpp
-                aprofiler.cpp
                 arguments.cpp
                 atomic.cpp
                 basicLock.cpp
                 biasedLocking.cpp
+                commandLineFlagConstraintList.cpp
+                commandLineFlagConstraintsCompiler.cpp
+                commandLineFlagConstraintsGC.cpp
+                commandLineFlagConstraintsRuntime.cpp
+                commandLineFlagRangeList.cpp
+                commandLineFlagWriteableList.cpp
                 compilationPolicy.cpp
                 deoptimization.cpp
-                dtraceJSDT.cpp
                 fieldDescriptor.cpp
                 fieldType.cpp
                 fprofiler.cpp
@@ -743,7 +851,9 @@
                 reflectionUtils.cpp
                 relocator.cpp
                 rframe.cpp
+                rtmLocking.cpp
                 safepoint.cpp
+                semaphore.cpp
                 serviceThread.cpp
                 sharedRuntime.cpp
                 sharedRuntimeTrans.cpp
@@ -759,13 +869,13 @@
                 synchronizer.cpp
                 task.cpp
                 thread.cpp
-                threadLocalStorage.cpp
+                thread_ext.cpp
                 timer.cpp
+                timerTrace.cpp
                 unhandledOops.cpp
                 vframe.cpp
                 vframeArray.cpp
                 vframe_hp.cpp
-                virtualspace.cpp
                 vmStructs.cpp
                 vmThread.cpp
                 vm_operations.cpp
@@ -782,32 +892,38 @@
                 gcNotifier.cpp
                 heapDumper.cpp
                 lowMemoryDetector.cpp
+                mallocSiteTable.cpp
+                mallocTracker.cpp
                 management.cpp
                 memBaseline.cpp
-                memPtr.cpp
-                memRecorder.cpp
                 memReporter.cpp
-                memSnapshot.cpp
-                memTrackWorker.cpp
                 memTracker.cpp
                 memoryManager.cpp
                 memoryPool.cpp
                 memoryService.cpp
+                nmtCommon.cpp
                 nmtDCmd.cpp
                 psMemoryPool.cpp
                 runtimeService.cpp
                 threadService.cpp
+                virtualMemoryTracker.cpp
+                writeableFlags.cpp
+              
+              
+                traceBackend.cpp
               
               
                 accessFlags.cpp
                 array.cpp
                 bitMap.cpp
+                chunkedList.cpp
                 constantTag.cpp
                 copy.cpp
                 debug.cpp
                 decoder.cpp
                 decoder_elf.cpp
                 elfFile.cpp
+                elfFuncDescTable.cpp
                 elfStringTable.cpp
                 elfSymbolTable.cpp
                 errorReporter.cpp
@@ -818,84 +934,56 @@
                 hashtable.cpp
                 histogram.cpp
                 intHisto.cpp
+                internalVMTests.cpp
+                json.cpp
+                linkedlist.cpp
+                nativeCallStack.cpp
                 numberSeq.cpp
                 ostream.cpp
                 preserveException.cpp
                 quickSort.cpp
+                resourceHash.cpp
                 sizes.cpp
-                taskqueue.cpp
+                stringUtils.cpp
+                ticks.cpp
                 utf8.cpp
                 vmError.cpp
-                workgroup.cpp
                 xmlstream.cpp
-                yieldingWorkgroup.cpp
               
             
           
         
+        
+          
+            
+              test_os.cpp
+            
+            
+              test_quicksort.cpp
+            
+            gtestLauncher.cpp
+            gtestMain.cpp
+          
+        
       
       
         
-          
-            
-              add_gnu_debuglink.c
-            
-            
-              fix_empty_sec_hdr_flags.c
+          
+            
+              
+                
+                  genSocketOptionRegistry.c
+                
+                
+                  genUnixConstants.c
+                
+              
             
           
         
         
-          
-            
-              ArrayReferenceImpl.c
-              ArrayTypeImpl.c
-              ClassLoaderReferenceImpl.c
-              ClassObjectReferenceImpl.c
-              ClassTypeImpl.c
-              EventRequestImpl.c
-              FieldImpl.c
-              FrameID.c
-              MethodImpl.c
-              ObjectReferenceImpl.c
-              ReferenceTypeImpl.c
-              SDE.c
-              StackFrameImpl.c
-              StringReferenceImpl.c
-              ThreadGroupReferenceImpl.c
-              ThreadReferenceImpl.c
-              VirtualMachineImpl.c
-              bag.c
-              classTrack.c
-              commonRef.c
-              debugDispatch.c
-              debugInit.c
-              debugLoop.c
-              error_messages.c
-              eventFilter.c
-              eventHandler.c
-              eventHelper.c
-              inStream.c
-              invoker.c
-              log_messages.c
-              outStream.c
-              standardHandlers.c
-              stepControl.c
-              stream.c
-              threadControl.c
-              transport.c
-              util.c
-            
-            
-              java.c
-              jli_util.c
-              main.c
-              parse_manifest.c
-              splashscreen_stubs.c
-              version_comp.c
-              wildcard.c
-            
-            
+          
+            
               
                 
                   agent_util.c
@@ -912,33 +1000,6 @@
                 
                   heapViewer.c
                 
-                
-                  debug_malloc.c
-                  hprof_blocks.c
-                  hprof_check.c
-                  hprof_class.c
-                  hprof_cpu.c
-                  hprof_error.c
-                  hprof_event.c
-                  hprof_frame.c
-                  hprof_init.c
-                  hprof_io.c
-                  hprof_ioname.c
-                  hprof_listener.c
-                  hprof_loader.c
-                  hprof_monitor.c
-                  hprof_object.c
-                  hprof_reference.c
-                  hprof_site.c
-                  hprof_stack.c
-                  hprof_string.c
-                  hprof_table.c
-                  hprof_tag.c
-                  hprof_tls.c
-                  hprof_trace.c
-                  hprof_tracker.c
-                  hprof_util.c
-                
                 
                   java_crw_demo.c
                 
@@ -959,287 +1020,848 @@
                 
               
             
-            
-              EncodingSupport.c
-              InstrumentationImplNativeMethods.c
-              InvocationAdapter.c
-              JPLISAgent.c
-              JPLISAssert.c
-              JarFacade.c
-              JavaExceptions.c
-              PathCharsValidator.c
-              Reentrancy.c
-              Utilities.c
+            
+              
+                
+                  Poller.c
+                
+              
             
-            
-              
-                
-                  
-                    
-                      
-                        
-                          bands.cpp
-                          bytes.cpp
-                          coding.cpp
-                          jni.cpp
-                          main.cpp
-                          unpack.cpp
-                          utils.cpp
-                          zip.cpp
-                        
-                      
-                    
+          
+          
+            
+              
+                
+                  ProcessHandleImpl_linux.c
+                
+                
+                  linux_close.c
+                
+                
+                  
+                    EPoll.c
+                    EPollArrayWrapper.c
+                    EPollPort.c
                   
-                  
-                    
-                      DirectAudioDevice.c
-                      DirectAudioDeviceProvider.c
-                      MidiInDevice.c
-                      MidiInDeviceProvider.c
-                      MidiOutDevice.c
-                      MidiOutDeviceProvider.c
-                      Platform.c
-                      PlatformMidi.c
-                      PortMixer.c
-                      PortMixerProvider.c
-                      Utilities.c
-                    
+                  
+                    LinuxNativeDispatcher.c
+                    LinuxWatchService.c
+                    MagicFileTypeDetector.c
                   
                 
               
-              
-                check_code.c
-                check_format.c
-                check_version.c
-                jdk_util.c
-                jio.c
-                jni_util.c
-                verify_stub.c
+            
+            
+              
+                
+                  HostLocaleProviderAdapter_md.c
+                  ProcessHandleImpl_macosx.c
+                  java_props_macosx.c
+                
+                
+                  java_md_macosx.c
+                
+                
+                  bsd_close.c
+                
+                
+                  
+                    KQueue.c
+                    KQueueArrayWrapper.c
+                    KQueuePort.c
+                  
+                  
+                    BsdNativeDispatcher.c
+                    MacOSXNativeDispatcher.c
+                    UTIFileTypeDetector.c
+                  
+                
+                
+                  KeystoreImpl.m
+                
               
-              
-                
+            
+            
+              
+                
+                  main.c
+                
+                
+                  e_acos.c
+                  e_asin.c
+                  e_atan2.c
+                  e_atanh.c
+                  e_cosh.c
+                  e_exp.c
+                  e_fmod.c
+                  e_log.c
+                  e_log10.c
+                  e_rem_pio2.c
+                  e_remainder.c
+                  e_scalb.c
+                  e_sinh.c
+                  e_sqrt.c
+                  k_cos.c
+                  k_rem_pio2.c
+                  k_sin.c
+                  k_standard.c
+                  k_tan.c
+                  s_atan.c
+                  s_ceil.c
+                  s_copysign.c
+                  s_cos.c
+                  s_expm1.c
+                  s_fabs.c
+                  s_finite.c
+                  s_floor.c
+                  s_frexp.c
+                  s_ilogb.c
+                  s_isnan.c
+                  s_ldexp.c
+                  s_lib_version.c
+                  s_log1p.c
+                  s_logb.c
+                  s_matherr.c
+                  s_modf.c
+                  s_nextafter.c
+                  s_rint.c
+                  s_scalbn.c
+                  s_signgam.c
+                  s_significand.c
+                  s_sin.c
+                  s_tan.c
+                  s_tanh.c
+                  w_acos.c
+                  w_asin.c
+                  w_atan2.c
+                  w_atanh.c
+                  w_cosh.c
+                  w_exp.c
+                  w_fmod.c
+                  w_log.c
+                  w_log10.c
+                  w_remainder.c
+                  w_scalb.c
+                  w_sinh.c
+                  w_sqrt.c
+                
+                
+                  AccessController.c
+                  Array.c
+                  AtomicLong.c
+                  BootLoader.c
+                  Class.c
+                  ClassLoader.c
+                  ConstantPool.c
+                  Double.c
+                  Executable.c
+                  Field.c
                   FileInputStream.c
+                  Float.c
+                  GC.c
+                  Module.c
+                  NativeAccessors.c
+                  Object.c
                   ObjectInputStream.c
                   ObjectOutputStream.c
                   ObjectStreamClass.c
-                  RandomAccessFile.c
-                  io_util.c
-                
-                
-                  
-                    
-                      e_acos.c
-                      e_asin.c
-                      e_atan2.c
-                      e_atanh.c
-                      e_cosh.c
-                      e_exp.c
-                      e_fmod.c
-                      e_hypot.c
-                      e_log.c
-                      e_log10.c
-                      e_pow.c
-                      e_rem_pio2.c
-                      e_remainder.c
-                      e_scalb.c
-                      e_sinh.c
-                      e_sqrt.c
-                      k_cos.c
-                      k_rem_pio2.c
-                      k_sin.c
-                      k_standard.c
-                      k_tan.c
-                      s_atan.c
-                      s_cbrt.c
-                      s_ceil.c
-                      s_copysign.c
-                      s_cos.c
-                      s_expm1.c
-                      s_fabs.c
-                      s_finite.c
-                      s_floor.c
-                      s_frexp.c
-                      s_ilogb.c
-                      s_isnan.c
-                      s_ldexp.c
-                      s_lib_version.c
-                      s_log1p.c
-                      s_logb.c
-                      s_matherr.c
-                      s_modf.c
-                      s_nextafter.c
-                      s_rint.c
-                      s_scalbn.c
-                      s_signgam.c
-                      s_significand.c
-                      s_sin.c
-                      s_tan.c
-                      s_tanh.c
-                      w_acos.c
-                      w_asin.c
-                      w_atan2.c
-                      w_atanh.c
-                      w_cosh.c
-                      w_exp.c
-                      w_fmod.c
-                      w_hypot.c
-                      w_log.c
-                      w_log10.c
-                      w_pow.c
-                      w_remainder.c
-                      w_scalb.c
-                      w_sinh.c
-                      w_sqrt.c
-                    
-                  
-                  
-                    Finalizer.c
-                  
-                  
-                    Array.c
-                    Executable.c
-                    Proxy.c
-                  
-                  Class.c
-                  ClassLoader.c
-                  Compiler.c
-                  Double.c
-                  Float.c
-                  Object.c
                   Package.c
-                  ResourceBundle.c
+                  Proxy.c
+                  RandomAccessFile.c
+                  Reflection.c
                   Runtime.c
                   SecurityManager.c
                   Shutdown.c
+                  Signal.c
+                  StackFrameInfo.c
+                  StackStreamFactory.c
                   StrictMath.c
                   String.c
+                  StringCoding.c
                   System.c
                   Thread.c
                   Throwable.c
+                  TimeZone.c
+                  VM.c
+                  VMSupport.c
+                  Version.c
+                  check_version.c
+                  io_util.c
+                  jdk_util.c
+                  jio.c
+                  jni_util.c
+                  verify_stub.c
                 
-                
+                
+                  ImageNativeSubstrate.cpp
+                  NativeImageBuffer.cpp
+                  endian.cpp
+                  imageDecompressor.cpp
+                  imageFile.cpp
+                  jimage.cpp
+                
+                
+                  args.c
+                  java.c
+                  jli_util.c
+                  parse_manifest.c
+                  splashscreen_stubs.c
+                  wildcard.c
+                
+                
                   DatagramPacket.c
                   Inet4Address.c
                   Inet6Address.c
                   InetAddress.c
                   net_util.c
                 
-                
-                  Bits.c
+                
+                  nio_util.c
                 
-                
-                  AccessController.c
+                
+                  check_code.c
+                  check_format.c
                 
-                
-                  
-                    
-                      AtomicLong.c
-                    
+                
+                  
+                    compress.c
+                    deflate.c
+                    gzclose.c
+                    gzlib.c
+                    gzread.c
+                    gzwrite.c
+                    infback.c
+                    inffast.c
+                    inflate.c
+                    inftrees.c
+                    trees.c
+                    uncompr.c
+                    zadler32.c
+                    zcrc32.c
+                    zutil.c
                   
-                  
-                    
-                      compress.c
-                      deflate.c
-                      gzclose.c
-                      gzlib.c
-                      gzread.c
-                      gzwrite.c
-                      infback.c
-                      inffast.c
-                      inflate.c
-                      inftrees.c
-                      trees.c
-                      uncompr.c
-                      zadler32.c
-                      zcrc32.c
-                      zutil.c
-                    
-                    Adler32.c
-                    CRC32.c
-                    Deflater.c
-                    Inflater.c
-                    ZipFile.c
-                    zip_util.c
-                  
-                  TimeZone.c
+                  Adler32.c
+                  CRC32.c
+                  Deflater.c
+                  Inflater.c
+                  zip_util.c
                 
               
-              
-                
-                  
-                    debug_assert.c
-                    debug_mem.c
-                    debug_trace.c
-                    debug_util.c
+            
+            
+              
+                
+                  ProcessHandleImpl_solaris.c
+                
+                
+                  solaris_close.c
+                
+                
+                  
+                    DevPollArrayWrapper.c
+                    SolarisEventPort.c
                   
+                  
+                    SolarisNativeDispatcher.c
+                    SolarisWatchService.c
+                  
+                
+              
+            
+            
+              
+                
+                  jspawnhelper.c
+                
+                
+                  jexec.c
+                
+                
+                  Console_md.c
+                  FileDescriptor_md.c
+                  FileInputStream_md.c
+                  FileOutputStream_md.c
+                  ProcessEnvironment_md.c
+                  ProcessHandleImpl_unix.c
+                  ProcessImpl_md.c
+                  RandomAccessFile_md.c
+                  TimeZone_md.c
+                  UnixFileSystem_md.c
+                  VM_md.c
+                  canonicalize_md.c
+                  childproc.c
+                  io_util_md.c
+                  java_props_md.c
+                  jdk_util_md.c
+                  jni_util_md.c
+                
+                
+                  osSupport_unix.cpp
+                
+                
+                  ergo.c
+                  ergo_i586.c
+                  java_md_common.c
+                  java_md_solinux.c
+                
+                
+                  DefaultProxySelector.c
+                  ExtendedOptionsImpl.c
+                  Inet4AddressImpl.c
+                  Inet6AddressImpl.c
+                  InetAddressImplFactory.c
+                  NetworkInterface.c
+                  PlainDatagramSocketImpl.c
+                  PlainSocketImpl.c
+                  ResolverConfigurationImpl.c
+                  SdpSupport.c
+                  SocketImpl.c
+                  SocketInputStream.c
+                  SocketOutputStream.c
+                  net_util_md.c
+                  portconfig.c
+                
+                
+                  
+                    DatagramChannelImpl.c
+                    DatagramDispatcher.c
+                    FileChannelImpl.c
+                    FileDispatcherImpl.c
+                    FileKey.c
+                    IOUtil.c
+                    InheritedChannel.c
+                    NativeThread.c
+                    Net.c
+                    PollArrayWrapper.c
+                    ServerSocketChannelImpl.c
+                    SocketChannelImpl.c
+                    SocketDispatcher.c
+                    UnixAsynchronousServerSocketChannelImpl.c
+                    UnixAsynchronousSocketChannelImpl.c
+                  
+                  
+                    GioFileTypeDetector.c
+                    UnixCopyFile.c
+                    UnixNativeDispatcher.c
+                  
+                  MappedByteBuffer.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  
+                    AWTEvent.m
+                    AWTSurfaceLayers.m
+                    AWTView.m
+                    AWTWindow.m
+                    ApplicationDelegate.m
+                    CClipboard.m
+                    CCursorManager.m
+                    CDataTransferer.m
+                    CDesktopPeer.m
+                    CDragSource.m
+                    CDragSourceContextPeer.m
+                    CDropTarget.m
+                    CDropTargetContextPeer.m
+                    CFRetainedResource.m
+                    CFileDialog.m
+                    CGraphicsConfig.m
+                    CGraphicsDevice.m
+                    CGraphicsEnv.m
+                    CImage.m
+                    CInputMethod.m
+                    CMenu.m
+                    CMenuBar.m
+                    CMenuComponent.m
+                    CMenuItem.m
+                    CPopupMenu.m
+                    CPrinterJob.m
+                    CRobot.m
+                    CRobotKeyCode.m
+                    CSystemColors.m
+                    CTextPipe.m
+                    CTrayIcon.m
+                    CWrapper.m
+                    DnDUtilities.m
+                    GeomUtilities.m
+                    ImageSurfaceData.m
+                    InitIDs.m
+                    JavaAccessibilityAction.m
+                    JavaAccessibilityUtilities.m
+                    JavaComponentAccessibility.m
+                    JavaTextAccessibility.m
+                    LWCToolkit.m
+                    OSVersion.m
+                    PrintModel.m
+                    PrinterSurfaceData.m
+                    PrinterView.m
+                    QuartzRenderer.m
+                    QuartzSurfaceData.m
+                    awt_DrawingSurface.m
+                  
+                  
+                    AWTFont.m
+                    AWTStrike.m
+                    CCharToGlyphMapper.m
+                    CGGlyphImages.m
+                    CGGlyphOutlines.m
+                    CoreTextSupport.m
+                  
+                  
+                    
+                      CGLGraphicsConfig.m
+                      CGLLayer.m
+                      CGLSurfaceData.m
+                    
+                  
+                
+                
+                  jawt.m
+                
+                
+                  PLATFORM_API_MacOSX_MidiIn.c
+                  PLATFORM_API_MacOSX_MidiOut.c
+                  PLATFORM_API_MacOSX_MidiUtils.c
+                  PLATFORM_API_MacOSX_PCM.cpp
+                  PLATFORM_API_MacOSX_Ports.cpp
+                  PLATFORM_API_MacOSX_Utils.cpp
+                
+                
+                  CFileManager.m
+                
+                
+                  AWT_debug.m
+                  NSApplicationAWT.m
+                  PropertiesUtilities.m
+                  QueuingApplicationDelegate.m
+                  ThreadUtilities.m
+                
+                
+                  AquaFileView.m
+                  AquaLookAndFeel.m
+                  AquaNativeResources.m
+                  JRSUIConstantSync.m
+                  JRSUIController.m
+                  JRSUIFocus.m
+                  ScreenMenu.m
+                
+                
+                  splashscreen_sys.m
+                
+              
+            
+            
+              
+                
+                  
+                    
+                      debug_assert.c
+                      debug_mem.c
+                      debug_trace.c
+                      debug_util.c
+                    
+                    
+                      mlib_ImageCopy_Bit.c
+                      mlib_ImageCreate.c
+                      mlib_sys.c
+                    
+                    
+                      rect.c
+                    
+                  
+                  
+                    AccelGlyphCache.c
+                  
+                  
+                    
+                      OGLBlitLoops.c
+                      OGLBufImgOps.c
+                      OGLContext.c
+                      OGLFuncs.c
+                      OGLMaskBlit.c
+                      OGLMaskFill.c
+                      OGLPaints.c
+                      OGLRenderQueue.c
+                      OGLRenderer.c
+                      OGLSurfaceData.c
+                      OGLTextRenderer.c
+                      OGLVertexCache.c
+                    
+                  
+                
+                
+                  
+                    
+                      
+                        img_colors.c
+                        img_globals.c
+                      
+                      
+                        gifdecoder.c
+                      
+                      BufImgSurfaceData.c
+                      DataBufferNative.c
+                      awt_ImageRep.c
+                      awt_parseImage.c
+                      dither.c
+                      imageInitIDs.c
+                    
+                    
+                      awt_ImagingLib.c
+                    
+                  
+                  
+                    
+                      AlphaMacros.c
+                      AlphaMath.c
+                      Any3Byte.c
+                      Any4Byte.c
+                      AnyByte.c
+                      AnyInt.c
+                      AnyShort.c
+                      Blit.c
+                      BlitBg.c
+                      ByteBinary1Bit.c
+                      ByteBinary2Bit.c
+                      ByteBinary4Bit.c
+                      ByteGray.c
+                      ByteIndexed.c
+                      DrawLine.c
+                      DrawParallelogram.c
+                      DrawPath.c
+                      DrawPolygons.c
+                      DrawRect.c
+                      FillParallelogram.c
+                      FillPath.c
+                      FillRect.c
+                      FillSpans.c
+                      FourByteAbgr.c
+                      FourByteAbgrPre.c
+                      GraphicsPrimitiveMgr.c
+                      Index12Gray.c
+                      Index8Gray.c
+                      IntArgb.c
+                      IntArgbBm.c
+                      IntArgbPre.c
+                      IntBgr.c
+                      IntRgb.c
+                      IntRgbx.c
+                      MapAccelFunc.c
+                      MaskBlit.c
+                      MaskFill.c
+                      ProcessPath.c
+                      ScaledBlit.c
+                      ThreeByteBgr.c
+                      TransformHelper.c
+                      Ushort4444Argb.c
+                      Ushort555Rgb.c
+                      Ushort555Rgbx.c
+                      Ushort565Rgb.c
+                      UshortGray.c
+                      UshortIndexed.c
+                    
+                    
+                      BufferedMaskBlit.c
+                      BufferedRenderPipe.c
+                      Region.c
+                      ShapeSpanIterator.c
+                      SpanClipRenderer.c
+                    
+                    Disposer.c
+                    SurfaceData.c
+                    Trace.c
+                  
+                
+                
+                  
+                    
+                      ucdn.c
+                    
+                    hb-blob.cc
+                    hb-buffer-serialize.cc
+                    hb-buffer.cc
+                    hb-common.cc
+                    hb-coretext.cc
+                    hb-face.cc
+                    hb-fallback-shape.cc
+                    hb-font.cc
+                    hb-ot-font.cc
+                    hb-ot-layout.cc
+                    hb-ot-map.cc
+                    hb-ot-shape-complex-arabic.cc
+                    hb-ot-shape-complex-default.cc
+                    hb-ot-shape-complex-hangul.cc
+                    hb-ot-shape-complex-hebrew.cc
+                    hb-ot-shape-complex-indic-table.cc
+                    hb-ot-shape-complex-indic.cc
+                    hb-ot-shape-complex-myanmar.cc
+                    hb-ot-shape-complex-thai.cc
+                    hb-ot-shape-complex-tibetan.cc
+                    hb-ot-shape-complex-use-table.cc
+                    hb-ot-shape-complex-use.cc
+                    hb-ot-shape-fallback.cc
+                    hb-ot-shape-normalize.cc
+                    hb-ot-shape.cc
+                    hb-ot-tag.cc
+                    hb-set.cc
+                    hb-shape-plan.cc
+                    hb-shape.cc
+                    hb-shaper.cc
+                    hb-ucdn.cc
+                    hb-unicode.cc
+                    hb-warning.cc
+                  
+                  
+                    AlternateSubstSubtables.cpp
+                    AnchorTables.cpp
+                    ArabicLayoutEngine.cpp
+                    ArabicShaping.cpp
+                    CanonData.cpp
+                    CanonShaping.cpp
+                    ClassDefinitionTables.cpp
+                    ContextualGlyphInsertionProc2.cpp
+                    ContextualGlyphSubstProc.cpp
+                    ContextualGlyphSubstProc2.cpp
+                    ContextualSubstSubtables.cpp
+                    CoverageTables.cpp
+                    CursiveAttachmentSubtables.cpp
+                    DeviceTables.cpp
+                    ExtensionSubtables.cpp
+                    Features.cpp
+                    GDEFMarkFilter.cpp
+                    GXLayoutEngine.cpp
+                    GXLayoutEngine2.cpp
+                    GlyphDefinitionTables.cpp
+                    GlyphIterator.cpp
+                    GlyphLookupTables.cpp
+                    GlyphPositionAdjustments.cpp
+                    GlyphPositioningTables.cpp
+                    GlyphPosnLookupProc.cpp
+                    GlyphSubstLookupProc.cpp
+                    GlyphSubstitutionTables.cpp
+                    HanLayoutEngine.cpp
+                    HangulLayoutEngine.cpp
+                    IndicClassTables.cpp
+                    IndicLayoutEngine.cpp
+                    IndicRearrangementProcessor.cpp
+                    IndicRearrangementProcessor2.cpp
+                    IndicReordering.cpp
+                    KernTable.cpp
+                    KhmerLayoutEngine.cpp
+                    KhmerReordering.cpp
+                    LEFontInstance.cpp
+                    LEGlyphStorage.cpp
+                    LEInsertionList.cpp
+                    LayoutEngine.cpp
+                    LigatureSubstProc.cpp
+                    LigatureSubstProc2.cpp
+                    LigatureSubstSubtables.cpp
+                    LookupProcessor.cpp
+                    LookupTables.cpp
+                    Lookups.cpp
+                    MPreFixups.cpp
+                    MarkArrays.cpp
+                    MarkToBasePosnSubtables.cpp
+                    MarkToLigaturePosnSubtables.cpp
+                    MarkToMarkPosnSubtables.cpp
+                    MirroredCharData.cpp
+                    MorphTables.cpp
+                    MorphTables2.cpp
+                    MultipleSubstSubtables.cpp
+                    NonContextualGlyphSubstProc.cpp
+                    NonContextualGlyphSubstProc2.cpp
+                    OpenTypeLayoutEngine.cpp
+                    OpenTypeUtilities.cpp
+                    PairPositioningSubtables.cpp
+                    ScriptAndLanguage.cpp
+                    ScriptAndLanguageTags.cpp
+                    SegmentArrayProcessor.cpp
+                    SegmentArrayProcessor2.cpp
+                    SegmentSingleProcessor.cpp
+                    SegmentSingleProcessor2.cpp
+                    ShapingTypeData.cpp
+                    SimpleArrayProcessor.cpp
+                    SimpleArrayProcessor2.cpp
+                    SinglePositioningSubtables.cpp
+                    SingleSubstitutionSubtables.cpp
+                    SingleTableProcessor.cpp
+                    SingleTableProcessor2.cpp
+                    StateTableProcessor.cpp
+                    StateTableProcessor2.cpp
+                    SubstitutionLookups.cpp
+                    SubtableProcessor.cpp
+                    SubtableProcessor2.cpp
+                    SunLayoutEngine.cpp
+                    ThaiLayoutEngine.cpp
+                    ThaiShaping.cpp
+                    ThaiStateTables.cpp
+                    TibetanLayoutEngine.cpp
+                    TibetanReordering.cpp
+                    TrimmedArrayProcessor.cpp
+                    TrimmedArrayProcessor2.cpp
+                    ValueRecords.cpp
+                  
+                  DrawGlyphList.c
+                  FontInstanceAdapter.cpp
+                  HBShaper.c
+                  freetypeScaler.c
+                  hb-jdk-font.cc
+                  scriptMapping.c
+                  sunFont.c
+                
+                
+                  imageioJPEG.c
+                  jcapimin.c
+                  jcapistd.c
+                  jccoefct.c
+                  jccolor.c
+                  jcdctmgr.c
+                  jchuff.c
+                  jcinit.c
+                  jcmainct.c
+                  jcmarker.c
+                  jcmaster.c
+                  jcomapi.c
+                  jcparam.c
+                  jcphuff.c
+                  jcprepct.c
+                  jcsample.c
+                  jctrans.c
+                  jdapimin.c
+                  jdapistd.c
+                  jdcoefct.c
+                  jdcolor.c
+                  jddctmgr.c
+                  jdhuff.c
+                  jdinput.c
+                  jdmainct.c
+                  jdmarker.c
+                  jdmaster.c
+                  jdmerge.c
+                  jdphuff.c
+                  jdpostct.c
+                  jdsample.c
+                  jdtrans.c
+                  jerror.c
+                  jfdctflt.c
+                  jfdctfst.c
+                  jfdctint.c
+                  jidctflt.c
+                  jidctfst.c
+                  jidctint.c
+                  jidctred.c
+                  jmemmgr.c
+                  jmemnobs.c
+                  jpegdecoder.c
+                  jquant1.c
+                  jquant2.c
+                  jutils.c
+                
+                
+                  DirectAudioDevice.c
+                  DirectAudioDeviceProvider.c
+                  MidiInDevice.c
+                  MidiInDeviceProvider.c
+                  MidiOutDevice.c
+                  MidiOutDeviceProvider.c
+                  Platform.c
+                  PlatformMidi.c
+                  PortMixer.c
+                  PortMixerProvider.c
+                  Utilities.c
+                
+                
+                  LCMS.c
+                  cmscam02.c
+                  cmscgats.c
+                  cmscnvrt.c
+                  cmserr.c
+                  cmsgamma.c
+                  cmsgmt.c
+                  cmshalf.c
+                  cmsintrp.c
+                  cmsio0.c
+                  cmsio1.c
+                  cmslut.c
+                  cmsmd5.c
+                  cmsmtrx.c
+                  cmsnamed.c
+                  cmsopt.c
+                  cmspack.c
+                  cmspcs.c
+                  cmsplugin.c
+                  cmsps2.c
+                  cmssamp.c
+                  cmssm.c
+                  cmstypes.c
+                  cmsvirt.c
+                  cmswtpnt.c
+                  cmsxform.c
+                
+                
+                  mlib_ImageAffine.c
+                  mlib_ImageAffineEdge.c
+                  mlib_ImageAffine_BC_D64.c
+                  mlib_ImageAffine_BC_F32.c
+                  mlib_ImageAffine_BC_S32.c
+                  mlib_ImageAffine_BL_D64.c
+                  mlib_ImageAffine_BL_F32.c
+                  mlib_ImageAffine_BL_S32.c
+                  mlib_ImageAffine_NN.c
+                  mlib_ImageAffine_NN_Bit.c
+                  mlib_ImageClipping.c
+                  mlib_ImageColorTrue2Index.c
+                  mlib_ImageConv2x2_f.c
+                  mlib_ImageConvClearEdge_Bit.c
+                  mlib_ImageConvClearEdge_Fp.c
+                  mlib_ImageConvCopyEdge_Bit.c
+                  mlib_ImageConvKernelConvert.c
+                  mlib_ImageConvMxN.c
+                  mlib_ImageConvMxN_Fp.c
+                  mlib_ImageConvMxN_ext.c
+                  mlib_ImageConv_16ext.c
+                  mlib_ImageConv_16nw.c
+                  mlib_ImageConv_32nw.c
+                  mlib_ImageConv_8ext.c
+                  mlib_ImageConv_8nw.c
+                  mlib_ImageConv_D64nw.c
+                  mlib_ImageConv_F32nw.c
+                  mlib_ImageConv_u16ext.c
+                  mlib_ImageConv_u16nw.c
+                  mlib_ImageDivTables.c
+                  mlib_ImageFilters.c
+                  mlib_ImageLookUp_64.c
+                  mlib_ImageLookUp_Bit.c
+                  mlib_ImageScanPoly.c
+                  mlib_ImageUtils.c
+                  mlib_c_ImageAffineIndex_BC.c
+                  mlib_c_ImageAffineIndex_BL.c
+                  mlib_c_ImageAffine_BC.c
+                  mlib_c_ImageAffine_BC_S16.c
+                  mlib_c_ImageAffine_BC_U16.c
+                  mlib_c_ImageAffine_BL.c
+                  mlib_c_ImageAffine_BL_S16.c
+                  mlib_c_ImageAffine_BL_U16.c
+                  mlib_c_ImageAffine_NN.c
+                  mlib_c_ImageConvClearEdge.c
+                  mlib_c_ImageConvCopyEdge.c
+                  mlib_c_ImageConvVersion.c
+                  mlib_c_ImageConv_f.c
+                  mlib_c_ImageCopy.c
+                  mlib_c_ImageLookUp.c
+                  mlib_c_ImageLookUp_f.c
+                  mlib_c_ImageThresh1_U8.c
+                
+                
                   
                     dgif_lib.c
                     gif_err.c
                     gifalloc.c
                   
-                  
-                    
-                      img_colors.c
-                      img_globals.c
-                    
-                    
-                      gifdecoder.c
-                    
-                    
-                      imageioJPEG.c
-                      jcapimin.c
-                      jcapistd.c
-                      jccoefct.c
-                      jccolor.c
-                      jcdctmgr.c
-                      jchuff.c
-                      jcinit.c
-                      jcmainct.c
-                      jcmarker.c
-                      jcmaster.c
-                      jcomapi.c
-                      jcparam.c
-                      jcphuff.c
-                      jcprepct.c
-                      jcsample.c
-                      jctrans.c
-                      jdapimin.c
-                      jdapistd.c
-                      jdcoefct.c
-                      jdcolor.c
-                      jddctmgr.c
-                      jdhuff.c
-                      jdinput.c
-                      jdmainct.c
-                      jdmarker.c
-                      jdmaster.c
-                      jdmerge.c
-                      jdphuff.c
-                      jdpostct.c
-                      jdsample.c
-                      jdtrans.c
-                      jerror.c
-                      jfdctflt.c
-                      jfdctfst.c
-                      jfdctint.c
-                      jidctflt.c
-                      jidctfst.c
-                      jidctint.c
-                      jidctred.c
-                      jmemmgr.c
-                      jmemnobs.c
-                      jpegdecoder.c
-                      jquant1.c
-                      jquant2.c
-                      jutils.c
-                    
-                    BufImgSurfaceData.c
-                    DataBufferNative.c
-                    awt_ImageRep.c
-                    awt_parseImage.c
-                    dither.c
-                    imageInitIDs.c
-                  
                   
                     png.c
                     pngerror.c
@@ -1257,270 +1879,148 @@
                     pngwtran.c
                     pngwutil.c
                   
-                  
-                    awt_ImagingLib.c
-                    mlib_ImageAffine.c
-                    mlib_ImageAffineEdge.c
-                    mlib_ImageAffine_BC_D64.c
-                    mlib_ImageAffine_BC_F32.c
-                    mlib_ImageAffine_BC_S32.c
-                    mlib_ImageAffine_BL_D64.c
-                    mlib_ImageAffine_BL_F32.c
-                    mlib_ImageAffine_BL_S32.c
-                    mlib_ImageAffine_NN.c
-                    mlib_ImageAffine_NN_Bit.c
-                    mlib_ImageClipping.c
-                    mlib_ImageColorTrue2Index.c
-                    mlib_ImageConv2x2_f.c
-                    mlib_ImageConvClearEdge_Bit.c
-                    mlib_ImageConvClearEdge_Fp.c
-                    mlib_ImageConvCopyEdge_Bit.c
-                    mlib_ImageConvKernelConvert.c
-                    mlib_ImageConvMxN.c
-                    mlib_ImageConvMxN_Fp.c
-                    mlib_ImageConvMxN_ext.c
-                    mlib_ImageConv_16ext.c
-                    mlib_ImageConv_16nw.c
-                    mlib_ImageConv_32nw.c
-                    mlib_ImageConv_8ext.c
-                    mlib_ImageConv_8nw.c
-                    mlib_ImageConv_D64nw.c
-                    mlib_ImageConv_F32nw.c
-                    mlib_ImageConv_u16ext.c
-                    mlib_ImageConv_u16nw.c
-                    mlib_ImageCopy_Bit.c
-                    mlib_ImageCreate.c
-                    mlib_ImageDivTables.c
-                    mlib_ImageFilters.c
-                    mlib_ImageLookUp_64.c
-                    mlib_ImageLookUp_Bit.c
-                    mlib_ImageScanPoly.c
-                    mlib_ImageUtils.c
-                    mlib_c_ImageAffineIndex_BC.c
-                    mlib_c_ImageAffineIndex_BL.c
-                    mlib_c_ImageAffine_BC.c
-                    mlib_c_ImageAffine_BC_S16.c
-                    mlib_c_ImageAffine_BC_U16.c
-                    mlib_c_ImageAffine_BL.c
-                    mlib_c_ImageAffine_BL_S16.c
-                    mlib_c_ImageAffine_BL_U16.c
-                    mlib_c_ImageAffine_NN.c
-                    mlib_c_ImageConvClearEdge.c
-                    mlib_c_ImageConvCopyEdge.c
-                    mlib_c_ImageConvVersion.c
-                    mlib_c_ImageConv_f.c
-                    mlib_c_ImageCopy.c
-                    mlib_c_ImageLookUp.c
-                    mlib_c_ImageLookUp_f.c
-                    mlib_c_ImageThresh1_U8.c
-                    mlib_sys.c
-                  
-                  
-                    java_awt_SplashScreen.c
-                    splashscreen_gfx_impl.c
-                    splashscreen_gif.c
-                    splashscreen_impl.c
-                    splashscreen_jpeg.c
-                    splashscreen_png.c
-                  
-                  
-                    rect.c
-                  
+                  java_awt_SplashScreen.c
+                  splashscreen_gfx_impl.c
+                  splashscreen_gif.c
+                  splashscreen_impl.c
+                  splashscreen_jpeg.c
+                  splashscreen_png.c
                 
-                
-                  
-                    AlternateSubstSubtables.cpp
-                    AnchorTables.cpp
-                    ArabicLayoutEngine.cpp
-                    ArabicShaping.cpp
-                    CanonData.cpp
-                    CanonShaping.cpp
-                    ClassDefinitionTables.cpp
-                    ContextualGlyphSubstProc.cpp
-                    ContextualSubstSubtables.cpp
-                    CoverageTables.cpp
-                    CursiveAttachmentSubtables.cpp
-                    DeviceTables.cpp
-                    ExtensionSubtables.cpp
-                    Features.cpp
-                    GDEFMarkFilter.cpp
-                    GXLayoutEngine.cpp
-                    GlyphDefinitionTables.cpp
-                    GlyphIterator.cpp
-                    GlyphLookupTables.cpp
-                    GlyphPositionAdjustments.cpp
-                    GlyphPositioningTables.cpp
-                    GlyphPosnLookupProc.cpp
-                    GlyphSubstLookupProc.cpp
-                    GlyphSubstitutionTables.cpp
-                    HanLayoutEngine.cpp
-                    HangulLayoutEngine.cpp
-                    IndicClassTables.cpp
-                    IndicLayoutEngine.cpp
-                    IndicRearrangementProcessor.cpp
-                    IndicReordering.cpp
-                    KernTable.cpp
-                    KhmerLayoutEngine.cpp
-                    KhmerReordering.cpp
-                    LEFontInstance.cpp
-                    LEGlyphStorage.cpp
-                    LEInsertionList.cpp
-                    LayoutEngine.cpp
-                    LigatureSubstProc.cpp
-                    LigatureSubstSubtables.cpp
-                    LookupProcessor.cpp
-                    LookupTables.cpp
-                    Lookups.cpp
-                    MPreFixups.cpp
-                    MarkArrays.cpp
-                    MarkToBasePosnSubtables.cpp
-                    MarkToLigaturePosnSubtables.cpp
-                    MarkToMarkPosnSubtables.cpp
-                    MirroredCharData.cpp
-                    MorphTables.cpp
-                    MultipleSubstSubtables.cpp
-                    NonContextualGlyphSubstProc.cpp
-                    OpenTypeLayoutEngine.cpp
-                    OpenTypeUtilities.cpp
-                    PairPositioningSubtables.cpp
-                    ScriptAndLanguage.cpp
-                    ScriptAndLanguageTags.cpp
-                    SegmentArrayProcessor.cpp
-                    SegmentSingleProcessor.cpp
-                    ShapingTypeData.cpp
-                    SimpleArrayProcessor.cpp
-                    SinglePositioningSubtables.cpp
-                    SingleSubstitutionSubtables.cpp
-                    SingleTableProcessor.cpp
-                    StateTableProcessor.cpp
-                    SubstitutionLookups.cpp
-                    SubtableProcessor.cpp
-                    SunLayoutEngine.cpp
-                    ThaiLayoutEngine.cpp
-                    ThaiShaping.cpp
-                    ThaiStateTables.cpp
-                    TibetanLayoutEngine.cpp
-                    TibetanReordering.cpp
-                    TrimmedArrayProcessor.cpp
-                    ValueRecords.cpp
+              
+            
+            
+              
+                
+                  
+                    
+                      systemScale.c
+                    
+                    CUPSfuncs.c
+                    X11Color.c
+                    awt_Font.c
+                    fontpath.c
                   
-                  AccelGlyphCache.c
-                  DrawGlyphList.c
-                  FontInstanceAdapter.cpp
-                  freetypeScaler.c
-                  sunFont.c
-                
-                
-                  
-                    
-                      LCMS.c
-                      cmscam02.c
-                      cmscgats.c
-                      cmscnvrt.c
-                      cmserr.c
-                      cmsgamma.c
-                      cmsgmt.c
-                      cmshalf.c
-                      cmsintrp.c
-                      cmsio0.c
-                      cmsio1.c
-                      cmslut.c
-                      cmsmd5.c
-                      cmsmtrx.c
-                      cmsnamed.c
-                      cmsopt.c
-                      cmspack.c
-                      cmspcs.c
-                      cmsplugin.c
-                      cmsps2.c
-                      cmssamp.c
-                      cmssm.c
-                      cmstypes.c
-                      cmsvirt.c
-                      cmswtpnt.c
-                      cmsxform.c
+                  
+                    
+                      GLXGraphicsConfig.c
+                      GLXSurfaceData.c
+                    
+                    
+                      X11FontScaler_md.c
+                      X11PMBlitLoops.c
+                      X11Renderer.c
+                      X11SurfaceData.c
+                      X11TextRenderer_md.c
                     
                   
-                  
-                    AlphaMacros.c
-                    AlphaMath.c
-                    Any3Byte.c
-                    Any4Byte.c
-                    AnyByte.c
-                    AnyInt.c
-                    AnyShort.c
-                    Blit.c
-                    BlitBg.c
-                    ByteBinary1Bit.c
-                    ByteBinary2Bit.c
-                    ByteBinary4Bit.c
-                    ByteGray.c
-                    ByteIndexed.c
-                    DrawLine.c
-                    DrawParallelogram.c
-                    DrawPath.c
-                    DrawPolygons.c
-                    DrawRect.c
-                    FillParallelogram.c
-                    FillPath.c
-                    FillRect.c
-                    FillSpans.c
-                    FourByteAbgr.c
-                    FourByteAbgrPre.c
-                    GraphicsPrimitiveMgr.c
-                    Index12Gray.c
-                    Index8Gray.c
-                    IntArgb.c
-                    IntArgbBm.c
-                    IntArgbPre.c
-                    IntBgr.c
-                    IntRgb.c
-                    IntRgbx.c
-                    MapAccelFunc.c
-                    MaskBlit.c
-                    MaskFill.c
-                    ProcessPath.c
-                    ScaledBlit.c
-                    ThreeByteBgr.c
-                    TransformHelper.c
-                    Ushort4444Argb.c
-                    Ushort555Rgb.c
-                    Ushort555Rgbx.c
-                    Ushort565Rgb.c
-                    UshortGray.c
-                    UshortIndexed.c
-                  
-                  
-                    OGLBlitLoops.c
-                    OGLBufImgOps.c
-                    OGLContext.c
-                    OGLFuncs.c
-                    OGLMaskBlit.c
-                    OGLMaskFill.c
-                    OGLPaints.c
-                    OGLRenderQueue.c
-                    OGLRenderer.c
-                    OGLSurfaceData.c
-                    OGLTextRenderer.c
-                    OGLVertexCache.c
-                  
-                  
-                    BufferedMaskBlit.c
-                    BufferedRenderPipe.c
-                    Region.c
-                    ShapeSpanIterator.c
-                    SpanClipRenderer.c
-                  
-                  Disposer.c
-                  SurfaceData.c
-                  Trace.c
                 
-                
+                
+                  
+                    awt_LoadLibrary.c
+                    awt_Mlib.c
+                    initIDs.c
+                  
+                
+                
+                  
+                    HeadlessToolkit.c
+                    VDrawingArea.c
+                  
+                
+                
+                  
+                    awt_AWTEvent.c
+                    awt_DrawingSurface.c
+                    awt_Event.c
+                    awt_GraphicsEnv.c
+                    awt_InputMethod.c
+                    awt_Insets.c
+                    awt_Robot.c
+                    awt_UNIXToolkit.c
+                    awt_util.c
+                    gtk2_interface.c
+                    gtk3_interface.c
+                    gtk_interface.c
+                    list.c
+                    multiVis.c
+                    multi_font.c
+                    robot_common.c
+                    sun_awt_X11_GtkFileDialogPeer.c
+                    swing_GTKEngine.c
+                    swing_GTKStyle.c
+                  
+                  
+                    
+                      XRBackendNative.c
+                      XRSurfaceData.c
+                    
+                  
+                  
+                    XToolkit.c
+                    XWindow.c
+                    XlibWrapper.c
+                    awt_Desktop.c
+                    awt_Taskbar.c
+                    gnome_interface.c
+                  
+                
+                
+                  X11FontScaler.c
+                  X11TextRenderer.c
+                
+                
+                  jawt.c
+                
+                
+                  PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
+                  PLATFORM_API_LinuxOS_ALSA_MidiIn.c
+                  PLATFORM_API_LinuxOS_ALSA_MidiOut.c
+                  PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
+                  PLATFORM_API_LinuxOS_ALSA_PCM.c
+                  PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
+                  PLATFORM_API_LinuxOS_ALSA_Ports.c
+                  PLATFORM_API_SolarisOS_PCM.c
+                  PLATFORM_API_SolarisOS_Ports.c
+                  PLATFORM_API_SolarisOS_Utils.c
+                
+                
+                  splashscreen_sys.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  EncodingSupport.c
+                  InstrumentationImplNativeMethods.c
+                  InvocationAdapter.c
+                  JPLISAgent.c
+                  JPLISAssert.c
+                  JarFacade.c
+                  JavaExceptions.c
+                  PathCharsValidator.c
+                  Reentrancy.c
+                  Utilities.c
+                
+              
+            
+            
+              
+                
+                  EncodingSupport_md.c
+                  FileSystemSupport_md.c
+                
+              
+            
+          
+          
+            
+              
+                
                   ClassLoadingImpl.c
-                  Flag.c
                   GarbageCollectorImpl.c
-                  GcInfoBuilder.c
-                  HotSpotDiagnostic.c
                   HotspotThread.c
                   MemoryImpl.c
                   MemoryManagerImpl.c
@@ -1529,362 +2029,351 @@
                   VMManagementImpl.c
                   management.c
                 
-                
-                  GC.c
-                  MessageUtils.c
-                  NativeSignalHandler.c
-                  Signal.c
-                  VM.c
-                  VMSupport.c
-                  Version.c
-                
-                
-                  
-                    genSocketOptionRegistry.c
-                  
-                
-                
-                  ConstantPool.c
-                  NativeAccessors.c
-                  Reflection.c
-                
-                
-                  
-                    
-                      ec.c
-                      ec2_163.c
-                      ec2_193.c
-                      ec2_233.c
-                      ec2_aff.c
-                      ec2_mont.c
-                      ec_naf.c
-                      ecdecode.c
-                      ecl.c
-                      ecl_curve.c
-                      ecl_gf.c
-                      ecl_mult.c
-                      ecp_192.c
-                      ecp_224.c
-                      ecp_256.c
-                      ecp_384.c
-                      ecp_521.c
-                      ecp_aff.c
-                      ecp_jac.c
-                      ecp_jm.c
-                      ecp_mont.c
-                      mp_gf2m.c
-                      mpi.c
-                      mplogic.c
-                      mpmontg.c
-                      oid.c
-                      secitem.c
-                    
-                    ECC_JNI.cpp
-                  
-                  
-                    
-                      GSSLibStub.c
-                      NativeUtil.c
-                    
-                  
-                  
-                    
-                      p11_convert.c
-                      p11_crypt.c
-                      p11_digest.c
-                      p11_dual.c
-                      p11_general.c
-                      p11_keymgmt.c
-                      p11_mutex.c
-                      p11_objmgmt.c
-                      p11_sessmgmt.c
-                      p11_sign.c
-                      p11_util.c
-                    
-                    j2secmod.c
-                  
-                  
-                    pcsc.c
-                  
-                
-                
-                  
-                    JVM.c
-                  
-                
               
             
-            
-              npt.c
-              utf.c
-            
-            
-              
-                socketTransport.c
+            
+              
+                
+                  FileSystemImpl.c
+                
               
             
           
-          
-            
-              exec_md.c
-              linker_md.c
-            
-            
-              ergo.c
-              ergo_i586.c
-              java_md_common.c
-              java_md_solinux.c
-              jexec.c
-            
-            
-              
-                
-                  Poller.c
-                
-              
-              
-                
-                  hprof_md.c
+          
+            
+              
+                
+                  MacOSXPreferencesFile.m
                 
               
             
-            
-              EncodingSupport_md.c
-              FileSystemSupport_md.c
-            
-            
-              
-                
-                  
-                    LinuxOperatingSystem.c
-                    SolarisOperatingSystem.c
-                    UnixOperatingSystem_md.c
-                  
-                  
-                    
-                      PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
-                      PLATFORM_API_LinuxOS_ALSA_MidiIn.c
-                      PLATFORM_API_LinuxOS_ALSA_MidiOut.c
-                      PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
-                      PLATFORM_API_LinuxOS_ALSA_PCM.c
-                      PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
-                      PLATFORM_API_LinuxOS_ALSA_Ports.c
-                      PLATFORM_API_SolarisOS_PCM.c
-                      PLATFORM_API_SolarisOS_Ports.c
-                      PLATFORM_API_SolarisOS_Utils.c
-                    
-                  
-                  
-                    
-                      
-                        Solaris.c
-                        Unix.c
-                      
-                    
-                  
-                
-              
-              
-                jdk_util_md.c
-                jni_util_md.c
-              
-              
-                
-                  Console_md.c
-                  FileDescriptor_md.c
-                  FileInputStream_md.c
-                  FileOutputStream_md.c
-                  RandomAccessFile_md.c
-                  UnixFileSystem_md.c
-                  canonicalize_md.c
-                  io_util_md.c
-                
-                
-                  ProcessEnvironment_md.c
-                  UNIXProcess_md.c
-                  java_props_md.c
-                
-                
-                  Inet4AddressImpl.c
-                  Inet6AddressImpl.c
-                  InetAddressImplFactory.c
-                  NetworkInterface.c
-                  PlainDatagramSocketImpl.c
-                  PlainSocketImpl.c
-                  SocketInputStream.c
-                  SocketOutputStream.c
-                  linux_close.c
-                  net_util_md.c
-                
-                
-                  MappedByteBuffer.c
-                
-                
+            
+              
+                
                   FileSystemPreferences.c
-                  TimeZone_md.c
-                  logging.c
-                
-              
-              
-                
-                  
-                    splashscreen_sys.c
-                  
-                  CUPSfuncs.c
-                  HeadlessToolkit.c
-                  VDrawingArea.c
-                  X11Color.c
-                  awt_AWTEvent.c
-                  awt_DrawingSurface.c
-                  awt_Event.c
-                  awt_Font.c
-                  awt_GraphicsEnv.c
-                  awt_InputMethod.c
-                  awt_Insets.c
-                  awt_LoadLibrary.c
-                  awt_Mlib.c
-                  awt_Plugin.c
-                  awt_Robot.c
-                  awt_UNIXToolkit.c
-                  awt_util.c
-                  fontpath.c
-                  gtk2_interface.c
-                  initIDs.c
-                  jawt.c
-                  list.c
-                  multiVis.c
-                  multi_font.c
-                  robot_common.c
-                  sun_awt_X11_GtkFileDialogPeer.c
-                  swing_GTKEngine.c
-                  swing_GTKStyle.c
-                
-                
-                  X11FontScaler.c
-                  X11TextRenderer.c
-                
-                
-                  
-                    GLXGraphicsConfig.c
-                    GLXSurfaceData.c
-                  
-                  
-                    X11FontScaler_md.c
-                    X11PMBlitLoops.c
-                    X11Renderer.c
-                    X11SurfaceData.c
-                    X11TextRenderer_md.c
-                    XRBackendNative.c
-                    XRSurfaceData.c
-                  
-                
-                
-                  FileSystemImpl.c
-                
-                
-                  
-                    ResolverConfigurationImpl.c
-                  
-                  
-                    SdpSupport.c
-                  
-                  
-                    DefaultProxySelector.c
-                  
-                
-                
-                  
-                    
-                      SctpChannelImpl.c
-                      SctpNet.c
-                      SctpServerChannelImpl.c
-                    
-                    DatagramChannelImpl.c
-                    DatagramDispatcher.c
-                    DevPollArrayWrapper.c
-                    EPoll.c
-                    EPollArrayWrapper.c
-                    EPollPort.c
-                    FileChannelImpl.c
-                    FileDispatcherImpl.c
-                    FileKey.c
-                    IOUtil.c
-                    InheritedChannel.c
-                    NativeThread.c
-                    Net.c
-                    PollArrayWrapper.c
-                    ServerSocketChannelImpl.c
-                    SocketChannelImpl.c
-                    SocketDispatcher.c
-                    SolarisEventPort.c
-                    UnixAsynchronousServerSocketChannelImpl.c
-                    UnixAsynchronousSocketChannelImpl.c
-                  
-                  
-                    GnomeFileTypeDetector.c
-                    LinuxNativeDispatcher.c
-                    LinuxWatchService.c
-                    MagicFileTypeDetector.c
-                    SolarisNativeDispatcher.c
-                    SolarisWatchService.c
-                    UnixCopyFile.c
-                    UnixNativeDispatcher.c
-                    genSolarisConstants.c
-                    genUnixConstants.c
-                  
-                
-                
-                  
-                    
-                      NativeFunc.c
-                    
-                  
-                  
-                    
-                      p11_md.c
-                    
-                    j2secmod_md.c
-                  
-                  
-                    pcsc_md.c
-                  
-                
-                
-                  
-                    LinuxVirtualMachine.c
-                    SolarisVirtualMachine.c
-                  
-                
-                
-                  
-                    jvm_symbols_md.c
-                  
-                
-                
-                  
-                    
-                      HostLocaleProviderAdapter_md.c
-                    
-                  
-                
-                
-                  XToolkit.c
-                  XWindow.c
-                  XlibWrapper.c
-                  awt_Desktop.c
-                  gnome_interface.c
                 
               
             
-            
-              utf_md.c
-            
-            
-              
-                socket_md.c
+          
+          
+            
+              
+                
+                  GC.c
+                
               
             
           
+          
+            
+              
+                
+                  SCDynamicStoreConfig.m
+                  nativeccache.c
+                
+              
+            
+            
+              
+                
+                  GSSLibStub.c
+                  NativeUtil.c
+                
+              
+            
+            
+              
+                
+                  NativeFunc.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  pcsc.c
+                
+              
+            
+            
+              
+                
+                  pcsc_md.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  VirtualMachineImpl.c
+                
+              
+            
+            
+              
+                
+                  VirtualMachineImpl.c
+                
+              
+            
+            
+              
+                
+                  VirtualMachineImpl.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  
+                    ec.c
+                    ec2_163.c
+                    ec2_193.c
+                    ec2_233.c
+                    ec2_aff.c
+                    ec2_mont.c
+                    ec_naf.c
+                    ecdecode.c
+                    ecl.c
+                    ecl_curve.c
+                    ecl_gf.c
+                    ecl_mult.c
+                    ecp_192.c
+                    ecp_224.c
+                    ecp_256.c
+                    ecp_384.c
+                    ecp_521.c
+                    ecp_aff.c
+                    ecp_jac.c
+                    ecp_jm.c
+                    ecp_mont.c
+                    mp_gf2m.c
+                    mpi.c
+                    mplogic.c
+                    mpmontg.c
+                    oid.c
+                    secitem.c
+                  
+                  ECC_JNI.cpp
+                
+              
+            
+          
+          
+            
+              
+                
+                  j2secmod.c
+                  p11_convert.c
+                  p11_crypt.c
+                  p11_digest.c
+                  p11_dual.c
+                  p11_general.c
+                  p11_keymgmt.c
+                  p11_mutex.c
+                  p11_objmgmt.c
+                  p11_sessmgmt.c
+                  p11_sign.c
+                  p11_util.c
+                
+              
+            
+            
+              
+                
+                  j2secmod_md.c
+                  p11_md.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  nativeCrypto.c
+                  nativeCryptoMD.c
+                  nativeFunc.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  socketTransport.c
+                
+                
+                  ArrayReferenceImpl.c
+                  ArrayTypeImpl.c
+                  ClassLoaderReferenceImpl.c
+                  ClassObjectReferenceImpl.c
+                  ClassTypeImpl.c
+                  EventRequestImpl.c
+                  FieldImpl.c
+                  FrameID.c
+                  InterfaceTypeImpl.c
+                  MethodImpl.c
+                  ModuleReferenceImpl.c
+                  ObjectReferenceImpl.c
+                  ReferenceTypeImpl.c
+                  SDE.c
+                  StackFrameImpl.c
+                  StringReferenceImpl.c
+                  ThreadGroupReferenceImpl.c
+                  ThreadReferenceImpl.c
+                  VirtualMachineImpl.c
+                  bag.c
+                  classTrack.c
+                  commonRef.c
+                  debugDispatch.c
+                  debugInit.c
+                  debugLoop.c
+                  error_messages.c
+                  eventFilter.c
+                  eventHandler.c
+                  eventHelper.c
+                  inStream.c
+                  invoker.c
+                  log_messages.c
+                  outStream.c
+                  standardHandlers.c
+                  stepControl.c
+                  stream.c
+                  threadControl.c
+                  transport.c
+                  utf_util.c
+                  util.c
+                
+              
+            
+            
+              
+                
+                  socket_md.c
+                
+                
+                  exec_md.c
+                  linker_md.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  UnixOperatingSystem.c
+                
+              
+            
+            
+              
+                
+                  UnixOperatingSystem.c
+                
+              
+            
+            
+              
+                
+                  DiagnosticCommandImpl.c
+                  Flag.c
+                  GarbageCollectorExtImpl.c
+                  GcInfoBuilder.c
+                  HotSpotDiagnostic.c
+                  management_ext.c
+                
+              
+            
+            
+              
+                
+                  UnixOperatingSystem.c
+                
+              
+            
+            
+              
+                
+                  OperatingSystemImpl.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  SolarisSocketOptions.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  bands.cpp
+                  bytes.cpp
+                  coding.cpp
+                  unpack.cpp
+                  utils.cpp
+                  zip.cpp
+                
+                
+                  jni.cpp
+                
+                
+                  main.cpp
+                
+              
+            
+          
+          
+            
+              
+                
+                  SctpChannelImpl.c
+                  SctpNet.c
+                  SctpServerChannelImpl.c
+                
+              
+            
+          
+          
+            
+              
+                
+                  Solaris.c
+                
+              
+            
+            
+              
+                
+                  Unix.c
+                
+              
+            
+          
+        
+      
+      
+        
+          
+            
+              gtest-all.cc
+            
+          
         
       
     
@@ -1895,7 +2384,7 @@
       ../../Makefile
     
   
-  ^(nbproject)$
+  ^(nbproject|build)$
   
     ../..
   
@@ -1903,13 +2392,19 @@
   
     
       
-        LOCAL_SOURCES
         default
+        false
+        false
       
+      
+        
+        
+        
+        
+        
+        
+      
       
-        
-          IDE_ALT_BOOTDIR
-        
         
           HOTSPOT_BUILD_TARGET="target"
           HOTSPOT_BUILD_USER="user"
@@ -1919,2283 +2414,15710 @@
       
         
           ../..
-          ${MAKE} -f Makefile LOG=debug images
+          ${MAKE} -f Makefile images
           ${MAKE} -f Makefile clean
           
-          
-            
-              ../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/product
-              ../../hotspot/src/share/vm/prims
-              ../../hotspot/src/share/vm
-              ../../hotspot/src/share/vm/precompiled
-              ../../hotspot/src/cpu/x86/vm
-              ../../hotspot/src/os_cpu/bsd_x86/vm
-              ../../hotspot/src/os/bsd/vm
-              ../../hotspot/src/os/posix/vm
-              ../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated
-            
+          
             
-              AMD64
-              COMPILER1
-              COMPILER2
-              DTRACE_ENABLED
-              HOTSPOT_BUILD_TARGET="target"
-              HOTSPOT_BUILD_USER="user"
-              HOTSPOT_LIB_ARCH="amd64"
-              HOTSPOT_RELEASE_VERSION="version"
-              HOTSPOT_VM_DISTRO="OpenJDK"
-              INCLUDE_TRACE
-              MAC_OS_X_VERSION_MAX_ALLOWED=1070
-              PRODUCT
-              TARGET_ARCH_MODEL_x86_64
-              TARGET_ARCH_x86
-              TARGET_COMPILER_gcc
-              TARGET_OS_ARCH_MODEL_bsd_x86_64
-              TARGET_OS_ARCH_bsd_x86
-              TARGET_OS_FAMILY_bsd
-              VM_LITTLE_ENDIAN
-              _ALLBSD_SOURCE
-              _DARWIN_C_SOURCE
-              _GNU_SOURCE
-              _LP64=1
-              _XOPEN_SOURCE
+              THIS_FILE="MacosxDebuggerLocal.m"
             
-            
-              __EXCEPTIONS
-              __GXX_RTTI
-            
-          
+          
         
+        
+          ../..
+          sh ../configure --with-debug-level=slowdebug --disable-zip-debug-info
+        
       
-      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ad_x86_64_clone.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ad_x86_64_expand.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ad_x86_64_format.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ad_x86_64_gen.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ad_x86_64_misc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ad_x86_64_peephole.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ad_x86_64_pipeline.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="dfa_x86_64.cpp"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="jvmtiEnter.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jvmtiEnterTrace.cpp"
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
-      
+        
+          
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
-      
-      
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/makefiles
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_gcc
+            TARGET_OS_ARCH_MODEL_bsd_x86_64
+            TARGET_OS_ARCH_bsd_x86
+            TARGET_OS_FAMILY_bsd
+            THIS_FILE="macroAssembler_libm_x86_64.cpp"
+            VM_LITTLE_ENDIAN
+            _ALLBSD_SOURCE
+            _DARWIN_C_SOURCE
+            _GNU_SOURCE
+            _LP64=1
+            _NMT_NOINLINE_
+            _XOPEN_SOURCE
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="libproc_impl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ps_core.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="symtab.c"
+          
+        
+      
+      
+        
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os/bsd/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+      
+        
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os/bsd/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os/bsd/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os/bsd/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os/bsd/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os/bsd/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
-      
-      
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os/bsd/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os/posix/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+            tool="1"
+            flavor2="4">
       
-      
+            tool="1"
+            flavor2="4">
+        
+          
+            THIS_FILE="archDesc.cpp"
+          
+        
       
-      
+            tool="1"
+            flavor2="4">
+        
+          
+            THIS_FILE="arena.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="dfa.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="dict2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="filebuff.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="forms.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="formsopt.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="formssel.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="main.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="output_c.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="output_h.cpp"
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/asm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/c1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/c1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/c1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/c1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/c1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/c1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/c1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/ci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/services
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/logging
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/classfile
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/code
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/ci
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/code
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/code
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/code
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/asm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/interpreter
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/compiler
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/compiler
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/compiler
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/cms
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/cms
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/cms
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/cms
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/cms
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/cms
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/cms
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/cms
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/g1
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/makefiles
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_gcc
+            TARGET_OS_ARCH_MODEL_bsd_x86_64
+            TARGET_OS_ARCH_bsd_x86
+            TARGET_OS_FAMILY_bsd
+            THIS_FILE="youngList.cpp"
+            VM_LITTLE_ENDIAN
+            _ALLBSD_SOURCE
+            _DARWIN_C_SOURCE
+            _GNU_SOURCE
+            _LP64=1
+            _NMT_NOINLINE_
+            _XOPEN_SOURCE
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/parallel
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/serial
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/serial
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/serial
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/gc/shared
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/interpreter
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/interpreter
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/interpreter
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/interpreter
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/interpreter
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/interpreter
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/interpreter
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/jvmci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/jvmci
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/asm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/libadt
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/logging
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/oops
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/make
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/make
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/opto
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/logging
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/services
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/cpu/x86/vm
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+            flavor2="4">
+        
+          
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/makefiles
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_gcc
+            TARGET_OS_ARCH_MODEL_bsd_x86_64
+            TARGET_OS_ARCH_bsd_x86
+            TARGET_OS_FAMILY_bsd
+            THIS_FILE="atomic.cpp"
+            VM_LITTLE_ENDIAN
+            _ALLBSD_SOURCE
+            _DARWIN_C_SOURCE
+            _GNU_SOURCE
+            _LP64=1
+            _NMT_NOINLINE_
+            _XOPEN_SOURCE
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../hotspot/src/share/vm/utilities
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/jvmci
+            ../../hotspot/src/share/vm/c1
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/asm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/services
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm/opto
+            ../../hotspot/src/share/vm/libadt
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/runtime
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
         
-          
-          
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
         
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/g1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
-      
-      
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
-      
-      
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/gc/serial
+            ../../hotspot/src/share/vm/gc/cms
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+            flavor2="4">
+        
+          
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/makefiles
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_gcc
+            TARGET_OS_ARCH_MODEL_bsd_x86_64
+            TARGET_OS_ARCH_bsd_x86
+            TARGET_OS_FAMILY_bsd
+            THIS_FILE="array.cpp"
+            VM_LITTLE_ENDIAN
+            _ALLBSD_SOURCE
+            _DARWIN_C_SOURCE
+            _GNU_SOURCE
+            _LP64=1
+            _NMT_NOINLINE_
+            _XOPEN_SOURCE
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
-      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/make
+          
+        
       
       
-      
-      
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm/compiler
+            ../../hotspot/src/share/vm/ci
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
       
+        
+          
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/share/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+        
       
-      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+            flavor2="4">
       
-      
-        
+      
+      
+      
+      
+      
+      
+      
+        
           
-            /usr/X11/include
-            ../../build/macosx-x86_64-normal-server-release/jdk/include
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/image/cvutils
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
           
         
-      
-      
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            ARCH="x86_64"
+            ARCHPROPNAME="x86_64"
+            DEBUG
+            MACOSX
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            THIS_FILE="java_props_macosx.c"
+            _ALLBSD_SOURCE
+            _DARWIN_UNLIMITED_SELECT
+            _LITTLE_ENDIAN
+            _LP64=1
+            x86_64
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/macosx/native/libnio/ch
+            ../../make
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/share/native/libjimage
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjimage
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjimage
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjimage
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjimage
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjli
+            ../../jdk/src/java.base/share/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjli
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjli
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/share/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjli
+            ../../jdk/src/java.base/share/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libnet
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libverify
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/share/native/libverify
+            ../../make
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            ARCH="x86_64"
+            ARCHPROPNAME="x86_64"
+            DEBUG
+            MACOSX
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            THIS_FILE="java_props_md.c"
+            _ALLBSD_SOURCE
+            _DARWIN_UNLIMITED_SELECT
+            _LITTLE_ENDIAN
+            _LP64=1
+            x86_64
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+        
+      
+      
+      
+      
+        
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/macosx/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            ARCH="x86_64"
+            DEBUG
+            MACOSX
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            THIS_FILE="ExtendedOptionsImpl.c"
+            _ALLBSD_SOURCE
+            _DARWIN_UNLIMITED_SELECT
+            _LITTLE_ENDIAN
+            _LP64=1
+            x86_64
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnio
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libnio
+            ../../jdk/src/java.base/share/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio
+            ../../jdk/src/java.base/macosx/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/libnio/fs
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio/fs
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/macosx/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            ARCH="x86_64"
+            DEBUG
+            MACOSX
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            THIS_FILE="SocketDispatcher.c"
+            _ALLBSD_SOURCE
+            _DARWIN_UNLIMITED_SELECT
+            _LITTLE_ENDIAN
+            _LP64=1
+            x86_64
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/libnio/fs
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libnio/fs
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="AWTSurfaceLayers.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AWTView.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AWTWindow.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ApplicationDelegate.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CClipboard.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CCursorManager.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CDataTransferer.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CDesktopPeer.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CDragSource.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CDragSourceContextPeer.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CDropTarget.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CDropTargetContextPeer.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CFRetainedResource.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CFileDialog.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CGraphicsConfig.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CGraphicsDevice.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CGraphicsEnv.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CImage.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CInputMethod.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CMenu.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CMenuBar.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CMenuComponent.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CMenuItem.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CPopupMenu.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CPrinterJob.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CRobot.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CRobotKeyCode.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CSystemColors.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CTextPipe.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CTrayIcon.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CWrapper.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DnDUtilities.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GeomUtilities.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ImageSurfaceData.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InitIDs.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JavaAccessibilityAction.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JavaAccessibilityUtilities.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JavaComponentAccessibility.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JavaTextAccessibility.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LWCToolkit.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OSVersion.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PrintModel.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PrinterSurfaceData.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PrinterView.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="QuartzRenderer.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="QuartzSurfaceData.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_DrawingSurface.m"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="AWTStrike.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CCharToGlyphMapper.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CGGlyphImages.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CGGlyphOutlines.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CoreTextSupport.m"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="CGLLayer.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CGLSurfaceData.m"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_MacOSX_MidiOut.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_MacOSX_MidiUtils.c"
+          
+        
+      
+      
+      
+      
         
           
-            LINUX
-            TARGET_OS_ARCH_MODEL_linux_x86_64
-            TARGET_OS_ARCH_linux_x86
-            TARGET_OS_FAMILY_linux
-            _REENTRANT
+            THIS_FILE="PLATFORM_API_MacOSX_Ports.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_MacOSX_Utils.cpp"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="NSApplicationAWT.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PropertiesUtilities.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="QueuingApplicationDelegate.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreadUtilities.m"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="AquaLookAndFeel.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AquaNativeResources.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JRSUIConstantSync.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JRSUIController.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JRSUIFocus.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScreenMenu.m"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="debug_mem.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debug_trace.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debug_util.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageCreate.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_sys.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="OGLBufImgOps.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLContext.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLFuncs.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLMaskBlit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLMaskFill.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLPaints.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLRenderQueue.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLRenderer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLSurfaceData.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLTextRenderer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLVertexCache.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="BufImgSurfaceData.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DataBufferNative.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_ImageRep.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_parseImage.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="dither.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="imageInitIDs.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="Disposer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SurfaceData.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Trace.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="AlphaMath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Any3Byte.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Any4Byte.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AnyByte.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AnyInt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AnyShort.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Blit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="BlitBg.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteBinary1Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteBinary2Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteBinary4Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteGray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteIndexed.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawLine.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawParallelogram.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawPath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawPolygons.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawRect.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillParallelogram.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillPath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillRect.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillSpans.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FourByteAbgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FourByteAbgrPre.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GraphicsPrimitiveMgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Index12Gray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Index8Gray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntArgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntArgbBm.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntArgbPre.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntBgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntRgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntRgbx.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MapAccelFunc.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MaskBlit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MaskFill.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ProcessPath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScaledBlit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreeByteBgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TransformHelper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort4444Argb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort555Rgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort555Rgbx.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort565Rgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UshortGray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UshortIndexed.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="BufferedRenderPipe.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Region.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ShapeSpanIterator.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SpanClipRenderer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawGlyphList.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FontInstanceAdapter.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HBShaper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="freetypeScaler.c"
+          
+        
+      
+      
+      
+      
+        
+          
+            THIS_FILE="hb-buffer-serialize.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-buffer.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-common.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-coretext.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-face.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-fallback-shape.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-font.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-font.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-layout.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-map.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-arabic.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-default.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-hangul.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-hebrew.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-indic-table.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-indic.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-myanmar.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-thai.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-tibetan.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-use-table.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-use.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-fallback.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-normalize.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-tag.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-set.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-shape-plan.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-shape.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-shaper.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ucdn.cc"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="hb-unicode.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-warning.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-jdk-font.cc"
+          
+        
+      
+      
+      
+      
+        
+          
+            THIS_FILE="AnchorTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ArabicLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ArabicShaping.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CanonData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CanonShaping.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassDefinitionTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualGlyphInsertionProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualGlyphSubstProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualGlyphSubstProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CoverageTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CursiveAttachmentSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DeviceTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ExtensionSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Features.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GDEFMarkFilter.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GXLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GXLayoutEngine2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphDefinitionTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphIterator.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphLookupTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphPositionAdjustments.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphPositioningTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphPosnLookupProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphSubstLookupProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphSubstitutionTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HanLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HangulLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicClassTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicRearrangementProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicRearrangementProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicReordering.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KernTable.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KhmerLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KhmerReordering.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LEFontInstance.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LEGlyphStorage.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LEInsertionList.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LigatureSubstProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LigatureSubstProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LigatureSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LookupProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LookupTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Lookups.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MPreFixups.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkArrays.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkToBasePosnSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkToLigaturePosnSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkToMarkPosnSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MirroredCharData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MorphTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MorphTables2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MultipleSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NonContextualGlyphSubstProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NonContextualGlyphSubstProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OpenTypeLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OpenTypeUtilities.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PairPositioningSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScriptAndLanguage.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScriptAndLanguageTags.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentArrayProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentArrayProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentSingleProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentSingleProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ShapingTypeData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SimpleArrayProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SimpleArrayProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SinglePositioningSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SingleSubstitutionSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SingleTableProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SingleTableProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StateTableProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StateTableProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SubstitutionLookups.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SubtableProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SubtableProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SunLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThaiLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThaiShaping.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThaiStateTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TibetanLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TibetanReordering.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TrimmedArrayProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TrimmedArrayProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ValueRecords.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="scriptMapping.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="sunFont.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcapimin.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcapistd.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jccoefct.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jccolor.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcdctmgr.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jchuff.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcinit.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcmainct.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcmarker.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcmaster.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcomapi.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcparam.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcphuff.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcprepct.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcsample.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jctrans.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdapimin.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdapistd.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdcoefct.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdcolor.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jddctmgr.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdhuff.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdinput.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdmainct.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdmarker.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdmaster.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdmerge.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdphuff.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdpostct.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdsample.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdtrans.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jerror.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jfdctflt.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jfdctfst.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jfdctint.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jidctflt.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jidctfst.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jidctint.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jidctred.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jmemmgr.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jmemnobs.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../make
+          
+          
+            THIS_FILE="jpegdecoder.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jquant1.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jquant2.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jutils.c"
+            WITH_MACOSX
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="DirectAudioDeviceProvider.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MidiInDevice.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MidiInDeviceProvider.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MidiOutDevice.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MidiOutDeviceProvider.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Platform.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PlatformMidi.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PortMixer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PortMixerProvider.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Utilities.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="cmscam02.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmscgats.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmscnvrt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmserr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsgamma.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsgmt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmshalf.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsintrp.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsio0.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsio1.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmslut.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsmd5.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsmtrx.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsnamed.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsopt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmspack.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmspcs.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsplugin.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsps2.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmssamp.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmssm.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmstypes.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsvirt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmswtpnt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cmsxform.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageAffineEdge.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageAffine_BC_D64.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageAffine_BC_F32.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageAffine_BC_S32.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageAffine_BL_D64.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageAffine_BL_F32.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageAffine_BL_S32.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageAffine_NN.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageAffine_NN_Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageClipping.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageColorTrue2Index.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv2x2_f.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConvClearEdge_Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConvClearEdge_Fp.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConvCopyEdge_Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConvKernelConvert.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConvMxN.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConvMxN_Fp.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConvMxN_ext.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv_16ext.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv_16nw.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv_32nw.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv_8ext.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv_8nw.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv_D64nw.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv_F32nw.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv_u16ext.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageConv_u16nw.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageDivTables.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageFilters.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageLookUp_64.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageLookUp_Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageScanPoly.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageUtils.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageAffineIndex_BC.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageAffineIndex_BL.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageAffine_BC.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageAffine_BC_S16.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageAffine_BC_U16.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageAffine_BL.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageAffine_BL_S16.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageAffine_BL_U16.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageAffine_NN.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageConvClearEdge.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageConvCopyEdge.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageConvVersion.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageConv_f.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageCopy.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageLookUp.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageLookUp_f.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_c_ImageThresh1_U8.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="gif_err.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gifalloc.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="java_awt_SplashScreen.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="pngerror.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngget.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngmem.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngpread.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngread.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngrio.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngrtran.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngrutil.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngset.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngtrans.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngwio.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngwrite.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngwtran.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pngwutil.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="splashscreen_gfx_impl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="splashscreen_gif.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="splashscreen_impl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="splashscreen_jpeg.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="splashscreen_png.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/macosx/native/include
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/font
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+          
+            THIS_FILE="CUPSfuncs.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="awt_Mlib.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            ../../build/support/headers/java.security.jgss
+            ../../make
+          
+        
+      
+      
+        
+          
+            /System/Library/Frameworks/Kerberos.framework/Headers
+            ../../make
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="p11_dual.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ArrayTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassLoaderReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassObjectReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="EventRequestImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FieldImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FrameID.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InterfaceTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MethodImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ModuleReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ObjectReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ReferenceTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SDE.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StackFrameImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StringReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreadGroupReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreadReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VirtualMachineImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="bag.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="classTrack.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="commonRef.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debugDispatch.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debugInit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debugLoop.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="error_messages.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="eventFilter.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="eventHandler.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="eventHelper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="inStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="invoker.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="log_messages.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="outStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="standardHandlers.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="stepControl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="stream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="threadControl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="transport.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="utf_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="util.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="linker_md.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="Flag.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GarbageCollectorExtImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GcInfoBuilder.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HotSpotDiagnostic.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="management_ext.c"
+          
+        
+      
+      
+        
+        
+      
+      
+      
+      
+        
+          
+            THIS_FILE="bytes.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="coding.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="unpack.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="utils.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="zip.cpp"
+          
+        
+      
+      
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/makefiles
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_gcc
+            TARGET_OS_ARCH_MODEL_bsd_x86_64
+            TARGET_OS_ARCH_bsd_x86
+            TARGET_OS_FAMILY_bsd
+            VM_LITTLE_ENDIAN
+            _ALLBSD_SOURCE
+            _DARWIN_C_SOURCE
+            _GNU_SOURCE
+            _LP64=1
+            _NMT_NOINLINE_
+            _XOPEN_SOURCE
           
         
       
-      
+      
+        
+          
+            THIS_FILE="ad_x86_64.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="bytecodeInterpreterWithChecks.cpp"
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+          
+        
+      
+      
         
           
             ../../hotspot/src/os/posix/launcher
@@ -4847,45 +30169,139 @@
             ../../hotspot/src/os/posix/vm
             ../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated
           
+        
+        
+          
+            ../../hotspot/src/share/vm
+          
           
             AMD64
-            ARCH="amd64"
-            GAMMA
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
+            ASSERT
+            THIS_FILE="abstractInterpreter_x86.cpp"
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/makefiles
+          
+          
+            COMPILER1
+            COMPILER2
+            DTRACE_ENABLED
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            LAUNCHER_TYPE="gamma"
-            LINK_INTO_LIBJVM
-            PRODUCT
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
             TARGET_ARCH_MODEL_x86_64
             TARGET_ARCH_x86
             TARGET_COMPILER_gcc
             TARGET_OS_ARCH_MODEL_bsd_x86_64
             TARGET_OS_ARCH_bsd_x86
             TARGET_OS_FAMILY_bsd
+            VM_LITTLE_ENDIAN
             _ALLBSD_SOURCE
+            _DARWIN_C_SOURCE
             _GNU_SOURCE
+            _LP64=1
+            _NMT_NOINLINE_
+            _XOPEN_SOURCE
           
-        
+        
       
-      
+      
         
           
-            ../../hotspot/agent/src/os/linux
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
-            ${IDE_ALT_BOOTDIR}include
-            ${IDE_ALT_BOOTDIR}include/linux
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../hotspot/src/jdk.hotspot.agent/share/native/libsaproc
+            ../../hotspot/src/jdk.hotspot.agent/macosx/native/libsaproc
+            ../../build/support/headers/jdk.hotspot.agent
+            ../../hotspot/src/os/macosx
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
           
           
-            _FILE_OFFSET_BITS=64
+            ARCH="x86_64"
+            DEBUG
+            MACOSX
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            _ALLBSD_SOURCE
+            _DARWIN_UNLIMITED_SELECT
+            _GNU_SOURCE
+            _LITTLE_ENDIAN
+            _LP64=1
             amd64
+            x86_64
           
         
       
-      
+      
+        
+          
+            THIS_FILE="sadis.c"
+          
+        
+      
+      
+        
+          
+            ../../hotspot/make
+          
+          
+            THIS_FILE="jsig.c"
+          
+        
+        
+          
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/makefiles
+          
+          
+            COMPILER1
+            COMPILER2
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_gcc
+            TARGET_OS_ARCH_MODEL_bsd_x86_64
+            TARGET_OS_ARCH_bsd_x86
+            TARGET_OS_FAMILY_bsd
+            THIS_FILE="attachListener_bsd.cpp"
+            VM_LITTLE_ENDIAN
+            _ALLBSD_SOURCE
+            _DARWIN_C_SOURCE
+            _GNU_SOURCE
+            _LP64=1
+            _NMT_NOINLINE_
+            _XOPEN_SOURCE
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+          
+        
+      
+      
         
           
             ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
@@ -4907,7 +30323,42 @@
           
         
       
-      
+      
+        
+          
+            THIS_FILE="os_posix.cpp"
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm/memory
+          
+          
+            COMPILER1
+            COMPILER2
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_gcc
+            TARGET_OS_ARCH_MODEL_bsd_x86_64
+            TARGET_OS_ARCH_bsd_x86
+            TARGET_OS_FAMILY_bsd
+            THIS_FILE="assembler_bsd_x86.cpp"
+            VM_LITTLE_ENDIAN
+            _ALLBSD_SOURCE
+            _DARWIN_C_SOURCE
+            _GNU_SOURCE
+            _LP64=1
+            _NMT_NOINLINE_
+            _XOPEN_SOURCE
+          
+        
+      
+      
         
           
             HOTSPOT_BUILD_TARGET="target"
@@ -4921,662 +30372,651 @@
           
         
       
-      
+      
         
-          
-            ../../hotspot/src/os_cpu/linux_x86/vm
-            ../../hotspot/src/os/linux/vm
-            ../../hotspot/src/share/vm/adlc
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
-          
           
-            ASSERT
-            LINUX
-            TARGET_OS_ARCH_MODEL_linux_x86_64
-            TARGET_OS_ARCH_linux_x86
-            TARGET_OS_FAMILY_linux
-            _REENTRANT
+            THIS_FILE="adlparse.cpp"
           
         
       
-      
-        
-          
-            THIS_FILE="ArrayReferenceImpl.c"
-          
-        
+      
         
+          
+            ../../hotspot/makefiles
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/bsd/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/makefiles
+          
           
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="Agent.cpp"
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _REENTRANT
-            amd64
+            COMPILER1
+            COMPILER2
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_gcc
+            TARGET_OS_ARCH_MODEL_bsd_x86_64
+            TARGET_OS_ARCH_bsd_x86
+            TARGET_OS_FAMILY_bsd
+            THIS_FILE="adaptiveFreeList.cpp"
+            VM_LITTLE_ENDIAN
+            _ALLBSD_SOURCE
+            _DARWIN_C_SOURCE
+            _GNU_SOURCE
+            _LP64=1
+            _NMT_NOINLINE_
+            _XOPEN_SOURCE
           
         
       
-      
-        
+      
+        
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/export
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/back
-            ../../jdk/src/solaris/back
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
-            ../../jdk/make
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/prims/wbtestmethods
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm/runtime
+            ../../hotspot/src/share/vm/oops
+            ../../hotspot/src/share/vm/gc/parallel
+            ../../hotspot/src/share/vm/gc/shared
+            ../../hotspot/src/share/vm/classfile
+            ../../hotspot/src/share/vm/trace
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles
+            ../../hotspot/src/os/bsd/vm
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles
+            ../../hotspot/src/share/vm/code
+            ../../hotspot/src/share/vm/asm
+            ../../hotspot/src/share/vm/interpreter
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/os_cpu/bsd_x86/vm
+            ../../hotspot/src/share/vm/services
+            ../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc
+            ../../hotspot/make
           
-          
-            ARCH="amd64"
-            JDWP_LOGGING
-            LINUX
-            NDEBUG
-            RELEASE=""
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
+        
       
-      
-        
+      
+        
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
+            ../../hotspot/src/share/vm/memory
+            ../../hotspot/src/share/vm/logging
+            ../../hotspot/src/share/vm/utilities
+            ../../hotspot/src/share/vm/trace
+            /usr/include/c++/4.2.1
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
           
-          
-            ARCH="amd64"
-            LIBARCHNAME="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="java.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
+        
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-          
           
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
+            ARCH="x86_64"
+            MACOSX
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
             THIS_FILE="agent_util.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
+            _ALLBSD_SOURCE
+            _DARWIN_UNLIMITED_SELECT
             _LITTLE_ENDIAN
             _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../jdk/src/share/demo/jvmti/waiters
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/heapTracker
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/compiledMethodLoad
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/make
-          
-          
-            THIS_FILE="compiledMethodLoad.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/gctest
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/make
-          
-          
-            THIS_FILE="gctest.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/heapTracker
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-          
-            THIS_FILE="heapTracker.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/heapViewer
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/make
-          
-          
-            THIS_FILE="heapViewer.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/demo/jvmti/hprof
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-          
-            THIS_FILE="debug_malloc.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/hprof
-            ../../jdk/src/solaris/demo/jvmti/hprof
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/make
-          
-          
-            THIS_FILE="java_crw_demo.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/minst
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-          
-            THIS_FILE="minst.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/mtrace
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-          
-            THIS_FILE="mtrace.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/versionCheck
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/make
-          
-          
-            THIS_FILE="versionCheck.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/instrument
-            ../../jdk/src/solaris/instrument
-            ../../jdk/src/share/bin
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            NO_JPLIS_LOGGING
-            RELEASE=""
-            THIS_FILE="EncodingSupport.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DirectAudioDevice.c"
+            x86_64
           
         
         
           
-            THIS_FILE="bands.cpp"
+            ARCH="x86_64"
+            MACOSX
+            MAC_OS_X_VERSION_MAX_ALLOWED=1070
+            THIS_FILE="Agent.cpp"
+            _ALLBSD_SOURCE
+            _DARWIN_UNLIMITED_SELECT
+            _LITTLE_ENDIAN
+            _LP64=1
+            x86_64
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/com/sun/media/sound
-            ../../jdk/src/solaris/native/com/sun/media/sound
-            ../../jdk/make
+            ../../jdk/make/src/native/genconstants/ch
+            ../../jdk/make/gensrc
           
+        
+      
+      
+        
+          
+            ../../jdk/make/src/native/genconstants/fs
+            ../../jdk/make/gensrc
+          
+        
+      
+      
+        
           
-            ARCH="amd64"
-            EXTRA_SOUND_JNI_LIBS=" jsoundalsa"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            X_ARCH=X_AMD64
-            X_PLATFORM=X_LINUX
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
+            DEBUG
           
         
         
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/demo/share/jvmti/waiters
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/make
+          
           
-            FULL
+            DEBUG
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="check_code.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="FileInputStream.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            THIS_FILE="e_acos.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/lang/fdlibm/include
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/macosx/native/include
             ../../jdk/make
           
         
       
-      
+      
         
           
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
+            ../../jdk/src/demo/share/jvmti/compiledMethodLoad
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
             ../../jdk/make
           
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Finalizer.c"
-          
         
       
-      
+      
         
           
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/demo/share/jvmti/gctest
             ../../jdk/make
           
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Array.c"
-          
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/src/solaris/native/sun/net/dns
-            ../../jdk/src/solaris/native/sun/net/spi
-            ../../jdk/src/solaris/native/sun/net/sdp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/demo/share/jvmti/heapTracker
             ../../jdk/make
           
-          
-            THIS_FILE="DatagramPacket.c"
-          
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/demo/share/jvmti/heapViewer
+            ../../jdk/src/java.base/macosx/native/include
             ../../jdk/make
           
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Bits.c"
-          
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
             ../../jdk/make
           
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="AccessController.c"
-          
         
       
-      
-        
-          
-            THIS_FILE="AtomicLong.c"
-          
-        
-      
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/demo/share/jvmti/minst
             ../../jdk/make
           
-          
-            ARCHPROPNAME="amd64"
-          
         
       
-      
-        
-          
-            THIS_FILE="compress.c"
-          
-        
-      
-      
+      
         
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/demo/share/jvmti/mtrace
             ../../jdk/make
           
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/demo/share/jvmti/versionCheck
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
           
+            THIS_FILE="HostLocaleProviderAdapter_md.c"
+          
+        
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjimage
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            THIS_FILE="NativeImageBuffer.cpp"
+          
+        
+      
+      
+        
+          
+            DEBUG
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/libjli
+            ../../jdk/src/java.base/unix/native/libjli
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
+          
+          
+            LIBARCHNAME="x86_64"
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="java_md_macosx.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/libnet
+            ../../make
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KQueue.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/libnio/fs
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/macosx/native/libosxsecurity
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            THIS_FILE="KeystoreImpl.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="main.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/launcher
+            ../../jdk/src/java.base/share/native/libjli
+            ../../jdk/src/java.base/unix/native/libjli
+            ../../jdk/src/java.base/macosx/native/libjli
+            ../../make
+          
+          
+            DEBUG
+            ENABLE_ARG_FILES
+            EXPAND_CLASSPATH_WILDCARDS
+            JAVA_ARGS={ "-J-ms8m", "-m", "jdk.jlink/jdk.tools.jlink.internal.Main", }
+            LAUNCHER_NAME="openjdk"
+            NEVER_ACT_AS_SERVER_CLASS_MACHINE
+            PACKAGE_PATH="/opt/local"
+            PROGNAME="jlink"
+            VERSION_BUILD=0
+            VERSION_MAJOR=9
+            VERSION_MINOR=0
+            VERSION_NUMBER="9"
+            VERSION_OPT="2016-06-20-162150.devtester.jdktrunk"
+            VERSION_PATCH=0
+            VERSION_PRE="internal"
+            VERSION_SECURITY=0
+            VERSION_SHORT="9-internal"
+            VERSION_SPECIFICATION="9"
+            VERSION_STRING="9-internal+0-2016-06-20-162150.devtester.jdktrunk"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libnio
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libzip
+            ../../make
+          
+        
+      
+      
+        
+          
+            DEBUG
+            THIS_FILE="jspawnhelper.c"
+          
+        
+        
+          
+            ../../jdk/src/java.base/unix/native/libjimage
+          
+          
+            THIS_FILE="osSupport_unix.cpp"
+          
+        
+      
+      
+        
+          
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libjli
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
+          
+        
+      
+      
+        
+          
+            DEBUG
+            THIS_FILE="AWTEvent.m"
+          
+        
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
+          
+            DEBUG
+            THIS_FILE="PLATFORM_API_MacOSX_PCM.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/macosx/native/libjsound
+            ../../jdk/src/java.desktop/share/native/libjsound
+          
+        
+        
+          
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
+          
+            EXTRA_SOUND_JNI_LIBS=""
+            USE_DAUDIO=TRUE
+            USE_PLATFORM_MIDI_IN=TRUE
+            USE_PLATFORM_MIDI_OUT=TRUE
+            USE_PORTS=TRUE
+            X_PLATFORM=X_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/macosx/native/include
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/font
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AWTFont.m"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CGLGraphicsConfig.m"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/macosx/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+          
+            THIS_FILE="jawt.m"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
+          
+            EXTRA_SOUND_JNI_LIBS=""
+            THIS_FILE="PLATFORM_API_MacOSX_MidiIn.c"
+            USE_DAUDIO=TRUE
+            USE_PLATFORM_MIDI_IN=TRUE
+            USE_PLATFORM_MIDI_OUT=TRUE
+            USE_PORTS=TRUE
+            X_PLATFORM=X_MACOSX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosx
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../make
+          
+          
+            THIS_FILE="CFileManager.m"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../build/support/headers/java.desktop
+            ../../make
+          
+          
+            THIS_FILE="AWT_debug.m"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxui
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/awt
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../build/support/headers/java.desktop
+            ../../make
+          
+          
+            THIS_FILE="AquaFileView.m"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
-            WITH_X11
+            THIS_FILE="splashscreen_sys.m"
+            WITH_MACOSX
           
         
       
-      
+      
         
           
             THIS_FILE="debug_assert.c"
@@ -5584,1494 +31024,984 @@
         
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
+            ../../jdk/src/java.desktop/share/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
+            ../../jdk/src/java.desktop/share/native/libfontmanager/layout
+            ../../jdk/src/java.desktop/unix/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common
+            ../../jdk/src/java.desktop/share/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common/java2d
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/macosx/native/libjava
+            /opt/local/include/freetype2
+            ../../make
           
+          
+            GETPAGESIZE
+            HAVE_CORETEXT
+            HAVE_FALLBACK
+            HAVE_INTEL_ATOMIC_PRIMITIVES
+            HAVE_MPROTECT
+            HAVE_OT
+            HAVE_PTHREAD
+            HAVE_SYSCONF
+            HAVE_SYS_MMAN_H
+            HAVE_UCDN
+            HAVE_UNISTD_H
+            HEADLESS
+            LE_STANDALONE
+            THIS_FILE="hb-blob.cc"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
+        
+      
+      
+        
+          
+            MLIB_NO_LIBSUNMATH
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libmlib_image
+            ../../make
+          
+          
+            MLIB_OS64BIT
+            THIS_FILE="mlib_ImageCopy_Bit.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/macosx/native/include
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/font
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+          
+            THIS_FILE="AccelGlyphCache.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/macosx/native/include
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/macosx/native/libawt_lwawt/font
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+          
+            THIS_FILE="OGLBlitLoops.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../make
+          
+          
+            MLIB_NO_LIBSUNMATH
+            THIS_FILE="img_globals.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gifdecoder.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_ImagingLib.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AlphaMacros.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="BufferedMaskBlit.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
+            ../../jdk/src/java.desktop/share/native/libfontmanager/layout
+            ../../jdk/src/java.desktop/unix/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common
+            ../../jdk/src/java.desktop/share/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common/java2d
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/macosx/native/libjava
+            /opt/local/include/freetype2
+            ../../make
+          
+          
+            GETPAGESIZE
+            HAVE_CORETEXT
+            HAVE_FALLBACK
+            HAVE_INTEL_ATOMIC_PRIMITIVES
+            HAVE_MPROTECT
+            HAVE_OT
+            HAVE_PTHREAD
+            HAVE_SYSCONF
+            HAVE_SYS_MMAN_H
+            HAVE_UCDN
+            HAVE_UNISTD_H
+            HEADLESS
+            LE_STANDALONE
+            THIS_FILE="ucdn.c"
+          
+        
+      
+      
+        
           
             THIS_FILE="AlternateSubstSubtables.cpp"
           
         
       
-      
-        
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="dgif_lib.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            THIS_FILE="img_colors.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="gifdecoder.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
+      
         
           
             THIS_FILE="imageioJPEG.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
           
           
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="png.c"
-            WITH_X11
+            EXTRA_SOUND_JNI_LIBS=""
+            THIS_FILE="DirectAudioDevice.c"
+            USE_DAUDIO=TRUE
+            USE_PLATFORM_MIDI_IN=TRUE
+            USE_PLATFORM_MIDI_OUT=TRUE
+            USE_PORTS=TRUE
+            X_PLATFORM=X_MACOSX
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.desktop/share/native/liblcms
+            ../../make
           
           
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="awt_ImagingLib.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="java_awt_SplashScreen.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="rect.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="AccelGlyphCache.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-        
-          
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            HEADLESS
-            LE_STANDALONE
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
+            CMS_DONT_USE_FAST_FLOOR
             THIS_FILE="LCMS.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libmlib_image
+            ../../make
           
           
-            INTERNAL_BUILD
             MLIB_NO_LIBSUNMATH
-            THIS_FILE="AlphaMacros.c"
+            MLIB_OS64BIT
+            THIS_FILE="mlib_ImageAffine.c"
             __MEDIALIB_OLD_NAMES
             __USE_J2D_NAMES
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/macosx/native/libsplashscreen
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.desktop/macosx/native/libosxapp
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="OGLBlitLoops.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="dgif_lib.c"
+            WITH_MACOSX
           
         
       
-      
+      
+        
+          
+            THIS_FILE="png.c"
+          
+        
+      
+      
         
           
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
+          
+            THIS_FILE="systemScale.c"
+          
+        
+      
+      
+        
+          
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../make
           
           
-            INTERNAL_BUILD
             MLIB_NO_LIBSUNMATH
-            THIS_FILE="BufferedMaskBlit.c"
             __MEDIALIB_OLD_NAMES
             __USE_J2D_NAMES
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/management
-            ../../jdk/make
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../make
           
           
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
+            MLIB_NO_LIBSUNMATH
+            THIS_FILE="awt_LoadLibrary.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.instrument/share/native/libinstrument
+            ../../jdk/src/java.instrument/unix/native/libinstrument
+            ../../build/support/headers/java.instrument
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
+          
+          
+            DEBUG
+            JPLIS_LOGGING
+            THIS_FILE="EncodingSupport.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="EncodingSupport_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.management/share/native/include
+            ../../jdk/src/java.management/share/native/libmanagement
+            ../../jdk/src/java.management/unix/native/libmanagement
+            ../../build/support/headers/java.management
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+          
+            DEBUG
             THIS_FILE="ClassLoadingImpl.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
           
         
       
-      
+      
+        
+          
+            THIS_FILE="FileSystemImpl.c"
+          
+        
+      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.prefs/macosx/native/libprefs
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
           
           
-            ARCH="amd64"
-            ARCHPROPNAME="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
+            DEBUG
+            THIS_FILE="MacOSXPreferencesFile.m"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.rmi/share/native/librmi
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
+          
+          
+            DEBUG
             THIS_FILE="GC.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
           
         
       
-      
+      
         
           
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
           
           
-            THIS_FILE="genSocketOptionRegistry.c"
+            DEBUG
+            THIS_FILE="SCDynamicStoreConfig.m"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../jdk/src/java.security.jgss/macosx/native/libosxkrb5
           
-          
-            ARCH="amd64"
-            ARCHPROPNAME="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="ConstantPool.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="ec.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-        
-          
-            ../../jdk/src/share/native/sun/security/ec
-            ../../jdk/src/share/native/sun/security/ec/impl
-            ../../jdk/make
-          
-          
-            THIS_FILE="ECC_JNI.cpp"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/ec
-            ../../jdk/src/share/native/sun/security/ec/impl
-            ../../jdk/make
-          
-          
-            MP_API_COMPATIBLE
-            NSS_ECC_MORE_THAN_SUITE_B
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/jgss/wrapper
-            ../../jdk/src/solaris/native/sun/security/jgss/wrapper
-            ../../jdk/make
+            ../../jdk/src/java.security.jgss/share/native/libj2gss
+            ../../jdk/src/java.security.jgss/unix/native/libj2gss
+            ../../make
           
           
             THIS_FILE="GSSLibStub.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/security/pkcs11
-            ../../jdk/src/solaris/native/sun/security/pkcs11
-            ../../jdk/src/share/native/sun/security/pkcs11/wrapper
-            ../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
-            ../../jdk/make
-          
-          
-            THIS_FILE="p11_convert.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
-            ../../jdk/make
-          
-          
-            THIS_FILE="pcsc.c"
-            __sun_jdk
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/tracing/dtrace
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="JVM.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="npt.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/socket
-            ../../jdk/src/solaris/transport/socket
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/back
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="socketTransport.c"
-            USE_MMAP
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="exec_md.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/export
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/back
-            ../../jdk/src/solaris/back
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
-            ../../jdk/make
-          
-          
-            JDWP_LOGGING
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-          
-          
-            THIS_FILE="ergo.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/demo/jvmti/hprof
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-          
-            THIS_FILE="hprof_md.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/instrument
-            ../../jdk/src/solaris/instrument
-            ../../jdk/src/share/bin
-            ../../jdk/make
-          
-          
-            NO_JPLIS_LOGGING
-            THIS_FILE="EncodingSupport_md.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LinuxOperatingSystem.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/management
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/com/sun/media/sound
-            ../../jdk/src/solaris/native/com/sun/media/sound
-            ../../jdk/make
-          
-          
-            EXTRA_SOUND_JNI_LIBS=" jsoundalsa"
-            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_CommonUtils.c"
-            USE_DAUDIO=TRUE
-            USE_PLATFORM_MIDI_IN=TRUE
-            USE_PLATFORM_MIDI_OUT=TRUE
-            USE_PORTS=TRUE
-            X_ARCH=X_AMD64
-            X_PLATFORM=X_LINUX
-          
-        
-      
-      
-        
-          
-            ../../jdk/make
-          
-          
-            THIS_FILE="Unix.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="jdk_util_md.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            THIS_FILE="Console_md.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="ProcessEnvironment_md.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/src/solaris/native/sun/net/dns
-            ../../jdk/src/solaris/native/sun/net/spi
-            ../../jdk/src/solaris/native/sun/net/sdp
-            ../../jdk/make
-          
-          
-            THIS_FILE="Inet4AddressImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="MappedByteBuffer.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="FileSystemPreferences.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_sys.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            HEADLESS
-            LE_STANDALONE
-            THIS_FILE="X11FontScaler.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="GLXGraphicsConfig.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            THIS_FILE="X11FontScaler_md.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/management
-            ../../jdk/make
-          
-          
-            THIS_FILE="FileSystemImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/src/solaris/native/sun/net/dns
-            ../../jdk/src/solaris/native/sun/net/spi
-            ../../jdk/src/solaris/native/sun/net/sdp
-            ../../jdk/make
-          
-          
-            THIS_FILE="ResolverConfigurationImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SdpSupport.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DefaultProxySelector.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SctpChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/nio/ch/sctp
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/sun/nio/ch
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GnomeFileTypeDetector.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
+            ../../jdk/src/java.security.jgss/share/native/libj2gss
+            ../../jdk/src/java.security.jgss/unix/native/libj2gss
+            ../../make
           
           
             THIS_FILE="NativeFunc.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/security/jgss/wrapper
-            ../../jdk/src/solaris/native/sun/security/jgss/wrapper
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/pkcs11
-            ../../jdk/src/solaris/native/sun/security/pkcs11
-            ../../jdk/src/share/native/sun/security/pkcs11/wrapper
-            ../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.smartcardio/share/native/libj2pcsc
+            ../../jdk/src/java.smartcardio/unix/native/libj2pcsc
+            ../../jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE
+            ../../build/support/headers/java.smartcardio
+            ../../make
           
           
-            THIS_FILE="p11_md.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
-            ../../jdk/make
-          
-          
-            THIS_FILE="pcsc_md.c"
+            DEBUG
+            THIS_FILE="pcsc.c"
             __sun_jdk
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
           
-            THIS_FILE="LinuxVirtualMachine.c"
+            THIS_FILE="pcsc_md.c"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/tracing/dtrace
-            ../../jdk/make
+            ../../jdk/src/jdk.attach/macosx/native/libattach
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../make
           
           
-            THIS_FILE="jvm_symbols_md.c"
+            DEBUG
+            THIS_FILE="VirtualMachineImpl.c"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl
+            ../../make
           
           
-            ARCHPROPNAME="amd64"
-            THIS_FILE="HostLocaleProviderAdapter_md.c"
+            DEBUG
+            MP_API_COMPATIBLE
+            NSS_ECC_MORE_THAN_SUITE_B
+            THIS_FILE="ec.c"
+          
+        
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/jdk.crypto.ec/share/native/libsunec
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="ECC_JNI.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11
+            ../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../build/support/headers/jdk.crypto.pkcs11
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="j2secmod.c"
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
           
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="XToolkit.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
+            THIS_FILE="j2secmod_md.c"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
           
           
-            THIS_FILE="utf_md.c"
+            DEBUG
+            THIS_FILE="socketTransport.c"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/socket
-            ../../jdk/src/solaris/transport/socket
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/back
-            ../../jdk/make
+            ../../jdk/src/jdk.jdwp.agent/share/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../make
           
+          
+            USE_MMAP
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libjdwp
+            ../../build/support/headers/jdk.jdwp.agent
+            ../../make
+          
+          
+            JDWP_LOGGING
+            THIS_FILE="ArrayReferenceImpl.c"
+          
+        
+      
+      
+        
           
             THIS_FILE="socket_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../make
+          
+          
             USE_MMAP
           
         
       
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libjdwp
+            ../../build/support/headers/jdk.jdwp.agent
+            ../../make
+          
+          
+            JDWP_LOGGING
+            THIS_FILE="exec_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.management/share/native/include
+            ../../jdk/src/jdk.management/share/native/libmanagement_ext
+            ../../jdk/src/jdk.management/unix/native/libmanagement_ext
+            ../../jdk/src/jdk.management/macosx/native/libmanagement_ext
+            ../../build/support/headers/jdk.management
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="UnixOperatingSystem.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DiagnosticCommandImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OperatingSystemImpl.c"
+          
+        
+      
+      
+        
+          
+            DEBUG
+            FULL
+            THIS_FILE="bands.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.base
+            ../../jdk/src/jdk.pack200/share/native/common-unpack
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+          
+            NO_ZLIB
+            UNPACK_JNI
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.base
+            ../../jdk/src/jdk.pack200/share/native/common-unpack
+            ../../jdk/src/java.base/macosx/native/libjava
+            ../../make
+          
+          
+            NO_ZLIB
+            THIS_FILE="jni.cpp"
+            UNPACK_JNI
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.pack200/share/native/common-unpack
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            SYSTEM_ZLIB
+            THIS_FILE="main.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/macosx/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/jdk.security.auth
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="Unix.c"
+          
+        
+      
     
     
       
-        LOCAL_SOURCES
         default
+        false
+        false
       
+      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
       
-        
-          IDE_ALT_BOOTDIR
-        
         
           HOTSPOT_BUILD_TARGET="target"
           HOTSPOT_BUILD_USER="user"
@@ -7092,2668 +32022,4436 @@
             
           
         
+        
+          ../..
+          sh ../configure --with-debug-level=slowdebug --disable-zip-debug-info
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+        
       
       
-      
-      
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
-      
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
-      
+        
+        
       
-      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="libproc_impl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ps_core.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ps_proc.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="salibelf.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="symtab.c"
+          
+        
+      
+      
+        
+        
       
       
-      
-      
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
-      
-      
-      
-      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
-      
-      
-      
-      
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
-      
-      
+        
+        
       
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
-      
-      
-      
-      
+        
+        
       
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
-        
+        
           
+            DEBUG_LEVEL="slowdebug"
+            HOTSPOT_VERSION_STRING="9-internal+0-2016-06-20-224455.vkvashin.jdktrunk"
+            VERSION_BUILD=0
+            VERSION_MAJOR=9
+            VERSION_MINOR=0
+            VERSION_PATCH=0
+            VERSION_SECURITY=0
+            VERSION_STRING="9-internal+0-2016-06-20-224455.vkvashin.jdktrunk"
           
         
       
@@ -9761,1330 +36459,6049 @@
             ex="false"
             tool="1"
             flavor2="0">
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
-      
-      
-      
-      
+        
+        
       
       
-      
-      
-      
-      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
+        
+          
+            _FILE_OFFSET_BITS=64
+          
+        
       
       
+        
+        
       
       
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
-      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+        
       
-      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
       
-      
-      
-      
-        
-          
-            THIS_FILE="ArrayTypeImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ClassLoaderReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ClassObjectReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ClassTypeImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="EventRequestImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FieldImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FrameID.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MethodImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ObjectReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ReferenceTypeImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SDE.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="StackFrameImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="StringReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThreadGroupReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThreadReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="VirtualMachineImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="bag.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="classTrack.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="commonRef.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="debugDispatch.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="debugInit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="debugLoop.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="error_messages.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="eventFilter.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="eventHandler.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="eventHelper.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="inStream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="invoker.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="log_messages.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="outStream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="standardHandlers.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="stepControl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="stream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="threadControl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="transport.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="util.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            THIS_FILE="jli_util.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/linux/bin
-            ../../jdk/make
-          
-          
-            EXPAND_CLASSPATH_WILDCARDS
-            JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }
-            LAUNCHER_NAME="openjdk"
-            NEVER_ACT_AS_SERVER_CLASS_MACHINE
-            PROGNAME="javac"
-            THIS_FILE="main.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            THIS_FILE="parse_manifest.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            THIS_FILE="splashscreen_stubs.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            THIS_FILE="version_comp.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            THIS_FILE="wildcard.c"
-          
-        
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-        
-          
-            THIS_FILE="hprof_blocks.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_check.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_class.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_cpu.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_error.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_event.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_frame.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_init.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_io.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_ioname.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_listener.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_loader.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_monitor.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_object.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_reference.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_site.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_stack.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_string.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_table.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_tag.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_tls.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_trace.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_tracker.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_util.c"
-          
-        
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-        
+        
           
             THIS_FILE="Monitor.cpp"
           
         
       
-      
-        
+        
           
             THIS_FILE="Thread.cpp"
           
         
       
-      
-        
+        
           
             THIS_FILE="waiters.cpp"
           
         
       
-      
+        
+        
       
-      
-        
+        
+        
+      
+      
+        
+        
+      
+      
+        
           
-            THIS_FILE="InstrumentationImplNativeMethods.c"
+            THIS_FILE="EPollArrayWrapper.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="InvocationAdapter.c"
+            THIS_FILE="EPollPort.c"
           
         
       
-      
-        
-          
-            THIS_FILE="JPLISAgent.c"
-          
+        
         
       
-      
-        
+        
           
-            THIS_FILE="JPLISAssert.c"
+            THIS_FILE="LinuxWatchService.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="JarFacade.c"
+            THIS_FILE="MagicFileTypeDetector.c"
           
         
       
-      
-        
-          
-            THIS_FILE="JavaExceptions.c"
-          
+        
         
       
-      
-        
-          
-            THIS_FILE="PathCharsValidator.c"
-          
+        
         
       
-      
-        
+        
           
-            THIS_FILE="Reentrancy.c"
+            THIS_FILE="e_asin.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="Utilities.c"
+            THIS_FILE="e_atan2.c"
           
         
       
-      
+        
+          
+            THIS_FILE="e_atanh.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_cosh.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_exp.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_fmod.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_log.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_log10.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_rem_pio2.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_remainder.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_scalb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_sinh.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="e_sqrt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="k_cos.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="k_rem_pio2.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="k_sin.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="k_standard.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="k_tan.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_atan.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_ceil.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_copysign.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_cos.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_expm1.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_fabs.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_finite.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_floor.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_frexp.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_ilogb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_isnan.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_ldexp.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_lib_version.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_log1p.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_logb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_matherr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_modf.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_nextafter.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_rint.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_scalbn.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_signgam.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_significand.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_sin.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_tan.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="s_tanh.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_acos.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_asin.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_atan2.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_atanh.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_cosh.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_exp.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_fmod.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_log.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_log10.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_remainder.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_scalb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_sinh.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="w_sqrt.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="Array.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AtomicLong.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Class.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassLoader.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ConstantPool.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Double.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Executable.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Field.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FileInputStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Float.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GC.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NativeAccessors.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Object.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ObjectInputStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ObjectOutputStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ObjectStreamClass.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Package.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Proxy.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="RandomAccessFile.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Reflection.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Runtime.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SecurityManager.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Shutdown.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Signal.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StackFrameInfo.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StackStreamFactory.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StrictMath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="String.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StringCoding.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="System.c"
+            VERSION_BUILD=0
+            VERSION_MAJOR=9
+            VERSION_MINOR=0
+            VERSION_NUMBER="9"
+            VERSION_OPT="2016-06-20-224455.vkvashin.jdktrunk"
+            VERSION_PATCH=0
+            VERSION_PRE="internal"
+            VERSION_SECURITY=0
+            VERSION_SHORT="9-internal"
+            VERSION_SPECIFICATION="9"
+            VERSION_STRING="9-internal+0-2016-06-20-224455.vkvashin.jdktrunk"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Thread.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Throwable.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TimeZone.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VM.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VMSupport.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Version.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="check_version.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="io_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jdk_util.c"
+            VERSION_BUILD=0
+            VERSION_MAJOR=9
+            VERSION_MINOR=0
+            VERSION_NUMBER="9"
+            VERSION_OPT="2016-06-20-224455.vkvashin.jdktrunk"
+            VERSION_PATCH=0
+            VERSION_PRE="internal"
+            VERSION_SECURITY=0
+            VERSION_SHORT="9-internal"
+            VERSION_SPECIFICATION="9"
+            VERSION_STRING="9-internal+0-2016-06-20-224455.vkvashin.jdktrunk"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jio.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jni_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="verify_stub.c"
+          
+        
+      
+      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            UNPACK_JNI
-          
+        
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
+        
           
-            NO_ZLIB
-            THIS_FILE="bytes.cpp"
-            UNPACK_JNI
+            THIS_FILE="endian.cpp"
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
+        
           
-            NO_ZLIB
-            THIS_FILE="coding.cpp"
-            UNPACK_JNI
+            THIS_FILE="imageDecompressor.cpp"
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
+        
           
-            NO_ZLIB
-            THIS_FILE="jni.cpp"
-            UNPACK_JNI
+            THIS_FILE="imageFile.cpp"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../jdk/make
-          
+        
           
-            THIS_FILE="main.cpp"
+            THIS_FILE="jimage.cpp"
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            THIS_FILE="unpack.cpp"
-            UNPACK_JNI
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            THIS_FILE="utils.cpp"
-            UNPACK_JNI
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            THIS_FILE="zip.cpp"
-            UNPACK_JNI
-          
-        
-      
-      
-        
+        
+        
+      
+      
+        
+          
+            THIS_FILE="java.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jli_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="parse_manifest.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="splashscreen_stubs.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="wildcard.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="Inet4Address.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Inet6Address.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InetAddress.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="net_util.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="check_format.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            THIS_FILE="Adler32.c"
+            USE_MMAP
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            THIS_FILE="CRC32.c"
+            USE_MMAP
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            THIS_FILE="Deflater.c"
+            USE_MMAP
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            THIS_FILE="Inflater.c"
+            USE_MMAP
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            THIS_FILE="zip_util.c"
+            USE_MMAP
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="deflate.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gzclose.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gzlib.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gzread.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gzwrite.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="infback.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="inffast.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="inflate.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="inftrees.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="trees.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="uncompr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="zadler32.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="zcrc32.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="zutil.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="FileDescriptor_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FileInputStream_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FileOutputStream_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ProcessEnvironment_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ProcessHandleImpl_unix.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ProcessImpl_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="RandomAccessFile_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TimeZone_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UnixFileSystem_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VM_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="canonicalize_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="childproc.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="io_util_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="java_props_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jdk_util_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jni_util_md.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ergo_i586.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="java_md_common.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="java_md_solinux.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ExtendedOptionsImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Inet4AddressImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Inet6AddressImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InetAddressImplFactory.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NetworkInterface.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PlainDatagramSocketImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PlainSocketImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ResolverConfigurationImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SdpSupport.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketInputStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketOutputStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="net_util_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="portconfig.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MappedByteBuffer.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="DatagramDispatcher.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FileChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FileDispatcherImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FileKey.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IOUtil.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InheritedChannel.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NativeThread.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Net.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PollArrayWrapper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ServerSocketChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketDispatcher.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UnixAsynchronousSocketChannelImpl.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="UnixCopyFile.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UnixNativeDispatcher.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="debug_mem.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debug_trace.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debug_util.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_ImageCreate.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mlib_sys.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="OGLBufImgOps.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLContext.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLFuncs.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLMaskBlit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLMaskFill.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLPaints.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLRenderQueue.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLRenderer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLSurfaceData.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLTextRenderer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLVertexCache.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="BufImgSurfaceData.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DataBufferNative.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_ImageRep.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_parseImage.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="img_globals.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="dither.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="imageInitIDs.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="Disposer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SurfaceData.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Trace.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="AlphaMath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Any3Byte.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Any4Byte.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AnyByte.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AnyInt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AnyShort.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Blit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="BlitBg.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteBinary1Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteBinary2Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteBinary4Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteGray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteIndexed.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawLine.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawParallelogram.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawPath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawPolygons.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawRect.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillParallelogram.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillPath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillRect.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillSpans.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FourByteAbgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FourByteAbgrPre.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GraphicsPrimitiveMgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Index12Gray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Index8Gray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntArgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntArgbBm.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntArgbPre.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntBgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntRgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntRgbx.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MapAccelFunc.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MaskBlit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MaskFill.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ProcessPath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScaledBlit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreeByteBgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TransformHelper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort4444Argb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort555Rgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort555Rgbx.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort565Rgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UshortGray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UshortIndexed.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="BufferedRenderPipe.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Region.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ShapeSpanIterator.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SpanClipRenderer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawGlyphList.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FontInstanceAdapter.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HBShaper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="freetypeScaler.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="hb-buffer-serialize.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-buffer.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-common.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-face.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-fallback-shape.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-font.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-font.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-layout.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-map.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-arabic.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-default.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-hangul.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-hebrew.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-indic-table.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-indic.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-myanmar.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-thai.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-tibetan.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-use-table.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-use.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-fallback.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-normalize.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-tag.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-set.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-shape-plan.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-shape.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-shaper.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ucdn.cc"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="hb-unicode.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-warning.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-jdk-font.cc"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="AnchorTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ArabicLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ArabicShaping.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CanonData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CanonShaping.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassDefinitionTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualGlyphInsertionProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualGlyphSubstProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualGlyphSubstProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CoverageTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CursiveAttachmentSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DeviceTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ExtensionSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Features.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GDEFMarkFilter.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GXLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GXLayoutEngine2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphDefinitionTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphIterator.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphLookupTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphPositionAdjustments.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphPositioningTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphPosnLookupProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphSubstLookupProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphSubstitutionTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HanLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HangulLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicClassTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicRearrangementProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicRearrangementProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicReordering.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KernTable.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KhmerLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KhmerReordering.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LEFontInstance.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LEGlyphStorage.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LEInsertionList.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LigatureSubstProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LigatureSubstProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LigatureSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LookupProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LookupTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Lookups.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MPreFixups.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkArrays.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkToBasePosnSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkToLigaturePosnSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkToMarkPosnSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MirroredCharData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MorphTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MorphTables2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MultipleSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NonContextualGlyphSubstProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NonContextualGlyphSubstProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OpenTypeLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OpenTypeUtilities.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PairPositioningSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScriptAndLanguage.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScriptAndLanguageTags.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentArrayProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentArrayProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentSingleProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentSingleProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ShapingTypeData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SimpleArrayProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SimpleArrayProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SinglePositioningSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SingleSubstitutionSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SingleTableProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SingleTableProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StateTableProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StateTableProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SubstitutionLookups.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SubtableProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SubtableProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SunLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThaiLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThaiShaping.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThaiStateTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TibetanLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TibetanReordering.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TrimmedArrayProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TrimmedArrayProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ValueRecords.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="scriptMapping.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="sunFont.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcapimin.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcapistd.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jccoefct.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jccolor.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcdctmgr.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jchuff.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcinit.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcmainct.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcmarker.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcmaster.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcomapi.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcparam.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcphuff.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcprepct.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jcsample.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jctrans.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdapimin.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdapistd.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdcoefct.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdcolor.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jddctmgr.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdhuff.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdinput.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdmainct.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdmarker.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdmaster.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdmerge.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdphuff.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdpostct.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdsample.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jdtrans.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jerror.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jfdctflt.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jfdctfst.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jfdctint.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jidctflt.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jidctfst.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jidctint.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jidctred.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jmemmgr.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jmemnobs.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../make
+          
+          
+            THIS_FILE="jpegdecoder.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jquant1.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jquant2.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="jutils.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             USE_DAUDIO=TRUE
             USE_PLATFORM_MIDI_IN=TRUE
@@ -11093,11 +42510,19 @@
           
         
       
-      
-        
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="DirectAudioDeviceProvider.c"
             USE_DAUDIO=TRUE
@@ -11107,11 +42532,19 @@
           
         
       
-      
-        
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="MidiInDevice.c"
             USE_DAUDIO=TRUE
@@ -11121,11 +42554,19 @@
           
         
       
-      
-        
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="MidiInDeviceProvider.c"
             USE_DAUDIO=TRUE
@@ -11135,11 +42576,19 @@
           
         
       
-      
-        
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="MidiOutDevice.c"
             USE_DAUDIO=TRUE
@@ -11149,11 +42598,19 @@
           
         
       
-      
-        
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="MidiOutDeviceProvider.c"
             USE_DAUDIO=TRUE
@@ -11163,21 +42620,36 @@
           
         
       
-      
-        
+        
+          
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="Platform.c"
           
         
       
-      
-        
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="PlatformMidi.c"
             USE_DAUDIO=TRUE
@@ -11187,11 +42659,19 @@
           
         
       
-      
-        
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="PortMixer.c"
             USE_DAUDIO=TRUE
@@ -11201,11 +42681,19 @@
           
         
       
-      
-        
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="PortMixerProvider.c"
             USE_DAUDIO=TRUE
@@ -11215,11 +42703,19 @@
           
         
       
-      
-        
+        
+          
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
           
             THIS_FILE="Utilities.c"
             USE_DAUDIO=TRUE
@@ -11229,9316 +42725,2765 @@
           
         
       
-      
-        
-          
-            ../../jdk/make
-          
+        
         
       
-      
-        
-          
-            ../../jdk/make
-          
-          
-            THIS_FILE="check_format.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="check_version.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="jdk_util.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="jio.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="jni_util.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="verify_stub.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="ObjectInputStream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ObjectOutputStream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ObjectStreamClass.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="RandomAccessFile.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="io_util.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Class.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="ClassLoader.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Compiler.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Double.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Float.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Object.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Package.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="ResourceBundle.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Runtime.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="SecurityManager.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Shutdown.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="StrictMath.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="String.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="System.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Thread.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Throwable.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="e_asin.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_atan2.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_atanh.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_cosh.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_exp.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_fmod.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_hypot.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_log.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_log10.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_pow.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_rem_pio2.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_remainder.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_scalb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_sinh.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="e_sqrt.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="k_cos.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="k_rem_pio2.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="k_sin.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="k_standard.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="k_tan.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_atan.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_cbrt.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_ceil.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_copysign.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_cos.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_expm1.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_fabs.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_finite.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_floor.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_frexp.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_ilogb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_isnan.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_ldexp.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_lib_version.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_log1p.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_logb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_matherr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_modf.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_nextafter.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_rint.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_scalbn.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_signgam.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_significand.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_sin.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_tan.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="s_tanh.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_acos.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_asin.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_atan2.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_atanh.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_cosh.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_exp.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_fmod.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_hypot.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_log.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_log10.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_pow.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_remainder.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_scalb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_sinh.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="w_sqrt.c"
-          
-        
-      
-      
-      
-      
-      
-      
-        
-          
-            THIS_FILE="Executable.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Proxy.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="Inet4Address.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Inet6Address.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="InetAddress.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="net_util.c"
-          
-        
-      
-      
-      
-      
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="TimeZone.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
-          
-            THIS_FILE="Adler32.c"
-            USE_MMAP
-          
-          
-            DEBUG
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
-          
-            THIS_FILE="CRC32.c"
-            USE_MMAP
-          
-          
-            DEBUG
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
-          
-            THIS_FILE="Deflater.c"
-            USE_MMAP
-          
-          
-            DEBUG
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
-          
-            THIS_FILE="Inflater.c"
-            USE_MMAP
-          
-          
-            DEBUG
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
-          
-            THIS_FILE="ZipFile.c"
-            USE_MMAP
-          
-          
-            DEBUG
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
-          
-            THIS_FILE="zip_util.c"
-            USE_MMAP
-          
-          
-            DEBUG
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="deflate.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="gzclose.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="gzlib.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="gzread.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="gzwrite.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="infback.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="inffast.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="inflate.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="inftrees.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="trees.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="uncompr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="zadler32.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="zcrc32.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="zutil.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="debug_mem.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="debug_trace.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="debug_util.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="gif_err.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="gifalloc.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="BufImgSurfaceData.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="DataBufferNative.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="awt_ImageRep.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="awt_parseImage.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="img_globals.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="dither.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="imageInitIDs.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcapimin.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcapistd.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jccoefct.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jccolor.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcdctmgr.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jchuff.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcinit.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcmainct.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcmarker.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcmaster.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcomapi.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcparam.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcphuff.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcprepct.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jcsample.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jctrans.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdapimin.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdapistd.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdcoefct.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdcolor.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jddctmgr.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdhuff.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdinput.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdmainct.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdmarker.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdmaster.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdmerge.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdphuff.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdpostct.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdsample.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jdtrans.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jerror.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jfdctflt.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jfdctfst.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jfdctint.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jidctflt.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jidctfst.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jidctint.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jidctred.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jmemmgr.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jmemnobs.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/make
-          
-          
-            THIS_FILE="jpegdecoder.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jquant1.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jquant2.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="jutils.c"
-            WITH_X11
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="pngerror.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngget.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngmem.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngpread.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngread.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngrio.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngrtran.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngrutil.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngset.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngtrans.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngwio.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngwrite.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngwtran.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngwutil.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffineEdge.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BC_D64.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BC_F32.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BC_S32.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BL_D64.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BL_F32.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BL_S32.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_NN.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_NN_Bit.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageClipping.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageColorTrue2Index.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv2x2_f.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvClearEdge_Bit.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvClearEdge_Fp.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvCopyEdge_Bit.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvKernelConvert.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvMxN.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvMxN_Fp.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvMxN_ext.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_16ext.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_16nw.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_32nw.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_8ext.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_8nw.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_D64nw.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_F32nw.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_u16ext.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_u16nw.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageCopy_Bit.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageCreate.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageDivTables.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageFilters.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageLookUp_64.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageLookUp_Bit.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageScanPoly.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageUtils.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffineIndex_BC.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffineIndex_BL.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BC.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BC_S16.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BC_U16.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BL.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BL_S16.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BL_U16.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_NN.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageConvClearEdge.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageConvCopyEdge.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageConvVersion.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageConv_f.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageCopy.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageLookUp.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageLookUp_f.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageThresh1_U8.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_OS64BIT
-            THIS_FILE="mlib_sys.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="splashscreen_gfx_impl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_gif.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_impl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_jpeg.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_png.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            HEADLESS
-            LE_STANDALONE
-            THIS_FILE="DrawGlyphList.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FontInstanceAdapter.cpp"
-          
-        
-      
-      
-        
-          
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            HEADLESS
-            LE_STANDALONE
-            THIS_FILE="freetypeScaler.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="AnchorTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ArabicLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ArabicShaping.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="CanonData.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="CanonShaping.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ClassDefinitionTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ContextualGlyphSubstProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ContextualSubstSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="CoverageTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="CursiveAttachmentSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DeviceTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ExtensionSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Features.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GDEFMarkFilter.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GXLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphDefinitionTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphIterator.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphLookupTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphPositionAdjustments.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphPositioningTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphPosnLookupProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphSubstLookupProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphSubstitutionTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="HanLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="HangulLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IndicClassTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IndicLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IndicRearrangementProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IndicReordering.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="KernTable.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="KhmerLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="KhmerReordering.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LEFontInstance.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LEGlyphStorage.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LEInsertionList.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LigatureSubstProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LigatureSubstSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LookupProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LookupTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Lookups.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MPreFixups.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MarkArrays.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MarkToBasePosnSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MarkToLigaturePosnSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MarkToMarkPosnSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MirroredCharData.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MorphTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MultipleSubstSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="NonContextualGlyphSubstProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OpenTypeLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OpenTypeUtilities.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="PairPositioningSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ScriptAndLanguage.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ScriptAndLanguageTags.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SegmentArrayProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SegmentSingleProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ShapingTypeData.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SimpleArrayProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SinglePositioningSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SingleSubstitutionSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SingleTableProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="StateTableProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SubstitutionLookups.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SubtableProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SunLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThaiLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThaiShaping.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThaiStateTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="TibetanLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="TibetanReordering.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="TrimmedArrayProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ValueRecords.cpp"
-          
-        
-      
-      
-        
-          
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            HEADLESS
-            LE_STANDALONE
-            THIS_FILE="sunFont.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="Disposer.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="SurfaceData.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="Trace.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-      
-      
-        
+        
           
             THIS_FILE="cmscam02.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmscgats.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmscnvrt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmserr.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsgamma.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsgmt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmshalf.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsintrp.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsio0.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsio1.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmslut.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsmd5.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsmtrx.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsnamed.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsopt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmspack.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmspcs.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsplugin.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsps2.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmssamp.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmssm.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmstypes.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsvirt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmswtpnt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsxform.c"
           
         
       
-      
-      
-      
-        
-          
-            THIS_FILE="AlphaMath.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Any3Byte.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Any4Byte.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="AnyByte.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="AnyInt.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="AnyShort.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Blit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="BlitBg.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteBinary1Bit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteBinary2Bit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteBinary4Bit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteGray.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteIndexed.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawLine.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawParallelogram.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawPath.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawPolygons.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawRect.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FillParallelogram.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FillPath.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FillRect.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FillSpans.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FourByteAbgr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FourByteAbgrPre.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GraphicsPrimitiveMgr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Index12Gray.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Index8Gray.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntArgb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntArgbBm.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntArgbPre.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntBgr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntRgb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntRgbx.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MapAccelFunc.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MaskBlit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MaskFill.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ProcessPath.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ScaledBlit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThreeByteBgr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="TransformHelper.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Ushort4444Argb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Ushort555Rgb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Ushort555Rgbx.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Ushort565Rgb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="UshortGray.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="UshortIndexed.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="OGLBufImgOps.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLContext.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLFuncs.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLMaskBlit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLMaskFill.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLPaints.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLRenderQueue.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLRenderer.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLSurfaceData.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLTextRenderer.c"
-          
+        
         
       
-      
-        
+        
           
-            THIS_FILE="OGLVertexCache.c"
+            THIS_FILE="mlib_ImageAffineEdge.c"
           
         
       
-      
-      
-      
-        
-          
-            THIS_FILE="BufferedRenderPipe.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Region.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ShapeSpanIterator.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SpanClipRenderer.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="Flag.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GarbageCollectorImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GcInfoBuilder.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="HotSpotDiagnostic.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="HotspotThread.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MemoryImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MemoryManagerImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MemoryPoolImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThreadImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="VMManagementImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="management.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="MessageUtils.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="NativeSignalHandler.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Signal.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="VM.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="VMSupport.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Version.c"
-          
-        
-      
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="NativeAccessors.c"
+            THIS_FILE="mlib_ImageAffine_BC_D64.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="Reflection.c"
+            THIS_FILE="mlib_ImageAffine_BC_F32.c"
           
         
       
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="ec2_163.c"
+            THIS_FILE="mlib_ImageAffine_BC_S32.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec2_193.c"
+            THIS_FILE="mlib_ImageAffine_BL_D64.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec2_233.c"
+            THIS_FILE="mlib_ImageAffine_BL_F32.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec2_aff.c"
+            THIS_FILE="mlib_ImageAffine_BL_S32.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec2_mont.c"
+            THIS_FILE="mlib_ImageAffine_NN.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec_naf.c"
+            THIS_FILE="mlib_ImageAffine_NN_Bit.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecdecode.c"
+            THIS_FILE="mlib_ImageClipping.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecl.c"
+            THIS_FILE="mlib_ImageColorTrue2Index.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecl_curve.c"
+            THIS_FILE="mlib_ImageConv2x2_f.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecl_gf.c"
+            THIS_FILE="mlib_ImageConvClearEdge_Bit.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecl_mult.c"
+            THIS_FILE="mlib_ImageConvClearEdge_Fp.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_192.c"
+            THIS_FILE="mlib_ImageConvCopyEdge_Bit.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_224.c"
+            THIS_FILE="mlib_ImageConvKernelConvert.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_256.c"
+            THIS_FILE="mlib_ImageConvMxN.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_384.c"
+            THIS_FILE="mlib_ImageConvMxN_Fp.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_521.c"
+            THIS_FILE="mlib_ImageConvMxN_ext.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_aff.c"
+            THIS_FILE="mlib_ImageConv_16ext.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_jac.c"
+            THIS_FILE="mlib_ImageConv_16nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_jm.c"
+            THIS_FILE="mlib_ImageConv_32nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_mont.c"
+            THIS_FILE="mlib_ImageConv_8ext.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="mp_gf2m.c"
+            THIS_FILE="mlib_ImageConv_8nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="mpi.c"
+            THIS_FILE="mlib_ImageConv_D64nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="mplogic.c"
+            THIS_FILE="mlib_ImageConv_F32nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="mpmontg.c"
+            THIS_FILE="mlib_ImageConv_u16ext.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="oid.c"
+            THIS_FILE="mlib_ImageConv_u16nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="secitem.c"
+            THIS_FILE="mlib_ImageDivTables.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="NativeUtil.c"
+            THIS_FILE="mlib_ImageFilters.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="j2secmod.c"
+            THIS_FILE="mlib_ImageLookUp_64.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="p11_crypt.c"
+            THIS_FILE="mlib_ImageLookUp_Bit.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_digest.c"
+            THIS_FILE="mlib_ImageScanPoly.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_dual.c"
+            THIS_FILE="mlib_ImageUtils.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_general.c"
+            THIS_FILE="mlib_c_ImageAffineIndex_BC.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_keymgmt.c"
+            THIS_FILE="mlib_c_ImageAffineIndex_BL.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_mutex.c"
+            THIS_FILE="mlib_c_ImageAffine_BC.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_objmgmt.c"
+            THIS_FILE="mlib_c_ImageAffine_BC_S16.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_sessmgmt.c"
+            THIS_FILE="mlib_c_ImageAffine_BC_U16.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_sign.c"
+            THIS_FILE="mlib_c_ImageAffine_BL.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_util.c"
+            THIS_FILE="mlib_c_ImageAffine_BL_S16.c"
           
         
       
-      
-      
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="utf.c"
+            THIS_FILE="mlib_c_ImageAffine_BL_U16.c"
           
         
       
-      
-      
-      
-      
-      
-        
-          
-            THIS_FILE="linker_md.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
+        
           
-            LIBARCHNAME="amd64"
+            THIS_FILE="mlib_c_ImageAffine_NN.c"
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
+        
           
-            LIBARCHNAME="amd64"
-            THIS_FILE="ergo_i586.c"
+            THIS_FILE="mlib_c_ImageConvClearEdge.c"
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
+        
           
-            LIBARCHNAME="amd64"
-            THIS_FILE="java_md_common.c"
+            THIS_FILE="mlib_c_ImageConvCopyEdge.c"
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
+        
           
-            LIBARCHNAME="amd64"
-            THIS_FILE="java_md_solinux.c"
+            THIS_FILE="mlib_c_ImageConvVersion.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/bin
-            ../../jdk/make
-          
-          
-            THIS_FILE="jexec.c"
-          
-        
-      
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="FileSystemSupport_md.c"
+            THIS_FILE="mlib_c_ImageConv_f.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="UnixOperatingSystem_md.c"
+            THIS_FILE="mlib_c_ImageCopy.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiIn.c"
+            THIS_FILE="mlib_c_ImageLookUp.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiOut.c"
+            THIS_FILE="mlib_c_ImageLookUp_f.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiUtils.c"
+            THIS_FILE="mlib_c_ImageThresh1_U8.c"
           
         
       
-      
-        
-          
-            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_PCM.c"
-          
+        
         
       
-      
-        
+        
           
-            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_PCMUtils.c"
+            THIS_FILE="gif_err.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_Ports.c"
+            THIS_FILE="gifalloc.c"
           
         
       
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="jni_util_md.c"
+            THIS_FILE="java_awt_SplashScreen.c"
           
         
       
-      
-      
-      
-        
-          
-            THIS_FILE="FileDescriptor_md.c"
-          
+        
         
       
-      
-        
+        
           
-            THIS_FILE="FileInputStream_md.c"
+            THIS_FILE="pngerror.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="FileOutputStream_md.c"
+            THIS_FILE="pngget.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="RandomAccessFile_md.c"
+            THIS_FILE="pngmem.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="UnixFileSystem_md.c"
+            THIS_FILE="pngpread.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="canonicalize_md.c"
+            THIS_FILE="pngread.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="io_util_md.c"
+            THIS_FILE="pngrio.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="UNIXProcess_md.c"
+            THIS_FILE="pngrtran.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="java_props_md.c"
+            THIS_FILE="pngrutil.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="Inet6AddressImpl.c"
+            THIS_FILE="pngset.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="InetAddressImplFactory.c"
+            THIS_FILE="pngtrans.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="NetworkInterface.c"
+            THIS_FILE="pngwio.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="PlainDatagramSocketImpl.c"
+            THIS_FILE="pngwrite.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="PlainSocketImpl.c"
+            THIS_FILE="pngwtran.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="SocketInputStream.c"
+            THIS_FILE="pngwutil.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="SocketOutputStream.c"
+            THIS_FILE="splashscreen_gfx_impl.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="linux_close.c"
+            THIS_FILE="splashscreen_gif.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="net_util_md.c"
+            THIS_FILE="splashscreen_impl.c"
           
         
       
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="TimeZone_md.c"
+            THIS_FILE="splashscreen_jpeg.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="logging.c"
+            THIS_FILE="splashscreen_png.c"
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="CUPSfuncs.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
+        
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
+        
           
-            HEADLESS=true
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="HeadlessToolkit.c"
-            X11_PATH="/usr/X11R6"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            HEADLESS=true
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="VDrawingArea.c"
-            X11_PATH="/usr/X11R6"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
             THIS_FILE="X11Color.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
+        
           
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_AWTEvent.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_DrawingSurface.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_Event.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
             THIS_FILE="awt_Font.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
+        
           
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_GraphicsEnv.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_InputMethod.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_Insets.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="awt_LoadLibrary.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="awt_Mlib.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_Plugin.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_Robot.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_UNIXToolkit.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_util.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
             THIS_FILE="fontpath.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="gtk2_interface.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
+        
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="initIDs.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="jawt.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="list.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="multiVis.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="multi_font.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="robot_common.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="sun_awt_X11_GtkFileDialogPeer.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="swing_GTKEngine.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="swing_GTKStyle.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="X11TextRenderer.c"
-          
-        
-      
-      
-      
-      
-        
+        
           
             THIS_FILE="GLXSurfaceData.c"
           
         
       
-      
+        
+        
       
-      
-        
+        
           
             THIS_FILE="X11PMBlitLoops.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="X11Renderer.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="X11SurfaceData.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="X11TextRenderer_md.c"
           
         
       
-      
-        
+        
+        
+      
+      
+        
           
-            THIS_FILE="XRBackendNative.c"
+            THIS_FILE="awt_Mlib.c"
           
         
       
-      
-        
+        
+          
+            THIS_FILE="initIDs.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="VDrawingArea.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="awt_DrawingSurface.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_Event.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_GraphicsEnv.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_InputMethod.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_Insets.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_Robot.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_UNIXToolkit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gtk2_interface.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="list.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="multiVis.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="multi_font.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="robot_common.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="sun_awt_X11_GtkFileDialogPeer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="swing_GTKEngine.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="swing_GTKStyle.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
           
             THIS_FILE="XRSurfaceData.c"
           
         
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="DatagramChannelImpl.c"
-          
+        
         
       
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="DatagramDispatcher.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="EPoll.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="EPollArrayWrapper.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="EPollPort.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="FileChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="FileDispatcherImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="FileKey.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="IOUtil.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="InheritedChannel.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="NativeThread.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="Net.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="PollArrayWrapper.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="ServerSocketChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="SocketChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="SocketDispatcher.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="UnixAsynchronousSocketChannelImpl.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="SctpNet.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SctpServerChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="LinuxNativeDispatcher.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="LinuxWatchService.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="MagicFileTypeDetector.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="UnixCopyFile.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="UnixNativeDispatcher.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/make
-          
-          
-            THIS_FILE="genUnixConstants.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="j2secmod_md.c"
-          
-        
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-        
+        
           
             THIS_FILE="XWindow.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="XlibWrapper.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="awt_Desktop.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="gnome_interface.c"
           
         
       
-      
-      
-      
+        
+        
       
-      
+      
+        
+          
+            THIS_FILE="X11TextRenderer.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiIn.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiOut.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiUtils.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_PCM.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_PCMUtils.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_LinuxOS_ALSA_Ports.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="InstrumentationImplNativeMethods.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InvocationAdapter.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JPLISAgent.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JPLISAssert.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JarFacade.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JavaExceptions.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PathCharsValidator.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Reentrancy.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Utilities.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="FileSystemSupport_md.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="GarbageCollectorImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HotspotThread.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MemoryImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MemoryManagerImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MemoryPoolImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreadImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VMManagementImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="management.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="NativeUtil.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_163.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_193.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_233.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_aff.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_mont.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec_naf.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecdecode.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecl_curve.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecl_gf.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecl_mult.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_192.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_224.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_256.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_384.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_521.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_aff.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_jac.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_jm.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_mont.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mp_gf2m.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mpi.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mplogic.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mpmontg.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="oid.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="secitem.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="p11_convert.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_crypt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_digest.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_dual.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_general.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_keymgmt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_mutex.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_objmgmt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_sessmgmt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_sign.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_util.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="p11_md.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ArrayTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassLoaderReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassObjectReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="EventRequestImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FieldImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FrameID.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InterfaceTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MethodImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ObjectReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ReferenceTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SDE.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StackFrameImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StringReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreadGroupReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreadReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VirtualMachineImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="bag.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="classTrack.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="commonRef.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debugDispatch.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debugInit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debugLoop.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="error_messages.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="eventFilter.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="eventHandler.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="eventHelper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="inStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="invoker.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="log_messages.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="outStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="standardHandlers.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="stepControl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="stream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="threadControl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="transport.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="utf_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="util.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="linker_md.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="Flag.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GarbageCollectorExtImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GcInfoBuilder.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HotSpotDiagnostic.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="management_ext.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="bytes.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="coding.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="unpack.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="utils.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="zip.cpp"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="SctpNet.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SctpServerChannelImpl.c"
+          
+        
+      
+      
+        
+        
+      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/image/cvutils
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
           
         
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20546,19 +45491,16 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
             AMD64
+            ASSERT
             COMPILER1
             COMPILER2
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             TARGET_ARCH_MODEL_x86_64
             TARGET_ARCH_x86
             TARGET_COMPILER_gcc
@@ -20567,22 +45509,21 @@
             TARGET_OS_FAMILY_linux
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
-          
-            __EXCEPTIONS
-            __GXX_RTTI
-          
         
       
-      
+      
         
           
             _GNU_SOURCE
+            _REENTRANT
           
         
         
           
             AMD64
+            ASSERT
             COMPILER1
             COMPILER2
             TARGET_ARCH_MODEL_x86_64
@@ -20598,84 +45539,92 @@
           
         
       
-      
-        
+      
+        
           
-            ../../hotspot/agent/src/os/linux
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
-            ${IDE_ALT_BOOTDIR}/include
-            ${IDE_ALT_BOOTDIR}/include/linux
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/linux_x86/vm
+            ../../hotspot/src/os/linux/vm
+            ../../hotspot/src/os/posix/vm
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
+            HOTSPOT_BUILD_USER="user"
+            HOTSPOT_LIB_ARCH="amd64"
+            HOTSPOT_VM_DISTRO="OpenJDK"
+            VM_LITTLE_ENDIAN
+            _LP64=1
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/jdk.hotspot.agent/share/native/libsaproc
+            ../../hotspot/src/jdk.hotspot.agent/linux/native/libsaproc
+            ../../build/support/headers/jdk.hotspot.agent
+            ../../hotspot/src/os/linux
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+          
+            ARCH="amd64"
+            DEBUG
+            LINUX
+            THIS_FILE="LinuxDebuggerLocal.c"
             _FILE_OFFSET_BITS=64
+            _LARGEFILE64_SOURCE
+            _LITTLE_ENDIAN
+            _LP64=1
             amd64
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
-            ../../hotspot/src/share/vm/prims
-            ../../hotspot/src/share/vm
-            ../../hotspot/src/share/vm/precompiled
-            ../../hotspot/src/cpu/x86/vm
-            ../../hotspot/src/os_cpu/linux_x86/vm
-            ../../hotspot/src/os/linux/vm
-            ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
-          
-          
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-            _LP64=1
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
-            ../../hotspot/src/share/vm/prims
-            ../../hotspot/src/share/vm
-            ../../hotspot/src/share/vm/precompiled
-            ../../hotspot/src/cpu/x86/vm
-            ../../hotspot/src/os_cpu/linux_x86/vm
-            ../../hotspot/src/os/linux/vm
-            ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
-          
-          
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-            _LP64=1
-          
-        
-      
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
-          
           
-            _REENTRANT
+            THIS_FILE="sadis.c"
           
         
       
-      
+      
+        
+          
+            ../../build/hotspot/linux_amd64_compiler2/debug
+          
+        
+        
+          
+            ../../build/hotspot/linux_amd64_compiler2/debug
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/linux_x86/vm
+            ../../hotspot/src/os/linux/vm
+            ../../hotspot/src/os/posix/vm
+            ../../build/hotspot/linux_amd64_compiler2/generated
+          
+          
+            HOTSPOT_BUILD_USER="user"
+            HOTSPOT_LIB_ARCH="amd64"
+            HOTSPOT_VM_DISTRO="OpenJDK"
+            VM_LITTLE_ENDIAN
+            _LP64=1
+            _NMT_NOINLINE_
+          
+        
+      
+      
         
           
             ../../hotspot/src/os/posix/launcher
@@ -20712,10 +45661,10 @@
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20723,22 +45672,19 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
             ../../hotspot/src/os/posix/launcher
@@ -20775,7 +45721,7 @@
           
         
       
-      
+      
         
           
             ../../hotspot/src/share/vm/prims
@@ -20786,18 +45732,15 @@
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
             ../../hotspot/src/share/vm/adlc
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/debug
           
-          
-            ASSERT
-          
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20805,25 +45748,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20831,25 +45771,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20857,25 +45794,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20883,25 +45817,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20909,25 +45840,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20935,25 +45863,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20961,25 +45886,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -20987,25 +45909,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21013,25 +45932,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21039,25 +45955,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21065,25 +45978,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21091,25 +46001,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21117,25 +46024,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21143,25 +46047,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21169,25 +46070,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21195,25 +46093,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21221,25 +46116,22 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../build/hotspot/linux_amd64_compiler2/debug
             ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
             ../../hotspot/src/share/vm/precompiled
@@ -21247,32 +46139,27 @@
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
+            ../../build/hotspot/linux_amd64_compiler2/generated
           
           
-            HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             VM_LITTLE_ENDIAN
             _LP64=1
+            _NMT_NOINLINE_
           
         
       
-      
+      
         
           
-            THIS_FILE="ArrayReferenceImpl.c"
+            THIS_FILE="genSocketOptionRegistry.c"
           
         
         
           
             ARCH="amd64"
-            NDEBUG
-            RELEASE=""
             THIS_FILE="Agent.cpp"
             _LARGEFILE64_SOURCE
             _LITTLE_ENDIAN
@@ -21281,81 +46168,25 @@
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/export
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/back
-            ../../jdk/src/solaris/back
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
-            ../../jdk/make
+            ../../jdk/make/gensrc
           
+        
+      
+      
+        
           
-            ARCH="amd64"
-            JDWP_LOGGING
-            LINUX
-            NDEBUG
-            RELEASE=""
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
+            THIS_FILE="genUnixConstants.c"
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-          
-          
-            ARCH="amd64"
-            LIBARCHNAME="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="java.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-          
           
             ARCH="amd64"
             LINUX
-            NDEBUG
-            RELEASE=""
             THIS_FILE="agent_util.c"
             _GNU_SOURCE
             _LARGEFILE64_SOURCE
@@ -21365,35 +46196,54 @@
             amd64
           
         
+      
+      
+        
+          
+            DEBUG
+          
+        
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../jdk/src/share/demo/jvmti/waiters
-            ../../jdk/src/share/demo/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/waiters
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
+          
+            DEBUG
+          
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/heapTracker
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
+            ../../jdk/src/demo/share/jvmti/heapTracker
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/compiledMethodLoad
-            ../../jdk/src/share/demo/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/compiledMethodLoad
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -21401,11 +46251,16 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/gctest
-            ../../jdk/src/share/demo/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/gctest
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -21413,12 +46268,17 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/heapTracker
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
+            ../../jdk/src/demo/share/jvmti/heapTracker
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -21426,11 +46286,16 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/heapViewer
-            ../../jdk/src/share/demo/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/heapViewer
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -21438,29 +46303,17 @@
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/demo/jvmti/hprof
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-          
-            THIS_FILE="debug_malloc.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/hprof
-            ../../jdk/src/solaris/demo/jvmti/hprof
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
+            ../../jdk/src/demo/share/jvmti/heapTracker
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -21468,12 +46321,17 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/minst
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
+            ../../jdk/src/demo/share/jvmti/minst
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -21481,12 +46339,17 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/mtrace
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
+            ../../jdk/src/demo/share/jvmti/mtrace
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -21494,11 +46357,16 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/versionCheck
-            ../../jdk/src/share/demo/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/versionCheck
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -21506,493 +46374,893 @@
           
         
       
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/instrument
-            ../../jdk/src/solaris/instrument
-            ../../jdk/src/share/bin
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            NO_JPLIS_LOGGING
-            RELEASE=""
-            THIS_FILE="EncodingSupport.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
+      
         
           
-            THIS_FILE="DirectAudioDevice.c"
+            THIS_FILE="ProcessHandleImpl_linux.c"
           
         
         
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjimage
+            ../../build/support/headers/java.base
+            ../../make
+          
           
-            THIS_FILE="bands.cpp"
+            THIS_FILE="ImageNativeSubstrate.cpp"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/com/sun/media/sound
-            ../../jdk/src/solaris/native/com/sun/media/sound
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
           
           
-            ARCH="amd64"
-            EXTRA_SOUND_JNI_LIBS=" jsoundalsa"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            X_ARCH=X_AMD64
-            X_PLATFORM=X_LINUX
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
+            DEBUG
           
         
-        
-          
-            FULL
-            PRODUCT
-          
-        
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="check_code.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="FileInputStream.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../build/support/headers/java.base
+            ../../make
           
           
             ARCHPROPNAME="amd64"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/linux/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
           
           
+            THIS_FILE="linux_close.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libnio
+            ../../jdk/src/java.base/share/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio
+            ../../jdk/src/java.base/linux/native/libnio/ch
+            ../../jdk/src/java.base/linux/native/libnio/fs
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio/fs
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/linux/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            THIS_FILE="EPoll.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LinuxNativeDispatcher.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="main.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/launcher
+            ../../jdk/src/java.base/share/native/libjli
+            ../../jdk/src/java.base/unix/native/libjli
+            ../../jdk/src/java.base/linux/native/libjli
+            ../../make
+          
+          
+            DEBUG
+            EXPAND_CLASSPATH_WILDCARDS
+            JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }
+            LAUNCHER_NAME="openjdk"
+            NEVER_ACT_AS_SERVER_CLASS_MACHINE
+            PROGNAME="javac"
+            VERSION_BUILD=0
+            VERSION_MAJOR=9
+            VERSION_MINOR=0
+            VERSION_NUMBER="9"
+            VERSION_OPT="2016-06-20-224455.vkvashin.jdktrunk"
+            VERSION_PATCH=0
+            VERSION_PRE="internal"
+            VERSION_SECURITY=0
+            VERSION_SHORT="9-internal"
+            VERSION_SPECIFICATION="9"
+            VERSION_STRING="9-internal+0-2016-06-20-224455.vkvashin.jdktrunk"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../make
+          
+          
+            DEBUG
+            LIBRARY_NAME=fdlibm
             THIS_FILE="e_acos.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Finalizer.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Array.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/src/solaris/native/sun/net/dns
-            ../../jdk/src/solaris/native/sun/net/spi
-            ../../jdk/src/solaris/native/sun/net/sdp
-            ../../jdk/make
-          
-          
-            THIS_FILE="DatagramPacket.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Bits.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../build/support/headers/java.base
+            ../../make
           
           
             ARCHPROPNAME="amd64"
+            DEBUG
             THIS_FILE="AccessController.c"
           
         
       
-      
-        
-          
-            THIS_FILE="AtomicLong.c"
-          
-        
-      
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/unix/native/libjli
+            ../../jdk/src/java.base/share/native/libjli
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../make
           
           
-            ARCHPROPNAME="amd64"
+            DEBUG
+            LIBARCHNAME="amd64"
+            THIS_FILE="args.c"
           
         
       
-      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/linux/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="DatagramPacket.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libnio
+            ../../jdk/src/java.base/share/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio
+            ../../jdk/src/java.base/linux/native/libnio/ch
+            ../../jdk/src/java.base/linux/native/libnio/fs
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio/fs
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/linux/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="nio_util.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="check_code.c"
+          
+        
+      
+      
         
           
             THIS_FILE="compress.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            DEBUG
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             WITH_X11
           
         
       
-      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
+          
+            DEBUG
+            THIS_FILE="jexec.c"
+          
+        
+        
+          
+            THIS_FILE="osSupport_unix.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            ARCHPROPNAME="amd64"
+            THIS_FILE="Console_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libjli
+            ../../jdk/src/java.base/share/native/libjli
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../make
+          
+          
+            LIBARCHNAME="amd64"
+            THIS_FILE="ergo.c"
+          
+        
+      
+      
+        
+          
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/linux/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            THIS_FILE="DefaultProxySelector.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libnio
+            ../../jdk/src/java.base/share/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio
+            ../../jdk/src/java.base/linux/native/libnio/ch
+            ../../jdk/src/java.base/linux/native/libnio/fs
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio/fs
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/linux/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            THIS_FILE="DatagramChannelImpl.c"
+          
+        
+      
+      
         
           
+            THIS_FILE="GioFileTypeDetector.c"
+          
+        
+      
+      
+        
+          
+            DEBUG
             THIS_FILE="debug_assert.c"
           
         
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
+            ../../jdk/src/java.desktop/share/native/libfontmanager/layout
+            ../../jdk/src/java.desktop/unix/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/java2d
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/java2d
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            /usr/include/freetype2
+            ../../make
           
           
-            THIS_FILE="AlternateSubstSubtables.cpp"
+            DEBUG
+            GETPAGESIZE
+            HAVE_FALLBACK
+            HAVE_INTEL_ATOMIC_PRIMITIVES
+            HAVE_MPROTECT
+            HAVE_OT
+            HAVE_PTHREAD
+            HAVE_SYSCONF
+            HAVE_SYS_MMAN_H
+            HAVE_UCDN
+            HAVE_UNISTD_H
+            HEADLESS
+            LE_STANDALONE
+            THIS_FILE="hb-blob.cc"
           
         
       
-      
-        
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/linux/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
           
           
-            INTERNAL_BUILD
             PACKAGE_PATH="/opt/local"
-            X11_PATH="/usr/X11R6"
             XAWT
             XAWT_HACK
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libmlib_image
+            ../../make
           
           
+            MLIB_NO_LIBSUNMATH
+            MLIB_OS64BIT
+            THIS_FILE="mlib_ImageCopy_Bit.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/linux/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
+          
+          
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="rect.c"
+            XAWT
+            XAWT_HACK
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/linux/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
+          
+          
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="AccelGlyphCache.c"
+            XAWT
+            XAWT_HACK
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/linux/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
+          
+          
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="OGLBlitLoops.c"
+            XAWT
+            XAWT_HACK
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../make
+          
+          
+            MLIB_NO_LIBSUNMATH
+            THIS_FILE="img_colors.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gifdecoder.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_ImagingLib.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AlphaMacros.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="BufferedMaskBlit.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
+            ../../jdk/src/java.desktop/share/native/libfontmanager/layout
+            ../../jdk/src/java.desktop/unix/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/java2d
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/java2d
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            /usr/include/freetype2
+            ../../make
+          
+          
+            GETPAGESIZE
+            HAVE_FALLBACK
+            HAVE_INTEL_ATOMIC_PRIMITIVES
+            HAVE_MPROTECT
+            HAVE_OT
+            HAVE_PTHREAD
+            HAVE_SYSCONF
+            HAVE_SYS_MMAN_H
+            HAVE_UCDN
+            HAVE_UNISTD_H
+            HEADLESS
+            LE_STANDALONE
+            THIS_FILE="ucdn.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AlternateSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="imageioJPEG.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
+          
+            EXTRA_SOUND_JNI_LIBS=" jsoundalsa"
+            THIS_FILE="DirectAudioDevice.c"
+            X_PLATFORM=X_LINUX
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/liblcms
+            ../../make
+          
+          
+            CMS_DONT_USE_FAST_FLOOR
+            THIS_FILE="LCMS.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libmlib_image
+            ../../make
+          
+          
+            MLIB_NO_LIBSUNMATH
+            MLIB_OS64BIT
+            THIS_FILE="mlib_ImageAffine.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="dgif_lib.c"
@@ -22000,811 +47268,316 @@
           
         
       
-      
+      
         
           
-            THIS_FILE="img_colors.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="gifdecoder.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            THIS_FILE="imageioJPEG.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
             THIS_FILE="png.c"
-            WITH_X11
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
           
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="awt_ImagingLib.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
+            THIS_FILE="CUPSfuncs.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/linux/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
           
           
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="java_awt_SplashScreen.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
             PACKAGE_PATH="/opt/local"
-            THIS_FILE="rect.c"
-            X11_PATH="/usr/X11R6"
             XAWT
             XAWT_HACK
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
           
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="AccelGlyphCache.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
+            THIS_FILE="GLXGraphicsConfig.c"
           
         
-        
+      
+      
+        
+          
+            THIS_FILE="X11FontScaler_md.c"
+          
+        
+      
+      
+        
           
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../make
           
           
+            MLIB_NO_LIBSUNMATH
+            THIS_FILE="awt_LoadLibrary.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/unix/native/libawt_headless/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
+          
+          
+            HEADLESS=true
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="HeadlessToolkit.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/linux/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
+          
+          
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="awt_AWTEvent.c"
+            XAWT
+            XAWT_HACK
+          
+        
+      
+      
+        
+          
+            THIS_FILE="XRBackendNative.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="XToolkit.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
+            ../../jdk/src/java.desktop/share/native/libfontmanager/layout
+            ../../jdk/src/java.desktop/unix/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/java2d
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/java2d
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            /usr/include/freetype2
+            ../../make
+          
+          
+            GETPAGESIZE
+            HAVE_FALLBACK
+            HAVE_INTEL_ATOMIC_PRIMITIVES
+            HAVE_MPROTECT
+            HAVE_OT
+            HAVE_PTHREAD
+            HAVE_SYSCONF
+            HAVE_SYS_MMAN_H
+            HAVE_UCDN
+            HAVE_UNISTD_H
             HEADLESS
             LE_STANDALONE
+            THIS_FILE="X11FontScaler.c"
           
-        
+        
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/linux/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
           
           
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="LCMS.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
+            THIS_FILE="jawt.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="AlphaMacros.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="OGLBlitLoops.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            MLIB_NO_LIBSUNMATH
-            THIS_FILE="BufferedMaskBlit.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/management
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="ClassLoadingImpl.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            ARCHPROPNAME="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="GC.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../jdk/make
-          
-          
-            THIS_FILE="genSocketOptionRegistry.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            ARCHPROPNAME="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="ConstantPool.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="ec.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-        
-          
-            ../../jdk/src/share/native/sun/security/ec
-            ../../jdk/src/share/native/sun/security/ec/impl
-            ../../jdk/make
-          
-          
-            THIS_FILE="ECC_JNI.cpp"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/ec
-            ../../jdk/src/share/native/sun/security/ec/impl
-            ../../jdk/make
-          
-          
-            MP_API_COMPATIBLE
-            NSS_ECC_MORE_THAN_SUITE_B
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/jgss/wrapper
-            ../../jdk/src/solaris/native/sun/security/jgss/wrapper
-            ../../jdk/make
-          
-          
-            THIS_FILE="GSSLibStub.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/pkcs11
-            ../../jdk/src/solaris/native/sun/security/pkcs11
-            ../../jdk/src/share/native/sun/security/pkcs11/wrapper
-            ../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
-            ../../jdk/make
-          
-          
-            THIS_FILE="p11_convert.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
-            ../../jdk/make
-          
-          
-            THIS_FILE="pcsc.c"
-            __sun_jdk
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/tracing/dtrace
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="JVM.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="npt.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/socket
-            ../../jdk/src/solaris/transport/socket
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/back
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="socketTransport.c"
-            USE_MMAP
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ARCH="amd64"
-            LINUX
-            NDEBUG
-            RELEASE=""
-            THIS_FILE="exec_md.c"
-            _GNU_SOURCE
-            _LARGEFILE64_SOURCE
-            _LITTLE_ENDIAN
-            _LP64=1
-            _REENTRANT
-            amd64
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/export
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/back
-            ../../jdk/src/solaris/back
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
-            ../../jdk/make
-          
-          
-            JDWP_LOGGING
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-          
-          
-            THIS_FILE="ergo.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/demo/jvmti/hprof
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-          
-            THIS_FILE="hprof_md.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/instrument
-            ../../jdk/src/solaris/instrument
-            ../../jdk/src/share/bin
-            ../../jdk/make
-          
-          
-            NO_JPLIS_LOGGING
-            THIS_FILE="EncodingSupport_md.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LinuxOperatingSystem.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/management
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/com/sun/media/sound
-            ../../jdk/src/solaris/native/com/sun/media/sound
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            /usr/include/alsa
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
           
           
             EXTRA_SOUND_JNI_LIBS=" jsoundalsa"
@@ -22813,587 +47586,483 @@
             USE_PLATFORM_MIDI_IN=TRUE
             USE_PLATFORM_MIDI_OUT=TRUE
             USE_PORTS=TRUE
-            X_ARCH=X_AMD64
             X_PLATFORM=X_LINUX
           
         
       
-      
+      
         
           
-            ../../jdk/make
-          
-          
-            THIS_FILE="Unix.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="jdk_util_md.c"
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            THIS_FILE="Console_md.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="ProcessEnvironment_md.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/src/solaris/native/sun/net/dns
-            ../../jdk/src/solaris/native/sun/net/spi
-            ../../jdk/src/solaris/native/sun/net/sdp
-            ../../jdk/make
-          
-          
-            THIS_FILE="Inet4AddressImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="MappedByteBuffer.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="FileSystemPreferences.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_sys.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/include
-            /usr/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
+            THIS_FILE="splashscreen_sys.c"
             WITH_X11
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.instrument/share/native/libinstrument
+            ../../jdk/src/java.instrument/unix/native/libinstrument
+            ../../build/support/headers/java.instrument
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
           
           
-            HEADLESS
-            LE_STANDALONE
-            THIS_FILE="X11FontScaler.c"
+            DEBUG
+            JPLIS_LOGGING
+            THIS_FILE="EncodingSupport.c"
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
           
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="GLXGraphicsConfig.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
+            THIS_FILE="EncodingSupport_md.c"
           
         
       
-      
+      
         
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.management/share/native/include
+            ../../jdk/src/java.management/share/native/libmanagement
+            ../../jdk/src/java.management/unix/native/libmanagement
+            ../../build/support/headers/java.management
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
+          
           
-            THIS_FILE="X11FontScaler_md.c"
+            DEBUG
+            THIS_FILE="ClassLoadingImpl.c"
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/management
-            ../../jdk/make
-          
           
             THIS_FILE="FileSystemImpl.c"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/src/solaris/native/sun/net/dns
-            ../../jdk/src/solaris/native/sun/net/spi
-            ../../jdk/src/solaris/native/sun/net/sdp
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.prefs/unix/native/libprefs
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
           
           
-            THIS_FILE="ResolverConfigurationImpl.c"
+            DEBUG
+            THIS_FILE="FileSystemPreferences.c"
           
         
       
-      
-        
-          
-            THIS_FILE="SdpSupport.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DefaultProxySelector.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SctpChannelImpl.c"
-          
-        
-      
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.security.jgss/share/native/libj2gss
+            ../../jdk/src/java.security.jgss/unix/native/libj2gss
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../build/support/headers/java.security.jgss
+            ../../make
           
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/nio/ch/sctp
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/sun/nio/ch
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-        
-      
-      
-        
           
-            THIS_FILE="GnomeFileTypeDetector.c"
+            DEBUG
+            THIS_FILE="GSSLibStub.c"
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-          
           
             THIS_FILE="NativeFunc.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/security/jgss/wrapper
-            ../../jdk/src/solaris/native/sun/security/jgss/wrapper
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/pkcs11
-            ../../jdk/src/solaris/native/sun/security/pkcs11
-            ../../jdk/src/share/native/sun/security/pkcs11/wrapper
-            ../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.smartcardio/share/native/libj2pcsc
+            ../../jdk/src/java.smartcardio/unix/native/libj2pcsc
+            ../../jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE
+            ../../build/support/headers/java.smartcardio
+            ../../make
           
           
-            THIS_FILE="p11_md.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
-            ../../jdk/make
-          
-          
-            THIS_FILE="pcsc_md.c"
+            DEBUG
+            THIS_FILE="pcsc.c"
             __sun_jdk
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
           
-            THIS_FILE="LinuxVirtualMachine.c"
+            THIS_FILE="pcsc_md.c"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/tracing/dtrace
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/jdk.attach
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
           
           
-            THIS_FILE="jvm_symbols_md.c"
+            DEBUG
+            THIS_FILE="VirtualMachineImpl.c"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
           
           
-            ARCHPROPNAME="amd64"
-            THIS_FILE="HostLocaleProviderAdapter_md.c"
+            DEBUG
+            MP_API_COMPATIBLE
+            NSS_ECC_MORE_THAN_SUITE_B
+            THIS_FILE="ec.c"
+          
+        
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="ECC_JNI.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11
+            ../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../build/support/headers/jdk.crypto.pkcs11
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="j2secmod.c"
           
         
       
-      
+      
         
-          
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
           
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="XToolkit.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
+            THIS_FILE="j2secmod_md.c"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
           
           
-            THIS_FILE="utf_md.c"
+            DEBUG
+            THIS_FILE="socketTransport.c"
           
         
       
-      
+      
         
           
-            ../../build/linux-x86_64-normal-server-release/jdk/include
-            ../../build/linux-x86_64-normal-server-release/jdk/include/linux
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/socket
-            ../../jdk/src/solaris/transport/socket
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/back
-            ../../jdk/make
+            ../../jdk/src/jdk.jdwp.agent/share/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../make
           
+          
+            USE_MMAP
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libjdwp
+            ../../build/support/headers/jdk.jdwp.agent
+            ../../make
+          
+          
+            JDWP_LOGGING
+            THIS_FILE="ArrayReferenceImpl.c"
+          
+        
+      
+      
+        
           
             THIS_FILE="socket_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../make
+          
+          
             USE_MMAP
           
         
       
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libjdwp
+            ../../build/support/headers/jdk.jdwp.agent
+            ../../make
+          
+          
+            JDWP_LOGGING
+            THIS_FILE="exec_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.management/share/native/include
+            ../../jdk/src/jdk.management/share/native/libmanagement_ext
+            ../../jdk/src/jdk.management/unix/native/libmanagement_ext
+            ../../jdk/src/jdk.management/linux/native/libmanagement_ext
+            ../../build/support/headers/jdk.management
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="UnixOperatingSystem.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DiagnosticCommandImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OperatingSystemImpl.c"
+          
+        
+      
+      
+        
+          
+            DEBUG
+            FULL
+            THIS_FILE="bands.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.base
+            ../../jdk/src/jdk.pack200/share/native/common-unpack
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
+          
+          
+            NO_ZLIB
+            UNPACK_JNI
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.base
+            ../../jdk/src/jdk.pack200/share/native/common-unpack
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../make
+          
+          
+            NO_ZLIB
+            THIS_FILE="jni.cpp"
+            UNPACK_JNI
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.pack200/share/native/common-unpack
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libzip/zlib-1.2.8
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            THIS_FILE="main.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/share/native/libnio/ch
+            ../../jdk/src/java.base/linux/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../jdk/src/java.base/linux/native/libjava
+            ../../build/support/headers/jdk.sctp
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="SctpChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/linux/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/jdk.security.auth
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="Unix.c"
+          
+        
+      
     
     
       
-        LOCAL_SOURCES
         default
+        false
+        false
       
+      
+        
+        
+        
+        
+        
+      
       
-        
-          IDE_ALT_BOOTDIR
-        
         
           HOTSPOT_BUILD_TARGET="target"
           HOTSPOT_BUILD_USER="user"
@@ -23406,323 +48075,697 @@
           gmake -f Makefile images
           gmake -f Makefile clean
           
+          
+            
+              THIS_FILE="ad_x86_64.cpp"
+            
+          
         
+        
+          ../..
+          sh ../configure --with-debug-level=slowdebug --disable-zip-debug-info
+        
       
-      
+        
+        
       
-      
+        
+          
+            THIS_FILE="ad_x86_64_clone.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="ad_x86_64_expand.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="ad_x86_64_format.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="ad_x86_64_gen.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="ad_x86_64_misc.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="ad_x86_64_peephole.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="ad_x86_64_pipeline.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="dfa_x86_64.cpp"
+          
+        
       
-      
+        
+        
       
-      
+        
+          
+            THIS_FILE="jvmtiEnter.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="jvmtiEnterTrace.cpp"
+          
+        
       
-      
+        
+        
       
-      
+        
+        
       
-      
-      
-      
+        
+        
       
       
-      
-      
-      
-      
+        
+          
+            THIS_FILE="assembler_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_CodeStubs_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_FpuStackSim_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_FrameMap_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_LIRAssembler_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_LIRGenerator_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_LinearScan_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_MacroAssembler_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_Runtime1_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c2_init_x86.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="compiledIC_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="debug_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="depChecker_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="frame_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="icBuffer_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="icache_x86.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="interp_masm_x86.cpp"
+          
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="interpreterRT_x86_64.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jniFastGetField_x86_64.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jvmciCodeInstaller_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="macroAssembler_x86.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="macroAssembler_x86_cos.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="macroAssembler_x86_exp.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="macroAssembler_x86_log.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="macroAssembler_x86_log10.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="macroAssembler_x86_pow.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="macroAssembler_x86_sha.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="macroAssembler_x86_sin.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="macroAssembler_x86_tan.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="metaspaceShared_x86_64.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="methodHandles_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="nativeInst_x86.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="registerMap_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="register_definitions_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="register_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="relocInfo_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="runtime_x86_64.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="sharedRuntime_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="sharedRuntime_x86_64.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stubGenerator_x86_64.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="stubRoutines_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stubRoutines_x86_64.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="templateInterpreterGenerator_x86.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="templateInterpreterGenerator_x86_64.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="templateTable_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vm_version_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vmreg_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vtableStubs_x86_64.cpp"
+          
+        
       
-      
+        
+        
+      
+      
+        
+        
       
       
+        
+        
       
-      
+        
+          
+            THIS_FILE="threadLocalStorage_posix.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="vmError_posix.cpp"
+          
+        
       
       
-        
+        
           
-            ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
-            ../../hotspot/src/share/vm/precompiled
-            ../../hotspot/src/cpu/x86/vm
-            ../../hotspot/src/os_cpu/solaris_x86/vm
             ../../hotspot/src/os/solaris/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
           
           
             AMD64
+            ASSERT
             COMPILER1
             COMPILER2
             DONT_USE_PRECOMPILED_HEADER
             DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
             SOLARIS
             SPARC_WORKS
             TARGET_ARCH_MODEL_x86_64
@@ -23733,6 +48776,7 @@
             TARGET_OS_FAMILY_solaris
             VM_LITTLE_ENDIAN
             _Crun_inline_placement
+            _NMT_NOINLINE_
           
         
       
@@ -23740,1622 +48784,4051 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
+        
           
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
+            ../../hotspot/make
           
+          
+            THIS_FILE="generateJvmOffsetsMain.c"
+          
         
       
       
+        
+          
+            ../../hotspot/make
+          
+        
       
       
-        
+        
           
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
+            ../../build/hotspot/variant-server/gensrc
+            ../../build/hotspot/variant-server/support/dtrace
+            ../../hotspot/make
           
+          
+            THIS_FILE="libjvm_db.c"
+          
         
       
-      
-      
       
-      
-      
+        
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="decoder_solaris.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="jvm_solaris.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="mutex_solaris.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="osThread_solaris.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="os_solaris.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="perfMemory_solaris.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stubRoutines_solaris.cpp"
+          
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="threadCritical_solaris.cpp"
+          
+        
       
       
+        
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="os_solaris_x86.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="thread_solaris_x86.cpp"
+          
+        
       
       
-      
-      
-      
-      
-      
-      
+        
+          
+            THIS_FILE="vm_version_solaris_x86.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="archDesc.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="arena.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="dfa.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="dict2.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="filebuff.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="forms.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="formsopt.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="formssel.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="main.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="output_c.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="output_h.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="codeBuffer.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="register.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="c1_Canonicalizer.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_Compilation.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_Compiler.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_Defs.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_FrameMap.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_GraphBuilder.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_IR.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_Instruction.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_InstructionPrinter.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_LIR.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_LIRAssembler.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_LIRGenerator.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_LinearScan.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_Optimizer.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_RangeCheckElimination.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_Runtime1.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_ValueMap.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_ValueSet.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_ValueStack.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_ValueType.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="c1_globals.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="ciArray.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciArrayKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciBaseObject.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciCallSite.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciConstant.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciConstantPoolCache.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciEnv.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciExceptionHandler.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciField.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciFlags.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciInstance.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciInstanceKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciMemberName.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciMetadata.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciMethod.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciMethodBlocks.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciMethodData.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciMethodHandle.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciNullObject.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciObjArray.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciObjArrayKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciObject.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciObjectFactory.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciReplay.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciSignature.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciStreams.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciSymbol.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciType.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciTypeArray.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciTypeArrayKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciTypeFlow.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ciUtilities.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="bytecodeAssembler.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="classFileError.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="classFileParser.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="classFileStream.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="classListParser.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="classLoader.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="classLoaderData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="classLoaderExt.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="classLoaderStats.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="compactHashtable.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="defaultMethods.cpp"
+          
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="dictionary.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="javaAssertions.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="javaClasses.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="klassFactory.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="loaderConstraints.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="metadataOnStackMark.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="moduleEntry.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="modules.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="packageEntry.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="placeholders.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="resolutionErrors.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="sharedPathsMiscInfo.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stackMapFrame.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stackMapTable.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="stringTable.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="symbolTable.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="systemDictionary.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="verificationType.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="verifier.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vmSymbols.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="codeCache.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="compiledIC.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="compiledMethod.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="compressedStream.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="debugInfo.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="debugInfoRec.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="dependencies.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="dependencyContext.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="exceptionHandlerTable.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="icBuffer.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="location.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="nmethod.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="oopRecorder.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="pcDesc.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="relocInfo.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="scopeDesc.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stubs.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vmreg.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vtableStubs.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="compileBroker.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="compileLog.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="compileTask.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="compilerDirectives.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="compilerOracle.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="directivesParser.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="disassembler.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="methodLiveness.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="methodMatcher.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="oopMap.cpp"
+          
+        
       
-      
+        
+        
       
-      
+        
+          
+            THIS_FILE="allocationStats.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="cmsCollectorPolicy.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="cmsLockVerifier.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="cmsOopClosures.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="compactibleFreeListSpace.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="concurrentMarkSweepGeneration.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="concurrentMarkSweepThread.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="freeChunk.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="gSpaceCounters.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="parCardTableModRefBS.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="parNewGeneration.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="parOopClosures.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="promotionInfo.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="vmCMSOperations.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="yieldingWorkgroup.cpp"
+          
+        
       
-      
+        
+        
       
-      
+        
+          
+            THIS_FILE="collectionSetChooser.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="concurrentG1Refine.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="concurrentG1RefineThread.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="concurrentMarkThread.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="dirtyCardQueue.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1AllocRegion.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1Allocator.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1Allocator_ext.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1Analytics.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1BiasedArray.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1BlockOffsetTable.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1CardCounts.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1CardLiveData.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1CodeBlobClosure.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1CodeCacheRemSet.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1CollectedHeap.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1CollectedHeap_ext.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1CollectionSet.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1CollectorPolicy.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1ConcurrentMark.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1DefaultPolicy.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1EvacFailure.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1EvacStats.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1FromCardCache.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1GCPhaseTimes.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1HeapSizingPolicy.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1HeapSizingPolicy_ext.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1HeapTransition.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1HeapVerifier.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1HotCardCache.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1IHOPControl.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1MMUTracker.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1MarkSweep.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1MarkSweep_ext.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1MonitoringSupport.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1OopClosures.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1PageBasedVirtualSpace.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1ParScanThreadState.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1ParScanThreadState_ext.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1Predictions.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1RegionToSpaceMapper.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1RemSet.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1RemSetSummary.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1RootClosures.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1RootClosures_ext.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1RootProcessor.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1SATBCardTableModRefBS.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1StringDedup.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1StringDedupQueue.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1StringDedupStat.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1StringDedupTable.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1StringDedupThread.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1SurvivorRegions.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1YoungGenSizer.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1YoungRemSetSamplingThread.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="g1_globals.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="hSpaceCounters.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="heapRegion.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="heapRegionManager.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="heapRegionRemSet.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="heapRegionSet.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="heapRegionTracer.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="heapRegionType.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="ptrQueue.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="satbMarkQueue.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="sparsePRT.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="survRateGroup.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="suspendibleThreadSet.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="vm_operations_g1.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="workerDataArray.cpp"
+          
+        
       
-      
+        
+        
       
-      
+        
+          
+            THIS_FILE="adjoiningVirtualSpaces.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="asPSOldGen.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="asPSYoungGen.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="cardTableExtension.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="gcAdaptivePolicyCounters.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcTaskManager.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcTaskThread.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="generationSizer.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="immutableSpace.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mutableNUMASpace.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mutableSpace.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="objectStartArray.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="parMarkBitMap.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="parallelScavengeHeap.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="pcTasks.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psAdaptiveSizePolicy.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psCompactionManager.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psGCAdaptivePolicyCounters.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psGenerationCounters.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psMarkSweep.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psMarkSweepDecorator.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psOldGen.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psParallelCompact.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psPromotionLAB.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psPromotionManager.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psScavenge.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psTasks.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psVirtualspace.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="psYoungGen.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="spaceCounters.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="vmPSOperations.cpp"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="defNewGeneration.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="genMarkSweep.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="markSweep.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="tenuredGeneration.cpp"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ageTable.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ageTableTracer.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="allocTracer.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="barrierSet.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="blockOffsetTable.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cardGeneration.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cardTableModRefBS.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cardTableModRefBSForCTRS.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cardTableRS.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="collectedHeap.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="collectorCounters.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="collectorPolicy.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="concurrentGCThread.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcCause.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcId.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcLocker.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcPolicyCounters.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcStats.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcTimer.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcTrace.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcTraceSend.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcTraceTime.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gcUtil.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="genCollectedHeap.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="genOopClosures.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="generation.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="generationCounters.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="generationSpec.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="memset_with_concurrent_readers.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="objectCountEventSender.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="plab.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="preservedMarks.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="referencePendingListLocker.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="referencePolicy.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="referenceProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="space.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="spaceDecorator.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="strongRootsScope.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="taskqueue.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="threadLocalAllocBuffer.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="vmGCOperations.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="workgroup.cpp"
+          
+        
+      
+      
+        
+        
       
       
+        
+          
+            THIS_FILE="bytecode.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="bytecodeHistogram.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="bytecodeInterpreter.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="bytecodeStream.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="bytecodeTracer.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="bytecodes.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="cppInterpreter.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cppInterpreterGenerator.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="interpreter.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="interpreterRuntime.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="invocationCounter.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="linkResolver.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="oopMapCache.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="rewriter.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="templateInterpreter.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="templateInterpreterGenerator.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="templateTable.cpp"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="jvmciCompiler.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jvmciCompilerToVM.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jvmciEnv.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jvmciJavaClasses.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jvmciRuntime.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jvmci_globals.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="vmStructs_jvmci.cpp"
+          
+        
       
       
-      
-      
+        
+        
       
       
+        
+          
+            THIS_FILE="set.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vectset.cpp"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="logConfiguration.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logDecorations.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logDecorators.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logDiagnosticCommand.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logFileOutput.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logFileStreamOutput.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logLevel.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logMessageBuffer.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logOutput.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logOutputList.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logStream.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logTag.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logTagLevelExpression.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logTagSet.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="logTagSetDescriptions.cpp"
+          
+        
       
       
-      
-      
+        
+        
       
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+          
+            THIS_FILE="binaryTreeDictionary.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="filemap.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="freeBlockDictionary.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="freeList.cpp"
+          
+        
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+          
+            THIS_FILE="guardedMemory.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="heap.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="heapInspection.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="iterator.cpp"
+          
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="memRegion.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="metachunk.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="metaspace.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="metaspaceCounters.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="metaspaceShared.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="metaspaceTracer.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="oopFactory.cpp"
+          
+        
       
-      
-      
-      
+        
+          
+            THIS_FILE="operator_new.cpp"
+          
+        
       
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+          
+            THIS_FILE="resourceArea.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="universe.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="universe_ext.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="virtualspace.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="arrayKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="arrayOop.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="compiledICHolder.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="constMethod.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="constantPool.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="cpCache.cpp"
+          
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="generateOopMap.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="instanceKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="instanceMirrorKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="instanceOop.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="instanceRefKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="klass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="klassVtable.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="markOop.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="metadata.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="method.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="methodCounters.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="methodData.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="objArrayKlass.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="objArrayOop.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="oop.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="oopsHierarchy.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="symbol.cpp"
+          
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="typeArrayKlass.cpp"
+          
+        
       
       
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
+        
+      
+      
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="arraycopynode.cpp"
           
         
       
@@ -25363,22 +52836,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="block.cpp"
           
         
       
@@ -25386,22 +52846,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="buildOopMap.cpp"
           
         
       
@@ -25409,22 +52856,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="bytecodeInfo.cpp"
           
         
       
@@ -25432,22 +52866,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="c2_globals.cpp"
           
         
       
@@ -25455,22 +52876,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="c2compiler.cpp"
           
         
       
@@ -25478,22 +52886,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="callGenerator.cpp"
           
         
       
@@ -25501,22 +52896,19 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="callnode.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="castnode.cpp"
           
         
       
@@ -25524,22 +52916,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="cfgnode.cpp"
           
         
       
@@ -25547,22 +52926,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="chaitin.cpp"
           
         
       
@@ -25570,22 +52936,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="classes.cpp"
           
         
       
@@ -25593,22 +52946,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="coalesce.cpp"
           
         
       
@@ -25616,22 +52956,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="compile.cpp"
           
         
       
@@ -25639,22 +52966,29 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="connode.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="convertnode.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="countbitsnode.cpp"
           
         
       
@@ -25662,22 +52996,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="divnode.cpp"
           
         
       
@@ -25685,22 +53006,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="doCall.cpp"
           
         
       
@@ -25708,22 +53016,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="domgraph.cpp"
           
         
       
@@ -25731,22 +53026,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="escape.cpp"
           
         
       
@@ -25754,22 +53036,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="gcm.cpp"
           
         
       
@@ -25777,22 +53046,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="generateOptoStub.cpp"
           
         
       
@@ -25800,22 +53056,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="graphKit.cpp"
           
         
       
@@ -25823,22 +53066,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="idealGraphPrinter.cpp"
           
         
       
@@ -25846,22 +53076,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="idealKit.cpp"
           
         
       
@@ -25869,22 +53086,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="ifg.cpp"
           
         
       
@@ -25892,22 +53096,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="ifnode.cpp"
           
         
       
@@ -25915,22 +53106,19 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="indexSet.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="intrinsicnode.cpp"
           
         
       
@@ -25938,22 +53126,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="lcm.cpp"
           
         
       
@@ -25961,22 +53136,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="library_call.cpp"
           
         
       
@@ -25984,22 +53146,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="live.cpp"
           
         
       
@@ -26007,22 +53156,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="locknode.cpp"
           
         
       
@@ -26030,22 +53166,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="loopPredicate.cpp"
           
         
       
@@ -26053,22 +53176,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="loopTransform.cpp"
           
         
       
@@ -26076,22 +53186,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="loopUnswitch.cpp"
           
         
       
@@ -26099,22 +53196,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="loopnode.cpp"
           
         
       
@@ -26122,22 +53206,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="loopopts.cpp"
           
         
       
@@ -26145,22 +53216,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="machnode.cpp"
           
         
       
@@ -26168,22 +53226,19 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="macro.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="macroArrayCopy.cpp"
           
         
       
@@ -26191,22 +53246,19 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="matcher.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mathexactnode.cpp"
           
         
       
@@ -26214,22 +53266,19 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="memnode.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="movenode.cpp"
           
         
       
@@ -26237,22 +53286,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="mulnode.cpp"
           
         
       
@@ -26260,22 +53296,19 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="multnode.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="narrowptrnode.cpp"
           
         
       
@@ -26283,22 +53316,19 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="node.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="opaquenode.cpp"
           
         
       
@@ -26306,14 +53336,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../hotspot/src/share/vm/adlc
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            ASSERT
+            THIS_FILE="opcodes.cpp"
           
         
       
@@ -26321,22 +53346,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="output.cpp"
           
         
       
@@ -26344,22 +53356,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="parse1.cpp"
           
         
       
@@ -26367,22 +53366,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="parse2.cpp"
           
         
       
@@ -26390,22 +53376,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="parse3.cpp"
           
         
       
@@ -26413,22 +53386,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="parseHelper.cpp"
           
         
       
@@ -26436,22 +53396,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="phase.cpp"
           
         
       
@@ -26459,22 +53406,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="phaseX.cpp"
           
         
       
@@ -26482,22 +53416,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="postaloc.cpp"
           
         
       
@@ -26505,22 +53426,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="reg_split.cpp"
           
         
       
@@ -26528,22 +53436,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="regalloc.cpp"
           
         
       
@@ -26551,22 +53446,19 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="regmask.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="replacednodes.cpp"
           
         
       
@@ -26574,22 +53466,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="rootnode.cpp"
           
         
       
@@ -26597,22 +53476,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="runtime.cpp"
           
         
       
@@ -26620,22 +53486,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="split_if.cpp"
           
         
       
@@ -26643,22 +53496,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="stringopts.cpp"
           
         
       
@@ -26666,22 +53506,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="subnode.cpp"
           
         
       
@@ -26689,22 +53516,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="superword.cpp"
           
         
       
@@ -26712,22 +53526,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="type.cpp"
           
         
       
@@ -26735,22 +53536,9 @@
             ex="false"
             tool="1"
             flavor2="0">
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="vectornode.cpp"
           
         
       
@@ -26758,478 +53546,1039 @@
             ex="false"
             tool="1"
             flavor2="0">
+        
+          
+            THIS_FILE="evmCompat.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="forte.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jni.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jniCheck.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jniFastGetField.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvm.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiClassFileReconstituter.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiCodeBlobEvents.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiEnv.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiEnvBase.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiEnvThreadState.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiEventController.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiExport.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiExtensions.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiGetLoadedClasses.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiImpl.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiManageCapabilities.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiRawMonitor.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiRedefineClasses.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiTagMap.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiThreadState.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiTrace.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jvmtiUtil.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="methodComparator.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="methodHandles.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="nativeLookup.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="perf.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="privilegedStack.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="stackwalk.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="unsafe.cpp"
+          
+        
       
       
+        
+        
       
       
+        
+          
+            THIS_FILE="whitebox.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="whitebox_ext.cpp"
+          
+        
       
       
-      
-      
+        
+        
       
       
+        
+          
+            THIS_FILE="arguments.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="atomic.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="basicLock.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="biasedLocking.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="commandLineFlagConstraintList.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="commandLineFlagConstraintsCompiler.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="commandLineFlagConstraintsGC.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="commandLineFlagConstraintsRuntime.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="commandLineFlagRangeList.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="commandLineFlagWriteableList.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="compilationPolicy.cpp"
+          
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="deoptimization.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="fieldDescriptor.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="fieldType.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="fprofiler.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="frame.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="globals.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="handles.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="icache.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="init.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="interfaceSupport.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="java.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="javaCalls.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jniHandles.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="jniPeriodicChecker.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="memprofiler.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="monitorChunk.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="mutex.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="mutexLocker.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="objectMonitor.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="orderAccess.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="os.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="osThread.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="park.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="perfData.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="perfMemory.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="reflection.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="reflectionUtils.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="relocator.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="rframe.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="rtmLocking.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="safepoint.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="semaphore.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="serviceThread.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="sharedRuntime.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="sharedRuntimeTrans.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="sharedRuntimeTrig.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="signature.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="simpleThresholdPolicy.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stackValue.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stackValueCollection.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="statSampler.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stubCodeGenerator.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="stubRoutines.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="sweeper.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="synchronizer.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="task.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="thread.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="thread_ext.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="timer.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="timerTrace.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="unhandledOops.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vframe.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vframeArray.cpp"
+          
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="vframe_hp.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vmStructs.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vmThread.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="vm_operations.cpp"
+          
+        
       
       
-        
+        
           
+            CPU="amd64"
+            DEBUG_LEVEL="slowdebug"
+            HOTSPOT_BUILD_USER="user"
+            HOTSPOT_VERSION_STRING="9-internal+0-2016-06-21-161756.vkvashin.jdktrunk"
+            HOTSPOT_VM_DISTRO="OpenJDK"
+            THIS_FILE="vm_version.cpp"
+            VERSION_BUILD=0
+            VERSION_MAJOR=9
+            VERSION_MINOR=0
+            VERSION_NUMBER="9"
+            VERSION_OPT="2016-06-21-161756.vkvashin.jdktrunk"
+            VERSION_PATCH=0
+            VERSION_PRE="internal"
+            VERSION_SECURITY=0
+            VERSION_SHORT="9-internal"
+            VERSION_SPECIFICATION="9"
+            VERSION_STRING="9-internal+0-2016-06-21-161756.vkvashin.jdktrunk"
           
         
       
@@ -27237,3545 +54586,4717 @@
             ex="false"
             tool="1"
             flavor2="0">
+        
+        
       
       
+        
+          
+            THIS_FILE="classLoadingService.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="diagnosticArgument.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="diagnosticCommand.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="diagnosticFramework.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="dtraceAttacher.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="g1MemoryPool.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="gcNotifier.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="heapDumper.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="lowMemoryDetector.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mallocSiteTable.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mallocTracker.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="management.cpp"
+          
+        
       
       
-      
-      
-      
-      
+        
+          
+            THIS_FILE="memBaseline.cpp"
+          
+        
       
       
-      
-      
-      
-      
+        
+          
+            THIS_FILE="memReporter.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="memTracker.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="memoryManager.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="memoryPool.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="memoryService.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="nmtCommon.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="nmtDCmd.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="psMemoryPool.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="runtimeService.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="threadService.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="virtualMemoryTracker.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="writeableFlags.cpp"
+          
+        
+      
+      
+        
+        
       
       
-      
-      
+        
+        
       
       
+        
+          
+            THIS_FILE="bitMap.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="chunkedList.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="constantTag.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="copy.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="debug.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="decoder.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="decoder_elf.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="elfFile.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="elfFuncDescTable.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="elfStringTable.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="elfSymbolTable.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="errorReporter.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="events.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="exceptions.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="globalDefinitions.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="growableArray.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="hashtable.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="histogram.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="intHisto.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="internalVMTests.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="json.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="linkedlist.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="nativeCallStack.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="numberSeq.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="ostream.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="preserveException.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="quickSort.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="resourceHash.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="sizes.cpp"
+          
+        
       
-      
+        
+          
+            THIS_FILE="stringUtils.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ticks.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="utf8.cpp"
+          
+        
       
       
-      
-      
+        
+          
+            THIS_FILE="vmError.cpp"
+          
+        
       
       
+        
+          
+            THIS_FILE="xmlstream.cpp"
+          
+        
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-        
-          
-            THIS_FILE="ArrayTypeImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ClassLoaderReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ClassObjectReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ClassTypeImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="EventRequestImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FieldImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FrameID.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MethodImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ObjectReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ReferenceTypeImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SDE.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="StackFrameImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="StringReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThreadGroupReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThreadReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="VirtualMachineImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="bag.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="classTrack.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="commonRef.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="debugDispatch.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="debugInit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="debugLoop.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="error_messages.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="eventFilter.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="eventHandler.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="eventHelper.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="inStream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="invoker.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="log_messages.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="outStream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="standardHandlers.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="stepControl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="stream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="threadControl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="transport.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="util.c"
-          
-        
-      
-      
-        
+        
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
+            ../../hotspot/make
           
           
-            LIBARCH32NAME="i386"
-            LIBARCH64NAME="amd64"
+            THIS_FILE="gtestLauncher.cpp"
           
-        
+        
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            LIBARCH32NAME="i386"
-            LIBARCH64NAME="amd64"
-            THIS_FILE="jli_util.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/make
-          
-          
-            EXPAND_CLASSPATH_WILDCARDS
-            HAVE_GETHRTIME
-            JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }
-            LAUNCHER_NAME="openjdk"
-            NEVER_ACT_AS_SERVER_CLASS_MACHINE
-            PROGNAME="javac"
-            THIS_FILE="main.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            LIBARCH32NAME="i386"
-            LIBARCH64NAME="amd64"
-            THIS_FILE="parse_manifest.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            LIBARCH32NAME="i386"
-            LIBARCH64NAME="amd64"
-            THIS_FILE="splashscreen_stubs.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            LIBARCH32NAME="i386"
-            LIBARCH64NAME="amd64"
-            THIS_FILE="version_comp.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            LIBARCH32NAME="i386"
-            LIBARCH64NAME="amd64"
-            THIS_FILE="wildcard.c"
-          
-        
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-        
-          
-            THIS_FILE="hprof_blocks.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_check.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_class.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_cpu.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_error.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_event.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_frame.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_init.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_io.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_ioname.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_listener.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_loader.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_monitor.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_object.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_reference.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_site.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_stack.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_string.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_table.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_tag.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_tls.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_trace.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_tracker.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="hprof_util.c"
-          
-        
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+        
+          
+            ../../hotspot/test/native
+            ../../hotspot/make
+          
+          
+            GTEST_HAS_EXCEPTIONS=0
+            THIS_FILE="gtestMain.cpp"
+          
+        
       
-      
-        
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
           
             THIS_FILE="Monitor.cpp"
           
         
       
-      
-        
+        
           
             THIS_FILE="Thread.cpp"
           
         
       
-      
-        
+        
           
             THIS_FILE="waiters.cpp"
           
         
       
-      
-      
-      
-        
-          
-            THIS_FILE="InstrumentationImplNativeMethods.c"
-          
+        
         
       
-      
-        
-          
-            THIS_FILE="InvocationAdapter.c"
-          
+        
         
       
-      
-        
-          
-            THIS_FILE="JPLISAgent.c"
-          
+        
         
       
-      
-        
-          
-            THIS_FILE="JPLISAssert.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="JarFacade.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="JavaExceptions.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="PathCharsValidator.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Reentrancy.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Utilities.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            UNPACK_JNI
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            THIS_FILE="bytes.cpp"
-            UNPACK_JNI
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            THIS_FILE="coding.cpp"
-            UNPACK_JNI
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            THIS_FILE="jni.cpp"
-            UNPACK_JNI
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../jdk/make
-          
-          
-            THIS_FILE="main.cpp"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            THIS_FILE="unpack.cpp"
-            UNPACK_JNI
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            THIS_FILE="utils.cpp"
-            UNPACK_JNI
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            NO_ZLIB
-            THIS_FILE="zip.cpp"
-            UNPACK_JNI
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="DirectAudioDeviceProvider.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MidiInDevice.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MidiInDeviceProvider.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MidiOutDevice.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MidiOutDeviceProvider.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Platform.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="PlatformMidi.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="PortMixer.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="PortMixerProvider.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Utilities.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/make
-          
-          
-            THIS_FILE="check_format.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="check_version.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="jdk_util.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="jio.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="jni_util.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="verify_stub.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="ObjectInputStream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ObjectOutputStream.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ObjectStreamClass.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="RandomAccessFile.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="io_util.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Class.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="ClassLoader.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Compiler.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Double.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Float.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Object.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Package.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="ResourceBundle.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Runtime.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="SecurityManager.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Shutdown.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="StrictMath.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="String.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="System.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Thread.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Throwable.c"
-          
-        
-      
-      
-      
-      
-        
+        
           
             THIS_FILE="e_asin.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_atan2.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_atanh.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_cosh.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_exp.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_fmod.c"
           
         
       
-      
-        
-          
-            THIS_FILE="e_hypot.c"
-          
-        
-      
-      
-        
+        
           
             THIS_FILE="e_log.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_log10.c"
           
         
       
-      
-        
-          
-            THIS_FILE="e_pow.c"
-          
-        
-      
-      
-        
+        
           
             THIS_FILE="e_rem_pio2.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_remainder.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_scalb.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_sinh.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="e_sqrt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="k_cos.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="k_rem_pio2.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="k_sin.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="k_standard.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="k_tan.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_atan.c"
           
         
       
-      
-        
-          
-            THIS_FILE="s_cbrt.c"
-          
-        
-      
-      
-        
+        
           
             THIS_FILE="s_ceil.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_copysign.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_cos.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_expm1.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_fabs.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_finite.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_floor.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_frexp.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_ilogb.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_isnan.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_ldexp.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_lib_version.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_log1p.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_logb.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_matherr.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_modf.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_nextafter.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_rint.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_scalbn.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_signgam.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_significand.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_sin.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_tan.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="s_tanh.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_acos.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_asin.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_atan2.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_atanh.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_cosh.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_exp.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_fmod.c"
           
         
       
-      
-        
-          
-            THIS_FILE="w_hypot.c"
-          
-        
-      
-      
-        
+        
           
             THIS_FILE="w_log.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_log10.c"
           
         
       
-      
-        
-          
-            THIS_FILE="w_pow.c"
-          
-        
-      
-      
-        
+        
           
             THIS_FILE="w_remainder.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_scalb.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_sinh.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="w_sqrt.c"
           
         
       
-      
+        
+        
       
-      
+        
+          
+            THIS_FILE="Array.c"
+          
+        
       
-      
-        
+        
+          
+            THIS_FILE="AtomicLong.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="BootLoader.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Class.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassLoader.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ConstantPool.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Double.c"
+          
+        
+      
+      
+        
           
             THIS_FILE="Executable.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="Proxy.c"
+            THIS_FILE="Field.c"
           
         
       
-      
+        
+          
+            THIS_FILE="FileInputStream.c"
+          
+        
       
-      
-        
+        
+          
+            THIS_FILE="Float.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Module.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NativeAccessors.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Object.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ObjectInputStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ObjectOutputStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ObjectStreamClass.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="RandomAccessFile.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Reflection.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Runtime.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SecurityManager.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Shutdown.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Signal.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StackFrameInfo.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StackStreamFactory.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StrictMath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="String.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StringCoding.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="System.c"
+            VERSION_BUILD=0
+            VERSION_MAJOR=9
+            VERSION_MINOR=0
+            VERSION_NUMBER="9"
+            VERSION_OPT="2016-06-21-161756.vkvashin.jdktrunk"
+            VERSION_PATCH=0
+            VERSION_PRE="internal"
+            VERSION_SECURITY=0
+            VERSION_SHORT="9-internal"
+            VERSION_SPECIFICATION="9"
+            VERSION_STRING="9-internal+0-2016-06-21-161756.vkvashin.jdktrunk"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Thread.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Throwable.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TimeZone.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VM.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VMSupport.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="check_version.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="io_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jdk_util.c"
+            VERSION_BUILD=0
+            VERSION_MAJOR=9
+            VERSION_MINOR=0
+            VERSION_NUMBER="9"
+            VERSION_OPT="2016-06-21-161756.vkvashin.jdktrunk"
+            VERSION_PATCH=0
+            VERSION_PRE="internal"
+            VERSION_SECURITY=0
+            VERSION_SHORT="9-internal"
+            VERSION_SPECIFICATION="9"
+            VERSION_STRING="9-internal+0-2016-06-21-161756.vkvashin.jdktrunk"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jio.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jni_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="verify_stub.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="endian.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="imageDecompressor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="imageFile.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jimage.cpp"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="java.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jli_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="parse_manifest.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="splashscreen_stubs.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="wildcard.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
           
             THIS_FILE="Inet4Address.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="Inet6Address.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="InetAddress.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="net_util.c"
           
         
       
-      
+        
+        
       
-      
+        
+        
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
+        
           
-            ARCHPROPNAME="amd64"
-            THIS_FILE="TimeZone.c"
+            THIS_FILE="check_format.c"
           
         
       
-      
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
-          
-            THIS_FILE="Adler32.c"
-            USE_MMAP
-          
-          
-            DEBUG
-          
+        
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
+        
           
             THIS_FILE="CRC32.c"
-            USE_MMAP
           
-          
-            DEBUG
-          
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
+        
           
             THIS_FILE="Deflater.c"
-            USE_MMAP
           
-          
-            DEBUG
-          
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
+        
           
             THIS_FILE="Inflater.c"
-            USE_MMAP
           
-          
-            DEBUG
-          
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
-          
-            THIS_FILE="ZipFile.c"
-            USE_MMAP
-          
-          
-            DEBUG
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/make
-          
+        
           
             THIS_FILE="zip_util.c"
-            USE_MMAP
           
-          
-            DEBUG
-          
         
       
-      
+        
+        
       
-      
-        
+        
+        
+      
+      
+        
+        
+      
+      
+        
           
-            THIS_FILE="deflate.c"
+            THIS_FILE="SolarisEventPort.c"
           
         
       
-      
-        
+        
+        
+      
+      
+        
           
-            THIS_FILE="gzclose.c"
+            THIS_FILE="SolarisWatchService.c"
           
         
       
-      
-        
+        
+        
+      
+      
+        
+        
+      
+      
+        
           
-            THIS_FILE="gzlib.c"
+            THIS_FILE="FileDescriptor_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="gzread.c"
+            THIS_FILE="FileInputStream_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="gzwrite.c"
+            THIS_FILE="FileOutputStream_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="infback.c"
+            THIS_FILE="ProcessEnvironment_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="inffast.c"
+            THIS_FILE="ProcessHandleImpl_unix.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="inflate.c"
+            THIS_FILE="ProcessImpl_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="inftrees.c"
+            THIS_FILE="RandomAccessFile_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="trees.c"
+            THIS_FILE="TimeZone_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="uncompr.c"
+            THIS_FILE="UnixFileSystem_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="zadler32.c"
+            THIS_FILE="VM_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="zcrc32.c"
+            THIS_FILE="canonicalize_md.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="zutil.c"
+            THIS_FILE="childproc.c"
           
         
       
-      
+        
+          
+            THIS_FILE="io_util_md.c"
+          
+        
       
-      
-        
+        
+          
+            THIS_FILE="java_props_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jdk_util_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="jni_util_md.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ergo_i586.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="java_md_common.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="java_md_solinux.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="Inet4AddressImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Inet6AddressImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InetAddressImplFactory.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NetworkInterface.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PlainDatagramSocketImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PlainSocketImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ResolverConfigurationImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SdpSupport.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketInputStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketOutputStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="net_util_md.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="portconfig.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MappedByteBuffer.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="DatagramDispatcher.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FileChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FileDispatcherImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FileKey.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IOUtil.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InheritedChannel.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NativeThread.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Net.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PollArrayWrapper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ServerSocketChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SocketDispatcher.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UnixAsynchronousSocketChannelImpl.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="UnixCopyFile.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UnixNativeDispatcher.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
           
             THIS_FILE="debug_mem.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="debug_trace.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="debug_util.c"
           
         
       
-      
+        
+        
       
-      
-        
+        
           
-            THIS_FILE="gif_err.c"
+            THIS_FILE="mlib_ImageCreate.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="gifalloc.c"
+            THIS_FILE="mlib_sys.c"
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="OGLBufImgOps.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLContext.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLFuncs.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLMaskBlit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLMaskFill.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLPaints.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLRenderQueue.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLRenderer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLSurfaceData.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLTextRenderer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OGLVertexCache.c"
+          
+        
+      
+      
+        
           
-            INTERNAL_BUILD
             THIS_FILE="BufImgSurfaceData.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
+        
           
-            INTERNAL_BUILD
             THIS_FILE="DataBufferNative.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
+        
           
-            INTERNAL_BUILD
             THIS_FILE="awt_ImageRep.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
+        
           
-            INTERNAL_BUILD
             THIS_FILE="awt_parseImage.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
           
         
       
-      
+        
+        
       
-      
-        
+        
           
             THIS_FILE="img_globals.c"
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
+        
           
-            INTERNAL_BUILD
             THIS_FILE="dither.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
           
         
       
-      
+        
+        
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
+        
           
-            INTERNAL_BUILD
             THIS_FILE="imageInitIDs.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
           
         
       
-      
-        
+        
+        
+      
+      
+        
+          
+            THIS_FILE="Disposer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SurfaceData.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Trace.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="AlphaMath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Any3Byte.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Any4Byte.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AnyByte.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AnyInt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AnyShort.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Blit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="BlitBg.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteBinary1Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteBinary2Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteBinary4Bit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteGray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ByteIndexed.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawLine.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawParallelogram.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawPath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawPolygons.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawRect.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillParallelogram.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillPath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillRect.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FillSpans.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FourByteAbgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FourByteAbgrPre.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GraphicsPrimitiveMgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Index12Gray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Index8Gray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntArgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntArgbBm.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntArgbPre.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntBgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntRgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IntRgbx.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MapAccelFunc.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MaskBlit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MaskFill.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ProcessPath.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScaledBlit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreeByteBgr.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TransformHelper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort4444Argb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort555Rgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort555Rgbx.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Ushort565Rgb.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UshortGray.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UshortIndexed.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="BufferedRenderPipe.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Region.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ShapeSpanIterator.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SpanClipRenderer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DrawGlyphList.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FontInstanceAdapter.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HBShaper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="freetypeScaler.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="hb-buffer-serialize.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-buffer.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-common.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-face.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-fallback-shape.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-font.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-font.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-layout.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-map.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-arabic.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-default.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-hangul.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-hebrew.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-indic-table.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-indic.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-myanmar.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-thai.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-tibetan.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-use-table.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-complex-use.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-fallback.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape-normalize.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-shape.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ot-tag.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-set.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-shape-plan.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-shape.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-shaper.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-ucdn.cc"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="hb-unicode.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-warning.cc"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="hb-jdk-font.cc"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="AnchorTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ArabicLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ArabicShaping.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CanonData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CanonShaping.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassDefinitionTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualGlyphInsertionProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualGlyphSubstProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualGlyphSubstProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ContextualSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CoverageTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="CursiveAttachmentSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="DeviceTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ExtensionSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Features.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GDEFMarkFilter.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GXLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GXLayoutEngine2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphDefinitionTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphIterator.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphLookupTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphPositionAdjustments.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphPositioningTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphPosnLookupProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphSubstLookupProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GlyphSubstitutionTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HanLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HangulLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicClassTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicRearrangementProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicRearrangementProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="IndicReordering.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KernTable.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KhmerLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="KhmerReordering.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LEFontInstance.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LEGlyphStorage.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LEInsertionList.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LigatureSubstProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LigatureSubstProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LigatureSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LookupProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="LookupTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Lookups.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MPreFixups.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkArrays.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkToBasePosnSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkToLigaturePosnSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MarkToMarkPosnSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MirroredCharData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MorphTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MorphTables2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MultipleSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NonContextualGlyphSubstProc.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="NonContextualGlyphSubstProc2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OpenTypeLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OpenTypeUtilities.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PairPositioningSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScriptAndLanguage.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ScriptAndLanguageTags.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentArrayProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentArrayProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentSingleProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SegmentSingleProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ShapingTypeData.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SimpleArrayProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SimpleArrayProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SinglePositioningSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SingleSubstitutionSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SingleTableProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SingleTableProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StateTableProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StateTableProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SubstitutionLookups.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SubtableProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SubtableProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SunLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThaiLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThaiShaping.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThaiStateTables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TibetanLayoutEngine.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TibetanReordering.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TrimmedArrayProcessor.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="TrimmedArrayProcessor2.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ValueRecords.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="scriptMapping.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="sunFont.c"
+          
+        
+      
+      
+        
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../make
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcapimin.c"
@@ -30783,30 +59304,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcapistd.c"
@@ -30814,30 +59335,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jccoefct.c"
@@ -30845,30 +59366,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jccolor.c"
@@ -30876,30 +59397,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcdctmgr.c"
@@ -30907,30 +59428,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jchuff.c"
@@ -30938,30 +59459,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcinit.c"
@@ -30969,30 +59490,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcmainct.c"
@@ -31000,30 +59521,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcmarker.c"
@@ -31031,30 +59552,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcmaster.c"
@@ -31062,30 +59583,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcomapi.c"
@@ -31093,30 +59614,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcparam.c"
@@ -31124,30 +59645,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcphuff.c"
@@ -31155,30 +59676,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcprepct.c"
@@ -31186,30 +59707,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jcsample.c"
@@ -31217,30 +59738,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jctrans.c"
@@ -31248,30 +59769,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdapimin.c"
@@ -31279,30 +59800,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdapistd.c"
@@ -31310,30 +59831,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdcoefct.c"
@@ -31341,30 +59862,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdcolor.c"
@@ -31372,30 +59893,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jddctmgr.c"
@@ -31403,30 +59924,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdhuff.c"
@@ -31434,30 +59955,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdinput.c"
@@ -31465,30 +59986,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdmainct.c"
@@ -31496,30 +60017,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdmarker.c"
@@ -31527,30 +60048,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdmaster.c"
@@ -31558,30 +60079,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdmerge.c"
@@ -31589,30 +60110,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdphuff.c"
@@ -31620,30 +60141,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdpostct.c"
@@ -31651,30 +60172,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdsample.c"
@@ -31682,30 +60203,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jdtrans.c"
@@ -31713,30 +60234,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jerror.c"
@@ -31744,30 +60265,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jfdctflt.c"
@@ -31775,30 +60296,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jfdctfst.c"
@@ -31806,30 +60327,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jfdctint.c"
@@ -31837,30 +60358,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jidctflt.c"
@@ -31868,30 +60389,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jidctfst.c"
@@ -31899,30 +60420,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jidctint.c"
@@ -31930,30 +60451,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jidctred.c"
@@ -31961,30 +60482,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jmemmgr.c"
@@ -31992,30 +60513,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jmemnobs.c"
@@ -32023,51 +60544,51 @@
           
         
       
-      
-        
+        
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../make
           
           
             THIS_FILE="jpegdecoder.c"
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jquant1.c"
@@ -32075,30 +60596,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jquant2.c"
@@ -32106,30 +60627,30 @@
           
         
       
-      
-        
+        
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
           
           
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="jutils.c"
@@ -32137,6693 +60658,4039 @@
           
         
       
-      
-      
-      
-        
-          
-            THIS_FILE="pngerror.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngget.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngmem.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngpread.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngread.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngrio.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngrtran.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngrutil.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngset.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngtrans.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngwio.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngwrite.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngwtran.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="pngwutil.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffineEdge.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BC_D64.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BC_F32.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BC_S32.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BL_D64.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BL_F32.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_BL_S32.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_NN.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageAffine_NN_Bit.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageClipping.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageColorTrue2Index.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv2x2_f.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvClearEdge_Bit.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvClearEdge_Fp.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvCopyEdge_Bit.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvKernelConvert.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvMxN.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvMxN_Fp.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConvMxN_ext.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_16ext.c"
-          
+        
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_16nw.c"
+            THIS_FILE="DirectAudioDeviceProvider.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_32nw.c"
+            THIS_FILE="MidiInDevice.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_8ext.c"
+            THIS_FILE="MidiInDeviceProvider.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_8nw.c"
+            THIS_FILE="MidiOutDevice.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_D64nw.c"
+            THIS_FILE="MidiOutDeviceProvider.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_F32nw.c"
+            THIS_FILE="Platform.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_u16ext.c"
+            THIS_FILE="PlatformMidi.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageConv_u16nw.c"
+            THIS_FILE="PortMixer.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageCopy_Bit.c"
+            THIS_FILE="PortMixerProvider.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
+        
           
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageCreate.c"
+            THIS_FILE="Utilities.c"
           
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageDivTables.c"
-          
+        
         
       
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageFilters.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageLookUp_64.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageLookUp_Bit.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageScanPoly.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_ImageUtils.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffineIndex_BC.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffineIndex_BL.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BC.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BC_S16.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BC_U16.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BL.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BL_S16.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_BL_U16.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageAffine_NN.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageConvClearEdge.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageConvCopyEdge.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageConvVersion.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageConv_f.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageCopy.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageLookUp.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageLookUp_f.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_c_ImageThresh1_U8.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/solaris/native/sun/awt/medialib
-            ../../jdk/make
-          
-          
-            MLIB_NO_LIBSUNMATH
-            MLIB_OS64BIT
-            THIS_FILE="mlib_sys.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="splashscreen_gfx_impl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_gif.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_impl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_jpeg.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_png.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            HEADLESS
-            LE_STANDALONE
-            THIS_FILE="DrawGlyphList.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FontInstanceAdapter.cpp"
-          
-        
-      
-      
-        
-          
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            HEADLESS
-            LE_STANDALONE
-            THIS_FILE="freetypeScaler.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="AnchorTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ArabicLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ArabicShaping.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="CanonData.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="CanonShaping.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ClassDefinitionTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ContextualGlyphSubstProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ContextualSubstSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="CoverageTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="CursiveAttachmentSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DeviceTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ExtensionSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Features.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GDEFMarkFilter.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GXLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphDefinitionTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphIterator.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphLookupTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphPositionAdjustments.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphPositioningTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphPosnLookupProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphSubstLookupProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GlyphSubstitutionTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="HanLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="HangulLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IndicClassTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IndicLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IndicRearrangementProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IndicReordering.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="KernTable.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="KhmerLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="KhmerReordering.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LEFontInstance.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LEGlyphStorage.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LEInsertionList.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LigatureSubstProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LigatureSubstSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LookupProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="LookupTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Lookups.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MPreFixups.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MarkArrays.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MarkToBasePosnSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MarkToLigaturePosnSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MarkToMarkPosnSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MirroredCharData.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MorphTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MultipleSubstSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="NonContextualGlyphSubstProc.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OpenTypeLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OpenTypeUtilities.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="PairPositioningSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ScriptAndLanguage.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ScriptAndLanguageTags.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SegmentArrayProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SegmentSingleProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ShapingTypeData.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SimpleArrayProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SinglePositioningSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SingleSubstitutionSubtables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SingleTableProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="StateTableProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SubstitutionLookups.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SubtableProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SunLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThaiLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThaiShaping.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThaiStateTables.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="TibetanLayoutEngine.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="TibetanReordering.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="TrimmedArrayProcessor.cpp"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ValueRecords.cpp"
-          
-        
-      
-      
-        
-          
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            HEADLESS
-            LE_STANDALONE
-            THIS_FILE="sunFont.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            THIS_FILE="Disposer.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            THIS_FILE="SurfaceData.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            THIS_FILE="Trace.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-      
-      
-        
+        
           
             THIS_FILE="cmscam02.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmscgats.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmscnvrt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmserr.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsgamma.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsgmt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmshalf.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsintrp.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsio0.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsio1.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmslut.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsmd5.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsmtrx.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsnamed.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsopt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmspack.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmspcs.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsplugin.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsps2.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmssamp.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmssm.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmstypes.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsvirt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmswtpnt.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="cmsxform.c"
           
         
       
-      
-      
-      
-        
-          
-            THIS_FILE="AlphaMath.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Any3Byte.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Any4Byte.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="AnyByte.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="AnyInt.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="AnyShort.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Blit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="BlitBg.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteBinary1Bit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteBinary2Bit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteBinary4Bit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteGray.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ByteIndexed.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawLine.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawParallelogram.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawPath.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawPolygons.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DrawRect.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FillParallelogram.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FillPath.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FillRect.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FillSpans.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FourByteAbgr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="FourByteAbgrPre.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GraphicsPrimitiveMgr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Index12Gray.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Index8Gray.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntArgb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntArgbBm.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntArgbPre.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntBgr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntRgb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="IntRgbx.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MapAccelFunc.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MaskBlit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MaskFill.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ProcessPath.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ScaledBlit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThreeByteBgr.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="TransformHelper.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Ushort4444Argb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Ushort555Rgb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Ushort555Rgbx.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Ushort565Rgb.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="UshortGray.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="UshortIndexed.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="OGLBufImgOps.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLContext.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLFuncs.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLMaskBlit.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLMaskFill.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLPaints.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLRenderQueue.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLRenderer.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLSurfaceData.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="OGLTextRenderer.c"
-          
+        
         
       
-      
-        
+        
           
-            THIS_FILE="OGLVertexCache.c"
+            THIS_FILE="mlib_ImageAffineEdge.c"
           
         
       
-      
-      
-      
-        
-          
-            THIS_FILE="BufferedRenderPipe.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Region.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ShapeSpanIterator.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SpanClipRenderer.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="Flag.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GarbageCollectorImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="GcInfoBuilder.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="HotSpotDiagnostic.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="HotspotThread.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MemoryImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MemoryManagerImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="MemoryPoolImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ThreadImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="VMManagementImpl.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="management.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="MessageUtils.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="NativeSignalHandler.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Signal.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="VM.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="VMSupport.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="Version.c"
-          
-        
-      
-      
-      
-      
-      
-      
-        
-          
-            THIS_FILE="NativeAccessors.c"
-          
-        
-      
-      
-        
+        
           
-            THIS_FILE="Reflection.c"
+            THIS_FILE="mlib_ImageAffine_BC_D64.c"
           
         
       
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="ec2_163.c"
+            THIS_FILE="mlib_ImageAffine_BC_F32.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec2_193.c"
+            THIS_FILE="mlib_ImageAffine_BC_S32.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec2_233.c"
+            THIS_FILE="mlib_ImageAffine_BL_D64.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec2_aff.c"
+            THIS_FILE="mlib_ImageAffine_BL_F32.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec2_mont.c"
+            THIS_FILE="mlib_ImageAffine_BL_S32.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ec_naf.c"
+            THIS_FILE="mlib_ImageAffine_NN.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecdecode.c"
+            THIS_FILE="mlib_ImageAffine_NN_Bit.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecl.c"
+            THIS_FILE="mlib_ImageClipping.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecl_curve.c"
+            THIS_FILE="mlib_ImageConvClearEdge_Bit.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecl_gf.c"
+            THIS_FILE="mlib_ImageConvClearEdge_Fp.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecl_mult.c"
+            THIS_FILE="mlib_ImageConvCopyEdge_Bit.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_192.c"
+            THIS_FILE="mlib_ImageConvKernelConvert.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_224.c"
+            THIS_FILE="mlib_ImageConvMxN.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_256.c"
+            THIS_FILE="mlib_ImageConvMxN_Fp.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_384.c"
+            THIS_FILE="mlib_ImageConvMxN_ext.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_521.c"
+            THIS_FILE="mlib_ImageConv_16ext.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_aff.c"
+            THIS_FILE="mlib_ImageConv_16nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_jac.c"
+            THIS_FILE="mlib_ImageConv_32nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_jm.c"
+            THIS_FILE="mlib_ImageConv_8ext.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="ecp_mont.c"
+            THIS_FILE="mlib_ImageConv_8nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="mp_gf2m.c"
+            THIS_FILE="mlib_ImageConv_D64nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="mpi.c"
+            THIS_FILE="mlib_ImageConv_F32nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="mplogic.c"
+            THIS_FILE="mlib_ImageConv_u16ext.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="mpmontg.c"
+            THIS_FILE="mlib_ImageConv_u16nw.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="oid.c"
+            THIS_FILE="mlib_ImageDivTables.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="secitem.c"
+            THIS_FILE="mlib_ImageFilters.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="NativeUtil.c"
+            THIS_FILE="mlib_ImageLookUp_64.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="j2secmod.c"
+            THIS_FILE="mlib_ImageLookUp_Bit.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="p11_crypt.c"
+            THIS_FILE="mlib_ImageScanPoly.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_digest.c"
+            THIS_FILE="mlib_ImageUtils.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_dual.c"
+            THIS_FILE="mlib_c_ImageAffine_BC.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_general.c"
+            THIS_FILE="mlib_c_ImageAffine_BC_S16.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_keymgmt.c"
+            THIS_FILE="mlib_c_ImageAffine_BC_U16.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_mutex.c"
+            THIS_FILE="mlib_c_ImageAffine_BL.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_objmgmt.c"
+            THIS_FILE="mlib_c_ImageAffine_BL_S16.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_sessmgmt.c"
+            THIS_FILE="mlib_c_ImageAffine_BL_U16.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_sign.c"
+            THIS_FILE="mlib_c_ImageAffine_NN.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="p11_util.c"
+            THIS_FILE="mlib_c_ImageConvClearEdge.c"
           
         
       
-      
-      
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="utf.c"
+            THIS_FILE="mlib_c_ImageConvCopyEdge.c"
           
         
       
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="linker_md.c"
+            THIS_FILE="mlib_c_ImageConvVersion.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="ergo_i586.c"
+            THIS_FILE="mlib_c_ImageConv_f.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="java_md_common.c"
+            THIS_FILE="mlib_c_ImageCopy.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="java_md_solinux.c"
+            THIS_FILE="mlib_c_ImageLookUp.c"
           
         
       
-      
-      
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="FileSystemSupport_md.c"
+            THIS_FILE="mlib_c_ImageLookUp_f.c"
           
         
       
-      
-      
-      
-        
-          
-            THIS_FILE="UnixOperatingSystem_md.c"
-          
+        
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="PLATFORM_API_SolarisOS_Ports.c"
+            THIS_FILE="gif_err.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="PLATFORM_API_SolarisOS_Utils.c"
+            THIS_FILE="gifalloc.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="Unix.c"
+            THIS_FILE="java_awt_SplashScreen.c"
           
         
       
-      
-      
-      
-        
-          
-            THIS_FILE="jni_util_md.c"
-          
+        
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="FileDescriptor_md.c"
+            THIS_FILE="pngerror.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="FileInputStream_md.c"
+            THIS_FILE="pngget.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="FileOutputStream_md.c"
+            THIS_FILE="pngmem.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="RandomAccessFile_md.c"
+            THIS_FILE="pngpread.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="UnixFileSystem_md.c"
+            THIS_FILE="pngread.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="canonicalize_md.c"
+            THIS_FILE="pngrio.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="io_util_md.c"
+            THIS_FILE="pngrtran.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="UNIXProcess_md.c"
+            THIS_FILE="pngrutil.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="java_props_md.c"
+            THIS_FILE="pngset.c"
           
         
       
-      
-      
-      
-        
+        
           
-            THIS_FILE="Inet6AddressImpl.c"
+            THIS_FILE="pngtrans.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="InetAddressImplFactory.c"
+            THIS_FILE="pngwio.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="NetworkInterface.c"
+            THIS_FILE="pngwrite.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="PlainDatagramSocketImpl.c"
+            THIS_FILE="pngwtran.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="PlainSocketImpl.c"
+            THIS_FILE="pngwutil.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="SocketInputStream.c"
+            THIS_FILE="splashscreen_gfx_impl.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="SocketOutputStream.c"
+            THIS_FILE="splashscreen_gif.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="net_util_md.c"
+            THIS_FILE="splashscreen_impl.c"
           
         
       
-      
-      
-      
-      
-      
-        
+        
           
-            THIS_FILE="TimeZone_md.c"
+            THIS_FILE="splashscreen_jpeg.c"
           
         
       
-      
-        
+        
           
-            THIS_FILE="logging.c"
+            THIS_FILE="splashscreen_png.c"
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
+        
           
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
             THIS_FILE="CUPSfuncs.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
+        
           
-            HEADLESS=true
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="HeadlessToolkit.c"
-            X11_PATH="/usr/X11R6"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            HEADLESS=true
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="VDrawingArea.c"
-            X11_PATH="/usr/X11R6"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
             THIS_FILE="X11Color.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
+        
           
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_AWTEvent.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_DrawingSurface.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_Event.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
             THIS_FILE="awt_Font.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
+        
           
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_GraphicsEnv.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_InputMethod.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_Insets.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            THIS_FILE="awt_LoadLibrary.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            THIS_FILE="awt_Mlib.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_Plugin.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_Robot.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_UNIXToolkit.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="awt_util.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
             THIS_FILE="fontpath.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="gtk2_interface.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
+        
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="initIDs.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
+        
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="jawt.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="list.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="multiVis.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="multi_font.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="robot_common.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="sun_awt_X11_GtkFileDialogPeer.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="swing_GTKEngine.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="swing_GTKStyle.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="X11TextRenderer.c"
-          
-        
-      
-      
-      
-      
-        
+        
           
             THIS_FILE="GLXSurfaceData.c"
           
         
       
-      
+        
+        
       
-      
-        
+        
           
             THIS_FILE="X11PMBlitLoops.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="X11Renderer.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="X11SurfaceData.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="X11TextRenderer_md.c"
           
         
       
-      
-        
+        
+        
+      
+      
+        
           
-            THIS_FILE="XRBackendNative.c"
+            THIS_FILE="awt_Mlib.c"
           
         
       
-      
-        
+        
+          
+            THIS_FILE="initIDs.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="awt_DrawingSurface.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_Event.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_GraphicsEnv.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_InputMethod.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_Insets.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_Robot.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_UNIXToolkit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gtk2_interface.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gtk3_interface.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gtk_interface.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="list.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="multiVis.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="multi_font.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="robot_common.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="sun_awt_X11_GtkFileDialogPeer.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="swing_GTKEngine.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="swing_GTKStyle.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
           
             THIS_FILE="XRSurfaceData.c"
           
         
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="DatagramChannelImpl.c"
-          
+        
         
       
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="DatagramDispatcher.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="DevPollArrayWrapper.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="FileChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="FileDispatcherImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="FileKey.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="IOUtil.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="InheritedChannel.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="NativeThread.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="Net.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="PollArrayWrapper.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="ServerSocketChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="SocketChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="SocketDispatcher.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="SolarisEventPort.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="UnixAsynchronousSocketChannelImpl.c"
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="SctpNet.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SctpServerChannelImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="SolarisNativeDispatcher.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="SolarisWatchService.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="UnixCopyFile.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="UnixNativeDispatcher.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../jdk/make
-          
-          
-            THIS_FILE="genSolarisConstants.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="genUnixConstants.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-      
-      
-        
-          
-            THIS_FILE="j2secmod_md.c"
-          
-        
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-        
+        
           
             THIS_FILE="XWindow.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="XlibWrapper.c"
           
         
       
-      
-        
+        
           
             THIS_FILE="awt_Desktop.c"
           
         
       
-      
-        
+        
+          
+            THIS_FILE="awt_Taskbar.c"
+          
+        
+      
+      
+        
           
             THIS_FILE="gnome_interface.c"
           
         
       
-      
-      
-      
+        
+        
       
-      
+      
+        
+          
+            THIS_FILE="X11TextRenderer.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_SolarisOS_Ports.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PLATFORM_API_SolarisOS_Utils.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="InstrumentationImplNativeMethods.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InvocationAdapter.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JPLISAgent.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JPLISAssert.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JarFacade.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="JavaExceptions.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="PathCharsValidator.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Reentrancy.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Utilities.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="FileSystemSupport_md.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="GarbageCollectorImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HotspotThread.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MemoryImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MemoryManagerImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MemoryPoolImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreadImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VMManagementImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="management.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="NativeUtil.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_163.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_193.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_233.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_aff.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec2_mont.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ec_naf.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecdecode.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecl_curve.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecl_gf.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecl_mult.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_192.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_224.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_256.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_384.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_521.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_aff.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_jac.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_jm.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ecp_mont.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mp_gf2m.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mpi.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mplogic.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="mpmontg.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="oid.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="secitem.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="p11_convert.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_crypt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_digest.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_dual.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_general.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_keymgmt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_mutex.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_objmgmt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_sessmgmt.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_sign.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="p11_util.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="p11_md.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="nativeCryptoMD.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="nativeFunc.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="ArrayTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassLoaderReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassObjectReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ClassTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="EventRequestImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FieldImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="FrameID.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="InterfaceTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="MethodImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ModuleReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ObjectReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ReferenceTypeImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SDE.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StackFrameImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="StringReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreadGroupReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="ThreadReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="VirtualMachineImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="bag.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="classTrack.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="commonRef.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debugDispatch.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debugInit.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="debugLoop.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="error_messages.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="eventFilter.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="eventHandler.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="eventHelper.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="inStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="invoker.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="log_messages.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="outStream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="standardHandlers.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="stepControl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="stream.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="threadControl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="transport.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="utf_util.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="util.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="linker_md.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="Flag.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GarbageCollectorExtImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GcInfoBuilder.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="HotSpotDiagnostic.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="management_ext.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="bytes.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="coding.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="unpack.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="utils.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="zip.cpp"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+          
+            THIS_FILE="SctpNet.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="SctpServerChannelImpl.c"
+          
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
+        
+        
+      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/image/cvutils
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
           
-          
-            __sparcv9
-          
         
         
           
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
-            ../../hotspot/src/share/vm/prims
             ../../hotspot/src/share/vm
-            ../../hotspot/src/share/vm/precompiled
-            ../../hotspot/src/cpu/x86/vm
-            ../../hotspot/src/os_cpu/linux_x86/vm
-            ../../hotspot/src/os/linux/vm
-            ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
-          
-          
-            __EXCEPTIONS
-            __GXX_RTTI
-          
-        
-      
-      
-        
-          
-            ../../hotspot/src/os_cpu/solaris_x86/vm
-            ../../hotspot/src/os/solaris/vm
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            AMD64
-            COMPILER1
-            COMPILER2
-            DONT_USE_PRECOMPILED_HEADER
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            SOLARIS
-            SPARC_WORKS
-            TARGET_ARCH_MODEL_x86_64
-            TARGET_ARCH_x86
-            TARGET_COMPILER_sparcWorks
-            TARGET_OS_ARCH_MODEL_solaris_x86_64
-            TARGET_OS_ARCH_solaris_x86
-            TARGET_OS_FAMILY_solaris
-            VM_LITTLE_ENDIAN
-            _Crun_inline_placement
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            TIERED
-          
-        
-      
-      
-        
-          
-            _GNU_SOURCE
-          
-        
-        
-          
-            __EXCEPTIONS
-            __GXX_RTTI
-          
-        
-      
-      
-        
-          
-            ../../hotspot/agent/src/os/solaris/proc
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ${IDE_ALT_BOOTDIR}/include
-            ${IDE_ALT_BOOTDIR}/include/solaris
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            SOLARIS_11_B159_OR_LATER
-          
-        
-        
-          
-            ../../hotspot/agent/src/os/solaris/proc
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ${IDE_ALT_BOOTDIR}/include
-            ${IDE_ALT_BOOTDIR}/include/solaris
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            SOLARIS_11_B159_OR_LATER
-          
-        
-      
-      
-        
-          
-            ${IDE_ALT_BOOTDIR}/include/linux
-          
-        
-      
-      
-        
-          
-            ../../hotspot/src/share/vm/prims
-            ../../hotspot/src/share/vm
-            ../../hotspot/src/share/vm/precompiled
-            ../../hotspot/src/cpu/x86/vm
-            ../../hotspot/src/os_cpu/solaris_x86/vm
             ../../hotspot/src/os/solaris/vm
             ../../hotspot/src/os/posix/vm
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            AMD64
-            COMPILER1
-            COMPILER2
-            DONT_USE_PRECOMPILED_HEADER
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            SOLARIS
-            SPARC_WORKS
-            TARGET_ARCH_MODEL_x86_64
-            TARGET_ARCH_x86
-            TARGET_COMPILER_sparcWorks
-            TARGET_OS_ARCH_MODEL_solaris_x86_64
-            TARGET_OS_ARCH_solaris_x86
-            TARGET_OS_FAMILY_solaris
-            VM_LITTLE_ENDIAN
-            _Crun_inline_placement
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
-            ../../hotspot/src/share/vm/prims
-            ../../hotspot/src/share/vm
-            ../../hotspot/src/share/vm/precompiled
-            ../../hotspot/src/cpu/x86/vm
-            ../../hotspot/src/os_cpu/linux_x86/vm
-            ../../hotspot/src/os/linux/vm
-            ../../hotspot/src/os/posix/vm
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
-          
-        
-      
-      
-        
-          
-            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
-          
-          
-            _REENTRANT
-          
-        
-        
-          
-            LINUX
-            _GNU_SOURCE
-            _REENTRANT
-          
-        
-      
-      
-        
-          
-            ../../hotspot/src/os/posix/launcher
-            ../../hotspot/src/share/vm/prims
-            ../../hotspot/src/share/tools/launcher
-            ../../hotspot/src/share/vm
-            ../../hotspot/src/share/vm/precompiled
             ../../hotspot/src/cpu/x86/vm
             ../../hotspot/src/os_cpu/solaris_x86/vm
-            ../../hotspot/src/os/solaris/vm
-            ../../hotspot/src/os/posix/vm
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            AMD64
-            ARCH="amd64"
-            GAMMA
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            LAUNCHER_TYPE="gamma"
-            LINK_INTO_LIBJVM
-            PRODUCT
-            SOLARIS
-            SPARC_WORKS
-            TARGET_ARCH_MODEL_x86_64
-            TARGET_ARCH_x86
-            TARGET_COMPILER_sparcWorks
-            TARGET_OS_ARCH_MODEL_solaris_x86_64
-            TARGET_OS_ARCH_solaris_x86
-            TARGET_OS_FAMILY_solaris
-          
-        
-        
-          
-            ../../hotspot/src/os_cpu/solaris_x86/vm
-            ../../hotspot/src/os/solaris/vm
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            AMD64
-            COMPILER1
-            COMPILER2
-            DONT_USE_PRECOMPILED_HEADER
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            SOLARIS
-            SPARC_WORKS
-            TARGET_ARCH_MODEL_x86_64
-            TARGET_ARCH_x86
-            TARGET_COMPILER_sparcWorks
-            TARGET_OS_ARCH_MODEL_solaris_x86_64
-            TARGET_OS_ARCH_solaris_x86
-            TARGET_OS_FAMILY_solaris
-            VM_LITTLE_ENDIAN
-            _Crun_inline_placement
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-        
-      
-      
-        
-          
-            TIERED
-          
-        
-      
-      
-        
-          
-            ../../hotspot/src/os_cpu/solaris_x86/vm
-            ../../hotspot/src/os/solaris/vm
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            AMD64
-            COMPILER1
-            COMPILER2
-            DONT_USE_PRECOMPILED_HEADER
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            SOLARIS
-            SPARC_WORKS
-            TARGET_ARCH_MODEL_x86_64
-            TARGET_ARCH_x86
-            TARGET_COMPILER_sparcWorks
-            TARGET_OS_ARCH_MODEL_solaris_x86_64
-            TARGET_OS_ARCH_solaris_x86
-            TARGET_OS_FAMILY_solaris
-            VM_LITTLE_ENDIAN
-            _Crun_inline_placement
-          
-        
-      
-      
-        
-          
-            ../../hotspot/src/share/vm/prims
-            ../../hotspot/src/share/vm
+            ../../build/hotspot/variant-server/gensrc
             ../../hotspot/src/share/vm/precompiled
-            ../../hotspot/src/cpu/x86/vm
-            ../../hotspot/src/os_cpu/solaris_x86/vm
-            ../../hotspot/src/os/solaris/vm
-            ../../hotspot/src/os/posix/vm
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            AMD64
-            COMPILER1
-            COMPILER2
-            DONT_USE_PRECOMPILED_HEADER
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            SOLARIS
-            SPARC_WORKS
-            TARGET_ARCH_MODEL_x86_64
-            TARGET_ARCH_x86
-            TARGET_COMPILER_sparcWorks
-            TARGET_OS_ARCH_MODEL_solaris_x86_64
-            TARGET_OS_ARCH_solaris_x86
-            TARGET_OS_FAMILY_solaris
-            VM_LITTLE_ENDIAN
-            _Crun_inline_placement
-          
-        
-      
-      
-        
-          
-            LINUX
-            _GNU_SOURCE
-            _LP64=1
-            _REENTRANT
-          
-        
-      
-      
-        
-          
-            ../../hotspot/src/os/posix/launcher
             ../../hotspot/src/share/vm/prims
-            ../../hotspot/src/share/tools/launcher
-            ../../hotspot/src/share/vm
-            ../../hotspot/src/share/vm/precompiled
-            ../../hotspot/src/cpu/x86/vm
-            ../../hotspot/src/os_cpu/solaris_x86/vm
-            ../../hotspot/src/os/solaris/vm
-            ../../hotspot/src/os/posix/vm
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
+            ../../hotspot/make
           
           
             AMD64
-            ARCH="amd64"
-            GAMMA
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            LAUNCHER_TYPE="gamma"
-            LINK_INTO_LIBJVM
-            PRODUCT
-            SOLARIS
-            SPARC_WORKS
-            TARGET_ARCH_MODEL_x86_64
-            TARGET_ARCH_x86
-            TARGET_COMPILER_sparcWorks
-            TARGET_OS_ARCH_MODEL_solaris_x86_64
-            TARGET_OS_ARCH_solaris_x86
-            TARGET_OS_FAMILY_solaris
-          
-        
-        
-          
-            ../../hotspot/src/share/vm/prims
-            ../../hotspot/src/share/vm
-            ../../hotspot/src/share/vm/precompiled
-            ../../hotspot/src/cpu/x86/vm
-            ../../hotspot/src/os_cpu/solaris_x86/vm
-            ../../hotspot/src/os/solaris/vm
-            ../../hotspot/src/os/posix/vm
-          
-          
-            AMD64
-            COMPILER1
-            COMPILER2
-            DONT_USE_PRECOMPILED_HEADER
-            SOLARIS
-            SPARC_WORKS
-            TARGET_ARCH_MODEL_x86_64
-            TARGET_ARCH_x86
-            TARGET_COMPILER_sparcWorks
-            TARGET_OS_ARCH_MODEL_solaris_x86_64
-            TARGET_OS_ARCH_solaris_x86
-            TARGET_OS_FAMILY_solaris
-            _Crun_inline_placement
-          
-        
-      
-      
-        
-          
-            ../../hotspot/src/share/vm/adlc
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
             ASSERT
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
           
         
       
-      
+      
+        
+          
+            THIS_FILE="bytecodeInterpreterWithChecks.cpp"
+          
+        
+      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
+            ../../build/hotspot/variant-server/support/dtrace
+          
+        
+      
+      
+        
+          
             ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
           
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="sadis.c"
           
+        
+        
+          
+            THIS_FILE="abstractInterpreter_x86.cpp"
+          
+          
+            __EXCEPTIONS
+            __GXX_RTTI
+          
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
           
           
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
             DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
             VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
           
         
       
-      
+      
+        
+          
+            ../../hotspot/src/jdk.hotspot.agent/share/native/libsaproc
+            ../../hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc
+            ../../build/support/headers/jdk.hotspot.agent
+            ../../hotspot/src/os/solaris
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
+          
+          
+            ARCH="amd64"
+            BREAKPTS
+            DEBUG
+            MACRO_MEMSYS_OPS
+            SOLARIS
+            SOLARIS_11_B159_OR_LATER
+            TRACING
+            _LITTLE_ENDIAN=
+            __solaris__
+            amd64
+            cpuIntel
+            i586
+          
+        
         
           
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
+            ../../hotspot/src/jdk.hotspot.agent/share/native/libsaproc
+            ../../hotspot/src/jdk.hotspot.agent/solaris/native/libsaproc
+            ../../build/support/headers/jdk.hotspot.agent
+            ../../hotspot/src/os/solaris
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
           
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            ARCH="amd64"
+            BREAKPTS
+            CC_NOEX
+            DEBUG
+            MACRO_MEMSYS_OPS
+            SOLARIS
+            SOLARIS_11_B159_OR_LATER
+            THIS_FILE="saproc.cpp"
+            TRACING
+            _LITTLE_ENDIAN=
+            __solaris__
+            amd64
+            cpuIntel
+            i586
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
+      
+        
           
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
+            THIS_FILE="jvm_dtrace.c"
           
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
+        
         
           
             ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/cpu/x86/vm
             ../../hotspot/src/os_cpu/linux_x86/vm
             ../../hotspot/src/os/linux/vm
+            ../../hotspot/src/os/posix/vm
             ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated
           
           
+            THIS_FILE="os_posix.cpp"
+          
+        
+      
+      
+        
+          
+            ../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product
+          
+          
+            _REENTRANT
+          
+        
+        
+          
+            LINUX
+            _GNU_SOURCE
+            _REENTRANT
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/posix/launcher
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/tools/launcher
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
+          
+          
+            AMD64
+            ARCH="amd64"
+            GAMMA
             HOTSPOT_BUILD_TARGET="target"
             HOTSPOT_BUILD_USER="user"
             HOTSPOT_LIB_ARCH="amd64"
             HOTSPOT_RELEASE_VERSION="version"
             HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            LINUX
+            LAUNCHER_TYPE="gamma"
+            LINK_INTO_LIBJVM
             PRODUCT
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+          
+        
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
             VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            THIS_FILE="generateJvmOffsets.cpp"
+          
+        
+      
+      
+        
+          
+            ../../hotspot/make
+          
+          
+            THIS_FILE="jsig.c"
+          
+        
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/make
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="attachListener_solaris.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="assembler_solaris_x86.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            LINUX
             _GNU_SOURCE
             _LP64=1
             _REENTRANT
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
-            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product
-          
-          
-            DTRACE_ENABLED
-            HAVE_DTRACE_H
-            HOTSPOT_BUILD_TARGET="target"
-            HOTSPOT_BUILD_USER="user"
-            HOTSPOT_LIB_ARCH="amd64"
-            HOTSPOT_RELEASE_VERSION="version"
-            HOTSPOT_VM_DISTRO="OpenJDK"
-            INCLUDE_TRACE
-            PRODUCT
-            VM_LITTLE_ENDIAN
-          
-        
-      
-      
+      
         
+          
+            ../../hotspot/src/os/posix/launcher
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/src/share/tools/launcher
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated
+          
           
-            THIS_FILE="add_gnu_debuglink.c"
+            AMD64
+            ARCH="amd64"
+            GAMMA
+            HOTSPOT_BUILD_TARGET="target"
+            HOTSPOT_BUILD_USER="user"
+            HOTSPOT_LIB_ARCH="amd64"
+            HOTSPOT_RELEASE_VERSION="version"
+            HOTSPOT_VM_DISTRO="OpenJDK"
+            LAUNCHER_TYPE="gamma"
+            LINK_INTO_LIBJVM
+            PRODUCT
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
           
         
         
+          
+            ../../hotspot/src/share/vm
+          
+          
+            AMD64
+            ASSERT
+            THIS_FILE="adlparse.cpp"
+          
+        
+      
+      
+        
+          
+            ../../hotspot/make
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="assembler.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="c1_CFGPrinter.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="bcEscapeAnalyzer.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="altHashing.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="codeBlob.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="abstractCompiler.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="adaptiveFreeList.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            THIS_FILE="bufferingOopClosure.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="adjoiningGenerations.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="cSpaceCounters.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="adaptiveSizePolicy.cpp"
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="abstractInterpreter.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="jvmciCodeInstaller.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="dict.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="log.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="allocation.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="annotations.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="addnode.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="parserTests.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="advancedThresholdPolicy.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="attachListener.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="traceBackend.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../hotspot/make
+          
+          
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="accessFlags.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../test/fmw/gtest
+            ../../test/fmw/gtest/include
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="test_os.cpp"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
+      
+        
+          
+            ../../hotspot/test/native
+            ../../hotspot/make
+          
+          
+            GTEST_HAS_EXCEPTIONS=0
+          
+        
+      
+      
+        
+          
+            ../../hotspot/test/native
+            ../../hotspot/make
+          
+          
+            GTEST_HAS_EXCEPTIONS=0
+            THIS_FILE="test_quicksort.cpp"
+          
+        
+      
+      
+        
+          
+            ARCH="amd64"
+            BREAKPTS
+            MACRO_MEMSYS_OPS
+            SOLARIS
+            THIS_FILE="agent_util.c"
+            TRACING
+            _LITTLE_ENDIAN=
+            __solaris__
+            amd64
+            cpuIntel
+            i586
+          
+        
+        
+          
+            ../../jdk/src/demo/share/jvmti/waiters
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/make
+          
           
             ARCH="amd64"
             BREAKPTS
             CC_NOEX
             MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
             SOLARIS
             THIS_FILE="Agent.cpp"
             TRACING
-            TRIMMED
             _LITTLE_ENDIAN=
             __solaris__
             amd64
@@ -38832,149 +64699,43 @@
           
         
       
-      
-        
-          
-            ../../jdk/make
-          
-        
-      
-      
+      
         
           
-            THIS_FILE="fix_empty_sec_hdr_flags.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="ArrayReferenceImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/export
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/back
-            ../../jdk/src/solaris/back
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            JDWP_LOGGING
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            LIBARCHNAME="amd64"
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="java.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="agent_util.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            DEBUG
           
         
         
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../jdk/src/share/demo/jvmti/waiters
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/make
-          
+          
+            DEBUG
+          
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/heapTracker
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
+            ../../jdk/src/demo/share/jvmti/heapTracker
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/compiledMethodLoad
-            ../../jdk/src/share/demo/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/compiledMethodLoad
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -38982,11 +64743,16 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/gctest
-            ../../jdk/src/share/demo/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/gctest
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -38994,12 +64760,17 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/heapTracker
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
+            ../../jdk/src/demo/share/jvmti/heapTracker
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -39007,11 +64778,16 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/heapViewer
-            ../../jdk/src/share/demo/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/heapViewer
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -39019,29 +64795,17 @@
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/demo/jvmti/hprof
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-          
-            THIS_FILE="debug_malloc.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/demo/jvmti/hprof
-            ../../jdk/src/solaris/demo/jvmti/hprof
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
+            ../../jdk/src/demo/share/jvmti/heapTracker
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -39049,12 +64813,17 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/minst
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
+            ../../jdk/src/demo/share/jvmti/minst
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -39062,12 +64831,17 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/mtrace
-            ../../jdk/src/share/demo/jvmti/agent_util
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
+            ../../jdk/src/demo/share/jvmti/mtrace
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/java_crw_demo
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -39075,11 +64849,16 @@
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/demo/jvmti/versionCheck
-            ../../jdk/src/share/demo/jvmti/agent_util
+            ../../jdk/src/demo/share/jvmti/versionCheck
+            ../../jdk/src/demo/share/jvmti/agent_util
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
             ../../jdk/make
           
           
@@ -39087,511 +64866,863 @@
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/instrument
-            ../../jdk/src/solaris/instrument
-            ../../jdk/src/share/bin
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/demos/classes/jni/Poller
             ../../jdk/make
           
           
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            NO_JPLIS_LOGGING
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="EncodingSupport.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            THIS_FILE="Poller.c"
           
         
       
-      
+      
         
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
           
-            THIS_FILE="DirectAudioDevice.c"
+            THIS_FILE="main.c"
           
         
         
+          
+            ../../jdk/src/java.base/share/native/libjimage
+            ../../build/support/headers/java.base
+            ../../make
+          
           
-            THIS_FILE="bands.cpp"
+            THIS_FILE="NativeImageBuffer.cpp"
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/com/sun/media/sound
-            ../../jdk/src/solaris/native/com/sun/media/sound
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/launcher
+            ../../jdk/src/java.base/share/native/libjli
+            ../../jdk/src/java.base/unix/native/libjli
+            ../../jdk/src/java.base/solaris/native/libjli
+            ../../make
           
           
-            ARCH="amd64"
-            BREAKPTS
-            EXTRA_SOUND_JNI_LIBS=""
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            TRACING
-            TRIMMED
-            USE_DAUDIO=TRUE
-            USE_PORTS=TRUE
-            X_ARCH=X_AMD64
-            X_PLATFORM=X_SOLARIS
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-        
-          
-            FULL
-            PRODUCT
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="check_code.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            DEBUG
+            ENABLE_ARG_FILES
+            EXPAND_CLASSPATH_WILDCARDS
+            HAVE_GETHRTIME
+            JAVA_ARGS={ "-J-addmods", "-JALL-DEFAULT", "-J-ms8m", "-m", "jdk.jlink/jdk.tools.jlink.internal.Main", }
+            LAUNCHER_NAME="openjdk"
+            NEVER_ACT_AS_SERVER_CLASS_MACHINE
+            PROGNAME="jlink"
+            VERSION_BUILD=0
+            VERSION_MAJOR=9
+            VERSION_MINOR=0
+            VERSION_NUMBER="9"
+            VERSION_OPT="2016-06-21-161756.vkvashin.jdktrunk"
+            VERSION_PATCH=0
+            VERSION_PRE="internal"
+            VERSION_SECURITY=0
+            VERSION_SHORT="9-internal"
+            VERSION_SPECIFICATION="9"
+            VERSION_STRING="9-internal+0-2016-06-21-161756.vkvashin.jdktrunk"
           
         
       
-      
-        
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="FileInputStream.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../make
           
           
+            DEBUG
+            LIBRARY_NAME=fdlibm
             THIS_FILE="e_acos.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Finalizer.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Array.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/src/solaris/native/sun/net/dns
-            ../../jdk/src/solaris/native/sun/net/spi
-            ../../jdk/src/solaris/native/sun/net/sdp
-            ../../jdk/make
-          
-          
-            THIS_FILE="DatagramPacket.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="Bits.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../build/support/headers/java.base
+            ../../make
           
           
             ARCHPROPNAME="amd64"
+            DEBUG
             THIS_FILE="AccessController.c"
           
         
       
-      
+      
         
+          
+            ../../jdk/src/java.base/unix/native/libjli
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
+          
           
-            THIS_FILE="AtomicLong.c"
+            DEBUG
+            LIBARCH32NAME="i386"
+            LIBARCH64NAME="amd64"
+            LIBARCHNAME="amd64"
+            THIS_FILE="args.c"
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/solaris/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="DatagramPacket.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libnio
+            ../../jdk/src/java.base/share/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio
+            ../../jdk/src/java.base/solaris/native/libnio/ch
+            ../../jdk/src/java.base/solaris/native/libnio/fs
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio/fs
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/solaris/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="nio_util.c"
+          
+        
+      
+      
+        
+          
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="check_code.c"
+          
+        
+      
+      
+        
+          
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            THIS_FILE="Adler32.c"
+            USE_MMAP
+          
+        
+      
+      
+        
+          
+            DEBUG
+            THIS_FILE="ProcessHandleImpl_solaris.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../build/support/headers/java.base
+            ../../make
           
           
             ARCHPROPNAME="amd64"
           
         
       
-      
-        
-          
-            THIS_FILE="compress.c"
-          
-        
-      
-      
+      
         
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/openwin/include
-            /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/solaris/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
           
           
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            WITH_X11
+            THIS_FILE="solaris_close.c"
           
         
       
-      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libnio
+            ../../jdk/src/java.base/share/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio
+            ../../jdk/src/java.base/solaris/native/libnio/ch
+            ../../jdk/src/java.base/solaris/native/libnio/fs
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio/fs
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/solaris/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            THIS_FILE="DevPollArrayWrapper.c"
+          
+        
+      
+      
         
           
+            THIS_FILE="SolarisNativeDispatcher.c"
+          
+        
+      
+      
+        
+          
+            DEBUG
+            THIS_FILE="jspawnhelper.c"
+          
+        
+        
+          
+            THIS_FILE="osSupport_unix.cpp"
+          
+        
+      
+      
+        
+          
+            ../../make
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/share/native/libfdlibm
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            ARCHPROPNAME="amd64"
+            THIS_FILE="Console_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/unix/native/libjli
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
+          
+          
+            LIBARCH32NAME="i386"
+            LIBARCH64NAME="amd64"
+            LIBARCHNAME="amd64"
+            THIS_FILE="ergo.c"
+          
+        
+      
+      
+        
+          
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/solaris/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            THIS_FILE="DefaultProxySelector.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/libnio
+            ../../jdk/src/java.base/share/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio
+            ../../jdk/src/java.base/solaris/native/libnio/ch
+            ../../jdk/src/java.base/solaris/native/libnio/fs
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/unix/native/libnio/fs
+            ../../build/support/headers/java.base
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/solaris/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../make
+          
+          
+            THIS_FILE="DatagramChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="GioFileTypeDetector.c"
+          
+        
+      
+      
+        
+          
+            DEBUG
             THIS_FILE="debug_assert.c"
           
         
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
+            ../../jdk/src/java.desktop/share/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
+            ../../jdk/src/java.desktop/share/native/libfontmanager/layout
+            ../../jdk/src/java.desktop/unix/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common
+            ../../jdk/src/java.desktop/share/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/java2d
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common
+            ../../jdk/src/java.desktop/unix/native/common/java2d
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/solaris/native/libjava
+            /usr/include/freetype2
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
           
           
-            THIS_FILE="AlternateSubstSubtables.cpp"
+            DEBUG
+            GETPAGESIZE
+            HAVE_FALLBACK
+            HAVE_MPROTECT
+            HAVE_OT
+            HAVE_PTHREAD
+            HAVE_SOLARIS_ATOMIC_OPS
+            HAVE_SYSCONF
+            HAVE_SYS_MMAN_H
+            HAVE_UCDN
+            HAVE_UNISTD_H
+            HEADLESS
+            LE_STANDALONE
+            THIS_FILE="hb-blob.cc"
           
         
       
-      
-        
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/solaris/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/solaris/native/libjava
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
           
           
             FUNCPROTO=15
-            INTERNAL_BUILD
             PACKAGE_PATH="/opt/local"
-            X11_PATH="/usr/X11R6"
             XAWT
             XAWT_HACK
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/openwin/include
-            /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libmlib_image
+            ../../make
           
           
+            MLIB_NO_LIBSUNMATH
+            MLIB_OS64BIT
+            THIS_FILE="mlib_ImageCopy_Bit.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/solaris/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/solaris/native/libjava
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
+          
+          
+            FUNCPROTO=15
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="rect.c"
+            XAWT
+            XAWT_HACK
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/solaris/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/solaris/native/libjava
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
+          
+          
+            FUNCPROTO=15
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="AccelGlyphCache.c"
+            XAWT
+            XAWT_HACK
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/solaris/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/solaris/native/libjava
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
+          
+          
+            FUNCPROTO=15
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="OGLBlitLoops.c"
+            XAWT
+            XAWT_HACK
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
+          
+          
+            THIS_FILE="img_colors.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            THIS_FILE="gifdecoder.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="awt_ImagingLib.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AlphaMacros.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="BufferedMaskBlit.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
+            ../../jdk/src/java.desktop/share/native/libfontmanager/layout
+            ../../jdk/src/java.desktop/unix/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common
+            ../../jdk/src/java.desktop/share/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/java2d
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common
+            ../../jdk/src/java.desktop/unix/native/common/java2d
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/solaris/native/libjava
+            /usr/include/freetype2
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
+          
+          
+            GETPAGESIZE
+            HAVE_FALLBACK
+            HAVE_MPROTECT
+            HAVE_OT
+            HAVE_PTHREAD
+            HAVE_SOLARIS_ATOMIC_OPS
+            HAVE_SYSCONF
+            HAVE_SYS_MMAN_H
+            HAVE_UCDN
+            HAVE_UNISTD_H
+            HEADLESS
+            LE_STANDALONE
+            THIS_FILE="ucdn.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="AlternateSubstSubtables.cpp"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="imageioJPEG.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
+          
+            EXTRA_SOUND_JNI_LIBS=""
+            THIS_FILE="DirectAudioDevice.c"
+            USE_DAUDIO=TRUE
+            USE_PORTS=TRUE
+            X_PLATFORM=X_SOLARIS
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.desktop/share/native/liblcms
+            ../../make
+          
+          
+            CMS_DONT_USE_FAST_FLOOR
+            THIS_FILE="LCMS.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libmlib_image
+            ../../make
+          
+          
+            MLIB_NO_LIBSUNMATH
+            MLIB_OS64BIT
+            THIS_FILE="mlib_ImageAffine.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
             PNG_NO_MMX_CODE
             SPLASHSCREEN
             THIS_FILE="dgif_lib.c"
@@ -39599,1699 +65730,876 @@
           
         
       
-      
+      
         
           
-            THIS_FILE="img_colors.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            THIS_FILE="gifdecoder.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            THIS_FILE="imageioJPEG.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/openwin/include
-            /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
             THIS_FILE="png.c"
-            WITH_X11
           
         
       
-      
+      
         
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-          
           
-            THIS_FILE="awt_ImagingLib.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
+            THIS_FILE="systemScale.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/solaris/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/solaris/native/libjava
             /usr/openwin/include
             /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            THIS_FILE="java_awt_SplashScreen.c"
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
+            ../../make
           
           
             FUNCPROTO=15
-            INTERNAL_BUILD
             PACKAGE_PATH="/opt/local"
-            THIS_FILE="rect.c"
-            X11_PATH="/usr/X11R6"
             XAWT
             XAWT_HACK
           
         
       
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="AccelGlyphCache.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-        
-          
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            HEADLESS
-            LE_STANDALONE
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="LCMS.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            THIS_FILE="AlphaMacros.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            PACKAGE_PATH="/opt/local"
-            THIS_FILE="OGLBlitLoops.c"
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/gif
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/share/native/sun/awt/medialib
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/make
-          
-          
-            INTERNAL_BUILD
-            THIS_FILE="BufferedMaskBlit.c"
-            __MEDIALIB_OLD_NAMES
-            __USE_J2D_NAMES
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/management
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="ClassLoadingImpl.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            ARCHPROPNAME="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="GC.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../jdk/make
-          
-          
-            THIS_FILE="genSocketOptionRegistry.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            ARCHPROPNAME="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="ConstantPool.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="ec.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-        
-          
-            ../../jdk/src/share/native/sun/security/ec
-            ../../jdk/src/share/native/sun/security/ec/impl
-            ../../jdk/make
-          
-          
-            THIS_FILE="ECC_JNI.cpp"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/ec
-            ../../jdk/src/share/native/sun/security/ec/impl
-            ../../jdk/make
-          
-          
-            MP_API_COMPATIBLE
-            NSS_ECC_MORE_THAN_SUITE_B
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/jgss/wrapper
-            ../../jdk/src/solaris/native/sun/security/jgss/wrapper
-            ../../jdk/make
-          
-          
-            THIS_FILE="GSSLibStub.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/pkcs11
-            ../../jdk/src/solaris/native/sun/security/pkcs11
-            ../../jdk/src/share/native/sun/security/pkcs11/wrapper
-            ../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
-            ../../jdk/make
-          
-          
-            THIS_FILE="p11_convert.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
-            ../../jdk/make
-          
-          
-            THIS_FILE="pcsc.c"
-            __sun_jdk
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/tracing/dtrace
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="JVM.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="npt.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/socket
-            ../../jdk/src/solaris/transport/socket
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/back
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="socketTransport.c"
-            TRACING
-            TRIMMED
-            USE_MMAP
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
+      
         
           
-            THIS_FILE="exec_md.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/export
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/back
-            ../../jdk/src/solaris/back
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            JDWP_LOGGING
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/bin
-            ../../jdk/src/solaris/bin
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            LIBARCH32NAME="i386"
-            LIBARCH64NAME="amd64"
-            LIBARCHNAME="amd64"
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="ergo.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="Poller.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/democlasses/jni/Poller
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/demo/jvmti/hprof
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/src/share/demo/jvmti/java_crw_demo
-            ../../jdk/make
-          
-          
-            THIS_FILE="hprof_md.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/instrument
-            ../../jdk/src/solaris/instrument
-            ../../jdk/src/share/bin
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            NO_JPLIS_LOGGING
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="EncodingSupport_md.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SolarisOperatingSystem.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/management
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/com/sun/media/sound
-            ../../jdk/src/solaris/native/com/sun/media/sound
-            ../../jdk/make
-          
-          
-            EXTRA_SOUND_JNI_LIBS=""
-            THIS_FILE="PLATFORM_API_SolarisOS_PCM.c"
-            USE_DAUDIO=TRUE
-            USE_PORTS=TRUE
-            X_ARCH=X_AMD64
-            X_PLATFORM=X_SOLARIS
-          
-        
-      
-      
-        
-          
-            ../../jdk/make
-          
-          
-            THIS_FILE="Solaris.c"
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            ARCHPROPNAME="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="jdk_util_md.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="Console_md.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="ProcessEnvironment_md.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/src/solaris/native/sun/net/dns
-            ../../jdk/src/solaris/native/sun/net/spi
-            ../../jdk/src/solaris/native/sun/net/sdp
-            ../../jdk/make
-          
-          
-            THIS_FILE="Inet4AddressImpl.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/nio/ch
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
-          
-          
-            THIS_FILE="MappedByteBuffer.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
-          
-          
-            ARCHPROPNAME="amd64"
-            THIS_FILE="FileSystemPreferences.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="splashscreen_sys.c"
-          
-        
-      
-      
-        
-          
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/awt/image/jpeg
-            ../../jdk/src/share/native/sun/awt/libpng
-            ../../jdk/src/share/native/sun/awt/splashscreen
-            ../../jdk/src/share/native/sun/awt/giflib
-            ../../jdk/src/solaris/native/sun/awt/splashscreen
-            /usr/openwin/include
-            /usr/openwin/include/X11/extensions
-            ../../jdk/src/share/native/java/util/zip/zlib-1.2.5
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
-          
-            PNG_NO_MMX_CODE
-            SPLASHSCREEN
-            WITH_X11
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            /usr/include/freetype2
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/share/native/sun/font/layout
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            HEADLESS
-            LE_STANDALONE
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="X11FontScaler.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
-          
-        
-      
-      
-        
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
-          
-            ARCH="amd64"
-            BREAKPTS
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            PACKAGE_PATH="/opt/local"
-            RELEASE=""
-            SOLARIS
             THIS_FILE="GLXGraphicsConfig.c"
-            TRACING
-            TRIMMED
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
           
         
       
-      
+      
         
           
             THIS_FILE="X11FontScaler_md.c"
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/management
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.desktop/share/native/libmlib_image
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
           
           
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
+            THIS_FILE="awt_LoadLibrary.c"
+            __MEDIALIB_OLD_NAMES
+            __USE_J2D_NAMES
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/unix/native/libawt_headless/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../make
+          
+          
+            HEADLESS=true
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="HeadlessToolkit.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.desktop/solaris/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/unix/native/libsunwjdga
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.base/solaris/native/libjava
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
+          
+          
+            FUNCPROTO=15
+            PACKAGE_PATH="/opt/local"
+            THIS_FILE="awt_AWTEvent.c"
+            XAWT
+            XAWT_HACK
+          
+        
+      
+      
+        
+          
+            THIS_FILE="XRBackendNative.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="XToolkit.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/share/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz
+            ../../jdk/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
+            ../../jdk/src/java.desktop/share/native/libfontmanager/layout
+            ../../jdk/src/java.desktop/unix/native/libfontmanager
+            ../../jdk/src/java.desktop/share/native/libawt
+            ../../jdk/src/java.desktop/share/native/libawt/java2d
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/libawt/java2d/pipe
+            ../../jdk/src/java.desktop/share/native/libawt/awt
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/gif
+            ../../jdk/src/java.desktop/share/native/libawt/awt/image/cvutils
+            ../../jdk/src/java.desktop/share/native/libawt/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/libawt
+            ../../jdk/src/java.desktop/unix/native/libawt/awt
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d
+            ../../jdk/src/java.desktop/unix/native/libawt/java2d/loops
+            ../../jdk/src/java.desktop/share/native/common
+            ../../jdk/src/java.desktop/share/native/common/awt
+            ../../jdk/src/java.desktop/share/native/common/awt/medialib
+            ../../jdk/src/java.desktop/share/native/common/awt/utility
+            ../../jdk/src/java.desktop/share/native/common/awt/debug
+            ../../jdk/src/java.desktop/share/native/common/java2d
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/share/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common
+            ../../jdk/src/java.desktop/unix/native/common/java2d
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl
+            ../../jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../jdk/src/java.desktop/unix/native/common/java2d/x11
+            ../../jdk/src/java.desktop/unix/native/common/font
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.desktop/unix/native/common/awt/medialib
+            ../../jdk/src/java.desktop/unix/native/common/awt/utility
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/solaris/native/libjava
+            /usr/include/freetype2
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../make
+          
+          
+            GETPAGESIZE
+            HAVE_FALLBACK
+            HAVE_MPROTECT
+            HAVE_OT
+            HAVE_PTHREAD
+            HAVE_SOLARIS_ATOMIC_OPS
+            HAVE_SYSCONF
+            HAVE_SYS_MMAN_H
+            HAVE_UCDN
+            HAVE_UNISTD_H
+            HEADLESS
+            LE_STANDALONE
+            THIS_FILE="X11FontScaler.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.desktop/unix/native/common/awt
+            ../../jdk/src/java.desktop/solaris/native/include
+            ../../jdk/src/java.desktop/unix/native/include
+            ../../jdk/src/java.desktop/share/native/include
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../make
+          
+          
+            THIS_FILE="jawt.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.desktop
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.desktop/share/native/libjsound
+            ../../jdk/src/java.desktop/unix/native/libjsound
+            ../../make
+          
+          
+            EXTRA_SOUND_JNI_LIBS=""
+            THIS_FILE="PLATFORM_API_SolarisOS_PCM.c"
+            USE_DAUDIO=TRUE
+            USE_PORTS=TRUE
+            X_PLATFORM=X_SOLARIS
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/giflib
+            ../../jdk/src/java.desktop/share/native/libjavajpeg
+            ../../jdk/src/java.desktop/share/native/libsplashscreen
+            ../../jdk/src/java.desktop/share/native/libsplashscreen/libpng
+            ../../jdk/src/java.desktop/unix/native/libsplashscreen
+            ../../jdk/src/java.desktop/unix/native/common/awt/systemscale
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/share/native/libjava
+            /usr/openwin/include
+            /usr/openwin/include/X11/extensions
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../make
+          
+          
+            PNG_ARM_NEON_OPT=0
+            PNG_NO_MMX_CODE
+            SPLASHSCREEN
+            THIS_FILE="splashscreen_sys.c"
+            WITH_X11
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.instrument/share/native/libinstrument
+            ../../jdk/src/java.instrument/unix/native/libinstrument
+            ../../build/support/headers/java.instrument
+            ../../jdk/src/java.base/share/native/libjli
+            ../../make
+          
+          
+            DEBUG
+            JPLIS_LOGGING
+            THIS_FILE="EncodingSupport.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="EncodingSupport_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.management/share/native/include
+            ../../jdk/src/java.management/share/native/libmanagement
+            ../../jdk/src/java.management/unix/native/libmanagement
+            ../../build/support/headers/java.management
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="ClassLoadingImpl.c"
+          
+        
+      
+      
+        
+          
             THIS_FILE="FileSystemImpl.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/src/solaris/native/sun/net/dns
-            ../../jdk/src/solaris/native/sun/net/spi
-            ../../jdk/src/solaris/native/sun/net/sdp
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.prefs/unix/native/libprefs
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../make
           
           
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="ResolverConfigurationImpl.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            DEBUG
+            THIS_FILE="FileSystemPreferences.c"
           
         
       
-      
-        
-          
-            THIS_FILE="SdpSupport.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="DefaultProxySelector.c"
-          
-        
-      
-      
-        
-          
-            THIS_FILE="SctpChannelImpl.c"
-          
-        
-      
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/nio/ch
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/java.rmi
+            ../../make
           
           
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            DEBUG
+            THIS_FILE="GC.c"
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/nio/ch/sctp
-            ../../jdk/src/share/native/java/net
-            ../../jdk/src/solaris/native/sun/nio/ch
-            ../../jdk/src/solaris/native/java/net
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.security.jgss/share/native/libj2gss
+            ../../jdk/src/java.security.jgss/unix/native/libj2gss
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../build/support/headers/java.security.jgss
+            ../../make
           
-        
-      
-      
-        
           
-            THIS_FILE="GnomeFileTypeDetector.c"
+            DEBUG
+            THIS_FILE="GSSLibStub.c"
           
         
       
-      
+      
         
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-          
           
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
             THIS_FILE="NativeFunc.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
           
         
       
-      
+      
         
           
-            ../../jdk/src/share/native/sun/security/jgss/wrapper
-            ../../jdk/src/solaris/native/sun/security/jgss/wrapper
-            ../../jdk/make
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/pkcs11
-            ../../jdk/src/solaris/native/sun/security/pkcs11
-            ../../jdk/src/share/native/sun/security/pkcs11/wrapper
-            ../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.smartcardio/share/native/libj2pcsc
+            ../../jdk/src/java.smartcardio/unix/native/libj2pcsc
+            ../../jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE
+            ../../build/support/headers/java.smartcardio
+            ../../make
           
           
-            THIS_FILE="p11_md.c"
-          
-        
-      
-      
-        
-          
-            ../../jdk/src/share/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio
-            ../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
-            ../../jdk/make
-          
-          
-            THIS_FILE="pcsc_md.c"
+            DEBUG
+            THIS_FILE="pcsc.c"
             __sun_jdk
           
         
       
-      
+      
         
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/make
-          
           
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="SolarisVirtualMachine.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            THIS_FILE="pcsc_md.c"
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/tracing/dtrace
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/jdk.attach
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../make
           
           
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="jvm_symbols_md.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            DEBUG
+            THIS_FILE="VirtualMachineImpl.c"
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/solaris/native/java/lang
-            ../../jdk/src/share/native/java/lang
-            ../../jdk/src/share/native/java/lang/ref
-            ../../jdk/src/share/native/java/lang/reflect
-            ../../jdk/src/share/native/java/io
-            ../../jdk/src/solaris/native/java/io
-            ../../jdk/src/share/native/java/nio
-            ../../jdk/src/share/native/java/security
-            ../../jdk/src/share/native/sun/misc
-            ../../jdk/src/share/native/sun/reflect
-            ../../jdk/src/share/native/java/util
-            ../../jdk/src/share/native/java/util/concurrent/atomic
-            ../../jdk/src/solaris/native/java/util
-            ../../jdk/src/solaris/native/sun/util/locale/provider
-            ../../jdk/src/share/native/java/lang/fdlibm/include
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../make
           
           
-            ARCH="amd64"
-            ARCHPROPNAME="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="HostLocaleProviderAdapter_md.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            DEBUG
+            MP_API_COMPATIBLE
+            NSS_ECC_MORE_THAN_SUITE_B
+            THIS_FILE="ec.c"
+          
+        
+        
+          
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="ECC_JNI.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11
+            ../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../build/support/headers/jdk.crypto.pkcs11
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="j2secmod.c"
           
         
       
-      
+      
         
-          
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/native/sun/awt/debug
-            ../../jdk/src/share/native/sun/awt/utility
-            ../../jdk/src/share/native/sun/font
-            ../../jdk/src/solaris/native/sun/font
-            ../../jdk/src/share/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/awt
-            ../../jdk/src/solaris/native/sun/java2d/opengl
-            ../../jdk/src/solaris/native/sun/java2d/x11
-            ../../jdk/src/solaris/native/sun/xawt
-            ../../jdk/src/share/native/sun/java2d
-            ../../jdk/src/solaris/native/sun/java2d
-            ../../jdk/src/share/native/sun/java2d/loops
-            ../../jdk/src/share/native/sun/java2d/pipe
-            ../../jdk/src/share/native/sun/awt/image
-            ../../jdk/src/share/native/sun/awt/image/cvutils
-            ../../jdk/src/solaris/native/sun/jdga
-            ../../jdk/make
-          
           
-            ARCH="amd64"
-            BREAKPTS
-            FUNCPROTO=15
-            INTERNAL_BUILD
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            PACKAGE_PATH="/opt/local"
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="XToolkit.c"
-            TRACING
-            TRIMMED
-            X11_PATH="/usr/X11R6"
-            XAWT
-            XAWT_HACK
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            THIS_FILE="j2secmod_md.c"
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/npt
-            ../../jdk/src/solaris/npt
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto
+            ../../make
           
           
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="utf_md.c"
-            TRACING
-            TRIMMED
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
+            DEBUG
+            THIS_FILE="nativeCrypto.c"
           
         
       
-      
+      
         
           
-            ../../build/solaris-x86_64-normal-server-release/jdk/include
-            ../../build/solaris-x86_64-normal-server-release/jdk/include/solaris
-            ../../jdk/src/share/javavm/export
-            ../../jdk/src/solaris/javavm/export
-            ../../jdk/src/share/native/common
-            ../../jdk/src/solaris/native/common
-            ../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
-            ../../jdk/src/share/transport/socket
-            ../../jdk/src/solaris/transport/socket
-            ../../jdk/src/share/back/export
-            ../../jdk/src/share/back
-            ../../jdk/make
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+          
+          
+            DEBUG
+            THIS_FILE="socketTransport.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../make
           
           
-            ARCH="amd64"
-            BREAKPTS
-            MACRO_MEMSYS_OPS
-            NDEBUG
-            RELEASE=""
-            SOLARIS
-            THIS_FILE="socket_md.c"
-            TRACING
-            TRIMMED
             USE_MMAP
-            _LITTLE_ENDIAN=
-            __solaris__
-            amd64
-            cpuIntel
-            i586
           
         
       
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libjdwp
+            ../../build/support/headers/jdk.jdwp.agent
+            ../../make
+          
+          
+            JDWP_LOGGING
+            THIS_FILE="ArrayReferenceImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="socket_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libdt_socket
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../make
+          
+          
+            USE_MMAP
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp/export
+            ../../jdk/src/jdk.jdwp.agent/share/native/include
+            ../../jdk/src/jdk.jdwp.agent/share/native/libjdwp
+            ../../jdk/src/jdk.jdwp.agent/unix/native/libjdwp
+            ../../build/support/headers/jdk.jdwp.agent
+            ../../make
+          
+          
+            JDWP_LOGGING
+            THIS_FILE="exec_md.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.management/share/native/include
+            ../../jdk/src/jdk.management/share/native/libmanagement_ext
+            ../../jdk/src/jdk.management/unix/native/libmanagement_ext
+            ../../jdk/src/jdk.management/solaris/native/libmanagement_ext
+            ../../build/support/headers/jdk.management
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="DiagnosticCommandImpl.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="UnixOperatingSystem.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="OperatingSystemImpl.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/jdk.net
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="SolarisSocketOptions.c"
+          
+        
+      
+      
+        
+          
+            DEBUG
+            FULL
+            THIS_FILE="bands.cpp"
+          
+        
+      
+      
+        
+          
+            ../../build/support/headers/java.base
+            ../../jdk/src/jdk.pack200/share/native/common-unpack
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../make
+          
+          
+            NO_ZLIB
+            UNPACK_JNI
+          
+        
+      
+      
+        
+          
+            ../../build/support/headers/java.base
+            ../../jdk/src/jdk.pack200/share/native/common-unpack
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../make
+          
+          
+            NO_ZLIB
+            THIS_FILE="jni.cpp"
+            UNPACK_JNI
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/jdk.pack200/share/native/common-unpack
+            ../../make
+          
+          
+            SYSTEM_ZLIB
+            THIS_FILE="main.cpp"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../jdk/src/java.base/unix/native/libnio/ch
+            ../../jdk/src/java.base/share/native/libnio/ch
+            ../../jdk/src/java.base/solaris/native/libnet
+            ../../jdk/src/java.base/unix/native/libnet
+            ../../jdk/src/java.base/share/native/libnet
+            ../../jdk/src/java.base/solaris/native/libjava
+            ../../build/support/headers/jdk.sctp
+            ../../build/support/headers/java.base
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="SctpChannelImpl.c"
+          
+        
+      
+      
+        
+          
+            ../../jdk/src/java.base/share/native/include
+            ../../jdk/src/java.base/solaris/native/include
+            ../../jdk/src/java.base/unix/native/include
+            ../../jdk/src/java.base/share/native/libjava
+            ../../jdk/src/java.base/unix/native/libjava
+            ../../build/support/headers/jdk.security.auth
+            ../../make
+          
+          
+            DEBUG
+            THIS_FILE="Solaris.c"
+          
+        
+      
+      
+        
+          
+            THIS_FILE="Unix.c"
+          
+        
+      
+      
+        
+          
+            ../../hotspot/src/share/vm
+            ../../hotspot/src/os/solaris/vm
+            ../../hotspot/src/os/posix/vm
+            ../../hotspot/src/cpu/x86/vm
+            ../../hotspot/src/os_cpu/solaris_x86/vm
+            ../../build/hotspot/variant-server/gensrc
+            ../../hotspot/src/share/vm/precompiled
+            ../../hotspot/src/share/vm/prims
+            ../../test/fmw/gtest
+            ../../test/fmw/gtest/include
+            ../../hotspot/test/native
+            ../../hotspot/make
+          
+          
+            AMD64
+            ASSERT
+            COMPILER1
+            COMPILER2
+            DONT_USE_PRECOMPILED_HEADER
+            DTRACE_ENABLED
+            GTEST_HAS_EXCEPTIONS=0
+            HOTSPOT_LIB_ARCH="amd64"
+            SOLARIS
+            SPARC_WORKS
+            TARGET_ARCH_MODEL_x86_64
+            TARGET_ARCH_x86
+            TARGET_COMPILER_sparcWorks
+            TARGET_OS_ARCH_MODEL_solaris_x86_64
+            TARGET_OS_ARCH_solaris_x86
+            TARGET_OS_FAMILY_solaris
+            THIS_FILE="gtest-all.cc"
+            VM_LITTLE_ENDIAN
+            _Crun_inline_placement
+            _NMT_NOINLINE_
+          
+        
+      
     
   
 
diff --git a/common/nb_native/nbproject/project.xml b/common/nb_native/nbproject/project.xml
index 0f248c751ed..37ac590e95d 100644
--- a/common/nb_native/nbproject/project.xml
+++ b/common/nb_native/nbproject/project.xml
@@ -6,7 +6,7 @@
             OpenJDK (Native)
             c,m
             cc,cpp
-            ad,h,hpp,in_out
+            ad,h,hh,hpp,in_out,map,txt
             UTF-8
             
             
@@ -26,6 +26,9 @@
                     0
                 
             
+            
+                false
+            
         
     
 

From f8e4173a4ef44d0fb362f114c8314fbe99862d1c Mon Sep 17 00:00:00 2001
From: Rahul Raghavan 
Date: Tue, 21 Jun 2016 13:14:33 -0400
Subject: [PATCH 044/111] 8151661: Performance regression on Solaris-SPARC in
 9-b103

Reviewed-by: kvn, aph
---
 hotspot/src/share/vm/adlc/formssel.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/adlc/formssel.cpp b/hotspot/src/share/vm/adlc/formssel.cpp
index c9904c7da15..42aefeb2575 100644
--- a/hotspot/src/share/vm/adlc/formssel.cpp
+++ b/hotspot/src/share/vm/adlc/formssel.cpp
@@ -1246,8 +1246,7 @@ bool InstructForm::check_branch_variant(ArchDesc &AD, InstructForm *short_branch
       !is_short_branch() &&     // Don't match another short branch variant
       reduce_result() != NULL &&
       strcmp(reduce_result(), short_branch->reduce_result()) == 0 &&
-      _matrule->equivalent(AD.globalNames(), short_branch->_matrule) &&
-      equivalent_predicates(this, short_branch)) {
+      _matrule->equivalent(AD.globalNames(), short_branch->_matrule)) {
     // The instructions are equivalent.
 
     // Now verify that both instructions have the same parameters and

From 6c974f899f61bc6e8e33cee76ac5479e608606ee Mon Sep 17 00:00:00 2001
From: Andrew Dinn 
Date: Tue, 21 Jun 2016 13:15:56 -0400
Subject: [PATCH 045/111] 8160006: Fix AArch64 after changes made by 8151661

Reviewed-by: kvn
---
 hotspot/src/cpu/aarch64/vm/aarch64.ad | 148 +++++++++++++++++---------
 1 file changed, 95 insertions(+), 53 deletions(-)

diff --git a/hotspot/src/cpu/aarch64/vm/aarch64.ad b/hotspot/src/cpu/aarch64/vm/aarch64.ad
index 1aeae0bf38f..89fac8fa208 100644
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad
@@ -6629,6 +6629,82 @@ operand cmpOpU()
   %}
 %}
 
+// used for certain integral comparisons which can be
+// converted to cbxx or tbxx instructions
+
+operand cmpOpEqNe()
+%{
+  match(Bool);
+  match(CmpOp);
+  op_cost(0);
+  predicate(n->as_Bool()->_test._test == BoolTest::ne
+            || n->as_Bool()->_test._test == BoolTest::eq);
+
+  format %{ "" %}
+  interface(COND_INTER) %{
+    equal(0x0, "eq");
+    not_equal(0x1, "ne");
+    less(0xb, "lt");
+    greater_equal(0xa, "ge");
+    less_equal(0xd, "le");
+    greater(0xc, "gt");
+    overflow(0x6, "vs");
+    no_overflow(0x7, "vc");
+  %}
+%}
+
+// used for certain integral comparisons which can be
+// converted to cbxx or tbxx instructions
+
+operand cmpOpLtGe()
+%{
+  match(Bool);
+  match(CmpOp);
+  op_cost(0);
+
+  predicate(n->as_Bool()->_test._test == BoolTest::lt
+            || n->as_Bool()->_test._test == BoolTest::ge);
+
+  format %{ "" %}
+  interface(COND_INTER) %{
+    equal(0x0, "eq");
+    not_equal(0x1, "ne");
+    less(0xb, "lt");
+    greater_equal(0xa, "ge");
+    less_equal(0xd, "le");
+    greater(0xc, "gt");
+    overflow(0x6, "vs");
+    no_overflow(0x7, "vc");
+  %}
+%}
+
+// used for certain unsigned integral comparisons which can be
+// converted to cbxx or tbxx instructions
+
+operand cmpOpUEqNeLtGe()
+%{
+  match(Bool);
+  match(CmpOp);
+  op_cost(0);
+
+  predicate(n->as_Bool()->_test._test == BoolTest::eq
+            || n->as_Bool()->_test._test == BoolTest::ne
+            || n->as_Bool()->_test._test == BoolTest::lt
+            || n->as_Bool()->_test._test == BoolTest::ge);
+
+  format %{ "" %}
+  interface(COND_INTER) %{
+    equal(0x0, "eq");
+    not_equal(0x1, "ne");
+    less(0xb, "lt");
+    greater_equal(0xa, "ge");
+    less_equal(0xd, "le");
+    greater(0xc, "gt");
+    overflow(0x6, "vs");
+    no_overflow(0x7, "vc");
+  %}
+%}
+
 // Special operand allowing long args to int ops to be truncated for free
 
 operand iRegL2I(iRegL reg) %{
@@ -14286,10 +14362,8 @@ instruct branchConU(cmpOpU cmp, rFlagsRegU cr, label lbl)
 // shorter than (cmp; branch), have the additional benefit of not
 // killing the flags.
 
-instruct cmpI_imm0_branch(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl, rFlagsReg cr) %{
+instruct cmpI_imm0_branch(cmpOpEqNe cmp, iRegIorL2I op1, immI0 op2, label labl, rFlagsReg cr) %{
   match(If cmp (CmpI op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14305,10 +14379,8 @@ instruct cmpI_imm0_branch(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl, rFla
   ins_pipe(pipe_cmp_branch);
 %}
 
-instruct cmpL_imm0_branch(cmpOp cmp, iRegL op1, immL0 op2, label labl, rFlagsReg cr) %{
+instruct cmpL_imm0_branch(cmpOpEqNe cmp, iRegL op1, immL0 op2, label labl, rFlagsReg cr) %{
   match(If cmp (CmpL op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14324,10 +14396,8 @@ instruct cmpL_imm0_branch(cmpOp cmp, iRegL op1, immL0 op2, label labl, rFlagsReg
   ins_pipe(pipe_cmp_branch);
 %}
 
-instruct cmpP_imm0_branch(cmpOp cmp, iRegP op1, immP0 op2, label labl, rFlagsReg cr) %{
+instruct cmpP_imm0_branch(cmpOpEqNe cmp, iRegP op1, immP0 op2, label labl, rFlagsReg cr) %{
   match(If cmp (CmpP op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14343,10 +14413,8 @@ instruct cmpP_imm0_branch(cmpOp cmp, iRegP op1, immP0 op2, label labl, rFlagsReg
   ins_pipe(pipe_cmp_branch);
 %}
 
-instruct cmpN_imm0_branch(cmpOp cmp, iRegN op1, immN0 op2, label labl, rFlagsReg cr) %{
+instruct cmpN_imm0_branch(cmpOpEqNe cmp, iRegN op1, immN0 op2, label labl, rFlagsReg cr) %{
   match(If cmp (CmpN op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne
-	    || n->in(1)->as_Bool()->_test._test == BoolTest::eq);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14362,10 +14430,8 @@ instruct cmpN_imm0_branch(cmpOp cmp, iRegN op1, immN0 op2, label labl, rFlagsReg
   ins_pipe(pipe_cmp_branch);
 %}
 
-instruct cmpP_narrowOop_imm0_branch(cmpOp cmp, iRegN oop, immP0 zero, label labl, rFlagsReg cr) %{
+instruct cmpP_narrowOop_imm0_branch(cmpOpEqNe cmp, iRegN oop, immP0 zero, label labl, rFlagsReg cr) %{
   match(If cmp (CmpP (DecodeN oop) zero));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14381,12 +14447,8 @@ instruct cmpP_narrowOop_imm0_branch(cmpOp cmp, iRegN oop, immP0 zero, label labl
   ins_pipe(pipe_cmp_branch);
 %}
 
-instruct cmpUI_imm0_branch(cmpOpU cmp, iRegIorL2I op1, immI0 op2, label labl, rFlagsRegU cr) %{
+instruct cmpUI_imm0_branch(cmpOpUEqNeLtGe cmp, iRegIorL2I op1, immI0 op2, label labl, rFlagsRegU cr) %{
   match(If cmp (CmpU op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq
-            || n->in(1)->as_Bool()->_test._test == BoolTest::gt
-            ||  n->in(1)->as_Bool()->_test._test == BoolTest::le);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14402,12 +14464,8 @@ instruct cmpUI_imm0_branch(cmpOpU cmp, iRegIorL2I op1, immI0 op2, label labl, rF
   ins_pipe(pipe_cmp_branch);
 %}
 
-instruct cmpUL_imm0_branch(cmpOpU cmp, iRegL op1, immL0 op2, label labl, rFlagsRegU cr) %{
+instruct cmpUL_imm0_branch(cmpOpUEqNeLtGe cmp, iRegL op1, immL0 op2, label labl, rFlagsRegU cr) %{
   match(If cmp (CmpU op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq
-            || n->in(1)->as_Bool()->_test._test == BoolTest::gt
-            || n->in(1)->as_Bool()->_test._test == BoolTest::le);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14426,10 +14484,8 @@ instruct cmpUL_imm0_branch(cmpOpU cmp, iRegL op1, immL0 op2, label labl, rFlagsR
 // Test bit and Branch
 
 // Patterns for short (< 32KiB) variants
-instruct cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl) %{
+instruct cmpL_branch_sign(cmpOpLtGe cmp, iRegL op1, immL0 op2, label labl) %{
   match(If cmp (CmpL op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt
-            || n->in(1)->as_Bool()->_test._test == BoolTest::ge);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14444,10 +14500,8 @@ instruct cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl) %{
   ins_short_branch(1);
 %}
 
-instruct cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl) %{
+instruct cmpI_branch_sign(cmpOpLtGe cmp, iRegIorL2I op1, immI0 op2, label labl) %{
   match(If cmp (CmpI op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt
-            || n->in(1)->as_Bool()->_test._test == BoolTest::ge);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14462,11 +14516,9 @@ instruct cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl) %{
   ins_short_branch(1);
 %}
 
-instruct cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label labl) %{
+instruct cmpL_branch_bit(cmpOpEqNe cmp, iRegL op1, immL op2, immL0 op3, label labl) %{
   match(If cmp (CmpL (AndL op1 op2) op3));
-  predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq)
-            && is_power_of_2(n->in(2)->in(1)->in(2)->get_long()));
+  predicate(is_power_of_2(n->in(2)->in(1)->in(2)->get_long()));
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14481,11 +14533,9 @@ instruct cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label labl)
   ins_short_branch(1);
 %}
 
-instruct cmpI_branch_bit(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl) %{
+instruct cmpI_branch_bit(cmpOpEqNe cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl) %{
   match(If cmp (CmpI (AndI op1 op2) op3));
-  predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq)
-            && is_power_of_2(n->in(2)->in(1)->in(2)->get_int()));
+  predicate(is_power_of_2(n->in(2)->in(1)->in(2)->get_int()));
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14501,10 +14551,8 @@ instruct cmpI_branch_bit(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, label l
 %}
 
 // And far variants
-instruct far_cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl) %{
+instruct far_cmpL_branch_sign(cmpOpLtGe cmp, iRegL op1, immL0 op2, label labl) %{
   match(If cmp (CmpL op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt
-            || n->in(1)->as_Bool()->_test._test == BoolTest::ge);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14518,10 +14566,8 @@ instruct far_cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl) %{
   ins_pipe(pipe_cmp_branch);
 %}
 
-instruct far_cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl) %{
+instruct far_cmpI_branch_sign(cmpOpLtGe cmp, iRegIorL2I op1, immI0 op2, label labl) %{
   match(If cmp (CmpI op1 op2));
-  predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt
-            || n->in(1)->as_Bool()->_test._test == BoolTest::ge);
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14535,11 +14581,9 @@ instruct far_cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl)
   ins_pipe(pipe_cmp_branch);
 %}
 
-instruct far_cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label labl) %{
+instruct far_cmpL_branch_bit(cmpOpEqNe cmp, iRegL op1, immL op2, immL0 op3, label labl) %{
   match(If cmp (CmpL (AndL op1 op2) op3));
-  predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq)
-            && is_power_of_2(n->in(2)->in(1)->in(2)->get_long()));
+  predicate(is_power_of_2(n->in(2)->in(1)->in(2)->get_long()));
   effect(USE labl);
 
   ins_cost(BRANCH_COST);
@@ -14553,11 +14597,9 @@ instruct far_cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label la
   ins_pipe(pipe_cmp_branch);
 %}
 
-instruct far_cmpI_branch_bit(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl) %{
+instruct far_cmpI_branch_bit(cmpOpEqNe cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl) %{
   match(If cmp (CmpI (AndI op1 op2) op3));
-  predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne
-            || n->in(1)->as_Bool()->_test._test == BoolTest::eq)
-            && is_power_of_2(n->in(2)->in(1)->in(2)->get_int()));
+  predicate(is_power_of_2(n->in(2)->in(1)->in(2)->get_int()));
   effect(USE labl);
 
   ins_cost(BRANCH_COST);

From 300dc664ff6eb811d8bbce38fbab58d9c2997b13 Mon Sep 17 00:00:00 2001
From: Igor Ignatyev 
Date: Wed, 22 Jun 2016 21:24:07 +0300
Subject: [PATCH 046/111] 8160025: compiler/testlibrary/uncommontrap/Verifier
 doesn't close FileReader

Reviewed-by: kvn
---
 hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java b/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java
index f9df6759ed1..d59c7ec24e3 100644
--- a/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java
+++ b/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java
@@ -34,6 +34,7 @@ import java.util.Properties;
 import java.util.regex.Pattern;
 
 import jdk.test.lib.Asserts;
+
 /**
  * Utility tool aimed to verify presence or absence of specified uncommon trap
  * in compilation log.
@@ -78,7 +79,9 @@ public class Verifier {
                 PROPERTIES_FILE_SUFFIX);
 
         Properties properties = new Properties();
-        properties.load(new FileReader(propertiesFile.toFile()));
+        try (FileReader reader = new FileReader(propertiesFile.toFile())) {
+            properties.load(reader);
+        }
 
         if (Boolean.valueOf(properties.getProperty(
                 VERIFICATION_SHOULD_BE_SKIPPED, "false"))) {

From 23e0d96f6e1d79d1125dbcecf0ee19fa5dbf719c Mon Sep 17 00:00:00 2001
From: Igor Ignatyev 
Date: Wed, 22 Jun 2016 00:29:32 +0300
Subject: [PATCH 047/111] 8132920: use package in compiler testlibraries

Reviewed-by: kvn, psandoz
---
 .../arraycopy/TestArrayCopyNoInitDeopt.java   |  8 ++-
 .../commandfile/CompileOnlyTest.java          |  4 +-
 .../commandfile/ExcludeTest.java              |  4 +-
 .../compilercontrol/commandfile/LogTest.java  |  4 +-
 .../commandfile/PrintTest.java                |  4 +-
 .../commands/CompileOnlyTest.java             |  4 +-
 .../compilercontrol/commands/ExcludeTest.java |  4 +-
 .../compilercontrol/commands/LogTest.java     |  4 +-
 .../compilercontrol/commands/PrintTest.java   |  4 +-
 .../directives/CompileOnlyTest.java           |  4 +-
 .../directives/ExcludeTest.java               |  4 +-
 .../compilercontrol/directives/LogTest.java   |  4 +-
 .../compilercontrol/directives/PrintTest.java |  4 +-
 .../jcmd/AddAndRemoveTest.java                |  4 +-
 .../jcmd/AddCompileOnlyTest.java              |  4 +-
 .../compilercontrol/jcmd/AddExcludeTest.java  |  4 +-
 .../compilercontrol/jcmd/AddLogTest.java      |  4 +-
 .../jcmd/AddPrintAssemblyTest.java            |  4 +-
 .../jcmd/ClearDirectivesFileStackTest.java    |  4 +-
 .../jcmd/ClearDirectivesStackTest.java        |  4 +-
 .../jcmd/PrintDirectivesTest.java             |  4 +-
 .../jcmd/StressAddMultiThreadedTest.java      |  4 +-
 .../logcompilation/LogTest.java               |  4 +-
 .../matcher/MethodMatcherTest.java            | 25 +++++-----
 .../mixed/RandomCommandsTest.java             |  4 +-
 .../mixed/RandomValidCommandsTest.java        |  4 +-
 .../TestAESIntrinsicsOnSupportedConfig.java   | 15 +++---
 .../TestAESIntrinsicsOnUnsupportedConfig.java | 24 ++++-----
 .../test/compiler/floatingpoint/TestPow2.java |  5 +-
 .../intrinsics/IntrinsicAvailableTest.java    | 19 ++++---
 .../intrinsics/bmi/verifycode/AndnTestI.java  |  6 +--
 .../intrinsics/bmi/verifycode/AndnTestL.java  |  6 +--
 .../intrinsics/bmi/verifycode/BlsiTestI.java  |  6 +--
 .../intrinsics/bmi/verifycode/BlsiTestL.java  |  6 +--
 .../bmi/verifycode/BlsmskTestI.java           |  6 +--
 .../bmi/verifycode/BlsmskTestL.java           |  6 +--
 .../intrinsics/bmi/verifycode/BlsrTestI.java  |  6 +--
 .../intrinsics/bmi/verifycode/BlsrTestL.java  |  6 +--
 .../intrinsics/bmi/verifycode/LZcntTestI.java |  6 +--
 .../intrinsics/bmi/verifycode/LZcntTestL.java |  6 +--
 .../intrinsics/bmi/verifycode/TZcntTestI.java |  6 +--
 .../intrinsics/bmi/verifycode/TZcntTestL.java |  6 +--
 .../mathexact/sanity/AddExactIntTest.java     |  8 +--
 .../mathexact/sanity/AddExactLongTest.java    |  8 +--
 .../sanity/DecrementExactIntTest.java         |  8 +--
 .../sanity/DecrementExactLongTest.java        |  8 +--
 .../sanity/IncrementExactIntTest.java         |  8 +--
 .../sanity/IncrementExactLongTest.java        |  8 +--
 .../mathexact/sanity/IntrinsicBase.java       |  3 +-
 .../sanity/MultiplyExactIntTest.java          |  8 +--
 .../sanity/MultiplyExactLongTest.java         |  8 +--
 .../mathexact/sanity/NegateExactIntTest.java  |  8 +--
 .../mathexact/sanity/NegateExactLongTest.java |  8 +--
 .../sanity/SubtractExactIntTest.java          |  9 ++--
 .../sanity/SubtractExactLongTest.java         |  8 +--
 .../intrinsics/sha/cli/SHAOptionsBase.java    |  2 +-
 ...UseSHA1IntrinsicsOptionOnSupportedCPU.java |  8 +--
 ...eSHA1IntrinsicsOptionOnUnsupportedCPU.java |  8 +--
 ...eSHA256IntrinsicsOptionOnSupportedCPU.java |  8 +--
 ...HA256IntrinsicsOptionOnUnsupportedCPU.java |  8 +--
 ...eSHA512IntrinsicsOptionOnSupportedCPU.java |  6 +--
 ...HA512IntrinsicsOptionOnUnsupportedCPU.java |  8 +--
 .../cli/TestUseSHAOptionOnSupportedCPU.java   |  8 +--
 .../cli/TestUseSHAOptionOnUnsupportedCPU.java |  6 +--
 ...sicsSpecificTestCaseForUnsupportedCPU.java |  2 +-
 ...UseSHASpecificTestCaseForSupportedCPU.java |  2 +-
 ...eSHASpecificTestCaseForUnsupportedCPU.java |  2 +-
 .../sha/sanity/SHASanityTestBase.java         |  3 +-
 .../sha/sanity/TestSHA1Intrinsics.java        | 13 ++---
 .../sanity/TestSHA1MultiBlockIntrinsics.java  | 15 +++---
 .../sha/sanity/TestSHA256Intrinsics.java      | 15 +++---
 .../TestSHA256MultiBlockIntrinsics.java       | 15 +++---
 .../sha/sanity/TestSHA512Intrinsics.java      | 15 +++---
 .../TestSHA512MultiBlockIntrinsics.java       | 15 +++---
 hotspot/test/compiler/jsr292/InvokerGC.java   |  2 +-
 .../rangechecks/TestExplicitRangeChecks.java  |  6 +--
 .../rangechecks/TestRangeCheckSmearing.java   |  6 +--
 .../compiler/rtm/cli/RTMLockingAwareTest.java |  4 +-
 ...kingStatisticsOptionOnSupportedConfig.java | 10 ++--
 ...ngStatisticsOptionOnUnsupportedConfig.java | 10 ++--
 ...tRTMAbortRatioOptionOnSupportedConfig.java |  6 +--
 ...TMAbortRatioOptionOnUnsupportedConfig.java | 10 ++--
 ...lCountIncrRateOptionOnSupportedConfig.java |  6 +--
 ...ountIncrRateOptionOnUnsupportedConfig.java | 10 ++--
 ...estUseRTMDeoptOptionOnSupportedConfig.java | 10 ++--
 ...tUseRTMDeoptOptionOnUnsupportedConfig.java | 10 ++--
 ...MForStackLocksOptionOnSupportedConfig.java | 10 ++--
 ...orStackLocksOptionOnUnsupportedConfig.java | 10 ++--
 ...tUseRTMLockingOptionOnSupportedConfig.java | 10 ++--
 ...stUseRTMLockingOptionOnUnsupportedCPU.java | 10 ++--
 ...estUseRTMLockingOptionOnUnsupportedVM.java | 10 ++--
 ...tUseRTMLockingOptionWithBiasedLocking.java | 10 ++--
 .../rtm/locking/TestRTMAbortRatio.java        | 10 ++--
 .../rtm/locking/TestRTMAbortThreshold.java    | 10 ++--
 .../rtm/locking/TestRTMAfterNonRTMDeopt.java  | 12 ++---
 .../locking/TestRTMDeoptOnHighAbortRatio.java | 12 ++---
 .../locking/TestRTMDeoptOnLowAbortRatio.java  | 12 ++---
 .../TestRTMLockingCalculationDelay.java       | 12 ++---
 .../rtm/locking/TestRTMLockingThreshold.java  | 12 ++---
 .../rtm/locking/TestRTMRetryCount.java        | 12 ++---
 .../rtm/locking/TestRTMSpinLoopCount.java     | 12 ++---
 .../locking/TestRTMTotalCountIncrRate.java    | 12 ++---
 .../locking/TestUseRTMAfterLockInflation.java | 12 ++---
 .../compiler/rtm/locking/TestUseRTMDeopt.java | 12 ++---
 .../locking/TestUseRTMForInflatedLocks.java   | 12 ++---
 .../rtm/locking/TestUseRTMForStackLocks.java  | 12 ++---
 .../locking/TestUseRTMXendForLockBusy.java    | 12 ++---
 .../TestNoRTMLockElidingOption.java           | 12 ++---
 .../TestUseRTMLockElidingOption.java          | 12 ++---
 .../TestPrintPreciseRTMLockingStatistics.java | 12 ++---
 .../testlibrary/intrinsics/Verifier.java      |  3 +-
 .../testlibrary/rtm/AbortProvoker.java        |  2 +-
 .../compiler/testlibrary/rtm/AbortType.java   |  2 +-
 .../rtm/BufferOverflowProvoker.java           |  2 +-
 .../compiler/testlibrary/rtm/BusyLock.java    |  2 +-
 .../testlibrary/rtm/CompilableTest.java       |  2 +-
 .../rtm/MemoryConflictProvoker.java           |  2 +-
 .../testlibrary/rtm/NestedAbortProvoker.java  |  2 +-
 .../testlibrary/rtm/RTMLockingStatistics.java |  2 +-
 .../compiler/testlibrary/rtm/RTMTestBase.java |  2 +-
 .../testlibrary/rtm/XAbortProvoker.java       |  2 +-
 .../rtm/predicate/SupportedCPU.java           |  2 +-
 .../rtm/predicate/SupportedVM.java            |  2 +-
 .../sha/predicate/IntrinsicPredicates.java    |  2 +-
 .../testlibrary/uncommontrap/Verifier.java    |  2 +-
 .../ConstantGettersTransitionsTest.java       | 11 ++--
 .../compiler/tiered/LevelTransitionTest.java  | 19 +++----
 .../compiler/tiered/NonTieredLevelsTest.java  |  9 ++--
 .../compiler/tiered/TieredLevelsTest.java     |  9 ++--
 .../uncommontrap/TestUnstableIfTrap.java      | 50 ++++++++++---------
 130 files changed, 516 insertions(+), 498 deletions(-)

diff --git a/hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java b/hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java
index ccd2cfe1028..6451b38795e 100644
--- a/hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java
+++ b/hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java
@@ -25,19 +25,17 @@
  * @test
  * @bug 8072016
  * @summary Infinite deoptimization/recompilation cycles in case of arraycopy with tightly coupled allocation
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestArrayCopyNoInitDeopt
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main ClassFileInstaller jdk.test.lib.Platform
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                jdk.test.lib.Platform
  * @run main/othervm -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=020
  *                   TestArrayCopyNoInitDeopt
- *
  */
 
-
 import sun.hotspot.WhiteBox;
 import sun.hotspot.code.NMethod;
 import jdk.test.lib.Platform;
diff --git a/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java b/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java
index 925c1c7ef5c..8acac55c2b5 100644
--- a/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java
+++ b/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests CompileCommand=compileonly
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.commandfile.CompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.commandfile.CompileOnlyTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java b/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java
index 98b3c715276..4a4bde5917b 100644
--- a/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java
+++ b/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests CompileCommand=exclude
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.commandfile.ExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.commandfile.ExcludeTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java b/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java
index 18dd2a7dbdd..75b9e79f6d5 100644
--- a/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java
+++ b/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests CompileCommand=log
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.commandfile.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.commandfile.LogTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java b/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java
index f47b9a43bae..ed45af6018d 100644
--- a/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java
+++ b/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests CompileCommand=print
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.commandfile.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.commandfile.PrintTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java b/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java
index d4e57e94e40..db98ab91a85 100644
--- a/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java
+++ b/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests CompileCommand=compileonly
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.commands.CompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.commands.CompileOnlyTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java b/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java
index f8311e77c70..272d4654ab5 100644
--- a/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java
+++ b/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests CompileCommand=exclude
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.commands.ExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.commands.ExcludeTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/commands/LogTest.java b/hotspot/test/compiler/compilercontrol/commands/LogTest.java
index 7f9db796be6..01189e36b25 100644
--- a/hotspot/test/compiler/compilercontrol/commands/LogTest.java
+++ b/hotspot/test/compiler/compilercontrol/commands/LogTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests CompileCommand=log
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.commands.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.commands.LogTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/commands/PrintTest.java b/hotspot/test/compiler/compilercontrol/commands/PrintTest.java
index bbe9efec173..f1bbe20bb5d 100644
--- a/hotspot/test/compiler/compilercontrol/commands/PrintTest.java
+++ b/hotspot/test/compiler/compilercontrol/commands/PrintTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests CompileCommand=print
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.commands.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.commands.PrintTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java b/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java
index e351c42fd07..d9e8bd87227 100644
--- a/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java
+++ b/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests directives to be able to compile only specified  methods
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.directives.CompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.directives.CompileOnlyTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java b/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java
index 5799fe20e0e..54614ab6aa9 100644
--- a/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java
+++ b/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests directives to be able to exclude methods from compilation
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.directives.ExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.directives.ExcludeTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/directives/LogTest.java b/hotspot/test/compiler/compilercontrol/directives/LogTest.java
index 0d5f9cc5dd1..18323234c6b 100644
--- a/hotspot/test/compiler/compilercontrol/directives/LogTest.java
+++ b/hotspot/test/compiler/compilercontrol/directives/LogTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests directives to be able to turn on LogCompilation
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.directives.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.directives.LogTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/directives/PrintTest.java b/hotspot/test/compiler/compilercontrol/directives/PrintTest.java
index ac45d43a768..d551865121e 100644
--- a/hotspot/test/compiler/compilercontrol/directives/PrintTest.java
+++ b/hotspot/test/compiler/compilercontrol/directives/PrintTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests directives to be able to turn on print_assembly
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.directives.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.directives.PrintTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java b/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java
index ec296cea78a..01de110b64c 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests directives to be able to add and remove directives
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.jcmd.AddAndRemoveTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.AddAndRemoveTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java b/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java
index 70963733f45..e3783b4f586 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to compile only specified methods
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.jcmd.AddCompileOnlyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.AddCompileOnlyTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java b/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java
index 38125fb6bac..a4d552f60c3 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to exclude only specified methods
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.jcmd.AddExcludeTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.AddExcludeTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java b/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java
index 7c14e41cf3c..acf98fa84df 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to log only specified methods
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.jcmd.AddLogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.AddLogTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java b/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java
index ea8bd585769..aff39388cf7 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java
@@ -27,12 +27,12 @@
  * @summary Tests jcmd to be able to add a directive to print assembly
  *          only for specified methods
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.jcmd.AddPrintAssemblyTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.AddPrintAssemblyTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java
index 4635a7f91f3..75c2e8a34de 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java
@@ -27,12 +27,12 @@
  * @ignore 8140405
  * @summary Tests jcmd to be able to clear directives added via options
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java
index 20d7a7a3441..63b467a8c85 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests clear JCMD command
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.jcmd.ClearDirectivesStackTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.ClearDirectivesStackTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java b/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java
index dfa3b82cd0f..44c1d474177 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java
@@ -26,13 +26,13 @@
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to compile only specified methods
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @requires vm.flavor != "minimal"
  * @build compiler.compilercontrol.jcmd.PrintDirectivesTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.PrintDirectivesTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java b/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java
index 4cf2945108d..83f05f84e13 100644
--- a/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java
+++ b/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java
@@ -27,13 +27,13 @@
  * @summary Tests jcmd to be able to add a lot of huge directive files with
  *          parallel executed jcmds until timeout has reached
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils
  *        compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java b/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java
index 48f200cc638..68b5981a8e3 100644
--- a/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java
+++ b/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Tests LogCompilation executed standalone without log commands or directives
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.logcompilation.LogTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver compiler.compilercontrol.logcompilation.LogTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java b/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java
index 9ec1eccf6e1..2c8bcb5e3f1 100644
--- a/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java
+++ b/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java
@@ -21,6 +21,19 @@
  * questions.
  */
 
+/*
+ * @test
+ * @bug 8135068
+ * @summary Tests CompilerCommand's method matcher
+ * @modules java.base/jdk.internal.misc
+ * @library /testlibrary /test/lib ../share /
+ * @build compiler.compilercontrol.matcher.MethodMatcherTest
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *           -XX:+WhiteBoxAPI compiler.compilercontrol.matcher.MethodMatcherTest
+ */
+
 package compiler.compilercontrol.matcher;
 
 import jdk.test.lib.Pair;
@@ -36,18 +49,6 @@ import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/*
- * @test
- * @bug 8135068
- * @summary Tests CompilerCommand's method matcher
- * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ../share /
- * @build compiler.compilercontrol.matcher.MethodMatcherTest
- * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- *           -XX:+WhiteBoxAPI compiler.compilercontrol.matcher.MethodMatcherTest
- */
 public class MethodMatcherTest {
     private static final WhiteBox WB = WhiteBox.getWhiteBox();
     private static final PoolHelper POOL = new PoolHelper();
diff --git a/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java b/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java
index 11d38586a96..24557664f9c 100644
--- a/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Randomly generates commands with random types
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.mixed.RandomCommandsTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver/timeout=600 compiler.compilercontrol.mixed.RandomCommandsTest
  */
 
diff --git a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java b/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java
index 0964178f7b2..d573ed0f88b 100644
--- a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java
@@ -26,12 +26,12 @@
  * @bug 8137167
  * @summary Randomly generates valid commands with random types
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
  * @build compiler.compilercontrol.mixed.RandomValidCommandsTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run driver/timeout=600 compiler.compilercontrol.mixed.RandomValidCommandsTest
  */
 
diff --git a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java b/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
index 3c16553a549..75c411de149 100644
--- a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
+++ b/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
@@ -21,24 +21,25 @@
  * questions.
  *
  */
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox
- *          /compiler/testlibrary /compiler/codegen/7184394
+ * @library /testlibrary /test/lib /compiler/codegen/7184394 /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @ignore 8146128
  * @build TestAESIntrinsicsOnSupportedConfig TestAESMain
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                  sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch
  *                   TestAESIntrinsicsOnSupportedConfig
  */
+
+import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.Platform;
+import jdk.test.lib.ProcessTools;
+
 public class TestAESIntrinsicsOnSupportedConfig extends AESIntrinsicsBase {
 
     /**
diff --git a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java b/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
index 0aeca412d17..9bc466229ad 100644
--- a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
@@ -22,22 +22,22 @@
  *
  */
 
+/*
+ * @test
+ * @library /testlibrary /test/lib /compiler/codegen/7184394 /
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build TestAESIntrinsicsOnUnsupportedConfig TestAESMain
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *       -XX:+WhiteBoxAPI -Xbatch  TestAESIntrinsicsOnUnsupportedConfig
+ */
+
 import jdk.test.lib.cli.predicate.NotPredicate;
 import jdk.test.lib.OutputAnalyzer;
 import jdk.test.lib.ProcessTools;
 
-/*
- * @test
- * @library /testlibrary /test/lib /compiler/whitebox
- *          /compiler/testlibrary /compiler/codegen/7184394
- * @modules java.base/jdk.internal.misc
- *          java.management
- * @build TestAESIntrinsicsOnUnsupportedConfig TestAESMain
- * @run main ClassFileInstaller
- * sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- *       -XX:+WhiteBoxAPI -Xbatch  TestAESIntrinsicsOnUnsupportedConfig
- */
 public class TestAESIntrinsicsOnUnsupportedConfig extends AESIntrinsicsBase {
 
     private static final String INTRINSICS_NOT_AVAILABLE_MSG = "warning: AES "
diff --git a/hotspot/test/compiler/floatingpoint/TestPow2.java b/hotspot/test/compiler/floatingpoint/TestPow2.java
index d3893e9863c..01b094ef533 100644
--- a/hotspot/test/compiler/floatingpoint/TestPow2.java
+++ b/hotspot/test/compiler/floatingpoint/TestPow2.java
@@ -25,11 +25,12 @@
  * @test
  * @bug 8063086
  * @summary X^2 special case for C2 yields different result than interpreter
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build TestPow2
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestPow2
  *
diff --git a/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java b/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java
index ab582f94b18..42ddab0303c 100644
--- a/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java
+++ b/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java
@@ -20,20 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.lang.reflect.Executable;
-import java.util.concurrent.Callable;
-import java.util.Objects;
 
-import jdk.test.lib.*;
-import compiler.whitebox.CompilerWhiteBoxTest;
 /*
  * @test
  * @bug 8130832
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox /compiler/testlibrary /
+ * @library /testlibrary /test/lib /
  * @build IntrinsicAvailableTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:.
  *                   -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
@@ -45,6 +40,14 @@ import compiler.whitebox.CompilerWhiteBoxTest;
  *                   -XX:-UseCRC32Intrinsics
  *                   IntrinsicAvailableTest
  */
+
+import java.lang.reflect.Executable;
+import java.util.concurrent.Callable;
+import java.util.Objects;
+
+import jdk.test.lib.*;
+import compiler.whitebox.CompilerWhiteBoxTest;
+
 public class IntrinsicAvailableTest extends CompilerWhiteBoxTest {
     protected String VMName;
 
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java
index 15380e8cd5f..0e224f86214 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AndnTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                                 -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AndnTestI
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java
index e0b9ecda1ea..369c0338e88 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AndnTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                                 -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AndnTestL
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
index fa944503aba..62860dac58c 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsiTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestI
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java
index 0ed38997ab5..ef665a1cd1d 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsiTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestL
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
index bed3688eeed..e780495ce86 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsmskTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestI
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java
index a419019fe0a..6f4346840bd 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsmskTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestL
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
index bb67b4185e9..a6791b019ee 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsrTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestI
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java
index b9ee3f3f12d..cd34faf346d 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build BlsrTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestL
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java
index 0cceb5847f5..f23792a1855 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build LZcntTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestI
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java
index 051999739c5..71a0fc0a65c 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build LZcntTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestL
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java
index a6d12248c47..1f71f43e22c 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TZcntTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestI
  */
diff --git a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java
index 618c18aa02e..ca77c2a4d48 100644
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java
@@ -24,12 +24,12 @@
 /*
  * @test
  * @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TZcntTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestL
  */
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java
index 0a183ffe102..b9b643d60d3 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AddExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics AddExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class AddExactIntTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java
index 961a3e2dfe6..45f78d41c4a 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build AddExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics AddExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class AddExactLongTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java
index 2e182ce6eb0..15f2d74764b 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build DecrementExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics DecrementExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class DecrementExactIntTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java
index 7c8121afab7..97fad805478 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build DecrementExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics DecrementExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class DecrementExactLongTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java
index ee47968b7e6..b1125c01408 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build IncrementExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics IncrementExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class IncrementExactIntTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java
index eb65784e18f..79f2497652f 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build IncrementExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics IncrementExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class IncrementExactLongTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java
index e271f9fd49f..f902164efa0 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java
@@ -22,12 +22,13 @@
  */
 
 import jdk.test.lib.Platform;
-import intrinsics.Verifier;
 
 import java.io.FileOutputStream;
 import java.lang.reflect.Executable;
 import java.util.Properties;
+
 import compiler.whitebox.CompilerWhiteBoxTest;
+import compiler.testlibrary.intrinsics.Verifier;
 
 public abstract class IntrinsicBase extends CompilerWhiteBoxTest {
     protected String javaVmName;
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java
index 7c53f29b0df..c3aec6265e6 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build MultiplyExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics MultiplyExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class MultiplyExactIntTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java
index 7c82e7328fd..bc49440cb46 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build MultiplyExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics MultiplyExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class MultiplyExactLongTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java
index c1ddb1649b7..d39d10871ad 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build NegateExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics NegateExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class NegateExactIntTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java
index dc18373ce95..8ad985b3d9c 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build NegateExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics NegateExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class NegateExactLongTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java
index 12813886b2d..cf7f2f1458c 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build SubtractExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,8 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics SubtractExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
-
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class SubtractExactIntTest {
diff --git a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java
index dd3e1c233df..d71ee75e4c7 100644
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java
@@ -23,12 +23,12 @@
 
 /*
  * @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build SubtractExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
  *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
  *                   -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics SubtractExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
  */
 
 public class SubtractExactLongTest {
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java b/hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java
index febf666aeb7..cb0856cc778 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java
@@ -23,7 +23,7 @@
 
 import jdk.test.lib.Platform;
 import jdk.test.lib.cli.CommandLineOptionTest;
-import sha.predicate.IntrinsicPredicates;
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
 
 import java.util.function.BooleanSupplier;
 
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
index ad85544a188..7fc3642e618 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
@@ -24,13 +24,13 @@
 /**
  * @test
  * @bug 8035968
- * @summary Verify UseSHA1Intrinsics option processing on supported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA1Intrinsics option processing on supported CPU.
+ * @library /testlibrary /test/lib testcases /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA1IntrinsicsOptionOnSupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseSHA1IntrinsicsOptionOnSupportedCPU
  */
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
index f48613971eb..34b66806c37 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
@@ -24,13 +24,13 @@
 /**
  * @test
  * @bug 8035968
- * @summary Verify UseSHA1Intrinsics option processing on unsupported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA1Intrinsics option processing on unsupported CPU.
+ * @library /testlibrary /test/lib testcases /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA1IntrinsicsOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseSHA1IntrinsicsOptionOnUnsupportedCPU
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java
index 692bf2262fb..47106008cc1 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java
@@ -24,13 +24,13 @@
 /**
  * @test
  * @bug 8035968
- * @summary Verify UseSHA256Intrinsics option processing on supported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA256Intrinsics option processing on supported CPU.
+ * @library /testlibrary /test/lib testcases /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA256IntrinsicsOptionOnSupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseSHA256IntrinsicsOptionOnSupportedCPU
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
index 665a05f3f41..a23dd213bf2 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
@@ -24,13 +24,13 @@
 /**
  * @test
  * @bug 8035968
- * @summary Verify UseSHA256Intrinsics option processing on unsupported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA256Intrinsics option processing on unsupported CPU.
+ * @library /testlibrary /test/lib testcases /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA256IntrinsicsOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseSHA256IntrinsicsOptionOnUnsupportedCPU
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java
index e9dec043dce..fb7c06558e0 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java
@@ -25,12 +25,12 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA512Intrinsics option processing on supported CPU.
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib testcases /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA512IntrinsicsOptionOnSupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseSHA512IntrinsicsOptionOnSupportedCPU
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
index ac270b055f8..d57c63ea01a 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
@@ -24,13 +24,13 @@
 /**
  * @test
  * @bug 8035968
- * @summary Verify UseSHA512Intrinsics option processing on unsupported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA512Intrinsics option processing on unsupported CPU.
+ * @library /testlibrary /test/lib testcases /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHA512IntrinsicsOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseSHA512IntrinsicsOptionOnUnsupportedCPU
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
index 7873eef1c95..5903dfbee89 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
@@ -24,13 +24,13 @@
 /**
  * @test
  * @bug 8035968
- * @summary Verify UseSHA option processing on supported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA option processing on supported CPU.
+ * @library /testlibrary /test/lib testcases /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHAOptionOnSupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseSHAOptionOnSupportedCPU
  */
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
index 3a5f6f08cda..3fed6d20d0d 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
@@ -25,12 +25,12 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA option processing on unsupported CPU.
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib testcases /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseSHAOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseSHAOptionOnUnsupportedCPU
  */
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java
index c75a66795b8..a4dfe43742f 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java
@@ -27,7 +27,7 @@ import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.OrPredicate;
 import jdk.test.lib.cli.predicate.NotPredicate;
-import sha.predicate.IntrinsicPredicates;
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
 
 /**
  * Test case specific to UseSHA*Intrinsics options targeted to SPARC and AArch64
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java
index 3c1d208790e..f4ed3bb6db1 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java
@@ -27,7 +27,7 @@ import jdk.test.lib.Platform;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.OrPredicate;
-import sha.predicate.IntrinsicPredicates;
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
 
 /**
  * UseSHA specific test case targeted to SPARC and AArch64 CPUs which
diff --git a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java
index 22f133deaa9..bc3068deb6a 100644
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java
@@ -28,7 +28,7 @@ import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.OrPredicate;
 import jdk.test.lib.cli.predicate.NotPredicate;
-import sha.predicate.IntrinsicPredicates;
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
 
 /**
  * UseSHA specific test case targeted to SPARC and AArch64 CPUs which don't
diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java b/hotspot/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java
index 13b10a51269..d60671c22fc 100644
--- a/hotspot/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java
@@ -21,7 +21,6 @@
  * questions.
  */
 
-import intrinsics.Verifier;
 import sun.hotspot.WhiteBox;
 
 import java.io.FileOutputStream;
@@ -30,6 +29,8 @@ import java.util.Objects;
 import java.util.Properties;
 import java.util.function.BooleanSupplier;
 
+import compiler.testlibrary.intrinsics.Verifier;
+
 /**
  * Base class for sanity tests on SHA intrinsics support.
  */
diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java
index 7f1dba6213c..98ae9c3ab0b 100644
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java
@@ -25,12 +25,12 @@
  * @test
  * @bug 8035968
  * @summary Verify that SHA-1 intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @build TestSHA intrinsics.Verifier TestSHA1Intrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA1Intrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
  *                   -XX:Tier4InvocationThreshold=500
@@ -48,9 +48,10 @@
  *                   -XX:-UseSHA1Intrinsics
  *                   -Dalgorithm=SHA-1 TestSHA1Intrinsics
  * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- *                   intrinsics.Verifier positive.log negative.log
+ *                   compiler.testlibrary.intrinsics.Verifier positive.log negative.log
  */
-import sha.predicate.IntrinsicPredicates;
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
 
 public class TestSHA1Intrinsics {
     public static void main(String args[]) throws Exception {
diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java
index f4909da982b..48693030a9f 100644
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java
@@ -21,18 +21,16 @@
  * questions.
  */
 
-import sha.predicate.IntrinsicPredicates;
-
 /**
  * @test
  * @bug 8035968
  * @summary Verify that SHA-1 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @build TestSHA intrinsics.Verifier TestSHA1MultiBlockIntrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA1MultiBlockIntrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
  *                   -XX:Tier4InvocationThreshold=500
@@ -58,9 +56,12 @@ import sha.predicate.IntrinsicPredicates;
  *                   -XX:CompileOnly=sun/security/provider/SHA -XX:-UseSHA
  *                   -Dalgorithm=SHA-1 TestSHA1MultiBlockIntrinsics
  * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- *                   intrinsics.Verifier positive.log positive_def.log
+ *                   compiler.testlibrary.intrinsics.Verifier positive.log positive_def.log
  *                   negative.log
  */
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
 public class TestSHA1MultiBlockIntrinsics {
     public static void main(String args[]) throws Exception {
         new SHASanityTestBase(IntrinsicPredicates.SHA1_INTRINSICS_AVAILABLE,
diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java
index 2154daf85de..51373332c95 100644
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java
@@ -21,18 +21,16 @@
  * questions.
  */
 
-import sha.predicate.IntrinsicPredicates;
-
 /**
  * @test
  * @bug 8035968
  * @summary Verify that SHA-256 intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @build TestSHA intrinsics.Verifier TestSHA256Intrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA256Intrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
  *                   -XX:Tier4InvocationThreshold=500
@@ -66,9 +64,12 @@ import sha.predicate.IntrinsicPredicates;
  *                   -XX:-UseSHA256Intrinsics
  *                   -Dalgorithm=SHA-256 TestSHA256Intrinsics
  * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- *                    intrinsics.Verifier positive_224.log positive_256.log
+ *                    compiler.testlibrary.intrinsics.Verifier positive_224.log positive_256.log
  *                    negative_224.log negative_256.log
  */
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
 public class TestSHA256Intrinsics {
     public static void main(String args[]) throws Exception {
         new SHASanityTestBase(IntrinsicPredicates.SHA256_INTRINSICS_AVAILABLE,
diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java
index 3d6809fbf61..214f666cf8f 100644
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java
@@ -21,18 +21,16 @@
  * questions.
  */
 
-import sha.predicate.IntrinsicPredicates;
-
 /**
  * @test
  * @bug 8035968
  * @summary Verify that SHA-256 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @build TestSHA intrinsics.Verifier TestSHA256MultiBlockIntrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA256MultiBlockIntrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
  *                   -XX:Tier4InvocationThreshold=500
@@ -82,10 +80,13 @@ import sha.predicate.IntrinsicPredicates;
  *                   -XX:CompileOnly=sun/security/provider/SHA -XX:-UseSHA
  *                   -Dalgorithm=SHA-256 TestSHA256MultiBlockIntrinsics
  * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- *                   intrinsics.Verifier positive_224.log positive_256.log
+ *                   compiler.testlibrary.intrinsics.Verifier positive_224.log positive_256.log
  *                   positive_224_def.log positive_256_def.log negative_224.log
  *                   negative_256.log
  */
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
 public class TestSHA256MultiBlockIntrinsics {
     public static void main(String args[]) throws Exception {
         new SHASanityTestBase(IntrinsicPredicates.SHA256_INTRINSICS_AVAILABLE,
diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java
index 771113cbef2..5ac5fc5f8b7 100644
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java
@@ -21,18 +21,16 @@
  * questions.
  */
 
-import sha.predicate.IntrinsicPredicates;
-
 /**
  * @test
  * @bug 8035968
  * @summary Verify that SHA-512 intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @build TestSHA intrinsics.Verifier TestSHA512Intrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA512Intrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
  *                   -XX:Tier4InvocationThreshold=500
@@ -66,9 +64,12 @@ import sha.predicate.IntrinsicPredicates;
  *                   -XX:-UseSHA512Intrinsics
  *                   -Dalgorithm=SHA-512 TestSHA512Intrinsics
  * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- *                    intrinsics.Verifier positive_384.log positive_512.log
+ *                    compiler.testlibrary.intrinsics.Verifier positive_384.log positive_512.log
  *                    negative_384.log negative_512.log
  */
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
 public class TestSHA512Intrinsics {
     public static void main(String args[]) throws Exception {
         new SHASanityTestBase(IntrinsicPredicates.SHA512_INTRINSICS_AVAILABLE,
diff --git a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java
index 0497415059e..722648360ef 100644
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java
@@ -21,18 +21,16 @@
  * questions.
  */
 
-import sha.predicate.IntrinsicPredicates;
-
 /**
  * @test
  * @bug 8035968
  * @summary Verify that SHA-512 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @build TestSHA intrinsics.Verifier TestSHA512MultiBlockIntrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA512MultiBlockIntrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
  *                   -XX:Tier4InvocationThreshold=500
@@ -82,10 +80,13 @@ import sha.predicate.IntrinsicPredicates;
  *                   -XX:CompileOnly=sun/security/provider/SHA -XX:-UseSHA
  *                   -Dalgorithm=SHA-512 TestSHA512MultiBlockIntrinsics
  * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- *                    intrinsics.Verifier positive_384.log positive_512.log
+ *                    compiler.testlibrary.intrinsics.Verifier positive_384.log positive_512.log
  *                    positive_384_def.log positive_512_def.log negative_384.log
  *                    negative_512.log
  */
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
 public class TestSHA512MultiBlockIntrinsics {
     public static void main(String args[]) throws Exception {
         new SHASanityTestBase(IntrinsicPredicates.SHA512_INTRINSICS_AVAILABLE,
diff --git a/hotspot/test/compiler/jsr292/InvokerGC.java b/hotspot/test/compiler/jsr292/InvokerGC.java
index 98c69b1a0b6..bcd63dd4857 100644
--- a/hotspot/test/compiler/jsr292/InvokerGC.java
+++ b/hotspot/test/compiler/jsr292/InvokerGC.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8067247
  * @modules java.base/jdk.internal.misc
- * @library /test/lib /compiler/whitebox /
+ * @library /test/lib /
  * @run main/bootclasspath/othervm -Xcomp -Xbatch
  *      -XX:CompileCommand=compileonly,InvokerGC::test
  *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
diff --git a/hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java b/hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java
index c4c97f98038..a023d5a4e74 100644
--- a/hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java
+++ b/hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java
@@ -26,10 +26,10 @@
  * @bug 8073480
  * @summary explicit range checks should be recognized by C2
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
  * @build TestExplicitRangeChecks
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main ClassFileInstaller jdk.test.lib.Platform
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                jdk.test.lib.Platform
  * @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=compileonly,TestExplicitRangeChecks.test* TestExplicitRangeChecks
  *
diff --git a/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java b/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java
index 72b78738288..33ff3e01d93 100644
--- a/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java
+++ b/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java
@@ -25,12 +25,12 @@
  * @test
  * @bug 8066103
  * @summary C2's range check smearing allows out of bound array accesses
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRangeCheckSmearing
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main ClassFileInstaller jdk.test.lib.Platform
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                jdk.test.lib.Platform
  * @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestRangeCheckSmearing
  *
diff --git a/hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java b/hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java
index 1d42662fa31..654040a1f4f 100644
--- a/hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java
+++ b/hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java
@@ -28,8 +28,8 @@ import java.util.LinkedList;
 import jdk.test.lib.ExitCode;
 import jdk.test.lib.cli.*;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Base for all RTM-related CLI tests on options whose processing depends
diff --git a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java
index c4eacf5f111..e8e9fdb870a 100644
--- a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify PrintPreciseRTMLockingStatistics on CPUs with
  *          rtm support and on VM with rtm locking support,
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
@@ -40,8 +40,8 @@
 
 import jdk.test.lib.cli.*;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
         extends TestPrintPreciseRTMLockingStatisticsBase {
diff --git a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
index 29cbee10771..ec2b4311568 100644
--- a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify PrintPreciseRTMLockingStatistics on CPUs without
  *          rtm support and/or unsupported VM.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                 TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
@@ -40,8 +40,8 @@
 
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
         extends TestPrintPreciseRTMLockingStatisticsBase {
diff --git a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java
index aa5fc122a64..b1a761df8af 100644
--- a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify RTMAbortRatio option processing on CPU with rtm
  *          support and on VM with rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAbortRatioOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnSupportedConfig
  */
diff --git a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
index 5c97ade4ce2..0104b8f3f83 100644
--- a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
@@ -27,20 +27,20 @@
  * @bug 8031320
  * @summary Verify RTMAbortRatio option processing on CPU without rtm
  *          support or on VM that does not support rtm locking.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAbortRatioOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnUnsupportedConfig
  */
 
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestRTMAbortRatioOptionOnUnsupportedConfig
         extends RTMGenericCommandLineOptionTest {
diff --git a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java
index b76fc6f7408..1e9300428a9 100644
--- a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify RTMTotalCountIncrRate option processing on CPU with
  *          rtm support and on VM with rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMTotalCountIncrRateOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestRTMTotalCountIncrRateOptionOnSupportedConfig
diff --git a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java
index c1d26ccd3a3..c855876cca8 100644
--- a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java
@@ -24,20 +24,20 @@
 
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * @test
  * @bug 8031320
  * @summary Verify RTMTotalCountIncrRate option processing on CPU without
  *          rtm support and/or on VM without rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java
index 07431f3e91f..5ac9c26dd9b 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify UseRTMDeopt option processing on CPUs with rtm support
  *          when rtm locking is supported by VM.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMDeoptOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnSupportedConfig
  */
@@ -40,8 +40,8 @@
 import jdk.test.lib.ExitCode;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestUseRTMDeoptOptionOnSupportedConfig
         extends CommandLineOptionTest {
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java
index 59b87002aa7..fd6ef44d53e 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify UseRTMDeopt option processing on CPUs without rtm support
  *          or on VMs without rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMDeoptOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnUnsupportedConfig
  */
@@ -41,8 +41,8 @@ import jdk.test.lib.cli.CommandLineOptionTest;
 
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestUseRTMDeoptOptionOnUnsupportedConfig
         extends RTMGenericCommandLineOptionTest {
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java
index a6520551d52..49c9ebd5638 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify UseRTMForStackLocks option processing on CPU with
  *          rtm support when VM supports rtm locking.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMForStackLocksOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                   TestUseRTMForStackLocksOptionOnSupportedConfig
@@ -41,8 +41,8 @@
 import jdk.test.lib.*;
 import jdk.test.lib.cli.*;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestUseRTMForStackLocksOptionOnSupportedConfig
         extends CommandLineOptionTest {
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java
index 54bc3e94ba4..ea1555ab57f 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify UseRTMForStackLocks option processing on CPUs without
  *          rtm support and/or on VMs without rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMForStackLocksOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI
  *                    TestUseRTMForStackLocksOptionOnUnsupportedConfig
@@ -42,8 +42,8 @@ import jdk.test.lib.ExitCode;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestUseRTMForStackLocksOptionOnUnsupportedConfig
         extends RTMGenericCommandLineOptionTest {
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java
index 8a923eb5b7c..ed8e386deb6 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify UseRTMLocking option processing on CPU with rtm support and
  *          on VM with rtm-locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockingOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnSupportedConfig
  */
@@ -40,8 +40,8 @@
 import jdk.test.lib.ExitCode;
 import jdk.test.lib.cli.*;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestUseRTMLockingOptionOnSupportedConfig
         extends CommandLineOptionTest {
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
index fa77a22d164..e5d24060824 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify UseRTMLocking option processing on CPU without
  *          rtm support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockingOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedCPU
  */
@@ -41,8 +41,8 @@ import jdk.test.lib.*;
 import jdk.test.lib.cli.*;
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestUseRTMLockingOptionOnUnsupportedCPU
         extends CommandLineOptionTest {
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java
index 69c5d1580e7..6b9c50d678b 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify UseRTMLocking option processing on CPU with rtm support
  *          in case when VM should not support this option.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockingOptionOnUnsupportedVM
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedVM
  */
@@ -41,8 +41,8 @@ import jdk.test.lib.ExitCode;
 import jdk.test.lib.cli.*;
 import jdk.test.lib.cli.predicate.AndPredicate;
 import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestUseRTMLockingOptionOnUnsupportedVM
         extends CommandLineOptionTest {
diff --git a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
index 33a39468dd0..d43c25bfc92 100644
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify processing of UseRTMLocking and UseBiasedLocking
  *          options combination on CPU and VM with rtm support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockingOptionWithBiasedLocking
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockingOptionWithBiasedLocking
  */
@@ -40,8 +40,8 @@
 import jdk.test.lib.*;
 import jdk.test.lib.cli.*;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 public class TestUseRTMLockingOptionWithBiasedLocking
         extends CommandLineOptionTest {
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java b/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java
index 574b7cc74fd..c9b601247b8 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java
@@ -27,11 +27,11 @@
  * @bug 8031320
  * @summary Verify that RTMAbortRatio affects amount of aborts before
  *          deoptimization.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAbortRatio
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAbortRatio
@@ -41,9 +41,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 import jdk.internal.misc.Unsafe;
 
 /**
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java b/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java
index 3597c8362bf..c3a4f39b8fc 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java
@@ -27,11 +27,11 @@
  * @bug 8031320
  * @summary Verify that RTMAbortThreshold option affects
  *          amount of aborts after which abort ratio is calculated.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAbortThreshold
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAbortThreshold
@@ -41,9 +41,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that on RTMAbortThreshold option actually affects how soon
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java b/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
index e4623c2c077..cbb3da2a191 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
@@ -29,12 +29,12 @@
  *          caused by reason other then rtm_state_change will reset
  *          method's RTM state. And if we don't use RTMDeopt, then
  *          RTM state remain the same after such deoptimization.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMAfterNonRTMDeopt
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMAfterNonRTMDeopt
  */
@@ -43,9 +43,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 import jdk.internal.misc.Unsafe;
 
 /**
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java
index eddc3cc3200..25e24e45384 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify that on high abort ratio method will be recompiled
  *          without rtm locking.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMDeoptOnHighAbortRatio
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMDeoptOnHighAbortRatio
  */
@@ -41,9 +41,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that on high abort ratio method wil be deoptimized with
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
index de8e8a3519f..ded714888d6 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
@@ -26,12 +26,12 @@
  * @test
  * @bug 8031320
  * @summary Verify that on low abort ratio method will be recompiled.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMDeoptOnLowAbortRatio
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMDeoptOnLowAbortRatio
  */
@@ -40,9 +40,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 import jdk.internal.misc.Unsafe;
 
 /**
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java b/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java
index 9cbcea733c8..8124d4107e0 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify that RTMLockingCalculationDelay affect when
  *          abort ratio calculation is started.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMLockingCalculationDelay
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMLockingCalculationDelay
  */
@@ -40,9 +40,9 @@
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that abort ratio calculation could be delayed using
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java b/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java
index 7280fc21b81..415f872d43d 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify that RTMLockingThreshold affects rtm state transition
  *          ProfileRTM => UseRTM.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMLockingThreshold
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMLockingThreshold
  */
@@ -41,9 +41,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 import jdk.internal.misc.Unsafe;
 
 /**
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java b/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java
index 35d5b62cc62..82c884b061f 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java
@@ -26,12 +26,12 @@
  * @test
  * @bug 8031320
  * @summary Verify that RTMRetryCount affects actual amount of retries.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMRetryCount
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMRetryCount
  */
@@ -41,9 +41,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that RTMRetryCount option actually affects amount of
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java b/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java
index b3d15716630..47e89b079cd 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify that RTMSpinLoopCount affects time spent
  *          between locking attempts.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMSpinLoopCount
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMSpinLoopCount
  */
@@ -41,9 +41,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that RTMSpinLoopCount increase time spent between retries
diff --git a/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java b/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
index 37920da4c1d..41aeddb71a3 100644
--- a/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
+++ b/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify that RTMTotalCountIncrRate option affects
  *          RTM locking statistics.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestRTMTotalCountIncrRate
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestRTMTotalCountIncrRate
  */
@@ -43,9 +43,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that with RTMTotalCountIncrRate=1 RTM locking statistics
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java b/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java
index 4916d29bd1c..9bc68b458b4 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify that rtm locking is used for stack locks before
  *          inflation and after it used for inflated locks.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMAfterLockInflation
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMAfterLockInflation
  */
@@ -42,9 +42,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that RTM is used after lock inflation by executing compiled
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java b/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java
index 93c630ce654..054d2f7eaa1 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify that UseRTMDeopt affects uncommon trap installation in
  *          copmpiled methods with synchronized block.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMDeopt
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMDeopt
  */
@@ -40,9 +40,9 @@
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that usage of UseRTMDeopt option affects uncommon traps usage
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java b/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java
index 9f433479b06..b9c23a43d44 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java
@@ -26,12 +26,12 @@
  * @test
  * @bug 8031320
  * @summary Verify that rtm locking is used for inflated locks.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMForInflatedLocks
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMForInflatedLocks
  */
@@ -41,9 +41,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that RTM-based lock elision could be used for inflated locks
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java b/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java
index 0f2cf7641e5..afede71949f 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java
@@ -26,12 +26,12 @@
  * @test
  * @bug 8031320
  * @summary Verify that rtm locking is used for stack locks.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMForStackLocks
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMForStackLocks
  */
@@ -41,9 +41,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that RTM-based lock elision could be used for stack locks
diff --git a/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java b/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java
index 4be6f198c7d..c61e6bcbb9a 100644
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify that UseRTMXendForLockBusy option affects
  *          method behaviour if lock is busy.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMXendForLockBusy
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMXendForLockBusy
  */
@@ -42,9 +42,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that with +UseRTMXendForLockBusy there will be no aborts
diff --git a/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java b/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java
index a63cc0f88f0..567ddd57cf7 100644
--- a/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java
+++ b/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java
@@ -27,12 +27,12 @@
  * @bug 8031320
  * @summary Verify that NoRTMLockEliding option could be applied to
  *          specified method and that such method will not use rtm.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestNoRTMLockElidingOption
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestNoRTMLockElidingOption
  */
@@ -41,9 +41,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that method tagged with option NoRTMLockElidingOption
diff --git a/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java b/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java
index c8edc9b053e..acb8bdd8bb6 100644
--- a/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java
+++ b/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java
@@ -28,12 +28,12 @@
  * @summary Verify that UseRTMLockEliding option could be applied to
  *          specified method and that such method will not be deoptimized
  *          on high abort ratio.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestUseRTMLockElidingOption
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestUseRTMLockElidingOption
  */
@@ -42,9 +42,9 @@ import java.util.List;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that method tagged with option UseRTMLockElidingOption
diff --git a/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java b/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java
index f94ed5ee8bc..40aa1a3c7af 100644
--- a/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java
+++ b/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java
@@ -29,12 +29,12 @@
  *          on overall aborts and locks count and count of aborts of
  *          different types. Test also verify that VM output does not
  *          contain rtm locking statistics when it should not.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestPrintPreciseRTMLockingStatistics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestPrintPreciseRTMLockingStatistics
  */
@@ -44,9 +44,9 @@ import java.util.*;
 import jdk.test.lib.*;
 import jdk.test.lib.cli.CommandLineOptionTest;
 import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
 
 /**
  * Test verifies that VM output does not contain RTM locking statistics when it
diff --git a/hotspot/test/compiler/testlibrary/intrinsics/Verifier.java b/hotspot/test/compiler/testlibrary/intrinsics/Verifier.java
index 595d3819f36..87102b885d4 100644
--- a/hotspot/test/compiler/testlibrary/intrinsics/Verifier.java
+++ b/hotspot/test/compiler/testlibrary/intrinsics/Verifier.java
@@ -20,7 +20,8 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package intrinsics;
+
+package compiler.testlibrary.intrinsics;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
diff --git a/hotspot/test/compiler/testlibrary/rtm/AbortProvoker.java b/hotspot/test/compiler/testlibrary/rtm/AbortProvoker.java
index 9b99961c217..c7ae7f48b9c 100644
--- a/hotspot/test/compiler/testlibrary/rtm/AbortProvoker.java
+++ b/hotspot/test/compiler/testlibrary/rtm/AbortProvoker.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 import java.util.Objects;
 import java.util.concurrent.BrokenBarrierException;
diff --git a/hotspot/test/compiler/testlibrary/rtm/AbortType.java b/hotspot/test/compiler/testlibrary/rtm/AbortType.java
index 269fc6e7465..b37d8b83b74 100644
--- a/hotspot/test/compiler/testlibrary/rtm/AbortType.java
+++ b/hotspot/test/compiler/testlibrary/rtm/AbortType.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 import jdk.test.lib.Asserts;
 
diff --git a/hotspot/test/compiler/testlibrary/rtm/BufferOverflowProvoker.java b/hotspot/test/compiler/testlibrary/rtm/BufferOverflowProvoker.java
index 7dac0db5c9f..568f20810d7 100644
--- a/hotspot/test/compiler/testlibrary/rtm/BufferOverflowProvoker.java
+++ b/hotspot/test/compiler/testlibrary/rtm/BufferOverflowProvoker.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 /**
  * In order to provoke transactional execution abort due to
diff --git a/hotspot/test/compiler/testlibrary/rtm/BusyLock.java b/hotspot/test/compiler/testlibrary/rtm/BusyLock.java
index 879edb830d6..3cba0ae1135 100644
--- a/hotspot/test/compiler/testlibrary/rtm/BusyLock.java
+++ b/hotspot/test/compiler/testlibrary/rtm/BusyLock.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
diff --git a/hotspot/test/compiler/testlibrary/rtm/CompilableTest.java b/hotspot/test/compiler/testlibrary/rtm/CompilableTest.java
index 840e9568138..1b97c2eb795 100644
--- a/hotspot/test/compiler/testlibrary/rtm/CompilableTest.java
+++ b/hotspot/test/compiler/testlibrary/rtm/CompilableTest.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 /**
  * Interface for test scenarios that contain methods
diff --git a/hotspot/test/compiler/testlibrary/rtm/MemoryConflictProvoker.java b/hotspot/test/compiler/testlibrary/rtm/MemoryConflictProvoker.java
index 670e97511e8..5fafe8f8c9d 100644
--- a/hotspot/test/compiler/testlibrary/rtm/MemoryConflictProvoker.java
+++ b/hotspot/test/compiler/testlibrary/rtm/MemoryConflictProvoker.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
diff --git a/hotspot/test/compiler/testlibrary/rtm/NestedAbortProvoker.java b/hotspot/test/compiler/testlibrary/rtm/NestedAbortProvoker.java
index 8fae9e48959..9fb6e8da61b 100644
--- a/hotspot/test/compiler/testlibrary/rtm/NestedAbortProvoker.java
+++ b/hotspot/test/compiler/testlibrary/rtm/NestedAbortProvoker.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 import java.util.Arrays;
 
diff --git a/hotspot/test/compiler/testlibrary/rtm/RTMLockingStatistics.java b/hotspot/test/compiler/testlibrary/rtm/RTMLockingStatistics.java
index 4c354bf5a49..bf8598da1ed 100644
--- a/hotspot/test/compiler/testlibrary/rtm/RTMLockingStatistics.java
+++ b/hotspot/test/compiler/testlibrary/rtm/RTMLockingStatistics.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 import java.util.EnumMap;
 import java.util.LinkedList;
diff --git a/hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java b/hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java
index 9f9d8f4ba76..f608d00c163 100644
--- a/hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java
+++ b/hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/hotspot/test/compiler/testlibrary/rtm/XAbortProvoker.java b/hotspot/test/compiler/testlibrary/rtm/XAbortProvoker.java
index 39916c516d8..6bab4cd6d36 100644
--- a/hotspot/test/compiler/testlibrary/rtm/XAbortProvoker.java
+++ b/hotspot/test/compiler/testlibrary/rtm/XAbortProvoker.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm;
+package compiler.testlibrary.rtm;
 
 import jdk.test.lib.Utils;
 import jdk.internal.misc.Unsafe;
diff --git a/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java b/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java
index f8c7ce17a65..8796d79f4d0 100644
--- a/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java
+++ b/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm.predicate;
+package compiler.testlibrary.rtm.predicate;
 
 import sun.hotspot.cpuinfo.CPUInfo;
 
diff --git a/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedVM.java b/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedVM.java
index c8e88f1d9da..352b4e9f9c2 100644
--- a/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedVM.java
+++ b/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedVM.java
@@ -22,7 +22,7 @@
  *
  */
 
-package rtm.predicate;
+package compiler.testlibrary.rtm.predicate;
 
 import jdk.test.lib.Platform;
 
diff --git a/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java b/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java
index 8d33ad65e45..b9d959ec57a 100644
--- a/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java
+++ b/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package sha.predicate;
+package compiler.testlibrary.sha.predicate;
 
 import jdk.test.lib.Platform;
 import jdk.test.lib.cli.predicate.AndPredicate;
diff --git a/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java b/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java
index d59c7ec24e3..c22db58e2a4 100644
--- a/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java
+++ b/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package uncommontrap;
+package compiler.testlibrary.uncommontrap;
 
 import java.io.FileReader;
 import java.io.IOException;
diff --git a/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java b/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java
index d0cbbad9cf9..4c6e972e0c2 100644
--- a/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java
+++ b/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java
@@ -21,13 +21,9 @@
  * questions.
  */
 
-import java.lang.reflect.Executable;
-import java.util.concurrent.Callable;
-import compiler.whitebox.CompilerWhiteBoxTest;
-
 /**
  * @test ConstantGettersTransitionsTest
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TransitionsTestExecutor ConstantGettersTransitionsTest
@@ -38,6 +34,11 @@ import compiler.whitebox.CompilerWhiteBoxTest;
  *                   TransitionsTestExecutor ConstantGettersTransitionsTest
  * @summary Test the correctness of compilation level transitions for constant getters methods
  */
+
+import java.lang.reflect.Executable;
+import java.util.concurrent.Callable;
+import compiler.whitebox.CompilerWhiteBoxTest;
+
 public class ConstantGettersTransitionsTest extends LevelTransitionTest {
     public static void main(String[] args) {
         assert (!CompilerWhiteBoxTest.skipOnTieredCompilation(false));
diff --git a/hotspot/test/compiler/tiered/LevelTransitionTest.java b/hotspot/test/compiler/tiered/LevelTransitionTest.java
index 62f1fc65e04..01220a2e5a2 100644
--- a/hotspot/test/compiler/tiered/LevelTransitionTest.java
+++ b/hotspot/test/compiler/tiered/LevelTransitionTest.java
@@ -21,21 +21,14 @@
  * questions.
  */
 
-import java.lang.reflect.Executable;
-import java.lang.reflect.Method;
-import java.util.Objects;
-import java.util.concurrent.Callable;
-import compiler.whitebox.CompilerWhiteBoxTest;
-import compiler.whitebox.SimpleTestCase;
-
 /**
  * @test LevelTransitionTest
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @ignore 8067651
  * @build TransitionsTestExecutor LevelTransitionTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:+TieredCompilation
  *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::*
@@ -43,6 +36,14 @@ import compiler.whitebox.SimpleTestCase;
  *                   TransitionsTestExecutor LevelTransitionTest
  * @summary Test the correctness of compilation level transitions for different methods
  */
+
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import compiler.whitebox.CompilerWhiteBoxTest;
+import compiler.whitebox.SimpleTestCase;
+
 public class LevelTransitionTest extends TieredLevelsTest {
     /** Shows if method was profiled by being executed on levels 2 or 3 */
     protected boolean isMethodProfiled;
diff --git a/hotspot/test/compiler/tiered/NonTieredLevelsTest.java b/hotspot/test/compiler/tiered/NonTieredLevelsTest.java
index 98fad1ee0b4..96f52576b4f 100644
--- a/hotspot/test/compiler/tiered/NonTieredLevelsTest.java
+++ b/hotspot/test/compiler/tiered/NonTieredLevelsTest.java
@@ -21,12 +21,9 @@
  * questions.
  */
 
-import java.util.function.IntPredicate;
-import compiler.whitebox.CompilerWhiteBoxTest;
-
 /**
  * @test NonTieredLevelsTest
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build NonTieredLevelsTest
@@ -39,6 +36,10 @@ import compiler.whitebox.CompilerWhiteBoxTest;
  * @summary Verify that only one level can be used
  * @author igor.ignatyev@oracle.com
  */
+
+import java.util.function.IntPredicate;
+import compiler.whitebox.CompilerWhiteBoxTest;
+
 public class NonTieredLevelsTest extends CompLevelsTest {
     private static final int AVAILABLE_COMP_LEVEL;
     private static final IntPredicate IS_AVAILABLE_COMPLEVEL;
diff --git a/hotspot/test/compiler/tiered/TieredLevelsTest.java b/hotspot/test/compiler/tiered/TieredLevelsTest.java
index bf1812128fc..2f36bd54713 100644
--- a/hotspot/test/compiler/tiered/TieredLevelsTest.java
+++ b/hotspot/test/compiler/tiered/TieredLevelsTest.java
@@ -21,16 +21,14 @@
  * questions.
  */
 
-import compiler.whitebox.CompilerWhiteBoxTest;
-
 /**
  * @test TieredLevelsTest
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
  * @build TieredLevelsTest
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+TieredCompilation
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCounterDecay
  *                   -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::*
@@ -38,6 +36,9 @@ import compiler.whitebox.CompilerWhiteBoxTest;
  * @summary Verify that all levels < 'TieredStopAtLevel' can be used
  * @author igor.ignatyev@oracle.com
  */
+
+import compiler.whitebox.CompilerWhiteBoxTest;
+
 public class TieredLevelsTest extends CompLevelsTest {
     public static void main(String[] args) throws Exception, Throwable {
         if (CompilerWhiteBoxTest.skipOnTieredCompilation(false)) {
diff --git a/hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java b/hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java
index aaf4d33f91a..3de7157aab5 100644
--- a/hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java
+++ b/hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java
@@ -20,35 +20,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Properties;
-
-import jdk.test.lib.ByteCodeLoader;
-import jdk.test.lib.Platform;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
-
-import sun.hotspot.WhiteBox;
-import uncommontrap.Verifier;
 
 /*
  * @test
  * @bug 8030976 8059226
- * @library /testlibrary /compiler/testlibrary /test/lib
+ * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.org.objectweb.asm
  *          java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
  *          jdk.jvmstat/sun.jvmstat.monitor
- * @build TestUnstableIfTrap jdk.test.lib.* uncommontrap.Verifier
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestUnstableIfTrap jdk.test.lib.* compiler.testlibrary.uncommontrap.Verifier
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbatch -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:+LogCompilation
  *                   -XX:CompileCommand=compileonly,UnstableIfExecutable.test
@@ -69,11 +53,29 @@ import uncommontrap.Verifier;
  *                   -XX:CompileCommand=compileonly,UnstableIfExecutable.test
  *                   -XX:LogFile=never_taken_fired.xml
  *                   TestUnstableIfTrap NEVER_TAKEN true
- * @run main/othervm uncommontrap.Verifier always_taken_not_fired.xml
- *                                 always_taken_fired.xml
- *                                 never_taken_not_fired.xml
- *                                 never_taken_fired.xml
+ * @run driver compiler.testlibrary.uncommontrap.Verifier always_taken_not_fired.xml
+ *                                                        always_taken_fired.xml
+ *                                                        never_taken_not_fired.xml
+ *                                                        never_taken_fired.xml
  */
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+import jdk.test.lib.ByteCodeLoader;
+import jdk.test.lib.Platform;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
+
+import sun.hotspot.WhiteBox;
+import compiler.testlibrary.uncommontrap.Verifier;
+
 public class TestUnstableIfTrap {
     private static final WhiteBox WB = WhiteBox.getWhiteBox();
     private static final String CLASS_NAME = "UnstableIfExecutable";

From afc9349c937c6566b9ecc05775d8a3827cb7069d Mon Sep 17 00:00:00 2001
From: Martin Doerr 
Date: Tue, 21 Jun 2016 19:25:41 -0400
Subject: [PATCH 048/111] 8155949: Support relaxed semantics in cmpxchg

Co-authored-by: Hiroshi H Horii 
Reviewed-by: dholmes, kbarrett, goetz, aph
---
 .../aix_ppc/vm/atomic_aix_ppc.inline.hpp      |  68 +++++++-----
 .../bsd_x86/vm/atomic_bsd_x86.inline.hpp      |  24 ++--
 .../bsd_zero/vm/atomic_bsd_zero.inline.hpp    |  15 ++-
 .../vm/atomic_linux_aarch64.inline.hpp        |  37 +++++--
 .../linux_ppc/vm/atomic_linux_ppc.inline.hpp  |  68 +++++++-----
 .../vm/atomic_linux_sparc.inline.hpp          |  10 +-
 .../linux_x86/vm/atomic_linux_x86.inline.hpp  |  24 ++--
 .../vm/atomic_linux_zero.inline.hpp           |  15 ++-
 .../vm/atomic_solaris_sparc.inline.hpp        |  32 +++---
 .../vm/atomic_solaris_x86.inline.hpp          |  18 +--
 .../vm/atomic_windows_x86.inline.hpp          |  28 ++---
 hotspot/src/share/vm/runtime/atomic.cpp       | 103 ------------------
 hotspot/src/share/vm/runtime/atomic.hpp       |  35 +++---
 .../src/share/vm/runtime/atomic.inline.hpp    |  78 ++++++++++++-
 14 files changed, 296 insertions(+), 259 deletions(-)
 delete mode 100644 hotspot/src/share/vm/runtime/atomic.cpp

diff --git a/hotspot/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp b/hotspot/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp
index 5cbb383f4b8..a7462ad395e 100644
--- a/hotspot/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp
+++ b/hotspot/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp
@@ -291,12 +291,30 @@ inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
   return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
 }
 
+inline void cmpxchg_pre_membar(cmpxchg_memory_order order) {
+  if (order != memory_order_relaxed) {
+    __asm__ __volatile__ (
+      /* fence */
+      strasm_sync
+      );
+  }
+}
+
+inline void cmpxchg_post_membar(cmpxchg_memory_order order) {
+  if (order != memory_order_relaxed) {
+    __asm__ __volatile__ (
+      /* fence */
+      strasm_sync
+      );
+  }
+}
+
 #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value) {
+inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
 
   // Note that cmpxchg guarantees a two-way memory barrier across
-  // the cmpxchg, so it's really a a 'fence_cmpxchg_acquire'
-  // (see atomic.hpp).
+  // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+  // specified otherwise (see atomic.hpp).
 
   // Using 32 bit internally.
   volatile int *dest_base = (volatile int*)((uintptr_t)dest & ~3);
@@ -312,9 +330,9 @@ inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte c
 
   unsigned int old_value, value32;
 
+  cmpxchg_pre_membar(order);
+
   __asm__ __volatile__ (
-    /* fence */
-    strasm_sync
     /* simple guard */
     "   lbz     %[old_value], 0(%[dest])                  \n"
     "   cmpw    %[masked_compare_val], %[old_value]       \n"
@@ -331,8 +349,6 @@ inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte c
     "   xor     %[value32], %[xor_value], %[value32]      \n"
     "   stwcx.  %[value32], 0, %[dest_base]               \n"
     "   bne-    1b                                        \n"
-    /* acquire */
-    strasm_sync
     /* exit */
     "2:                                                   \n"
     /* out */
@@ -353,21 +369,23 @@ inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte c
       "memory"
     );
 
+  cmpxchg_post_membar(order);
+
   return (jbyte)(unsigned char)old_value;
 }
 
-inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value) {
+inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
 
   // Note that cmpxchg guarantees a two-way memory barrier across
-  // the cmpxchg, so it's really a a 'fence_cmpxchg_acquire'
-  // (see atomic.hpp).
+  // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+  // specified otherwise (see atomic.hpp).
 
   unsigned int old_value;
   const uint64_t zero = 0;
 
+  cmpxchg_pre_membar(order);
+
   __asm__ __volatile__ (
-    /* fence */
-    strasm_sync
     /* simple guard */
     "   lwz     %[old_value], 0(%[dest])                \n"
     "   cmpw    %[compare_value], %[old_value]          \n"
@@ -379,8 +397,6 @@ inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compa
     "   bne-    2f                                      \n"
     "   stwcx.  %[exchange_value], %[dest], %[zero]     \n"
     "   bne-    1b                                      \n"
-    /* acquire */
-    strasm_sync
     /* exit */
     "2:                                                 \n"
     /* out */
@@ -397,21 +413,23 @@ inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compa
       "memory"
     );
 
+  cmpxchg_post_membar(order);
+
   return (jint) old_value;
 }
 
-inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong compare_value) {
+inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
 
   // Note that cmpxchg guarantees a two-way memory barrier across
-  // the cmpxchg, so it's really a a 'fence_cmpxchg_acquire'
-  // (see atomic.hpp).
+  // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+  // specified otherwise (see atomic.hpp).
 
   long old_value;
   const uint64_t zero = 0;
 
+  cmpxchg_pre_membar(order);
+
   __asm__ __volatile__ (
-    /* fence */
-    strasm_sync
     /* simple guard */
     "   ld      %[old_value], 0(%[dest])                \n"
     "   cmpd    %[compare_value], %[old_value]          \n"
@@ -423,8 +441,6 @@ inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong c
     "   bne-    2f                                      \n"
     "   stdcx.  %[exchange_value], %[dest], %[zero]     \n"
     "   bne-    1b                                      \n"
-    /* acquire */
-    strasm_sync
     /* exit */
     "2:                                                 \n"
     /* out */
@@ -441,15 +457,17 @@ inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong c
       "memory"
     );
 
+  cmpxchg_post_membar(order);
+
   return (jlong) old_value;
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) {
-  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
 #undef strasm_sync
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp b/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp
index 9108476c2d5..8310003a8f1 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp
+++ b/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp
@@ -89,7 +89,7 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
 }
 
 #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value) {
+inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value, cmpxchg_memory_order order) {
   int mp = os::is_MP();
   __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
                     : "=a" (exchange_value)
@@ -98,7 +98,7 @@ inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*
   return exchange_value;
 }
 
-inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
+inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
   int mp = os::is_MP();
   __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
                     : "=a" (exchange_value)
@@ -149,7 +149,7 @@ inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* des
   return exchange_value;
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
   bool mp = os::is_MP();
   __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
                         : "=a" (exchange_value)
@@ -158,12 +158,12 @@ inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*
   return exchange_value;
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
 inline jlong Atomic::load(volatile jlong* src) { return *src; }
@@ -197,16 +197,16 @@ extern "C" {
   void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
   return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, os::is_MP());
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
 inline jlong Atomic::load(volatile jlong* src) {
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp b/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp
index 4e7e702ad66..4490e49020c 100644
--- a/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp
+++ b/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp
@@ -270,7 +270,8 @@ inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
 
 inline jint Atomic::cmpxchg(jint exchange_value,
                             volatile jint* dest,
-                            jint compare_value) {
+                            jint compare_value,
+                            cmpxchg_memory_order order) {
 #ifdef ARM
   return arm_compare_and_swap(dest, compare_value, exchange_value);
 #else
@@ -284,14 +285,16 @@ inline jint Atomic::cmpxchg(jint exchange_value,
 
 inline jlong Atomic::cmpxchg(jlong exchange_value,
                              volatile jlong* dest,
-                             jlong compare_value) {
+                             jlong compare_value,
+                             cmpxchg_memory_order order) {
 
   return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
 }
 
 inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
                                     volatile intptr_t* dest,
-                                    intptr_t compare_value) {
+                                    intptr_t compare_value,
+                                    cmpxchg_memory_order order) {
 #ifdef ARM
   return arm_compare_and_swap(dest, compare_value, exchange_value);
 #else
@@ -305,11 +308,13 @@ inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
 
 inline void* Atomic::cmpxchg_ptr(void* exchange_value,
                                  volatile void* dest,
-                                 void* compare_value) {
+                                 void* compare_value,
+                                 cmpxchg_memory_order order) {
 
   return (void *) cmpxchg_ptr((intptr_t) exchange_value,
                               (volatile intptr_t*) dest,
-                              (intptr_t) compare_value);
+                              (intptr_t) compare_value,
+                              order);
 }
 
 inline jlong Atomic::load(volatile jlong* src) {
diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp b/hotspot/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp
index d47e6cc82ac..95d007fc21b 100644
--- a/hotspot/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp
@@ -87,10 +87,28 @@ inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest)
                            (volatile intptr_t*) dest);
 }
 
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value)
+template  T generic_cmpxchg(T exchange_value, volatile T* dest,
+                                        T compare_value, cmpxchg_memory_order order)
 {
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+  if (order == memory_order_relaxed) {
+    T value = compare_value;
+    __atomic_compare_exchange(dest, &value, &exchange_value, /*weak*/false,
+                              __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+    return value;
+  } else {
+    return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+  }
+}
+
+#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order)
+{
+  return generic_cmpxchg(exchange_value, dest, compare_value, order);
+}
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order)
+{
+  return generic_cmpxchg(exchange_value, dest, compare_value, order);
 }
 
 inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
@@ -123,21 +141,22 @@ inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* des
   return res;
 }
 
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value)
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order)
 {
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+  return generic_cmpxchg(exchange_value, dest, compare_value, order);
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value)
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order)
 {
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+  return generic_cmpxchg(exchange_value, dest, compare_value, order);
 }
 
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value)
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order)
 {
   return (void *) cmpxchg_ptr((intptr_t) exchange_value,
                               (volatile intptr_t*) dest,
-                              (intptr_t) compare_value);
+                              (intptr_t) compare_value,
+                              order);
 }
 
 inline jlong Atomic::load(volatile jlong* src) { return *src; }
diff --git a/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp b/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp
index c40ce1fbe4e..6c8498c4508 100644
--- a/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp
+++ b/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp
@@ -291,12 +291,30 @@ inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
   return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
 }
 
+inline void cmpxchg_pre_membar(cmpxchg_memory_order order) {
+  if (order != memory_order_relaxed) {
+    __asm__ __volatile__ (
+      /* fence */
+      strasm_sync
+      );
+  }
+}
+
+inline void cmpxchg_post_membar(cmpxchg_memory_order order) {
+  if (order != memory_order_relaxed) {
+    __asm__ __volatile__ (
+      /* fence */
+      strasm_sync
+      );
+  }
+}
+
 #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value) {
+inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
 
   // Note that cmpxchg guarantees a two-way memory barrier across
-  // the cmpxchg, so it's really a a 'fence_cmpxchg_acquire'
-  // (see atomic.hpp).
+  // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+  // specified otherwise (see atomic.hpp).
 
   // Using 32 bit internally.
   volatile int *dest_base = (volatile int*)((uintptr_t)dest & ~3);
@@ -312,9 +330,9 @@ inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte c
 
   unsigned int old_value, value32;
 
+  cmpxchg_pre_membar(order);
+
   __asm__ __volatile__ (
-    /* fence */
-    strasm_sync
     /* simple guard */
     "   lbz     %[old_value], 0(%[dest])                  \n"
     "   cmpw    %[masked_compare_val], %[old_value]       \n"
@@ -331,8 +349,6 @@ inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte c
     "   xor     %[value32], %[xor_value], %[value32]      \n"
     "   stwcx.  %[value32], 0, %[dest_base]               \n"
     "   bne-    1b                                        \n"
-    /* acquire */
-    strasm_sync
     /* exit */
     "2:                                                   \n"
     /* out */
@@ -353,21 +369,23 @@ inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte c
       "memory"
     );
 
+  cmpxchg_post_membar(order);
+
   return (jbyte)(unsigned char)old_value;
 }
 
-inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value) {
+inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
 
   // Note that cmpxchg guarantees a two-way memory barrier across
-  // the cmpxchg, so it's really a a 'fence_cmpxchg_acquire'
-  // (see atomic.hpp).
+  // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+  // specified otherwise (see atomic.hpp).
 
   unsigned int old_value;
   const uint64_t zero = 0;
 
+  cmpxchg_pre_membar(order);
+
   __asm__ __volatile__ (
-    /* fence */
-    strasm_sync
     /* simple guard */
     "   lwz     %[old_value], 0(%[dest])                \n"
     "   cmpw    %[compare_value], %[old_value]          \n"
@@ -379,8 +397,6 @@ inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compa
     "   bne-    2f                                      \n"
     "   stwcx.  %[exchange_value], %[dest], %[zero]     \n"
     "   bne-    1b                                      \n"
-    /* acquire */
-    strasm_sync
     /* exit */
     "2:                                                 \n"
     /* out */
@@ -397,21 +413,23 @@ inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compa
       "memory"
     );
 
+  cmpxchg_post_membar(order);
+
   return (jint) old_value;
 }
 
-inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong compare_value) {
+inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
 
   // Note that cmpxchg guarantees a two-way memory barrier across
-  // the cmpxchg, so it's really a a 'fence_cmpxchg_acquire'
-  // (see atomic.hpp).
+  // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+  // specified otherwise (see atomic.hpp).
 
   long old_value;
   const uint64_t zero = 0;
 
+  cmpxchg_pre_membar(order);
+
   __asm__ __volatile__ (
-    /* fence */
-    strasm_sync
     /* simple guard */
     "   ld      %[old_value], 0(%[dest])                \n"
     "   cmpd    %[compare_value], %[old_value]          \n"
@@ -423,8 +441,6 @@ inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong c
     "   bne-    2f                                      \n"
     "   stdcx.  %[exchange_value], %[dest], %[zero]     \n"
     "   bne-    1b                                      \n"
-    /* acquire */
-    strasm_sync
     /* exit */
     "2:                                                 \n"
     /* out */
@@ -441,15 +457,17 @@ inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong c
       "memory"
     );
 
+  cmpxchg_post_membar(order);
+
   return (jlong) old_value;
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) {
-  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
 #undef strasm_sync
diff --git a/hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp b/hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp
index 29b51d70f7f..b0df28daea3 100644
--- a/hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp
+++ b/hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp
@@ -148,7 +148,7 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
 }
 
 
-inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
+inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
   jint rv;
   __asm__ volatile(
     " cas    [%2], %3, %0"
@@ -158,7 +158,7 @@ inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*
   return rv;
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
 #ifdef _LP64
   jlong rv;
   __asm__ volatile(
@@ -190,7 +190,7 @@ inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*
 #endif
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
   intptr_t rv;
 #ifdef _LP64
   __asm__ volatile(
@@ -208,8 +208,8 @@ inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t*
   return rv;
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value, order);
 }
 
 #endif // OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
diff --git a/hotspot/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp b/hotspot/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp
index 03fa9bcf840..faf0a8043f7 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp
+++ b/hotspot/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp
@@ -89,7 +89,7 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
 }
 
 #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value) {
+inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value, cmpxchg_memory_order order) {
   int mp = os::is_MP();
   __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
                     : "=a" (exchange_value)
@@ -98,7 +98,7 @@ inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*
   return exchange_value;
 }
 
-inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
+inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
   int mp = os::is_MP();
   __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
                     : "=a" (exchange_value)
@@ -149,7 +149,7 @@ inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* des
   return exchange_value;
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
   bool mp = os::is_MP();
   __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
                         : "=a" (exchange_value)
@@ -158,12 +158,12 @@ inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*
   return exchange_value;
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
 inline jlong Atomic::load(volatile jlong* src) { return *src; }
@@ -197,16 +197,16 @@ extern "C" {
   void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
   return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, os::is_MP());
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
 inline jlong Atomic::load(volatile jlong* src) {
diff --git a/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp b/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
index 266c950422b..4a9b2c05da9 100644
--- a/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
+++ b/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
@@ -264,7 +264,8 @@ inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
 
 inline jint Atomic::cmpxchg(jint exchange_value,
                             volatile jint* dest,
-                            jint compare_value) {
+                            jint compare_value,
+                            cmpxchg_memory_order order) {
 #ifdef ARM
   return arm_compare_and_swap(dest, compare_value, exchange_value);
 #else
@@ -278,14 +279,16 @@ inline jint Atomic::cmpxchg(jint exchange_value,
 
 inline jlong Atomic::cmpxchg(jlong exchange_value,
                              volatile jlong* dest,
-                             jlong compare_value) {
+                             jlong compare_value,
+                             cmpxchg_memory_order order) {
 
   return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
 }
 
 inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
                                     volatile intptr_t* dest,
-                                    intptr_t compare_value) {
+                                    intptr_t compare_value,
+                                    cmpxchg_memory_order order) {
 #ifdef ARM
   return arm_compare_and_swap(dest, compare_value, exchange_value);
 #else
@@ -299,11 +302,13 @@ inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
 
 inline void* Atomic::cmpxchg_ptr(void* exchange_value,
                                  volatile void* dest,
-                                 void* compare_value) {
+                                 void* compare_value,
+                                 cmpxchg_memory_order order) {
 
   return (void *) cmpxchg_ptr((intptr_t) exchange_value,
                               (volatile intptr_t*) dest,
-                              (intptr_t) compare_value);
+                              (intptr_t) compare_value,
+                              order);
 }
 
 inline jlong Atomic::load(volatile jlong* src) {
diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp b/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp
index 83a07ce3fe5..03c4326073a 100644
--- a/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp
@@ -177,7 +177,7 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
 }
 
 
-inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
+inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
   jint rv;
   __asm__ volatile(
     " cas    [%2], %3, %0"
@@ -187,7 +187,7 @@ inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*
   return rv;
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
 #ifdef _LP64
   jlong rv;
   __asm__ volatile(
@@ -219,7 +219,7 @@ inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*
 #endif  //_LP64
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
   intptr_t rv;
 #ifdef _LP64
   __asm__ volatile(
@@ -237,8 +237,8 @@ inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t*
   return rv;
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value, order);
 }
 
 #else // _GNU_SOURCE
@@ -296,11 +296,11 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
 }
 
 
-inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
+inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
   return _Atomic_cas32(exchange_value, dest, compare_value);
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
 #ifdef _LP64
   // Return 64 bit value in %o0
   return _Atomic_cas64((intptr_t)exchange_value, (intptr_t *)dest, (intptr_t)compare_value);
@@ -310,7 +310,7 @@ inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*
 #endif // _LP64
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
 #ifdef _LP64
   return _Atomic_cas64(exchange_value, dest, compare_value);
 #else  // _LP64
@@ -318,8 +318,8 @@ inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t*
 #endif // _LP64
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value, order);
 }
 
 
@@ -354,20 +354,20 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
 }
 
 
-inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
+inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
   return (*os::atomic_cmpxchg_func)(exchange_value, dest, compare_value);
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
   return (*os::atomic_cmpxchg_long_func)(exchange_value, dest, compare_value);
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
 #endif // _LP64 || COMPILER2
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp b/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
index f8b47f56495..e856b755cf2 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
+++ b/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
@@ -85,15 +85,15 @@ inline jint     Atomic::xchg       (jint     exchange_value, volatile jint*
 }
 
 #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value) {
+inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value, cmpxchg_memory_order order) {
   return _Atomic_cmpxchg_byte(exchange_value, dest, compare_value IS_MP_ARG());
 }
 
-inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
+inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
   return _Atomic_cmpxchg(exchange_value, dest, compare_value IS_MP_ARG());
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
   return _Atomic_cmpxchg_long(exchange_value, dest, compare_value IS_MP_ARG());
 }
 
@@ -120,11 +120,11 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
   return (void*)_Atomic_xchg_long((jlong)exchange_value, (volatile jlong*)dest);
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
   return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
   return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
 }
 
@@ -148,12 +148,12 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
   return (void*)xchg((jint)exchange_value, (volatile jint*)dest);
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
 extern "C" void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
diff --git a/hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp b/hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp
index d8c5f70870c..3d7662e5cd7 100644
--- a/hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp
+++ b/hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp
@@ -119,25 +119,25 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
   return (void *)(os::atomic_xchg_ptr_func)((intptr_t)exchange_value, (volatile intptr_t*)dest);
 }
 
-inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
+inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
   return (*os::atomic_cmpxchg_func)(exchange_value, dest, compare_value);
 }
 
 #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value) {
+inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value, cmpxchg_memory_order order) {
     return (*os::atomic_cmpxchg_byte_func)(exchange_value, dest, compare_value);
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
   return (*os::atomic_cmpxchg_long_func)(exchange_value, dest, compare_value);
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
 }
 
 inline jlong Atomic::load(volatile jlong* src) { return *src; }
@@ -218,7 +218,7 @@ inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     des
 }
 
 #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value) {
+inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value, cmpxchg_memory_order order) {
   // alternative for InterlockedCompareExchange
   int mp = os::is_MP();
   __asm {
@@ -230,7 +230,7 @@ inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*
   }
 }
 
-inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
+inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
   // alternative for InterlockedCompareExchange
   int mp = os::is_MP();
   __asm {
@@ -242,7 +242,7 @@ inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*
   }
 }
 
-inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
+inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
   int mp = os::is_MP();
   jint ex_lo  = (jint)exchange_value;
   jint ex_hi  = *( ((jint*)&exchange_value) + 1 );
@@ -263,12 +263,12 @@ inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*
   }
 }
 
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
-  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+  return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
-inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
-  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, cmpxchg_memory_order order) {
+  return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
 }
 
 inline jlong Atomic::load(volatile jlong* src) {
diff --git a/hotspot/src/share/vm/runtime/atomic.cpp b/hotspot/src/share/vm/runtime/atomic.cpp
deleted file mode 100644
index 9aaa416e24c..00000000000
--- a/hotspot/src/share/vm/runtime/atomic.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2001, 2014, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
-
-/*
- * This is the default implementation of byte-sized cmpxchg. It emulates jbyte-sized cmpxchg
- * in terms of jint-sized cmpxchg. Platforms may override this by defining their own inline definition
- * as well as defining VM_HAS_SPECIALIZED_CMPXCHG_BYTE. This will cause the platform specific
- * implementation to be used instead.
- */
-jbyte Atomic::cmpxchg_general(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value) {
-  assert(sizeof(jbyte) == 1, "assumption.");
-  uintptr_t dest_addr = (uintptr_t)dest;
-  uintptr_t offset = dest_addr % sizeof(jint);
-  volatile jint* dest_int = (volatile jint*)(dest_addr - offset);
-  jint cur = *dest_int;
-  jbyte* cur_as_bytes = (jbyte*)(&cur);
-  jint new_val = cur;
-  jbyte* new_val_as_bytes = (jbyte*)(&new_val);
-  new_val_as_bytes[offset] = exchange_value;
-  while (cur_as_bytes[offset] == compare_value) {
-    jint res = cmpxchg(new_val, dest_int, cur);
-    if (res == cur) break;
-    cur = res;
-    new_val = cur;
-    new_val_as_bytes[offset] = exchange_value;
-  }
-  return cur_as_bytes[offset];
-}
-
-unsigned Atomic::xchg(unsigned int exchange_value, volatile unsigned int* dest) {
-  assert(sizeof(unsigned int) == sizeof(jint), "more work to do");
-  return (unsigned int)Atomic::xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-unsigned Atomic::cmpxchg(unsigned int exchange_value,
-                         volatile unsigned int* dest, unsigned int compare_value) {
-  assert(sizeof(unsigned int) == sizeof(jint), "more work to do");
-  return (unsigned int)Atomic::cmpxchg((jint)exchange_value, (volatile jint*)dest,
-                                       (jint)compare_value);
-}
-
-jlong Atomic::add(jlong    add_value, volatile jlong*    dest) {
-  jlong old = load(dest);
-  jlong new_value = old + add_value;
-  while (old != cmpxchg(new_value, dest, old)) {
-    old = load(dest);
-    new_value = old + add_value;
-  }
-  return old;
-}
-
-void Atomic::inc(volatile short* dest) {
-  // Most platforms do not support atomic increment on a 2-byte value. However,
-  // if the value occupies the most significant 16 bits of an aligned 32-bit
-  // word, then we can do this with an atomic add of 0x10000 to the 32-bit word.
-  //
-  // The least significant parts of this 32-bit word will never be affected, even
-  // in case of overflow/underflow.
-  //
-  // Use the ATOMIC_SHORT_PAIR macro to get the desired alignment.
-#ifdef VM_LITTLE_ENDIAN
-  assert((intx(dest) & 0x03) == 0x02, "wrong alignment");
-  (void)Atomic::add(0x10000, (volatile int*)(dest-1));
-#else
-  assert((intx(dest) & 0x03) == 0x00, "wrong alignment");
-  (void)Atomic::add(0x10000, (volatile int*)(dest));
-#endif
-}
-
-void Atomic::dec(volatile short* dest) {
-#ifdef VM_LITTLE_ENDIAN
-  assert((intx(dest) & 0x03) == 0x02, "wrong alignment");
-  (void)Atomic::add(-0x10000, (volatile int*)(dest-1));
-#else
-  assert((intx(dest) & 0x03) == 0x00, "wrong alignment");
-  (void)Atomic::add(-0x10000, (volatile int*)(dest));
-#endif
-}
-
diff --git a/hotspot/src/share/vm/runtime/atomic.hpp b/hotspot/src/share/vm/runtime/atomic.hpp
index 0662c8e3b2a..c71a2d3f3a5 100644
--- a/hotspot/src/share/vm/runtime/atomic.hpp
+++ b/hotspot/src/share/vm/runtime/atomic.hpp
@@ -27,10 +27,13 @@
 
 #include "memory/allocation.hpp"
 
-class Atomic : AllStatic {
- private:
-  static jbyte cmpxchg_general(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value);
+enum cmpxchg_memory_order {
+  memory_order_relaxed,
+  // Use value which doesn't interfere with C++2011. We need to be more conservative.
+  memory_order_conservative = 8
+};
 
+class Atomic : AllStatic {
  public:
   // Atomic operations on jlong types are not available on all 32-bit
   // platforms. If atomic ops on jlongs are defined here they must only
@@ -77,12 +80,12 @@ class Atomic : AllStatic {
   inline static intptr_t add_ptr(intptr_t add_value, volatile intptr_t* dest);
   inline static void*    add_ptr(intptr_t add_value, volatile void*     dest);
   // See comment above about using jlong atomics on 32-bit platforms
-  static jlong           add    (jlong    add_value, volatile jlong*    dest);
+  inline static jlong    add    (jlong    add_value, volatile jlong*    dest);
 
   // Atomically increment location. inc*() provide:
   //  increment-dest 
   inline static void inc    (volatile jint*     dest);
-  static void        inc    (volatile jshort*   dest);
+  inline static void inc    (volatile jshort*   dest);
   inline static void inc    (volatile size_t*   dest);
   inline static void inc_ptr(volatile intptr_t* dest);
   inline static void inc_ptr(volatile void*     dest);
@@ -90,7 +93,7 @@ class Atomic : AllStatic {
   // Atomically decrement a location. dec*() provide:
   //  decrement-dest 
   inline static void dec    (volatile jint*     dest);
-  static void        dec    (volatile jshort*   dest);
+  inline static void dec    (volatile jshort*   dest);
   inline static void dec    (volatile size_t*   dest);
   inline static void dec_ptr(volatile intptr_t* dest);
   inline static void dec_ptr(volatile void*     dest);
@@ -98,22 +101,22 @@ class Atomic : AllStatic {
   // Performs atomic exchange of *dest with exchange_value. Returns old
   // prior value of *dest. xchg*() provide:
   //  exchange-value-with-dest 
-  inline static jint     xchg    (jint         exchange_value, volatile jint*         dest);
-  static unsigned int    xchg    (unsigned int exchange_value, volatile unsigned int* dest);
-  inline static intptr_t xchg_ptr(intptr_t     exchange_value, volatile intptr_t*     dest);
-  inline static void*    xchg_ptr(void*        exchange_value, volatile void*         dest);
+  inline static jint         xchg    (jint         exchange_value, volatile jint*         dest);
+  inline static unsigned int xchg    (unsigned int exchange_value, volatile unsigned int* dest);
+  inline static intptr_t     xchg_ptr(intptr_t     exchange_value, volatile intptr_t*     dest);
+  inline static void*        xchg_ptr(void*        exchange_value, volatile void*         dest);
 
   // Performs atomic compare of *dest and compare_value, and exchanges
   // *dest with exchange_value if the comparison succeeded. Returns prior
   // value of *dest. cmpxchg*() provide:
   //  compare-and-exchange 
-  inline static jbyte    cmpxchg    (jbyte        exchange_value, volatile jbyte*        dest, jbyte        compare_value);
-  inline static jint     cmpxchg    (jint         exchange_value, volatile jint*         dest, jint         compare_value);
+  inline static jbyte        cmpxchg    (jbyte        exchange_value, volatile jbyte*        dest, jbyte        compare_value, cmpxchg_memory_order order = memory_order_conservative);
+  inline static jint         cmpxchg    (jint         exchange_value, volatile jint*         dest, jint         compare_value, cmpxchg_memory_order order = memory_order_conservative);
   // See comment above about using jlong atomics on 32-bit platforms
-  inline static jlong    cmpxchg    (jlong        exchange_value, volatile jlong*        dest, jlong        compare_value);
-  static unsigned int    cmpxchg    (unsigned int exchange_value, volatile unsigned int* dest, unsigned int compare_value);
-  inline static intptr_t cmpxchg_ptr(intptr_t     exchange_value, volatile intptr_t*     dest, intptr_t     compare_value);
-  inline static void*    cmpxchg_ptr(void*        exchange_value, volatile void*         dest, void*        compare_value);
+  inline static jlong        cmpxchg    (jlong        exchange_value, volatile jlong*        dest, jlong        compare_value, cmpxchg_memory_order order = memory_order_conservative);
+  inline static unsigned int cmpxchg    (unsigned int exchange_value, volatile unsigned int* dest, unsigned int compare_value, cmpxchg_memory_order order = memory_order_conservative);
+  inline static intptr_t     cmpxchg_ptr(intptr_t     exchange_value, volatile intptr_t*     dest, intptr_t     compare_value, cmpxchg_memory_order order = memory_order_conservative);
+  inline static void*        cmpxchg_ptr(void*        exchange_value, volatile void*         dest, void*        compare_value, cmpxchg_memory_order order = memory_order_conservative);
 };
 
 // To use Atomic::inc(jshort* dest) and Atomic::dec(jshort* dest), the address must be specially
diff --git a/hotspot/src/share/vm/runtime/atomic.inline.hpp b/hotspot/src/share/vm/runtime/atomic.inline.hpp
index 593db7d03f3..8abc7293b24 100644
--- a/hotspot/src/share/vm/runtime/atomic.inline.hpp
+++ b/hotspot/src/share/vm/runtime/atomic.inline.hpp
@@ -91,11 +91,83 @@ inline void Atomic::dec(volatile size_t* dest) {
 }
 
 #ifndef VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-// See comment in atomic.cpp how to override.
-inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte *dest, jbyte comparand)
+/*
+ * This is the default implementation of byte-sized cmpxchg. It emulates jbyte-sized cmpxchg
+ * in terms of jint-sized cmpxchg. Platforms may override this by defining their own inline definition
+ * as well as defining VM_HAS_SPECIALIZED_CMPXCHG_BYTE. This will cause the platform specific
+ * implementation to be used instead.
+ */
+inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte *dest, jbyte comparand, cmpxchg_memory_order order)
 {
-  return cmpxchg_general(exchange_value, dest, comparand);
+  assert(sizeof(jbyte) == 1, "assumption.");
+  uintptr_t dest_addr = (uintptr_t)dest;
+  uintptr_t offset = dest_addr % sizeof(jint);
+  volatile jint* dest_int = (volatile jint*)(dest_addr - offset);
+  jint cur = *dest_int;
+  jbyte* cur_as_bytes = (jbyte*)(&cur);
+  jint new_val = cur;
+  jbyte* new_val_as_bytes = (jbyte*)(&new_val);
+  new_val_as_bytes[offset] = exchange_value;
+  while (cur_as_bytes[offset] == comparand) {
+    jint res = cmpxchg(new_val, dest_int, cur, order);
+    if (res == cur) break;
+    cur = res;
+    new_val = cur;
+    new_val_as_bytes[offset] = exchange_value;
+  }
+  return cur_as_bytes[offset];
 }
 #endif // VM_HAS_SPECIALIZED_CMPXCHG_BYTE
 
+inline unsigned Atomic::xchg(unsigned int exchange_value, volatile unsigned int* dest) {
+  assert(sizeof(unsigned int) == sizeof(jint), "more work to do");
+  return (unsigned int)Atomic::xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+inline unsigned Atomic::cmpxchg(unsigned int exchange_value,
+                         volatile unsigned int* dest, unsigned int compare_value,
+                         cmpxchg_memory_order order) {
+  assert(sizeof(unsigned int) == sizeof(jint), "more work to do");
+  return (unsigned int)Atomic::cmpxchg((jint)exchange_value, (volatile jint*)dest,
+                                       (jint)compare_value, order);
+}
+
+inline jlong Atomic::add(jlong    add_value, volatile jlong*    dest) {
+  jlong old = load(dest);
+  jlong new_value = old + add_value;
+  while (old != cmpxchg(new_value, dest, old)) {
+    old = load(dest);
+    new_value = old + add_value;
+  }
+  return old;
+}
+
+inline void Atomic::inc(volatile short* dest) {
+  // Most platforms do not support atomic increment on a 2-byte value. However,
+  // if the value occupies the most significant 16 bits of an aligned 32-bit
+  // word, then we can do this with an atomic add of 0x10000 to the 32-bit word.
+  //
+  // The least significant parts of this 32-bit word will never be affected, even
+  // in case of overflow/underflow.
+  //
+  // Use the ATOMIC_SHORT_PAIR macro to get the desired alignment.
+#ifdef VM_LITTLE_ENDIAN
+  assert((intx(dest) & 0x03) == 0x02, "wrong alignment");
+  (void)Atomic::add(0x10000, (volatile int*)(dest-1));
+#else
+  assert((intx(dest) & 0x03) == 0x00, "wrong alignment");
+  (void)Atomic::add(0x10000, (volatile int*)(dest));
+#endif
+}
+
+inline void Atomic::dec(volatile short* dest) {
+#ifdef VM_LITTLE_ENDIAN
+  assert((intx(dest) & 0x03) == 0x02, "wrong alignment");
+  (void)Atomic::add(-0x10000, (volatile int*)(dest-1));
+#else
+  assert((intx(dest) & 0x03) == 0x00, "wrong alignment");
+  (void)Atomic::add(-0x10000, (volatile int*)(dest));
+#endif
+}
+
 #endif // SHARE_VM_RUNTIME_ATOMIC_INLINE_HPP

From 161976b05f1dfb05867e218794ee946f5c77d9d5 Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga 
Date: Tue, 21 Jun 2016 19:29:39 -0400
Subject: [PATCH 049/111] 8153743: AllocateHeap() and ReallocateHeap() should
 use ALWAYSINLINE macro

Reviewed-by: dholmes, zgu
---
 hotspot/src/share/vm/memory/allocation.inline.hpp     | 11 +++--------
 .../src/share/vm/utilities/globalDefinitions_gcc.hpp  |  2 +-
 .../vm/utilities/globalDefinitions_sparcWorks.hpp     |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/hotspot/src/share/vm/memory/allocation.inline.hpp b/hotspot/src/share/vm/memory/allocation.inline.hpp
index 27c9c786fbc..5fe55f4a292 100644
--- a/hotspot/src/share/vm/memory/allocation.inline.hpp
+++ b/hotspot/src/share/vm/memory/allocation.inline.hpp
@@ -28,6 +28,7 @@
 #include "runtime/atomic.inline.hpp"
 #include "runtime/os.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // Explicit C-heap memory management
 
@@ -63,18 +64,12 @@ inline char* AllocateHeap(size_t size, MEMFLAGS flags,
   return p;
 }
 
-#ifdef __GNUC__
-__attribute__((always_inline))
-#endif
-inline char* AllocateHeap(size_t size, MEMFLAGS flags,
+ALWAYSINLINE char* AllocateHeap(size_t size, MEMFLAGS flags,
     AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
   return AllocateHeap(size, flags, CURRENT_PC, alloc_failmode);
 }
 
-#ifdef __GNUC__
-__attribute__((always_inline))
-#endif
-inline char* ReallocateHeap(char *old, size_t size, MEMFLAGS flag,
+ALWAYSINLINE char* ReallocateHeap(char *old, size_t size, MEMFLAGS flag,
     AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
   char* p = (char*) os::realloc(old, size, flag, CURRENT_PC);
   #ifdef ASSERT
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
index 63a04ad80e0..7b6c7b9302b 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
@@ -324,6 +324,6 @@ inline int wcslen(const jchar* x) { return wcslen((const wchar_t*)x); }
 
 // Inlining support
 #define NOINLINE     __attribute__ ((noinline))
-#define ALWAYSINLINE __attribute__ ((always_inline))
+#define ALWAYSINLINE inline __attribute__ ((always_inline))
 
 #endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_GCC_HPP
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
index 8b127114ca0..755eba01c07 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
@@ -279,6 +279,6 @@ inline int wcslen(const jchar* x) { return wcslen((const wchar_t*)x); }
 
 // Inlining support
 #define NOINLINE
-#define ALWAYSINLINE __attribute__((always_inline))
+#define ALWAYSINLINE inline __attribute__((always_inline))
 
 #endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SPARCWORKS_HPP

From 423717c15682589ca34bb0b56114f4be19d0f85d Mon Sep 17 00:00:00 2001
From: Thomas Schatzl 
Date: Wed, 22 Jun 2016 10:34:01 +0200
Subject: [PATCH 050/111] 8152438: Threads may do significant work out of the
 non-shared overflow buffer

Before processing an element in the non-shared overflow buffer, try to push it into the local shared buffer to keep it full.

Reviewed-by: jmasa, ehelin, sjohanss
---
 hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp | 4 +++-
 hotspot/src/share/vm/gc/shared/taskqueue.hpp        | 4 +++-
 hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp
index dc324322ae8..5caeb3abaa2 100644
--- a/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp
@@ -137,7 +137,9 @@ void G1ParScanThreadState::trim_queue() {
   do {
     // Drain the overflow stack first, so other threads can steal.
     while (_refs->pop_overflow(ref)) {
-      dispatch_reference(ref);
+      if (!_refs->try_push_to_taskqueue(ref)) {
+        dispatch_reference(ref);
+      }
     }
 
     while (_refs->pop_local(ref)) {
diff --git a/hotspot/src/share/vm/gc/shared/taskqueue.hpp b/hotspot/src/share/vm/gc/shared/taskqueue.hpp
index e61a6c2451b..7ba1d38441b 100644
--- a/hotspot/src/share/vm/gc/shared/taskqueue.hpp
+++ b/hotspot/src/share/vm/gc/shared/taskqueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -330,6 +330,8 @@ public:
 
   // Push task t onto the queue or onto the overflow stack.  Return true.
   inline bool push(E t);
+  // Try to push task t onto the queue only. Returns true if successful, false otherwise.
+  inline bool try_push_to_taskqueue(E t);
 
   // Attempt to pop from the overflow stack; return true if anything was popped.
   inline bool pop_overflow(E& t);
diff --git a/hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp b/hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp
index 8ba1577002c..baa35059bed 100644
--- a/hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp
+++ b/hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp
@@ -103,6 +103,11 @@ inline bool OverflowTaskQueue::push(E t)
   return true;
 }
 
+template 
+inline bool OverflowTaskQueue::try_push_to_taskqueue(E t) {
+  return taskqueue_t::push(t);
+}
+
 // pop_local_slow() is done by the owning thread and is trying to
 // get the last task in the queue.  It will compete with pop_global()
 // that will be used by other threads.  The tag age is incremented

From f6c1efe6acbed27c628e4fe281254fa22b6e588a Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev 
Date: Wed, 22 Jun 2016 13:29:09 +0300
Subject: [PATCH 051/111] 8156803: Turn StressLCM/StressGCM flags to diagnostic

Reviewed-by: kvn, ctornqvi
---
 hotspot/src/share/vm/opto/c2_globals.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp
index 9b276301cda..e79ee116479 100644
--- a/hotspot/src/share/vm/opto/c2_globals.hpp
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp
@@ -72,10 +72,10 @@
                  constraint, \
                  writeable) \
                                                                             \
-  develop(bool, StressLCM, false,                                           \
+  diagnostic(bool, StressLCM, false,                                        \
           "Randomize instruction scheduling in LCM")                        \
                                                                             \
-  develop(bool, StressGCM, false,                                           \
+  diagnostic(bool, StressGCM, false,                                        \
           "Randomize instruction scheduling in GCM")                        \
                                                                             \
   develop(intx, OptoPrologueNops, 0,                                        \

From 109e24d96ef7e048226ce8e6c055cadf063dbbf2 Mon Sep 17 00:00:00 2001
From: Erik Helin 
Date: Wed, 22 Jun 2016 14:03:01 +0200
Subject: [PATCH 052/111] 8155099: Remove duplicate comments from G1Policy

Reviewed-by: jmasa, drwhite
---
 .../src/share/vm/gc/g1/g1DefaultPolicy.hpp    | 43 -------------------
 1 file changed, 43 deletions(-)

diff --git a/hotspot/src/share/vm/gc/g1/g1DefaultPolicy.hpp b/hotspot/src/share/vm/gc/g1/g1DefaultPolicy.hpp
index 2627dc4517d..263da38203e 100644
--- a/hotspot/src/share/vm/gc/g1/g1DefaultPolicy.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1DefaultPolicy.hpp
@@ -36,11 +36,6 @@
 #include "gc/shared/gcCause.hpp"
 #include "utilities/pair.hpp"
 
-// A G1Policy makes policy decisions that determine the
-// characteristics of the collector.  Examples include:
-//   * choice of collection set.
-//   * when to collect.
-
 class HeapRegion;
 class G1CollectionSet;
 class CollectionSetChooser;
@@ -109,11 +104,8 @@ public:
   const G1Predictions& predictor() const { return _predictor; }
   const G1Analytics* analytics()   const { return const_cast(_analytics); }
 
-  // Add the given number of bytes to the total number of allocated bytes in the old gen.
   void add_bytes_allocated_in_old_since_last_gc(size_t bytes) { _bytes_allocated_in_old_since_last_gc += bytes; }
 
-  // Accessors
-
   void set_region_eden(HeapRegion* hr) {
     hr->set_eden();
     hr->install_surv_rate_group(_short_lived_surv_rate_group);
@@ -164,8 +156,6 @@ public:
     return _mmu_tracker->max_gc_time() * 1000.0;
   }
 
-  // Returns an estimate of the survival rate of the region at yg-age
-  // "yg_age".
   double predict_yg_surv_rate(int age, SurvRateGroup* surv_rate_group) const;
 
   double predict_yg_surv_rate(int age) const;
@@ -250,16 +240,9 @@ private:
 public:
   size_t pending_cards() const { return _pending_cards; }
 
-  // Calculate the minimum number of old regions we'll add to the CSet
-  // during a mixed GC.
   uint calc_min_old_cset_length() const;
-
-  // Calculate the maximum number of old regions we'll add to the CSet
-  // during a mixed GC.
   uint calc_max_old_cset_length() const;
 
-  // Returns the given amount of uncollected reclaimable space
-  // as a percentage of the current heap capacity.
   double reclaimable_bytes_perc(size_t reclaimable_bytes) const;
 
 private:
@@ -293,12 +276,8 @@ public:
 
   G1GCPhaseTimes* phase_times() const { return _phase_times; }
 
-  // Check the current value of the young list RSet lengths and
-  // compare it against the last prediction. If the current value is
-  // higher, recalculate the young list target length prediction.
   void revise_young_list_target_length_if_necessary(size_t rs_lengths);
 
-  // This should be called after the heap is resized.
   void record_new_heap_size(uint new_number_of_regions);
 
   void init(G1CollectedHeap* g1h, G1CollectionSet* collection_set);
@@ -309,42 +288,31 @@ public:
 
   bool about_to_start_mixed_phase() const;
 
-  // Record the start and end of an evacuation pause.
   void record_collection_pause_start(double start_time_sec);
   void record_collection_pause_end(double pause_time_ms, size_t cards_scanned, size_t heap_used_bytes_before_gc);
 
-  // Record the start and end of a full collection.
   void record_full_collection_start();
   void record_full_collection_end();
 
-  // Must currently be called while the world is stopped.
   void record_concurrent_mark_init_end(double mark_init_elapsed_time_ms);
 
-  // Record start and end of remark.
   void record_concurrent_mark_remark_start();
   void record_concurrent_mark_remark_end();
 
-  // Record start, end, and completion of cleanup.
   void record_concurrent_mark_cleanup_start();
   void record_concurrent_mark_cleanup_end();
   void record_concurrent_mark_cleanup_completed();
 
   virtual void print_phases();
 
-  // Record how much space we copied during a GC. This is typically
-  // called when a GC alloc region is being retired.
   void record_bytes_copied_during_gc(size_t bytes) {
     _bytes_copied_during_gc += bytes;
   }
 
-  // The amount of space we copied during a GC.
   size_t bytes_copied_during_gc() const {
     return _bytes_copied_during_gc;
   }
 
-  // Determine whether there are candidate regions so that the
-  // next GC should be mixed. The two action strings are used
-  // in the ergo output when the method returns true or false.
   bool next_gc_should_be_mixed(const char* true_action_str,
                                const char* false_action_str) const;
 
@@ -356,18 +324,8 @@ private:
   void initiate_conc_mark();
 
 public:
-  // This sets the initiate_conc_mark_if_possible() flag to start a
-  // new cycle, as long as we are not already in one. It's best if it
-  // is called during a safepoint when the test whether a cycle is in
-  // progress or not is stable.
   bool force_initial_mark_if_outside_cycle(GCCause::Cause gc_cause);
 
-  // This is called at the very beginning of an evacuation pause (it
-  // has to be the first thing that the pause does). If
-  // initiate_conc_mark_if_possible() is true, and the concurrent
-  // marking thread has completed its work during the previous cycle,
-  // it will set during_initial_mark_pause() to so that the pause does
-  // the initial-mark work and start a marking cycle.
   void decide_on_conc_mark_initiation();
 
   void finished_recalculating_age_indexes(bool is_survivors) {
@@ -431,7 +389,6 @@ public:
 
   void update_max_gc_locker_expansion();
 
-  // Calculates survivor space parameters.
   void update_survivors_policy();
 };
 

From 773a50bc6fcc394045d5b47d0d6d0caecc14b188 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik 
Date: Wed, 22 Jun 2016 20:06:39 +0300
Subject: [PATCH 053/111] 8158581: ciReplay can not be run w/ JFR enabled

Reviewed-by: iignatyev, kvn
---
 hotspot/test/compiler/ciReplay/TestSA.sh               | 1 +
 hotspot/test/compiler/ciReplay/TestVM.sh               | 1 +
 hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh | 1 +
 3 files changed, 3 insertions(+)

diff --git a/hotspot/test/compiler/ciReplay/TestSA.sh b/hotspot/test/compiler/ciReplay/TestSA.sh
index bf98f1a7691..03999366558 100644
--- a/hotspot/test/compiler/ciReplay/TestSA.sh
+++ b/hotspot/test/compiler/ciReplay/TestSA.sh
@@ -29,6 +29,7 @@
 ## @ignore 8029528
 ## @summary testing of ciReplay with using generated by SA replay.txt 
 ## @author igor.ignatyev@oracle.com
+## @requires vm.flightRecorder != true
 ## @run shell TestSA.sh
 ##
 
diff --git a/hotspot/test/compiler/ciReplay/TestVM.sh b/hotspot/test/compiler/ciReplay/TestVM.sh
index e58d63e16fa..9b8fe49b284 100644
--- a/hotspot/test/compiler/ciReplay/TestVM.sh
+++ b/hotspot/test/compiler/ciReplay/TestVM.sh
@@ -28,6 +28,7 @@
 ## @bug 8011675
 ## @summary testing of ciReplay with using generated by VM replay.txt 
 ## @author igor.ignatyev@oracle.com
+## @requires vm.flightRecorder != true
 ## @run shell TestVM.sh
 ##
 
diff --git a/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh b/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh
index d961d42541d..85ce38b6605 100644
--- a/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh
+++ b/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh
@@ -28,6 +28,7 @@
 ## @bug 8011675
 ## @summary testing of ciReplay with using generated by VM replay.txt w/o comp_level
 ## @author igor.ignatyev@oracle.com
+## @requires vm.flightRecorder != true
 ## @run shell TestVM_no_comp_level.sh
 ##
 

From 1e3a876d37da1d418302c43411de2557475062aa Mon Sep 17 00:00:00 2001
From: Tom Rodriguez 
Date: Wed, 22 Jun 2016 21:13:52 +0000
Subject: [PATCH 054/111] 8159856: [JVMCI] InterpreterFrameSizeTest.java failed
 compilation

Reviewed-by: kvn, iveresov
---
 .../src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java
index 098871da3b1..222e19349d2 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java
@@ -32,7 +32,7 @@
  *          jdk.vm.ci/jdk.vm.ci.common
  *          jdk.vm.ci/jdk.vm.ci.amd64
  *          jdk.vm.ci/jdk.vm.ci.sparc
- * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
+ * @compile CodeInstallationTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.code.test.InterpreterFrameSizeTest
  */
 

From d64a4e7df3af9fc99d3d7098bdefa71183fcfc85 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez 
Date: Wed, 22 Jun 2016 22:39:32 +0000
Subject: [PATCH 055/111] 8158850: [JVMCI] be more precise when enforcing
 OopMapValue encoding limitations

Reviewed-by: kvn
---
 .../src/share/vm/jvmci/jvmciCodeInstaller.cpp | 14 ++-
 .../src/share/vm/jvmci/jvmciCompilerToVM.cpp  |  6 ++
 .../src/share/vm/jvmci/jvmciCompilerToVM.hpp  |  6 ++
 .../src/share/vm/jvmci/vmStructs_jvmci.cpp    |  2 +
 .../vm/ci/code/test/CodeInstallationTest.java | 20 ++--
 .../jdk/vm/ci/code/test/DebugInfoTest.java    |  6 +-
 .../code/test/MaxOopMapStackOffsetTest.java   | 90 ++++++++++++++++++
 .../jdk/vm/ci/code/test/TestAssembler.java    |  8 +-
 .../vm/ci/code/test/TestHotSpotVMConfig.java  |  3 +
 .../code/test/sparc/SPARCTestAssembler.java   | 91 ++++++++++++++++---
 10 files changed, 217 insertions(+), 29 deletions(-)
 create mode 100644 hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java

diff --git a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
index 8e2111ea0fd..979be2a66e6 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCodeInstaller.cpp
@@ -91,7 +91,19 @@ VMReg getVMRegFromLocation(Handle location, int total_frame_size, TRAPS) {
   } else {
     // stack slot
     if (offset % 4 == 0) {
-      return VMRegImpl::stack2reg(offset / 4);
+      VMReg vmReg = VMRegImpl::stack2reg(offset / 4);
+      if (!OopMapValue::legal_vm_reg_name(vmReg)) {
+        // This restriction only applies to VMRegs that are used in OopMap but
+        // since that's the only use of VMRegs it's simplest to put this test
+        // here.  This test should also be equivalent legal_vm_reg_name but JVMCI
+        // clients can use max_oop_map_stack_stack_offset to detect this problem
+        // directly.  The asserts just ensure that the tests are in agreement.
+        assert(offset > CompilerToVM::Data::max_oop_map_stack_offset(), "illegal VMReg");
+        JVMCI_ERROR_NULL("stack offset %d is too large to be encoded in OopMap (max %d)",
+                         offset, CompilerToVM::Data::max_oop_map_stack_offset());
+      }
+      assert(OopMapValue::legal_vm_reg_name(vmReg), "illegal VMReg");
+      return vmReg;
     } else {
       JVMCI_ERROR_NULL("unaligned stack offset %d in oop map", offset);
     }
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
index 9f5a486e8da..36837cda7f4 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
@@ -113,6 +113,7 @@ uintptr_t CompilerToVM::Data::Universe_verify_oop_bits;
 bool       CompilerToVM::Data::_supports_inline_contig_alloc;
 HeapWord** CompilerToVM::Data::_heap_end_addr;
 HeapWord** CompilerToVM::Data::_heap_top_addr;
+int CompilerToVM::Data::_max_oop_map_stack_offset;
 
 jbyte* CompilerToVM::Data::cardtable_start_address;
 int CompilerToVM::Data::cardtable_shift;
@@ -154,6 +155,11 @@ void CompilerToVM::Data::initialize() {
   _heap_end_addr = _supports_inline_contig_alloc ? Universe::heap()->end_addr() : (HeapWord**) -1;
   _heap_top_addr = _supports_inline_contig_alloc ? Universe::heap()->top_addr() : (HeapWord**) -1;
 
+  _max_oop_map_stack_offset = (OopMapValue::register_mask - VMRegImpl::stack2reg(0)->value()) * VMRegImpl::stack_slot_size;
+  int max_oop_map_stack_index = _max_oop_map_stack_offset / VMRegImpl::stack_slot_size;
+  assert(OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index)), "should be valid");
+  assert(!OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index + 1)), "should be invalid");
+
   BarrierSet* bs = Universe::heap()->barrier_set();
   switch (bs->kind()) {
   case BarrierSet::CardTableModRef:
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp
index f6790375d64..2bbd2034795 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp
@@ -59,6 +59,7 @@ class CompilerToVM {
     static bool _supports_inline_contig_alloc;
     static HeapWord** _heap_end_addr;
     static HeapWord** _heap_top_addr;
+    static int _max_oop_map_stack_offset;
 
     static jbyte* cardtable_start_address;
     static int cardtable_shift;
@@ -75,6 +76,11 @@ class CompilerToVM {
 
    public:
     static void initialize();
+
+    static int max_oop_map_stack_offset() {
+      assert(_max_oop_map_stack_offset > 0, "must be initialized");
+      return Data::_max_oop_map_stack_offset;
+    }
   };
 
  public:
diff --git a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp b/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
index 2efb9ac8364..9244cd46cda 100644
--- a/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
+++ b/hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
@@ -71,6 +71,8 @@
   static_field(CompilerToVM::Data,             _heap_end_addr,                         HeapWord**)                                   \
   static_field(CompilerToVM::Data,             _heap_top_addr,                         HeapWord**)                                   \
                                                                                                                                      \
+  static_field(CompilerToVM::Data,             _max_oop_map_stack_offset,              int)                                          \
+                                                                                                                                     \
   static_field(CompilerToVM::Data,             cardtable_start_address,                jbyte*)                                       \
   static_field(CompilerToVM::Data,             cardtable_shift,                        int)                                          \
                                                                                                                                      \
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
index 55896c1d08c..9ae9d83a2d6 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInstallationTest.java
@@ -89,17 +89,17 @@ public class CodeInstallationTest {
     }
 
     protected void test(TestCompiler compiler, Method method, Object... args) {
-        HotSpotResolvedJavaMethod resolvedMethod = (HotSpotResolvedJavaMethod) metaAccess.lookupJavaMethod(method);
-        TestAssembler asm = createAssembler();
-
-        asm.emitPrologue();
-        compiler.compile(asm);
-        asm.emitEpilogue();
-
-        HotSpotCompiledCode code = asm.finish(resolvedMethod);
-        InstalledCode installed = codeCache.addCode(resolvedMethod, code, null, null);
-
         try {
+            HotSpotResolvedJavaMethod resolvedMethod = (HotSpotResolvedJavaMethod) metaAccess.lookupJavaMethod(method);
+            TestAssembler asm = createAssembler();
+
+            asm.emitPrologue();
+            compiler.compile(asm);
+            asm.emitEpilogue();
+
+            HotSpotCompiledCode code = asm.finish(resolvedMethod);
+            InstalledCode installed = codeCache.addCode(resolvedMethod, code, null, null);
+
             Object expected = method.invoke(null, args);
             Object actual = installed.executeVarargs(args);
             Assert.assertEquals(expected, actual);
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DebugInfoTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DebugInfoTest.java
index c1bdc039196..584249c21b7 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DebugInfoTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DebugInfoTest.java
@@ -44,6 +44,10 @@ public class DebugInfoTest extends CodeInstallationTest {
     }
 
     protected void test(DebugInfoCompiler compiler, Method method, int bci, JavaKind... slotKinds) {
+        test(compiler, method, bci, new Location[0], new Location[0], new int[0], slotKinds);
+    }
+
+    protected void test(DebugInfoCompiler compiler, Method method, int bci, Location[] objects, Location[] derivedBase, int[] sizeInBytes, JavaKind... slotKinds) {
         ResolvedJavaMethod resolvedMethod = metaAccess.lookupJavaMethod(method);
 
         int numLocals = resolvedMethod.getMaxLocals();
@@ -54,7 +58,7 @@ public class DebugInfoTest extends CodeInstallationTest {
 
             BytecodeFrame frame = new BytecodeFrame(null, resolvedMethod, bci, false, false, values, slotKinds, numLocals, numStack, 0);
             DebugInfo info = new DebugInfo(frame, vobjs);
-            info.setReferenceMap(new HotSpotReferenceMap(new Location[0], new Location[0], new int[0], 8));
+            info.setReferenceMap(new HotSpotReferenceMap(objects, derivedBase, sizeInBytes, 8));
 
             asm.emitTrap(info);
         }, method);
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java
new file mode 100644
index 00000000000..b9e56256b96
--- /dev/null
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
+ * @library /
+ * @modules jdk.vm.ci/jdk.vm.ci.hotspot
+ *          jdk.vm.ci/jdk.vm.ci.meta
+ *          jdk.vm.ci/jdk.vm.ci.code
+ *          jdk.vm.ci/jdk.vm.ci.code.site
+ *          jdk.vm.ci/jdk.vm.ci.common
+ *          jdk.vm.ci/jdk.vm.ci.runtime
+ *          jdk.vm.ci/jdk.vm.ci.amd64
+ *          jdk.vm.ci/jdk.vm.ci.sparc
+ * @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.code.test.MaxOopMapStackOffsetTest
+ */
+
+package jdk.vm.ci.code.test;
+
+import org.junit.Test;
+
+import jdk.vm.ci.code.Location;
+import jdk.vm.ci.code.Register;
+import jdk.vm.ci.common.JVMCIError;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
+
+public class MaxOopMapStackOffsetTest extends DebugInfoTest {
+
+    public static int pass() {
+        return 42;
+    }
+
+    public static int fail() {
+        return 42;
+    }
+
+    private void test(String name, int offset) {
+        Location location = Location.stack(offset);
+               DebugInfoCompiler compiler = (asm, values) -> {
+            asm.growFrame(offset);
+            Register v = asm.emitLoadInt(0);
+            asm.emitIntToStack(v);
+            values[0] = JavaConstant.forInt(42);
+            return null;
+        };
+        test(compiler, getMethod(name), 2, new Location[]{location}, new Location[1], new int[]{4}, JavaKind.Int);
+    }
+
+    private int maxOffset() {
+        return config.maxOopMapStackOffset;
+    }
+
+    private int wordSize() {
+        return config.heapWordSize;
+    }
+
+    @Test(expected = JVMCIError.class)
+    public void failTooLargeOffset() {
+        // This should throw a JVMCIError during installation because the offset is too large.
+        test("fail", maxOffset() + wordSize());
+    }
+
+    @Test
+    public void passWithLargeOffset() {
+        test("pass", maxOffset());
+    }
+}
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
index 1f1601b7ed4..44b1d4bcf2a 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestAssembler.java
@@ -233,7 +233,12 @@ public abstract class TestAssembler {
     }
 
     protected StackSlot newStackSlot(PlatformKind kind) {
-        curStackSlot += kind.getSizeInBytes();
+        growFrame(kind.getSizeInBytes());
+        return StackSlot.get(new TestValueKind(kind), -curStackSlot, true);
+    }
+
+    protected void growFrame(int sizeInBytes) {
+        curStackSlot += sizeInBytes;
         if (curStackSlot > frameSize) {
             int newFrameSize = curStackSlot;
             if (newFrameSize % stackAlignment != 0) {
@@ -242,7 +247,6 @@ public abstract class TestAssembler {
             emitGrowStack(newFrameSize - frameSize);
             frameSize = newFrameSize;
         }
-        return StackSlot.get(new TestValueKind(kind), -curStackSlot, true);
     }
 
     protected void setDeoptRescueSlot(StackSlot deoptRescue) {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
index 6112107127b..cc80c0bcdbe 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestHotSpotVMConfig.java
@@ -44,4 +44,7 @@ public class TestHotSpotVMConfig extends HotSpotVMConfigAccess {
 
     public final int MARKID_DEOPT_HANDLER_ENTRY = getConstant("CodeInstaller::DEOPT_HANDLER_ENTRY", Integer.class);
     public final long handleDeoptStub = getFieldValue("CompilerToVM::Data::SharedRuntime_deopt_blob_unpack", Long.class, "address");
+
+    public final int maxOopMapStackOffset = getFieldValue("CompilerToVM::Data::_max_oop_map_stack_offset", Integer.class, "int");
+    public final int heapWordSize = getConstant("HeapWordSize", Integer.class);
 }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
index 3427d91e919..89bc0575470 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
@@ -50,6 +50,7 @@ public class SPARCTestAssembler extends TestAssembler {
     }
 
     private void emitOp2(Register rd, int op2, int imm22) {
+        assert isSimm(imm22, 22);
         code.emitInt((0b00 << 30) | (rd.encoding << 25) | (op2 << 22) | imm22);
     }
 
@@ -58,6 +59,7 @@ public class SPARCTestAssembler extends TestAssembler {
     }
 
     private void emitOp3(int op, Register rd, int op3, Register rs1, int simm13) {
+        assert isSimm(simm13, 13);
         code.emitInt((op << 30) | (rd.encoding << 25) | (op3 << 19) | (rs1.encoding << 14) | (1 << 13) | (simm13 & MASK13));
     }
 
@@ -65,6 +67,27 @@ public class SPARCTestAssembler extends TestAssembler {
         code.emitInt(1 << 24);
     }
 
+    /**
+     * Minimum value for signed immediate ranges.
+     */
+    public static long minSimm(long nbits) {
+        return -(1L << (nbits - 1));
+    }
+
+    /**
+     * Maximum value for signed immediate ranges.
+     */
+    public static long maxSimm(long nbits) {
+        return (1L << (nbits - 1)) - 1;
+    }
+
+    /**
+     * Test if imm is within signed immediate range for nbits.
+     */
+    public static boolean isSimm(long imm, int nbits) {
+        return minSimm(nbits) <= imm && imm <= maxSimm(nbits);
+    }
+
     @Override
     public void emitPrologue() {
         // SAVE sp, -128, sp
@@ -87,7 +110,13 @@ public class SPARCTestAssembler extends TestAssembler {
 
     @Override
     public void emitGrowStack(int size) {
-        emitOp3(0b10, SPARC.sp, 0b000100, SPARC.sp, size); // SUB sp, size, sp
+        frameSize += size;
+        if (isSimm(size, 13)) {
+            emitOp3(0b10, SPARC.sp, 0b000100, SPARC.sp, size); // SUB sp, size, sp
+        } else {
+            Register r = emitLoadInt(size);
+            emitOp3(0b10, SPARC.sp, 0b000100, SPARC.sp, r); // SUB sp, size, sp
+        }
     }
 
     @Override
@@ -103,6 +132,11 @@ public class SPARCTestAssembler extends TestAssembler {
     @Override
     public Register emitLoadInt(int c) {
         Register ret = newRegister();
+        loadIntToRegister(c, ret);
+        return ret;
+    }
+
+    private void loadIntToRegister(int c, Register ret) {
         int hi = c >>> 10;
         int lo = c & ((1 << 10) - 1);
         if (hi == 0) {
@@ -113,19 +147,28 @@ public class SPARCTestAssembler extends TestAssembler {
                 emitOp3(0b10, ret, 0b000010, ret, lo);  // OR ret, lo, ret
             }
         }
-        return ret;
     }
 
     @Override
     public Register emitLoadLong(long c) {
+        Register ret = newRegister();
+        emitLoadLongToRegister(c, ret);
+        return ret;
+    }
+
+    private void loadLongToRegister(long c, Register ret) {
+        DataSectionReference ref = new DataSectionReference();
+        data.align(8);
+        ref.setOffset(data.position());
+        data.emitLong(c);
+        emitLoadPointerToRegister(ref, ret);
+    }
+
+    public void emitLoadLongToRegister(long c, Register r) {
         if ((c & 0xFFFF_FFFFL) == c) {
-            return emitLoadInt((int) c);
+            loadIntToRegister((int) c, r);
         } else {
-            DataSectionReference ref = new DataSectionReference();
-            data.align(8);
-            ref.setOffset(data.position());
-            data.emitLong(c);
-            return emitLoadPointer(ref);
+            loadLongToRegister(c, r);
         }
     }
 
@@ -168,10 +211,14 @@ public class SPARCTestAssembler extends TestAssembler {
     @Override
     public Register emitLoadPointer(DataSectionReference ref) {
         Register ret = newRegister();
+        emitLoadPointerToRegister(ref, ret);
+        return ret;
+    }
+
+    private void emitLoadPointerToRegister(DataSectionReference ref, Register ret) {
         recordDataPatchInCode(ref);
         emitPatchableSethi(ret, true);
         emitOp3(0b11, ret, 0b001011, ret, 0); // LDX [ret+0], ret
-        return ret;
     }
 
     @Override
@@ -194,15 +241,15 @@ public class SPARCTestAssembler extends TestAssembler {
     public StackSlot emitIntToStack(Register a) {
         StackSlot ret = newStackSlot(SPARCKind.WORD);
         // STW a, [fp+offset]
-        emitOp3(0b11, a, 0b000100, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
+        emitStore(0b000100, a, ret);
         return ret;
     }
 
     @Override
     public StackSlot emitLongToStack(Register a) {
         StackSlot ret = newStackSlot(SPARCKind.XWORD);
-        // STX a, [fp+offset]
-        emitOp3(0b11, a, 0b001110, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
+        // STX a, [sp+offset]
+        emitStore(0b001110, a, ret);
         return ret;
     }
 
@@ -210,7 +257,7 @@ public class SPARCTestAssembler extends TestAssembler {
     public StackSlot emitFloatToStack(Register a) {
         StackSlot ret = newStackSlot(SPARCKind.SINGLE);
         // STF a, [fp+offset]
-        emitOp3(0b11, a, 0b100100, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
+        emitStore(0b100100, a, ret);
         return ret;
     }
 
@@ -218,7 +265,7 @@ public class SPARCTestAssembler extends TestAssembler {
     public StackSlot emitPointerToStack(Register a) {
         StackSlot ret = newStackSlot(SPARCKind.XWORD);
         // STX a, [fp+offset]
-        emitOp3(0b11, a, 0b001110, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
+        emitStore(0b001110, a, ret);
         return ret;
     }
 
@@ -226,10 +273,24 @@ public class SPARCTestAssembler extends TestAssembler {
     public StackSlot emitNarrowPointerToStack(Register a) {
         StackSlot ret = newStackSlot(SPARCKind.WORD);
         // STW a, [fp+offset]
-        emitOp3(0b11, a, 0b000100, SPARC.fp, ret.getRawOffset() + SPARC.STACK_BIAS);
+        emitStore(0b000100, a, ret);
         return ret;
     }
 
+    private void emitStore(int op3, Register a, StackSlot ret) {
+        int offset = ret.getRawOffset() + SPARC.STACK_BIAS;
+        if (isSimm(offset, 13)) {
+            // op3 a, [sp+offset]
+            emitOp3(0b11, a, op3, SPARC.fp, offset);
+        } else {
+            assert a != SPARC.g3;
+            Register r = SPARC.g3;
+            loadLongToRegister(offset, r);
+            // op3 a, [sp+g3]
+            emitOp3(0b11, a, op3, SPARC.fp, r);
+        }
+    }
+
     @Override
     public Register emitUncompressPointer(Register compressed, long base, int shift) {
         Register ret;

From 46fa7d986ac7a8f3db01de5712355d241a7406d4 Mon Sep 17 00:00:00 2001
From: Doug Simon 
Date: Thu, 23 Jun 2016 05:13:55 +0000
Subject: [PATCH 056/111] 8159613: [Findbugs] various warnings reported for
 JVMCI sources

Reviewed-by: kvn, twisti
---
 hotspot/.mx.jvmci/mx_jvmci.py                 |   3 +-
 .../src/jdk/vm/ci/aarch64/AArch64.java        |  13 +-
 .../src/jdk/vm/ci/amd64/AMD64.java            |  15 +-
 .../src/jdk/vm/ci/code/Architecture.java      |  26 +-
 .../src/jdk/vm/ci/code/BytecodeFrame.java     |  66 +++-
 .../src/jdk/vm/ci/code/CallingConvention.java |   1 +
 .../src/jdk/vm/ci/code/DebugInfo.java         |   4 +-
 .../src/jdk/vm/ci/code/RegisterArray.java     | 105 ++++++
 .../jdk/vm/ci/code/RegisterAttributes.java    |  24 +-
 .../src/jdk/vm/ci/code/RegisterConfig.java    |  10 +-
 .../jdk/vm/ci/code/RegisterSaveLayout.java    |   1 +
 .../jdk/vm/ci/code/SuppressFBWarnings.java    |  40 +++
 .../src/jdk/vm/ci/code/VirtualObject.java     |  17 +-
 .../src/jdk/vm/ci/common/InitTimer.java       |   6 +-
 .../aarch64/AArch64HotSpotRegisterConfig.java |  68 ++--
 .../aarch64/AArch64HotSpotVMConfig.java       |   5 -
 .../amd64/AMD64HotSpotRegisterConfig.java     |  75 ++--
 .../hotspot/amd64/AMD64HotSpotVMConfig.java   |   5 -
 .../sparc/SPARCHotSpotRegisterConfig.java     |  73 ++--
 .../ci/hotspot/HotSpotCodeCacheProvider.java  |   5 +-
 .../vm/ci/hotspot/HotSpotCompiledCode.java    |   1 +
 .../vm/ci/hotspot/HotSpotConstantPool.java    |  35 +-
 .../ci/hotspot/HotSpotForeignCallTarget.java  |   1 +
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    | 106 ++----
 .../jdk/vm/ci/hotspot/HotSpotMethodData.java  | 340 +++++++-----------
 .../ci/hotspot/HotSpotMethodDataAccessor.java | 169 +++++----
 .../vm/ci/hotspot/HotSpotReferenceMap.java    |  20 +-
 .../HotSpotResolvedObjectTypeImpl.java        |  11 +-
 .../vm/ci/hotspot/HotSpotSpeculationLog.java  |   4 +-
 .../jdk/vm/ci/hotspot/HotSpotVMConfig.java    |  28 +-
 .../vm/ci/hotspot/HotSpotVMConfigAccess.java  |   6 +-
 .../jdk/vm/ci/hotspot/HotSpotVmSymbols.java   |  48 ---
 .../jdk/vm/ci/meta/AbstractJavaProfile.java   |   6 +
 .../jdk/vm/ci/meta/AbstractProfiledItem.java  |  12 +-
 .../src/jdk/vm/ci/meta/LineNumberTable.java   |  26 +-
 .../src/jdk/vm/ci/meta/Local.java             |   3 +
 .../jdk/vm/ci/meta/LocalVariableTable.java    |  13 +-
 .../jdk/vm/ci/meta/SuppressFBWarnings.java    |  40 +++
 .../src/jdk/vm/ci/sparc/SPARC.java            |  27 +-
 .../jvmci/errors/CodeInstallerTest.java       |   9 +-
 .../code/test/amd64/AMD64TestAssembler.java   |   4 +-
 .../code/test/sparc/SPARCTestAssembler.java   |   4 +-
 42 files changed, 823 insertions(+), 652 deletions(-)
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SuppressFBWarnings.java
 delete mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVmSymbols.java
 create mode 100644 hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SuppressFBWarnings.java

diff --git a/hotspot/.mx.jvmci/mx_jvmci.py b/hotspot/.mx.jvmci/mx_jvmci.py
index b359dcf7f95..ede9029a5ba 100644
--- a/hotspot/.mx.jvmci/mx_jvmci.py
+++ b/hotspot/.mx.jvmci/mx_jvmci.py
@@ -186,7 +186,8 @@ To build hotspot and import it into the JDK: "mx make hotspot import-hotspot"
             # Might be building with JDK8 which has cacerts under jre/
             srcCerts = join(mx.get_jdk(tag='default').home, 'jre', 'lib', 'security', 'cacerts')
         dstCerts = join(jdkImageDir, 'lib', 'security', 'cacerts')
-        shutil.copyfile(srcCerts, dstCerts)
+        if srcCerts != dstCerts:
+            shutil.copyfile(srcCerts, dstCerts)
 
         _create_jdk_bundle(jdkBuildDir, _vm.debugLevel, jdkImageDir)
 
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java
index 582d3004424..a21f0844c61 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java
@@ -28,6 +28,7 @@ import java.util.EnumSet;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.Register.RegisterCategory;
+import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 
@@ -84,13 +85,13 @@ public class AArch64 extends Architecture {
     public static final Register lr = r30;
 
     // @formatter:off
-    public static final Register[] cpuRegisters = {
+    public static final RegisterArray cpuRegisters = new RegisterArray(
         r0,  r1,  r2,  r3,  r4,  r5,  r6,  r7,
         r8,  r9,  r10, r11, r12, r13, r14, r15,
         r16, r17, r18, r19, r20, r21, r22, r23,
         r24, r25, r26, r27, r28, r29, r30, r31,
         zr,  sp
-    };
+    );
     // @formatter:on
 
     public static final RegisterCategory SIMD = new RegisterCategory("SIMD");
@@ -130,16 +131,16 @@ public class AArch64 extends Architecture {
     public static final Register v31 = new Register(65, 31, "v31", SIMD);
 
     // @formatter:off
-    public static final Register[] simdRegisters = {
+    public static final RegisterArray simdRegisters = new RegisterArray(
         v0,  v1,  v2,  v3,  v4,  v5,  v6,  v7,
         v8,  v9,  v10, v11, v12, v13, v14, v15,
         v16, v17, v18, v19, v20, v21, v22, v23,
         v24, v25, v26, v27, v28, v29, v30, v31
-    };
+    );
     // @formatter:on
 
     // @formatter:off
-    public static final Register[] allRegisters = {
+    public static final RegisterArray allRegisters = new RegisterArray(
         r0,  r1,  r2,  r3,  r4,  r5,  r6,  r7,
         r8,  r9,  r10, r11, r12, r13, r14, r15,
         r16, r17, r18, r19, r20, r21, r22, r23,
@@ -150,7 +151,7 @@ public class AArch64 extends Architecture {
         v8,  v9,  v10, v11, v12, v13, v14, v15,
         v16, v17, v18, v19, v20, v21, v22, v23,
         v24, v25, v26, v27, v28, v29, v30, v31
-    };
+    );
     // @formatter:on
 
     /**
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java
index 3fb9046711b..2e68bb8b8c9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java
@@ -33,6 +33,7 @@ import java.util.EnumSet;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.Register.RegisterCategory;
+import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 
@@ -131,14 +132,14 @@ public class AMD64 extends Architecture {
     public static final Register k6 = new Register(54, 6, "k6", MASK);
     public static final Register k7 = new Register(55, 7, "k7", MASK);
 
-    public static final Register[] valueRegistersSSE = {
+    public static final RegisterArray valueRegistersSSE = new RegisterArray(
         rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
         r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
         xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
         xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15
-    };
+    );
 
-    public static final Register[] valueRegistersAVX512 = {
+    public static final RegisterArray valueRegistersAVX512 = new RegisterArray(
         rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
         r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
         xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
@@ -146,14 +147,14 @@ public class AMD64 extends Architecture {
         xmm16, xmm17, xmm18, xmm19, xmm20, xmm21, xmm22, xmm23,
         xmm24, xmm25, xmm26, xmm27, xmm28, xmm29, xmm30, xmm31,
         k0, k1, k2, k3, k4, k5, k6, k7
-    };
+    );
 
     /**
      * Register used to construct an instruction-relative address.
      */
     public static final Register rip = new Register(56, -1, "rip", SPECIAL);
 
-    public static final Register[] allRegisters = {
+    public static final RegisterArray allRegisters = new RegisterArray(
         rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
         r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
         xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
@@ -162,7 +163,7 @@ public class AMD64 extends Architecture {
         xmm24, xmm25, xmm26, xmm27, xmm28, xmm29, xmm30, xmm31,
         k0, k1, k2, k3, k4, k5, k6, k7,
         rip
-    };
+    );
 
     // @formatter:on
 
@@ -245,7 +246,7 @@ public class AMD64 extends Architecture {
     }
 
     @Override
-    public Register[] getAvailableValueRegisters() {
+    public RegisterArray getAvailableValueRegisters() {
         if (features.contains(CPUFeature.AVX512F)) {
             return valueRegistersAVX512;
         } else {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Architecture.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Architecture.java
index 10bf6a81fe7..3c2fc5aa4eb 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Architecture.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/Architecture.java
@@ -23,7 +23,6 @@
 package jdk.vm.ci.code;
 
 import java.nio.ByteOrder;
-import java.util.Arrays;
 
 import jdk.vm.ci.code.Register.RegisterCategory;
 import jdk.vm.ci.meta.JavaKind;
@@ -46,10 +45,10 @@ public abstract class Architecture {
     private final String name;
 
     /**
-     * Array of all available registers on this architecture. The index of each register in this
-     * array is equal to its {@linkplain Register#number number}.
+     * List of all available registers on this architecture. The index of each register in this list
+     * is equal to its {@linkplain Register#number number}.
      */
-    private final Register[] registers;
+    private final RegisterArray registers;
 
     /**
      * The byte ordering can be either little or big endian.
@@ -78,7 +77,8 @@ public abstract class Architecture {
      */
     private final int returnAddressSize;
 
-    protected Architecture(String name, PlatformKind wordKind, ByteOrder byteOrder, boolean unalignedMemoryAccess, Register[] registers, int implicitMemoryBarriers, int nativeCallDisplacementOffset,
+    protected Architecture(String name, PlatformKind wordKind, ByteOrder byteOrder, boolean unalignedMemoryAccess, RegisterArray registers, int implicitMemoryBarriers,
+                    int nativeCallDisplacementOffset,
                     int returnAddressSize) {
         this.name = name;
         this.registers = registers;
@@ -120,20 +120,20 @@ public abstract class Architecture {
     }
 
     /**
-     * Gets an array of all registers that exist on this architecture. This contains all registers
+     * Gets the list of all registers that exist on this architecture. This contains all registers
      * that exist in the specification of this architecture. Not all of them may be available on
-     * this particular architecture instance. The index of each register in this array is equal to
+     * this particular architecture instance. The index of each register in this list is equal to
      * its {@linkplain Register#number number}.
      */
-    public Register[] getRegisters() {
-        return registers.clone();
+    public RegisterArray getRegisters() {
+        return registers;
     }
 
     /**
-     * Gets an array of all registers available for storing values on this architecture. This may be
-     * a subset of {@link #getRegisters()}, depending on the capabilities of this particular CPU.
+     * Gets a list of all registers available for storing values on this architecture. This may be a
+     * subset of {@link #getRegisters()}, depending on the capabilities of this particular CPU.
      */
-    public Register[] getAvailableValueRegisters() {
+    public RegisterArray getAvailableValueRegisters() {
         return getRegisters();
     }
 
@@ -206,7 +206,7 @@ public abstract class Architecture {
                 assert this.byteOrder.equals(that.byteOrder);
                 assert this.implicitMemoryBarriers == that.implicitMemoryBarriers;
                 assert this.machineCodeCallDisplacementOffset == that.machineCodeCallDisplacementOffset;
-                assert Arrays.equals(this.registers, that.registers);
+                assert this.registers.equals(that.registers);
                 assert this.returnAddressSize == that.returnAddressSize;
                 assert this.unalignedMemoryAccess == that.unalignedMemoryAccess;
                 assert this.wordKind == that.wordKind;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java
index d7aa4af0133..f731cdd3235 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/BytecodeFrame.java
@@ -34,7 +34,7 @@ import jdk.vm.ci.meta.Value;
  * where to find the local variables, operand stack values and locked objects of the bytecode
  * frame(s).
  */
-public class BytecodeFrame extends BytecodePosition {
+public final class BytecodeFrame extends BytecodePosition {
 
     /**
      * An array of values representing how to reconstruct the state of the Java frame. This is array
@@ -65,14 +65,18 @@ public class BytecodeFrame extends BytecodePosition {
      * 
    
      * Note that the number of locals and the number of stack slots may be smaller than the maximum
      * number of locals and stack slots as specified in the compiled method.
+     *
+     * This field is intentionally exposed as a mutable array that a compiler may modify (e.g.
+     * during register allocation).
      */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "field is intentionally mutable")//
     public final JavaValue[] values;
 
     /**
-     * An array describing the Java kind of the {@link #values}. It records a kind for the locals
-     * and the operand stack.
+     * An array describing the Java kinds in {@link #values}. It records a kind for the locals and
+     * the operand stack.
      */
-    public final JavaKind[] slotKinds;
+    private final JavaKind[] slotKinds;
 
     /**
      * The number of locals in the values array.
@@ -99,8 +103,8 @@ public class BytecodeFrame extends BytecodePosition {
     public final boolean rethrowException;
 
     /**
-     * Specifies if this object represents a frame state in the middle of executing a call. If
-     * true, the arguments to the call have been popped from the stack and the return value (for a
+     * Specifies if this object represents a frame state in the middle of executing a call. If true,
+     * the arguments to the call have been popped from the stack and the return value (for a
      * non-void call) has not yet been pushed.
      */
     public final boolean duringCall;
@@ -178,11 +182,14 @@ public class BytecodeFrame extends BytecodePosition {
      * @param bci a BCI within the method
      * @param rethrowException specifies if the VM should re-throw the pending exception when
      *            deopt'ing using this frame
-     * @param values the frame state {@link #values}
+     * @param values the frame state {@link #values}.
+     * @param slotKinds the kinds in {@code values}. This array is now owned by this object and must
+     *            not be mutated by the caller.
      * @param numLocals the number of local variables
      * @param numStack the depth of the stack
      * @param numLocks the number of locked objects
      */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "caller transfers ownership of `slotKinds`")
     public BytecodeFrame(BytecodeFrame caller, ResolvedJavaMethod method, int bci, boolean rethrowException, boolean duringCall, JavaValue[] values, JavaKind[] slotKinds, int numLocals, int numStack,
                     int numLocks) {
         super(caller, method, bci);
@@ -218,13 +225,45 @@ public class BytecodeFrame extends BytecodePosition {
         return true;
     }
 
+    /**
+     * Gets the kind of a local variable.
+     *
+     * @param i the local variable to query
+     * @return the kind of local variable {@code i}
+     * @throw {@link IndexOutOfBoundsException} if {@code i < 0 || i >= this.numLocals}
+     */
+    public JavaKind getLocalValueKind(int i) {
+        if (i < 0 || i >= numLocals) {
+            throw new IndexOutOfBoundsException();
+        }
+        return slotKinds[i];
+    }
+
+    /**
+     * Gets the kind of a stack slot.
+     *
+     * @param i the local variable to query
+     * @return the kind of stack slot {@code i}
+     * @throw {@link IndexOutOfBoundsException} if {@code i < 0 || i >= this.numStack}
+     */
+    public JavaKind getStackValueKind(int i) {
+        if (i < 0 || i >= numStack) {
+            throw new IndexOutOfBoundsException();
+        }
+        return slotKinds[i + numLocals];
+    }
+
     /**
      * Gets the value representing the specified local variable.
      *
      * @param i the local variable index
      * @return the value that can be used to reconstruct the local's current value
+     * @throw {@link IndexOutOfBoundsException} if {@code i < 0 || i >= this.numLocals}
      */
     public JavaValue getLocalValue(int i) {
+        if (i < 0 || i >= numLocals) {
+            throw new IndexOutOfBoundsException();
+        }
         return values[i];
     }
 
@@ -233,8 +272,12 @@ public class BytecodeFrame extends BytecodePosition {
      *
      * @param i the stack index
      * @return the value that can be used to reconstruct the stack slot's current value
+     * @throw {@link IndexOutOfBoundsException} if {@code i < 0 || i >= this.numStack}
      */
     public JavaValue getStackValue(int i) {
+        if (i < 0 || i >= numStack) {
+            throw new IndexOutOfBoundsException();
+        }
         return values[i + numLocals];
     }
 
@@ -243,8 +286,12 @@ public class BytecodeFrame extends BytecodePosition {
      *
      * @param i the lock index
      * @return the value that can be used to reconstruct the lock's current value
+     * @throw {@link IndexOutOfBoundsException} if {@code i < 0 || i >= this.numLocks}
      */
     public JavaValue getLockValue(int i) {
+        if (i < 0 || i >= numLocks) {
+            throw new IndexOutOfBoundsException();
+        }
         return values[i + numLocals + numStack];
     }
 
@@ -257,6 +304,11 @@ public class BytecodeFrame extends BytecodePosition {
         return (BytecodeFrame) getCaller();
     }
 
+    @Override
+    public int hashCode() {
+        return (numLocals + 1) ^ (numStack + 11) ^ (numLocks + 7);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CallingConvention.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CallingConvention.java
index 240b4be1423..1c839e9ba54 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CallingConvention.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/CallingConvention.java
@@ -100,6 +100,7 @@ public class CallingConvention {
     /**
      * Gets the locations required for the arguments.
      */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP", justification = "FB false positive")
     public AllocatableValue[] getArguments() {
         if (argumentLocations.length == 0) {
             return argumentLocations;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/DebugInfo.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/DebugInfo.java
index be7729fb76f..0638d139739 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/DebugInfo.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/DebugInfo.java
@@ -48,8 +48,10 @@ public final class DebugInfo {
      *
      * @param codePos the {@linkplain BytecodePosition code position} or {@linkplain BytecodeFrame
      *            frame} info
-     * @param virtualObjectMapping the mapping of {@link VirtualObject}s to their real values
+     * @param virtualObjectMapping the mapping of {@link VirtualObject}s to their real values. This
+     *            array is now owned by this object and must not be mutated by the caller.
      */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "caller transfers ownership of `virtualObjectMapping`")
     public DebugInfo(BytecodePosition codePos, VirtualObject[] virtualObjectMapping) {
         this.bytecodePosition = codePos;
         this.virtualObjectMapping = virtualObjectMapping;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java
new file mode 100644
index 00000000000..a7fac1f2d3d
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterArray.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.code;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * An immutable ordered list of registers. Only required because Java lacks immutable arrays.
+ */
+public final class RegisterArray implements Iterable {
+
+    private final Register[] registers;
+    private int hash;
+
+    public RegisterArray(Register... registers) {
+        this.registers = registers;
+    }
+
+    public RegisterArray(Collection registers) {
+        this.registers = registers.toArray(new Register[registers.size()]);
+    }
+
+    /**
+     * Gets the number of registers.
+     */
+    public int size() {
+        return registers.length;
+    }
+
+    /**
+     * Gets the register at a given index.
+     *
+     * @param index the index of the register to retrieve
+     */
+    public Register get(int index) {
+        return registers[index];
+    }
+
+    public void addTo(Collection collection) {
+        collection.addAll(Arrays.asList(registers));
+    }
+
+    /**
+     * Gets an immutable view of the registers as a list.
+     */
+    public List asList() {
+        return Collections.unmodifiableList(Arrays.asList(registers));
+    }
+
+    /**
+     * Gets a copy of the registers as an array.
+     */
+    public Register[] toArray() {
+        return registers.clone();
+    }
+
+    public Iterator iterator() {
+        return Arrays.asList(registers).iterator();
+    }
+
+    @Override
+    public int hashCode() {
+        if (hash == 0 && registers.length > 0) {
+            hash = Arrays.hashCode(registers);
+        }
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof RegisterArray) {
+            return Arrays.equals(registers, ((RegisterArray) obj).registers);
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return Arrays.toString(registers);
+    }
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterAttributes.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterAttributes.java
index b8c15075627..cde1df0bfc5 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterAttributes.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterAttributes.java
@@ -23,6 +23,8 @@
 package jdk.vm.ci.code;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * A collection of register attributes. The specific attribute values for a register may be local to
@@ -53,13 +55,14 @@ public class RegisterAttributes {
      * @return an array whose length is the max register number in {@code registers} plus 1. An
      *         element at index i holds the attributes of the register whose number is i.
      */
-    public static RegisterAttributes[] createMap(RegisterConfig registerConfig, Register[] registers) {
-        RegisterAttributes[] map = new RegisterAttributes[registers.length];
+    public static RegisterAttributes[] createMap(RegisterConfig registerConfig, RegisterArray registers) {
+        RegisterAttributes[] map = new RegisterAttributes[registers.size()];
+        List callerSaveRegisters = registerConfig.getCallerSaveRegisters().asList();
+        List calleeSaveRegisters = registerConfig.getCalleeSaveRegisters() == null ? Collections.emptyList() : registerConfig.getCalleeSaveRegisters().asList();
+        List allocatableRegisters = registerConfig.getAllocatableRegisters().asList();
         for (Register reg : registers) {
             if (reg != null) {
-                Register[] csr = registerConfig.getCalleeSaveRegisters();
-                RegisterAttributes attr = new RegisterAttributes(Arrays.asList(registerConfig.getCallerSaveRegisters()).contains(reg), csr == null ? false : Arrays.asList(csr).contains(reg),
-                                Arrays.asList(registerConfig.getAllocatableRegisters()).contains(reg));
+                RegisterAttributes attr = new RegisterAttributes(callerSaveRegisters.contains(reg), calleeSaveRegisters.contains(reg), allocatableRegisters.contains(reg));
                 if (map.length <= reg.number) {
                     map = Arrays.copyOf(map, reg.number + 1);
                 }
@@ -75,23 +78,24 @@ public class RegisterAttributes {
     }
 
     /**
-     * @return Denotes a register that is available for use by a register allocator.
+     * @return {@code true} if a register is available for use by a register allocator otherwise
+     *         {@code false}
      */
     public boolean isAllocatable() {
         return allocatable;
     }
 
     /**
-     * @return Denotes a register whose value preservation (if required) across a call is the
-     *         responsibility of the callee.
+     * @return {@code true} if a register whose value preservation (if required) across a call is
+     *         the responsibility of the callee otherwise {@code false}
      */
     public boolean isCalleeSave() {
         return calleeSave;
     }
 
     /**
-     * @return Denotes a register whose value preservation (if required) across a call is the
-     *         responsibility of the caller.
+     * @return {@code true} if a register whose value preservation (if required) across a call is
+     *         the responsibility of the caller otherwise {@code false}
      */
     public boolean isCallerSave() {
         return callerSave;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java
index d2b83496af9..fac19780ae0 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterConfig.java
@@ -71,7 +71,7 @@ public interface RegisterConfig {
      * @return the ordered set of registers that may be used to pass parameters in a call conforming
      *         to {@code type}
      */
-    Register[] getCallingConventionRegisters(Type type, JavaKind kind);
+    RegisterArray getCallingConventionRegisters(Type type, JavaKind kind);
 
     /**
      * Gets the set of all registers that might be used by the register allocator.
@@ -80,23 +80,23 @@ public interface RegisterConfig {
      * {@link RegisterAllocationConfig#getAllocatableRegisters()}
      */
     @SuppressWarnings("javadoc")
-    Register[] getAllocatableRegisters();
+    RegisterArray getAllocatableRegisters();
 
     /**
      * Filters a set of registers and returns only those that can be used by the register allocator
      * for a value of a particular kind.
      */
-    Register[] filterAllocatableRegisters(PlatformKind kind, Register[] registers);
+    RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray registers);
 
     /**
      * Gets the registers whose values must be preserved by a method across any call it makes.
      */
-    Register[] getCallerSaveRegisters();
+    RegisterArray getCallerSaveRegisters();
 
     /**
      * Gets the registers whose values must be preserved by the callee.
      */
-    Register[] getCalleeSaveRegisters();
+    RegisterArray getCalleeSaveRegisters();
 
     /**
      * Gets a map from register {@linkplain Register#number numbers} to register
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterSaveLayout.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterSaveLayout.java
index 86b92579654..bc7421b9741 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterSaveLayout.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/RegisterSaveLayout.java
@@ -50,6 +50,7 @@ public final class RegisterSaveLayout {
      * @param registers the keys in the map
      * @param slots frame slot index for each register in {@code registers}
      */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "caller transfers ownership of `registers` and `slots`")
     public RegisterSaveLayout(Register[] registers, int[] slots) {
         assert registers.length == slots.length;
         this.registers = registers;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SuppressFBWarnings.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SuppressFBWarnings.java
new file mode 100644
index 00000000000..21a59625b13
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/SuppressFBWarnings.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.code;
+
+/**
+ * Used to suppress FindBugs warnings.
+ */
+@interface SuppressFBWarnings {
+    /**
+     * The set of FindBugs
+     * warnings that are to be
+     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     */
+    String[] value();
+
+    /**
+     * Reason why the warning is suppressed.
+     */
+    String justification();
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualObject.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualObject.java
index 7b4b2e60af7..60ef30078cd 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualObject.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualObject.java
@@ -119,17 +119,20 @@ public final class VirtualObject implements JavaValue {
     }
 
     /**
-     * Returns an array containing all the values to be stored into the object when it is recreated.
+     * Returns the array containing all the values to be stored into the object when it is
+     * recreated. This field is intentional exposed as a mutable array that a compiler may modify
+     * (e.g. during register allocation).
      */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP", justification = "`values` is intentional mutable")//
     public JavaValue[] getValues() {
         return values;
     }
 
     /**
-     * Returns an array containing the Java kind of all values in the object.
+     * Returns the kind of the value at {@code index}.
      */
-    public JavaKind[] getSlotKinds() {
-        return slotKinds;
+    public JavaKind getSlotKind(int index) {
+        return slotKinds[index];
     }
 
     /**
@@ -145,9 +148,13 @@ public final class VirtualObject implements JavaValue {
      *
      * @param values an array containing all the values to be stored into the object when it is
      *            recreated.
-     * @param slotKinds an array containing the Java kinds of the values.
+     * @param slotKinds an array containing the Java kinds of the values. This must have the same
+     *            length as {@code values}. This array is now owned by this object and must not be
+     *            mutated by the caller.
      */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "caller transfers ownership of `slotKinds`")
     public void setValues(JavaValue[] values, JavaKind[] slotKinds) {
+        assert values.length == slotKinds.length;
         this.values = values;
         this.slotKinds = slotKinds;
     }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java
index 85eb72e49ac..19af5f5a0d9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.common/src/jdk/vm/ci/common/InitTimer.java
@@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicInteger;
  * {@code "jvmci.inittimer"} system property to {@code "true"}.
  */
 public final class InitTimer implements AutoCloseable {
-    final String name;
-    final long start;
+    private final String name;
+    private final long start;
 
     private InitTimer(String name) {
         int n = nesting.getAndIncrement();
@@ -76,5 +76,5 @@ public final class InitTimer implements AutoCloseable {
     /**
      * Used to assert the invariant that all related initialization happens on the same thread.
      */
-    public static Thread initializingThread;
+    static Thread initializingThread;
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
index 3a0e2220dfd..24f4e02eca6 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
@@ -49,8 +49,6 @@ import static jdk.vm.ci.aarch64.AArch64.v7;
 import static jdk.vm.ci.aarch64.AArch64.zr;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -60,6 +58,7 @@ import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
@@ -78,24 +77,24 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
 
     private final TargetDescription target;
 
-    private final Register[] allocatable;
+    private final RegisterArray allocatable;
 
     /**
      * The caller saved registers always include all parameter registers.
      */
-    private final Register[] callerSaved;
+    private final RegisterArray callerSaved;
 
     private final boolean allAllocatableAreCallerSaved;
 
     private final RegisterAttributes[] attributesMap;
 
     @Override
-    public Register[] getAllocatableRegisters() {
-        return allocatable.clone();
+    public RegisterArray getAllocatableRegisters() {
+        return allocatable;
     }
 
     @Override
-    public Register[] filterAllocatableRegisters(PlatformKind kind, Register[] registers) {
+    public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray registers) {
         ArrayList list = new ArrayList<>();
         for (Register reg : registers) {
             if (target.arch.canStoreValue(reg.getRegisterCategory(), kind)) {
@@ -103,8 +102,7 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
             }
         }
 
-        Register[] ret = list.toArray(new Register[list.size()]);
-        return ret;
+        return new RegisterArray(list);
     }
 
     @Override
@@ -112,9 +110,9 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
         return attributesMap.clone();
     }
 
-    private final Register[] javaGeneralParameterRegisters = {r1, r2, r3, r4, r5, r6, r7, r0};
-    private final Register[] nativeGeneralParameterRegisters = {r0, r1, r2, r3, r4, r5, r6, r7};
-    private final Register[] simdParameterRegisters = {v0, v1, v2, v3, v4, v5, v6, v7};
+    private final RegisterArray javaGeneralParameterRegisters = new RegisterArray(r1, r2, r3, r4, r5, r6, r7, r0);
+    private final RegisterArray nativeGeneralParameterRegisters = new RegisterArray(r0, r1, r2, r3, r4, r5, r6, r7);
+    private final RegisterArray simdParameterRegisters = new RegisterArray(v0, v1, v2, v3, v4, v5, v6, v7);
 
     public static final Register inlineCacheRegister = r9;
 
@@ -127,12 +125,12 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
     public static final Register threadRegister = r28;
     public static final Register fp = r29;
 
-    private static final Register[] reservedRegisters = {threadRegister, fp, lr, r31, zr, sp};
+    private static final RegisterArray reservedRegisters = new RegisterArray(threadRegister, fp, lr, r31, zr, sp);
 
-    private static Register[] initAllocatable(Architecture arch, boolean reserveForHeapBase) {
-        Register[] allRegisters = arch.getAvailableValueRegisters();
-        Register[] registers = new Register[allRegisters.length - reservedRegisters.length - (reserveForHeapBase ? 1 : 0)];
-        List reservedRegistersList = Arrays.asList(reservedRegisters);
+    private static RegisterArray initAllocatable(Architecture arch, boolean reserveForHeapBase) {
+        RegisterArray allRegisters = arch.getAvailableValueRegisters();
+        Register[] registers = new Register[allRegisters.size() - reservedRegisters.size() - (reserveForHeapBase ? 1 : 0)];
+        List reservedRegistersList = reservedRegisters.asList();
 
         int idx = 0;
         for (Register reg : allRegisters) {
@@ -150,35 +148,35 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
         }
 
         assert idx == registers.length;
-        return registers;
+        return new RegisterArray(registers);
     }
 
     public AArch64HotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops) {
         this(target, initAllocatable(target.arch, useCompressedOops));
-        assert callerSaved.length >= allocatable.length;
+        assert callerSaved.size() >= allocatable.size();
     }
 
-    public AArch64HotSpotRegisterConfig(TargetDescription target, Register[] allocatable) {
+    public AArch64HotSpotRegisterConfig(TargetDescription target, RegisterArray allocatable) {
         this.target = target;
 
-        this.allocatable = allocatable.clone();
+        this.allocatable = allocatable;
         Set callerSaveSet = new HashSet<>();
-        Collections.addAll(callerSaveSet, allocatable);
-        Collections.addAll(callerSaveSet, simdParameterRegisters);
-        Collections.addAll(callerSaveSet, javaGeneralParameterRegisters);
-        Collections.addAll(callerSaveSet, nativeGeneralParameterRegisters);
-        callerSaved = callerSaveSet.toArray(new Register[callerSaveSet.size()]);
+        allocatable.addTo(callerSaveSet);
+        simdParameterRegisters.addTo(callerSaveSet);
+        javaGeneralParameterRegisters.addTo(callerSaveSet);
+        nativeGeneralParameterRegisters.addTo(callerSaveSet);
+        callerSaved = new RegisterArray(callerSaveSet);
 
         allAllocatableAreCallerSaved = true;
         attributesMap = RegisterAttributes.createMap(this, AArch64.allRegisters);
     }
 
     @Override
-    public Register[] getCallerSaveRegisters() {
+    public RegisterArray getCallerSaveRegisters() {
         return callerSaved;
     }
 
-    public Register[] getCalleeSaveRegisters() {
+    public RegisterArray getCalleeSaveRegisters() {
         return null;
     }
 
@@ -199,7 +197,7 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
     }
 
     @Override
-    public Register[] getCallingConventionRegisters(Type type, JavaKind kind) {
+    public RegisterArray getCallingConventionRegisters(Type type, JavaKind kind) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
         switch (kind) {
             case Boolean:
@@ -218,7 +216,7 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
         }
     }
 
-    private CallingConvention callingConvention(Register[] generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
+    private CallingConvention callingConvention(RegisterArray generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
                     ValueKindFactory valueKindFactory) {
         AllocatableValue[] locations = new AllocatableValue[parameterTypes.length];
 
@@ -237,15 +235,15 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
                 case Int:
                 case Long:
                 case Object:
-                    if (currentGeneral < generalParameterRegisters.length) {
-                        Register register = generalParameterRegisters[currentGeneral++];
+                    if (currentGeneral < generalParameterRegisters.size()) {
+                        Register register = generalParameterRegisters.get(currentGeneral++);
                         locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 case Float:
                 case Double:
-                    if (currentSIMD < simdParameterRegisters.length) {
-                        Register register = simdParameterRegisters[currentSIMD++];
+                    if (currentSIMD < simdParameterRegisters.size()) {
+                        Register register = simdParameterRegisters.get(currentSIMD++);
                         locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
@@ -294,6 +292,6 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
 
     @Override
     public String toString() {
-        return String.format("Allocatable: " + Arrays.toString(getAllocatableRegisters()) + "%n" + "CallerSave:  " + Arrays.toString(getCallerSaveRegisters()) + "%n");
+        return String.format("Allocatable: " + getAllocatableRegisters() + "%n" + "CallerSave:  " + getCallerSaveRegisters() + "%n");
     }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java
index 42119c577e1..41dd2ef7677 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java
@@ -36,11 +36,6 @@ class AArch64HotSpotVMConfig extends HotSpotVMConfigAccess {
         super(config);
     }
 
-    /**
-     * Maximum allowed size of allocated area for a frame.
-     */
-    final int maxFrameSize = 16 * 1024;
-
     final boolean linuxOs = System.getProperty("os.name", "").startsWith("Linux");
 
     final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
index 74db7d1c76a..7f3eb35f7b3 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
@@ -42,8 +42,6 @@ import static jdk.vm.ci.amd64.AMD64.xmm6;
 import static jdk.vm.ci.amd64.AMD64.xmm7;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -52,6 +50,7 @@ import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
@@ -70,24 +69,24 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
 
     private final TargetDescription target;
 
-    private final Register[] allocatable;
+    private final RegisterArray allocatable;
 
     /**
      * The caller saved registers always include all parameter registers.
      */
-    private final Register[] callerSaved;
+    private final RegisterArray callerSaved;
 
     private final boolean allAllocatableAreCallerSaved;
 
     private final RegisterAttributes[] attributesMap;
 
     @Override
-    public Register[] getAllocatableRegisters() {
-        return allocatable.clone();
+    public RegisterArray getAllocatableRegisters() {
+        return allocatable;
     }
 
     @Override
-    public Register[] filterAllocatableRegisters(PlatformKind kind, Register[] registers) {
+    public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray registers) {
         ArrayList list = new ArrayList<>();
         for (Register reg : registers) {
             if (target.arch.canStoreValue(reg.getRegisterCategory(), kind)) {
@@ -95,7 +94,7 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
             }
         }
 
-        Register[] ret = list.toArray(new Register[list.size()]);
+        RegisterArray ret = new RegisterArray(list);
         return ret;
     }
 
@@ -104,9 +103,9 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
         return attributesMap.clone();
     }
 
-    private final Register[] javaGeneralParameterRegisters;
-    private final Register[] nativeGeneralParameterRegisters;
-    private final Register[] xmmParameterRegisters = {xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7};
+    private final RegisterArray javaGeneralParameterRegisters;
+    private final RegisterArray nativeGeneralParameterRegisters;
+    private final RegisterArray xmmParameterRegisters = new RegisterArray(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
 
     /*
      * Some ABIs (e.g. Windows) require a so-called "home space", that is a save area on the stack
@@ -114,12 +113,12 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
      */
     private final boolean needsNativeStackHomeSpace;
 
-    private static final Register[] reservedRegisters = {rsp, r15};
+    private static final RegisterArray reservedRegisters = new RegisterArray(rsp, r15);
 
-    private static Register[] initAllocatable(Architecture arch, boolean reserveForHeapBase) {
-        Register[] allRegisters = arch.getAvailableValueRegisters();
-        Register[] registers = new Register[allRegisters.length - reservedRegisters.length - (reserveForHeapBase ? 1 : 0)];
-        List reservedRegistersList = Arrays.asList(reservedRegisters);
+    private static RegisterArray initAllocatable(Architecture arch, boolean reserveForHeapBase) {
+        RegisterArray allRegisters = arch.getAvailableValueRegisters();
+        Register[] registers = new Register[allRegisters.size() - reservedRegisters.size() - (reserveForHeapBase ? 1 : 0)];
+        List reservedRegistersList = reservedRegisters.asList();
 
         int idx = 0;
         for (Register reg : allRegisters) {
@@ -136,46 +135,46 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
         }
 
         assert idx == registers.length;
-        return registers;
+        return new RegisterArray(registers);
     }
 
     public AMD64HotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops, boolean windowsOs) {
         this(target, initAllocatable(target.arch, useCompressedOops), windowsOs);
-        assert callerSaved.length >= allocatable.length;
+        assert callerSaved.size() >= allocatable.size();
     }
 
-    public AMD64HotSpotRegisterConfig(TargetDescription target, Register[] allocatable, boolean windowsOs) {
+    public AMD64HotSpotRegisterConfig(TargetDescription target, RegisterArray allocatable, boolean windowsOs) {
         this.target = target;
 
         if (windowsOs) {
-            javaGeneralParameterRegisters = new Register[]{rdx, r8, r9, rdi, rsi, rcx};
-            nativeGeneralParameterRegisters = new Register[]{rcx, rdx, r8, r9};
+            javaGeneralParameterRegisters = new RegisterArray(rdx, r8, r9, rdi, rsi, rcx);
+            nativeGeneralParameterRegisters = new RegisterArray(rcx, rdx, r8, r9);
             this.needsNativeStackHomeSpace = true;
         } else {
-            javaGeneralParameterRegisters = new Register[]{rsi, rdx, rcx, r8, r9, rdi};
-            nativeGeneralParameterRegisters = new Register[]{rdi, rsi, rdx, rcx, r8, r9};
+            javaGeneralParameterRegisters = new RegisterArray(rsi, rdx, rcx, r8, r9, rdi);
+            nativeGeneralParameterRegisters = new RegisterArray(rdi, rsi, rdx, rcx, r8, r9);
             this.needsNativeStackHomeSpace = false;
         }
 
         this.allocatable = allocatable;
         Set callerSaveSet = new HashSet<>();
-        Collections.addAll(callerSaveSet, allocatable);
-        Collections.addAll(callerSaveSet, xmmParameterRegisters);
-        Collections.addAll(callerSaveSet, javaGeneralParameterRegisters);
-        Collections.addAll(callerSaveSet, nativeGeneralParameterRegisters);
-        callerSaved = callerSaveSet.toArray(new Register[callerSaveSet.size()]);
+        allocatable.addTo(callerSaveSet);
+        xmmParameterRegisters.addTo(callerSaveSet);
+        callerSaveSet.addAll(javaGeneralParameterRegisters.asList());
+        nativeGeneralParameterRegisters.addTo(callerSaveSet);
+        callerSaved = new RegisterArray(callerSaveSet);
 
         allAllocatableAreCallerSaved = true;
         attributesMap = RegisterAttributes.createMap(this, target.arch.getRegisters());
     }
 
     @Override
-    public Register[] getCallerSaveRegisters() {
+    public RegisterArray getCallerSaveRegisters() {
         return callerSaved;
     }
 
     @Override
-    public Register[] getCalleeSaveRegisters() {
+    public RegisterArray getCalleeSaveRegisters() {
         return null;
     }
 
@@ -196,7 +195,7 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
     }
 
     @Override
-    public Register[] getCallingConventionRegisters(Type type, JavaKind kind) {
+    public RegisterArray getCallingConventionRegisters(Type type, JavaKind kind) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
         switch (kind) {
             case Boolean:
@@ -215,13 +214,13 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
         }
     }
 
-    private CallingConvention callingConvention(Register[] generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
+    private CallingConvention callingConvention(RegisterArray generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
                     ValueKindFactory valueKindFactory) {
         AllocatableValue[] locations = new AllocatableValue[parameterTypes.length];
 
         int currentGeneral = 0;
         int currentXMM = 0;
-        int currentStackOffset = type == HotSpotCallingConventionType.NativeCall && needsNativeStackHomeSpace ? generalParameterRegisters.length * target.wordSize : 0;
+        int currentStackOffset = type == HotSpotCallingConventionType.NativeCall && needsNativeStackHomeSpace ? generalParameterRegisters.size() * target.wordSize : 0;
 
         for (int i = 0; i < parameterTypes.length; i++) {
             final JavaKind kind = parameterTypes[i].getJavaKind().getStackKind();
@@ -234,15 +233,15 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
                 case Int:
                 case Long:
                 case Object:
-                    if (currentGeneral < generalParameterRegisters.length) {
-                        Register register = generalParameterRegisters[currentGeneral++];
+                    if (currentGeneral < generalParameterRegisters.size()) {
+                        Register register = generalParameterRegisters.get(currentGeneral++);
                         locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 case Float:
                 case Double:
-                    if (currentXMM < xmmParameterRegisters.length) {
-                        Register register = xmmParameterRegisters[currentXMM++];
+                    if (currentXMM < xmmParameterRegisters.size()) {
+                        Register register = xmmParameterRegisters.get(currentXMM++);
                         locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
@@ -291,6 +290,6 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
 
     @Override
     public String toString() {
-        return String.format("Allocatable: " + Arrays.toString(getAllocatableRegisters()) + "%n" + "CallerSave:  " + Arrays.toString(getCallerSaveRegisters()) + "%n");
+        return String.format("Allocatable: " + getAllocatableRegisters() + "%n" + "CallerSave:  " + getCallerSaveRegisters() + "%n");
     }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
index 4d38a73ebe4..4506916fbdd 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
@@ -31,11 +31,6 @@ class AMD64HotSpotVMConfig extends HotSpotVMConfigAccess {
         super(config);
     }
 
-    /**
-     * Maximum allowed size of allocated area for a frame.
-     */
-    final int maxFrameSize = 16 * 1024;
-
     final boolean windowsOs = System.getProperty("os.name", "").startsWith("Windows");
 
     final boolean useCountLeadingZerosInstruction = getFlag("UseCountLeadingZerosInstruction", Boolean.class);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
index e8ebf5cf0e2..bb25c611df5 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotRegisterConfig.java
@@ -65,8 +65,6 @@ import static jdk.vm.ci.sparc.SPARC.o5;
 import static jdk.vm.ci.sparc.SPARC.sp;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
@@ -74,6 +72,7 @@ import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
@@ -92,7 +91,7 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
 
     private final TargetDescription target;
 
-    private final Register[] allocatable;
+    private final RegisterArray allocatable;
 
     private final RegisterAttributes[] attributesMap;
 
@@ -102,20 +101,19 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
     private final boolean addNativeRegisterArgumentSlots;
 
     @Override
-    public Register[] getAllocatableRegisters() {
-        return allocatable.clone();
+    public RegisterArray getAllocatableRegisters() {
+        return allocatable;
     }
 
     @Override
-    public Register[] filterAllocatableRegisters(PlatformKind kind, Register[] registers) {
+    public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray registers) {
         ArrayList list = new ArrayList<>();
         for (Register reg : registers) {
             if (target.arch.canStoreValue(reg.getRegisterCategory(), kind)) {
                 list.add(reg);
             }
         }
-        Register[] ret = list.toArray(new Register[list.size()]);
-        return ret;
+        return new RegisterArray(list);
     }
 
     @Override
@@ -123,29 +121,29 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         return attributesMap.clone();
     }
 
-    private final Register[] cpuCallerParameterRegisters = {o0, o1, o2, o3, o4, o5};
-    private final Register[] cpuCalleeParameterRegisters = {i0, i1, i2, i3, i4, i5};
+    private final RegisterArray cpuCallerParameterRegisters = new RegisterArray(o0, o1, o2, o3, o4, o5);
+    private final RegisterArray cpuCalleeParameterRegisters = new RegisterArray(i0, i1, i2, i3, i4, i5);
 
-    private final Register[] fpuFloatParameterRegisters = {f0, f1, f2, f3, f4, f5, f6, f7};
-    private final Register[] fpuDoubleParameterRegisters = {d0, null, d2, null, d4, null, d6, null};
+    private final RegisterArray fpuFloatParameterRegisters = new RegisterArray(f0, f1, f2, f3, f4, f5, f6, f7);
+    private final RegisterArray fpuDoubleParameterRegisters = new RegisterArray(d0, null, d2, null, d4, null, d6, null);
 
     // @formatter:off
-    private final Register[] callerSaveRegisters;
+    private final RegisterArray callerSaveRegisters;
 
     /**
      * This lists all L and I registers which are saved in the register window.
      */
-    private final Register[] windowSaveRegisters = {
+    private final RegisterArray windowSaveRegisters = new RegisterArray(
                     l0, l1, l2, l3, l4, l5, l6, l7,
-                    i0, i1, i2, i3, i4, i5, i6, i7};
+                    i0, i1, i2, i3, i4, i5, i6, i7);
     // @formatter:on
 
-    private static final Register[] reservedRegisters = {sp, g0, g2};
+    private static final RegisterArray reservedRegisters = new RegisterArray(sp, g0, g2);
 
-    private static Register[] initAllocatable(Architecture arch, boolean reserveForHeapBase) {
-        Register[] allRegisters = arch.getAvailableValueRegisters();
-        Register[] registers = new Register[allRegisters.length - reservedRegisters.length - (reserveForHeapBase ? 1 : 0)];
-        List reservedRegistersList = Arrays.asList(reservedRegisters);
+    private static RegisterArray initAllocatable(Architecture arch, boolean reserveForHeapBase) {
+        RegisterArray allRegisters = arch.getAvailableValueRegisters();
+        Register[] registers = new Register[allRegisters.size() - reservedRegisters.size() - (reserveForHeapBase ? 1 : 0)];
+        List reservedRegistersList = reservedRegisters.asList();
 
         int idx = 0;
         for (Register reg : allRegisters) {
@@ -162,33 +160,32 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         }
 
         assert idx == registers.length;
-        return registers;
+        return new RegisterArray(registers);
     }
 
     public SPARCHotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops) {
         this(target, initAllocatable(target.arch, useCompressedOops));
     }
 
-    public SPARCHotSpotRegisterConfig(TargetDescription target, Register[] allocatable) {
+    public SPARCHotSpotRegisterConfig(TargetDescription target, RegisterArray allocatable) {
         this.target = target;
-        this.allocatable = allocatable.clone();
+        this.allocatable = allocatable;
         this.addNativeRegisterArgumentSlots = false;
-        HashSet callerSaveSet = new HashSet<>();
-        Collections.addAll(callerSaveSet, target.arch.getAvailableValueRegisters());
+        HashSet callerSaveSet = new HashSet<>(target.arch.getAvailableValueRegisters().asList());
         for (Register cs : windowSaveRegisters) {
             callerSaveSet.remove(cs);
         }
-        this.callerSaveRegisters = callerSaveSet.toArray(new Register[callerSaveSet.size()]);
+        this.callerSaveRegisters = new RegisterArray(callerSaveSet);
         attributesMap = RegisterAttributes.createMap(this, SPARC.allRegisters);
     }
 
     @Override
-    public Register[] getCallerSaveRegisters() {
+    public RegisterArray getCallerSaveRegisters() {
         return callerSaveRegisters;
     }
 
     @Override
-    public Register[] getCalleeSaveRegisters() {
+    public RegisterArray getCalleeSaveRegisters() {
         return null;
     }
 
@@ -210,7 +207,7 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
     }
 
     @Override
-    public Register[] getCallingConventionRegisters(Type type, JavaKind kind) {
+    public RegisterArray getCallingConventionRegisters(Type type, JavaKind kind) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
         switch (kind) {
             case Boolean:
@@ -229,7 +226,7 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         }
     }
 
-    private CallingConvention callingConvention(Register[] generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
+    private CallingConvention callingConvention(RegisterArray generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
                     ValueKindFactory valueKindFactory) {
         AllocatableValue[] locations = new AllocatableValue[parameterTypes.length];
 
@@ -248,25 +245,25 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
                 case Int:
                 case Long:
                 case Object:
-                    if (currentGeneral < generalParameterRegisters.length) {
-                        Register register = generalParameterRegisters[currentGeneral++];
+                    if (currentGeneral < generalParameterRegisters.size()) {
+                        Register register = generalParameterRegisters.get(currentGeneral++);
                         locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 case Double:
-                    if (currentFloating < fpuFloatParameterRegisters.length) {
+                    if (currentFloating < fpuFloatParameterRegisters.size()) {
                         if (currentFloating % 2 != 0) {
                             // Make register number even to be a double reg
                             currentFloating++;
                         }
-                        Register register = fpuDoubleParameterRegisters[currentFloating];
+                        Register register = fpuDoubleParameterRegisters.get(currentFloating);
                         currentFloating += 2; // Only every second is a double register
                         locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
                 case Float:
-                    if (currentFloating < fpuFloatParameterRegisters.length) {
-                        Register register = fpuFloatParameterRegisters[currentFloating++];
+                    if (currentFloating < fpuFloatParameterRegisters.size()) {
+                        Register register = fpuFloatParameterRegisters.get(currentFloating++);
                         locations[i] = register.asValue(valueKindFactory.getValueKind(kind));
                     }
                     break;
@@ -291,7 +288,7 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
         int outArgSpillArea;
         if (type == HotSpotCallingConventionType.NativeCall && addNativeRegisterArgumentSlots) {
             // Space for native callee which may spill our outgoing arguments
-            outArgSpillArea = Math.min(locations.length, generalParameterRegisters.length) * target.wordSize;
+            outArgSpillArea = Math.min(locations.length, generalParameterRegisters.size()) * target.wordSize;
         } else {
             outArgSpillArea = 0;
         }
@@ -336,6 +333,6 @@ public class SPARCHotSpotRegisterConfig implements RegisterConfig {
 
     @Override
     public String toString() {
-        return String.format("Allocatable: " + Arrays.toString(getAllocatableRegisters()) + "%n" + "CallerSave:  " + Arrays.toString(getCallerSaveRegisters()) + "%n");
+        return String.format("Allocatable: " + getAllocatableRegisters() + "%n" + "CallerSave:  " + getCallerSaveRegisters() + "%n");
     }
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
index efb596f0f20..803f55a21f0 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
@@ -80,12 +80,13 @@ public class HotSpotCodeCacheProvider implements CodeCacheProvider {
         for (Field f : fields) {
             if (f.getName().endsWith("Stub")) {
                 f.setAccessible(true);
+                Object address;
                 try {
-                    Object address = f.get(runtime.getConfig());
+                    address = f.get(runtime.getConfig());
                     if (address.equals(call.target)) {
                         return f.getName() + ":0x" + Long.toHexString((Long) address);
                     }
-                } catch (Exception e) {
+                } catch (IllegalArgumentException | IllegalAccessException e) {
                 }
             }
         }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledCode.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledCode.java
index 48d861515ab..be909cfc40a 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledCode.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCompiledCode.java
@@ -115,6 +115,7 @@ public class HotSpotCompiledCode implements CompiledCode {
         }
     }
 
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "caller transfers ownership of `sites`, `targetCode`, `comments`, `methods`, `dataSection`, `dataSectionPatches` and `assumptions`")
     public HotSpotCompiledCode(String name, byte[] targetCode, int targetCodeSize, Site[] sites, Assumption[] assumptions, ResolvedJavaMethod[] methods, Comment[] comments, byte[] dataSection,
                     int dataSectionAlignment, DataPatch[] dataSectionPatches, boolean isImmutablePIC, int totalFrameSize, StackSlot deoptRescueSlot) {
         this.name = name;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
index 2d9d022e06f..1f29ff8cce4 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java
@@ -300,7 +300,8 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
      */
     private long getEntryAt(int index) {
         assertBounds(index);
-        return UNSAFE.getAddress(getMetaspaceConstantPool() + config().constantPoolSize + index * runtime().getHostJVMCIBackend().getTarget().wordSize);
+        int offset = index * runtime().getHostJVMCIBackend().getTarget().wordSize;
+        return UNSAFE.getAddress(getMetaspaceConstantPool() + config().constantPoolSize + offset);
     }
 
     /**
@@ -311,7 +312,8 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
      */
     private int getIntAt(int index) {
         assertTag(index, JVM_CONSTANT.Integer);
-        return UNSAFE.getInt(getMetaspaceConstantPool() + config().constantPoolSize + index * runtime().getHostJVMCIBackend().getTarget().wordSize);
+        int offset = index * runtime().getHostJVMCIBackend().getTarget().wordSize;
+        return UNSAFE.getInt(getMetaspaceConstantPool() + config().constantPoolSize + offset);
     }
 
     /**
@@ -322,7 +324,8 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
      */
     private long getLongAt(int index) {
         assertTag(index, JVM_CONSTANT.Long);
-        return UNSAFE.getLong(getMetaspaceConstantPool() + config().constantPoolSize + index * runtime().getHostJVMCIBackend().getTarget().wordSize);
+        int offset = index * runtime().getHostJVMCIBackend().getTarget().wordSize;
+        return UNSAFE.getLong(getMetaspaceConstantPool() + config().constantPoolSize + offset);
     }
 
     /**
@@ -333,7 +336,8 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
      */
     private float getFloatAt(int index) {
         assertTag(index, JVM_CONSTANT.Float);
-        return UNSAFE.getFloat(getMetaspaceConstantPool() + config().constantPoolSize + index * runtime().getHostJVMCIBackend().getTarget().wordSize);
+        int offset = index * runtime().getHostJVMCIBackend().getTarget().wordSize;
+        return UNSAFE.getFloat(getMetaspaceConstantPool() + config().constantPoolSize + offset);
     }
 
     /**
@@ -344,7 +348,8 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
      */
     private double getDoubleAt(int index) {
         assertTag(index, JVM_CONSTANT.Double);
-        return UNSAFE.getDouble(getMetaspaceConstantPool() + config().constantPoolSize + index * runtime().getHostJVMCIBackend().getTarget().wordSize);
+        int offset = index * runtime().getHostJVMCIBackend().getTarget().wordSize;
+        return UNSAFE.getDouble(getMetaspaceConstantPool() + config().constantPoolSize + offset);
     }
 
     /**
@@ -355,7 +360,8 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
      */
     private int getNameAndTypeAt(int index) {
         assertTag(index, JVM_CONSTANT.NameAndType);
-        return UNSAFE.getInt(getMetaspaceConstantPool() + config().constantPoolSize + index * runtime().getHostJVMCIBackend().getTarget().wordSize);
+        int offset = index * runtime().getHostJVMCIBackend().getTarget().wordSize;
+        return UNSAFE.getInt(getMetaspaceConstantPool() + config().constantPoolSize + offset);
     }
 
     /**
@@ -436,7 +442,8 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
      */
     private int getUncachedKlassRefIndexAt(int index) {
         assertTagIsFieldOrMethod(index);
-        final int refIndex = UNSAFE.getInt(getMetaspaceConstantPool() + config().constantPoolSize + index * runtime().getHostJVMCIBackend().getTarget().wordSize);
+        int offset = index * runtime().getHostJVMCIBackend().getTarget().wordSize;
+        final int refIndex = UNSAFE.getInt(getMetaspaceConstantPool() + config().constantPoolSize + offset);
         // klass ref index is in the low 16-bits.
         return refIndex & 0xFFFF;
     }
@@ -682,15 +689,15 @@ final class HotSpotConstantPool implements ConstantPool, MetaspaceWrapperObject
                 if (!klass.isPrimitive() && !klass.isArray()) {
                     UNSAFE.ensureClassInitialized(klass);
                 }
-                switch (tag) {
-                    case MethodRef:
-                        if (Bytecodes.isInvokeHandleAlias(opcode)) {
-                            final int methodRefCacheIndex = rawIndexToConstantPoolIndex(cpi, opcode);
-                            if (isInvokeHandle(methodRefCacheIndex, type)) {
-                                compilerToVM().resolveInvokeHandleInPool(this, methodRefCacheIndex);
-                            }
+                if (tag == JVM_CONSTANT.MethodRef) {
+                    if (Bytecodes.isInvokeHandleAlias(opcode)) {
+                        final int methodRefCacheIndex = rawIndexToConstantPoolIndex(cpi, opcode);
+                        if (isInvokeHandle(methodRefCacheIndex, type)) {
+                            compilerToVM().resolveInvokeHandleInPool(this, methodRefCacheIndex);
                         }
+                    }
                 }
+
                 break;
             case InvokeDynamic:
                 if (isInvokedynamicIndex(cpi)) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotForeignCallTarget.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotForeignCallTarget.java
index 2b4d0e1166f..cdce4f473f7 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotForeignCallTarget.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotForeignCallTarget.java
@@ -29,6 +29,7 @@ public class HotSpotForeignCallTarget implements InvokeTarget {
     /**
      * The entry point address of this call's target.
      */
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "accessed by subclasses")//
     protected long address;
 
     public HotSpotForeignCallTarget(long address) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 4268da3bfe6..4d6be98fc6f 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -27,10 +27,6 @@ import static jdk.vm.ci.common.InitTimer.timer;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -48,8 +44,8 @@ import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.services.HotSpotJVMCICompilerFactory;
-import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
 import jdk.vm.ci.hotspot.services.HotSpotJVMCICompilerFactory.CompilationLevel;
+import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -95,9 +91,10 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
      */
     public enum Option {
         Compiler(String.class, null, "Selects the system compiler."),
-        // Note: The following one is not used (see InitTimer.ENABLED).
+        // Note: The following one is not used (see InitTimer.ENABLED). It is added here
+        // so that -Djvmci.PrintFlags=true shows the option.
         InitTimer(boolean.class, false, "Specifies if initialization timing is enabled."),
-        PrintConfig(boolean.class, false, "Prints all HotSpotVMConfig fields."),
+        PrintConfig(boolean.class, false, "Prints VM configuration available via JVMCI and exits."),
         PrintFlags(boolean.class, false, "Prints all JVMCI flags and exits."),
         ShowFlags(boolean.class, false, "Prints all JVMCI flags and continues."),
         TraceMethodDataFilter(String.class, null, "");
@@ -242,6 +239,7 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
     @SuppressWarnings("unused") private final String[] trivialPrefixes;
 
     @SuppressWarnings("try")
+    @SuppressFBWarnings(value = "DM_EXIT", justification = "PrintFlags is meant to exit the VM")
     private HotSpotJVMCIRuntime() {
         compilerToVm = new CompilerToVM();
 
@@ -273,7 +271,8 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
         }
 
         if (Option.PrintConfig.getBoolean()) {
-            printConfig(config, compilerToVm);
+            printConfig(configStore, compilerToVm);
+            System.exit(0);
         }
 
         compilerFactory = HotSpotJVMCICompilerConfig.getCompilerFactory();
@@ -464,71 +463,40 @@ public final class HotSpotJVMCIRuntime implements HotSpotJVMCIRuntimeProvider {
         }
     }
 
-    private static void printConfig(HotSpotVMConfig config, CompilerToVM vm) {
-        Field[] fields = config.getClass().getDeclaredFields();
-        Map sortedFields = new TreeMap<>();
-        for (Field f : fields) {
-            if (!f.isSynthetic() && !Modifier.isStatic(f.getModifiers())) {
-                f.setAccessible(true);
-                sortedFields.put(f.getName(), f);
-            }
-        }
-        for (Field f : sortedFields.values()) {
-            try {
-                String line = String.format("%9s %-40s = %s%n", f.getType().getSimpleName(), f.getName(), pretty(f.get(config)));
-                byte[] lineBytes = line.getBytes();
-                vm.writeDebugOutput(lineBytes, 0, lineBytes.length);
-                vm.flushDebugOutput();
-            } catch (Exception e) {
-            }
-        }
+    @SuppressFBWarnings(value = "DM_DEFAULT_ENCODING", justification = "no localization here please!")
+    private static void printConfigLine(CompilerToVM vm, String format, Object... args) {
+        String line = String.format(format, args);
+        byte[] lineBytes = line.getBytes();
+        vm.writeDebugOutput(lineBytes, 0, lineBytes.length);
+        vm.flushDebugOutput();
     }
 
-    private static String pretty(Object value) {
-        if (value == null) {
-            return "null";
+    private static void printConfig(HotSpotVMConfigStore store, CompilerToVM vm) {
+        TreeMap fields = new TreeMap<>(store.getFields());
+        for (VMField field : fields.values()) {
+            if (!field.isStatic()) {
+                printConfigLine(vm, "[vmconfig:instance field] %s %s {offset=%d[0x%x]}%n", field.type, field.name, field.offset, field.offset);
+            } else {
+                String value = field.value == null ? "null" : String.format("%d[0x%x]", field.value, field.value);
+                printConfigLine(vm, "[vmconfig:static field] %s %s = %s {address=0x%x}%n", field.type, field.name, value, field.address);
+            }
         }
-
-        Class klass = value.getClass();
-        if (value instanceof String) {
-            return "\"" + value + "\"";
-        } else if (value instanceof Method) {
-            return "method \"" + ((Method) value).getName() + "\"";
-        } else if (value instanceof Class) {
-            return "class \"" + ((Class) value).getSimpleName() + "\"";
-        } else if (value instanceof Integer) {
-            if ((Integer) value < 10) {
-                return value.toString();
-            }
-            return value + " (0x" + Integer.toHexString((Integer) value) + ")";
-        } else if (value instanceof Long) {
-            if ((Long) value < 10 && (Long) value > -10) {
-                return value + "l";
-            }
-            return value + "l (0x" + Long.toHexString((Long) value) + "l)";
-        } else if (klass.isArray()) {
-            StringBuilder str = new StringBuilder();
-            int dimensions = 0;
-            while (klass.isArray()) {
-                dimensions++;
-                klass = klass.getComponentType();
-            }
-            int length = Array.getLength(value);
-            str.append(klass.getSimpleName()).append('[').append(length).append(']');
-            for (int i = 1; i < dimensions; i++) {
-                str.append("[]");
-            }
-            str.append(" {");
-            for (int i = 0; i < length; i++) {
-                str.append(pretty(Array.get(value, i)));
-                if (i < length - 1) {
-                    str.append(", ");
-                }
-            }
-            str.append('}');
-            return str.toString();
+        TreeMap flags = new TreeMap<>(store.getFlags());
+        for (VMFlag flag : flags.values()) {
+            printConfigLine(vm, "[vmconfig:flag] %s %s = %s%n", flag.type, flag.name, flag.value);
+        }
+        TreeMap addresses = new TreeMap<>(store.getAddresses());
+        for (Map.Entry e : addresses.entrySet()) {
+            printConfigLine(vm, "[vmconfig:address] %s = %d[0x%x]%n", e.getKey(), e.getValue(), e.getValue());
+        }
+        TreeMap constants = new TreeMap<>(store.getConstants());
+        for (Map.Entry e : constants.entrySet()) {
+            printConfigLine(vm, "[vmconfig:constant] %s = %d[0x%x]%n", e.getKey(), e.getValue(), e.getValue());
+        }
+        TreeMap typeSizes = new TreeMap<>(store.getTypeSizes());
+        for (Map.Entry e : typeSizes.entrySet()) {
+            printConfigLine(vm, "[vmconfig:type size] %s = %d%n", e.getKey(), e.getValue());
         }
-        return value.toString();
     }
 
     public OutputStream getLogStream() {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java
index dfdc3ebf3f6..0471ae50c48 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodData.java
@@ -30,7 +30,7 @@ import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
 
 import java.util.Arrays;
 
-import jdk.vm.ci.hotspot.HotSpotMethodDataAccessor.Tag;
+import jdk.internal.misc.Unsafe;
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaMethodProfile;
 import jdk.vm.ci.meta.JavaMethodProfile.ProfiledMethod;
@@ -39,41 +39,20 @@ import jdk.vm.ci.meta.JavaTypeProfile.ProfiledType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.TriState;
-import jdk.internal.misc.Unsafe;
 
 /**
- * Access to a HotSpot MethodData structure (defined in methodData.hpp).
+ * Access to a HotSpot {@code MethodData} structure (defined in methodData.hpp).
  */
-public final class HotSpotMethodData {
+final class HotSpotMethodData {
 
-    private static final HotSpotVMConfig config = config();
-    private static final HotSpotMethodDataAccessor NO_DATA_NO_EXCEPTION_ACCESSOR = new NoMethodData(TriState.FALSE);
-    private static final HotSpotMethodDataAccessor NO_DATA_EXCEPTION_POSSIBLY_NOT_RECORDED_ACCESSOR = new NoMethodData(TriState.UNKNOWN);
-
-    // sorted by tag
-    // @formatter:off
-    private static final HotSpotMethodDataAccessor[] PROFILE_DATA_ACCESSORS = {
-        null,
-        new BitData(),
-        new CounterData(),
-        new JumpData(),
-        new ReceiverTypeData(),
-        new VirtualCallData(),
-        new RetData(),
-        new BranchData(),
-        new MultiBranchData(),
-        new ArgInfoData(),
-        new UnknownProfileData(Tag.CallTypeData),
-        new VirtualCallTypeData(),
-        new UnknownProfileData(Tag.ParametersTypeData),
-        new UnknownProfileData(Tag.SpeculativeTrapData),
-    };
-    // @formatter:on
+    static final HotSpotVMConfig config = config();
+    static final HotSpotMethodDataAccessor NO_DATA_NO_EXCEPTION_ACCESSOR = new NoMethodData(config, config.dataLayoutNoTag, TriState.FALSE);
+    static final HotSpotMethodDataAccessor NO_DATA_EXCEPTION_POSSIBLY_NOT_RECORDED_ACCESSOR = new NoMethodData(config, config.dataLayoutNoTag, TriState.UNKNOWN);
 
     /**
      * Reference to the C++ MethodData object.
      */
-    private final long metaspaceMethodData;
+    final long metaspaceMethodData;
     @SuppressWarnings("unused") private final HotSpotResolvedJavaMethodImpl method;
 
     public HotSpotMethodData(long metaspaceMethodData, HotSpotResolvedJavaMethodImpl method) {
@@ -133,10 +112,7 @@ public final class HotSpotMethodData {
             return null;
         }
 
-        HotSpotMethodDataAccessor result = getData(position);
-        final Tag tag = AbstractMethodData.readTag(this, position);
-        assert result != null : "NO_DATA tag is not allowed " + tag;
-        return result;
+        return getData(position);
     }
 
     public HotSpotMethodDataAccessor getExtraData(int position) {
@@ -160,18 +136,18 @@ public final class HotSpotMethodData {
 
     private HotSpotMethodDataAccessor getData(int position) {
         assert position >= 0 : "out of bounds";
-        final Tag tag = AbstractMethodData.readTag(this, position);
-        HotSpotMethodDataAccessor accessor = PROFILE_DATA_ACCESSORS[tag.getValue()];
+        final int tag = HotSpotMethodDataAccessor.readTag(config, this, position);
+        HotSpotMethodDataAccessor accessor = PROFILE_DATA_ACCESSORS[tag];
         assert accessor == null || accessor.getTag() == tag : "wrong data accessor " + accessor + " for tag " + tag;
         return accessor;
     }
 
-    private int readUnsignedByte(int position, int offsetInBytes) {
+    int readUnsignedByte(int position, int offsetInBytes) {
         long fullOffsetInBytes = computeFullOffset(position, offsetInBytes);
         return UNSAFE.getByte(metaspaceMethodData + fullOffsetInBytes) & 0xFF;
     }
 
-    private int readUnsignedShort(int position, int offsetInBytes) {
+    int readUnsignedShort(int position, int offsetInBytes) {
         long fullOffsetInBytes = computeFullOffset(position, offsetInBytes);
         return UNSAFE.getShort(metaspaceMethodData + fullOffsetInBytes) & 0xFFFF;
     }
@@ -269,102 +245,14 @@ public final class HotSpotMethodData {
         return sb.toString();
     }
 
-    private abstract static class AbstractMethodData implements HotSpotMethodDataAccessor {
+    static final int NO_DATA_SIZE = cellIndexToOffset(0);
 
-        /**
-         * Corresponds to {@code exception_seen_flag}.
-         */
-        private static final int EXCEPTIONS_MASK = 1 << config.bitDataExceptionSeenFlag;
-
-        private final Tag tag;
-        protected final int staticSize;
-
-        protected AbstractMethodData(Tag tag, int staticSize) {
-            this.tag = tag;
-            this.staticSize = staticSize;
-        }
-
-        public Tag getTag() {
-            return tag;
-        }
-
-        public static Tag readTag(HotSpotMethodData data, int position) {
-            final int tag = data.readUnsignedByte(position, config.dataLayoutTagOffset);
-            return Tag.getEnum(tag);
-        }
-
-        @Override
-        public int getBCI(HotSpotMethodData data, int position) {
-            return data.readUnsignedShort(position, config.dataLayoutBCIOffset);
-        }
-
-        @Override
-        public final int getSize(HotSpotMethodData data, int position) {
-            int size = staticSize + getDynamicSize(data, position);
-            // Sanity check against VM
-            int vmSize = HotSpotJVMCIRuntime.runtime().compilerToVm.methodDataProfileDataSize(data.metaspaceMethodData, position);
-            assert size == vmSize : size + " != " + vmSize;
-            return size;
-        }
-
-        @Override
-        public TriState getExceptionSeen(HotSpotMethodData data, int position) {
-            return TriState.get((getFlags(data, position) & EXCEPTIONS_MASK) != 0);
-        }
-
-        @Override
-        public JavaTypeProfile getTypeProfile(HotSpotMethodData data, int position) {
-            return null;
-        }
-
-        @Override
-        public JavaMethodProfile getMethodProfile(HotSpotMethodData data, int position) {
-            return null;
-        }
-
-        @Override
-        public double getBranchTakenProbability(HotSpotMethodData data, int position) {
-            return -1;
-        }
-
-        @Override
-        public double[] getSwitchProbabilities(HotSpotMethodData data, int position) {
-            return null;
-        }
-
-        @Override
-        public int getExecutionCount(HotSpotMethodData data, int position) {
-            return -1;
-        }
-
-        @Override
-        public TriState getNullSeen(HotSpotMethodData data, int position) {
-            return TriState.UNKNOWN;
-        }
-
-        protected int getFlags(HotSpotMethodData data, int position) {
-            return data.readUnsignedByte(position, config.dataLayoutFlagsOffset);
-        }
-
-        /**
-         * @param data
-         * @param position
-         */
-        protected int getDynamicSize(HotSpotMethodData data, int position) {
-            return 0;
-        }
-
-        public abstract StringBuilder appendTo(StringBuilder sb, HotSpotMethodData data, int pos);
-    }
-
-    private static class NoMethodData extends AbstractMethodData {
-
-        private static final int NO_DATA_SIZE = cellIndexToOffset(0);
+    static class NoMethodData extends HotSpotMethodDataAccessor {
 
         private final TriState exceptionSeen;
 
-        protected NoMethodData(TriState exceptionSeen) {
-            super(Tag.No, NO_DATA_SIZE);
+        protected NoMethodData(HotSpotVMConfig config, int tag, TriState exceptionSeen) {
+            super(config, tag, NO_DATA_SIZE);
             this.exceptionSeen = exceptionSeen;
         }
 
@@ -384,17 +272,17 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class BitData extends AbstractMethodData {
+    static final int BIT_DATA_SIZE = cellIndexToOffset(0);
+    static final int BIT_DATA_NULL_SEEN_FLAG = 1 << config.bitDataNullSeenFlag;
 
-        private static final int BIT_DATA_SIZE = cellIndexToOffset(0);
-        private static final int BIT_DATA_NULL_SEEN_FLAG = 1 << config.bitDataNullSeenFlag;
+    static class BitData extends HotSpotMethodDataAccessor {
 
-        private BitData() {
-            super(Tag.BitData, BIT_DATA_SIZE);
+        private BitData(HotSpotVMConfig config, int tag) {
+            super(config, tag, BIT_DATA_SIZE);
         }
 
-        protected BitData(Tag tag, int staticSize) {
-            super(tag, staticSize);
+        protected BitData(HotSpotVMConfig config, int tag, int staticSize) {
+            super(config, tag, staticSize);
         }
 
         @Override
@@ -408,17 +296,17 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class CounterData extends BitData {
+    static final int COUNTER_DATA_SIZE = cellIndexToOffset(1);
+    static final int COUNTER_DATA_COUNT_OFFSET = cellIndexToOffset(config.methodDataCountOffset);
 
-        private static final int COUNTER_DATA_SIZE = cellIndexToOffset(1);
-        private static final int COUNTER_DATA_COUNT_OFFSET = cellIndexToOffset(config.methodDataCountOffset);
+    static class CounterData extends BitData {
 
-        CounterData() {
-            super(Tag.CounterData, COUNTER_DATA_SIZE);
+        CounterData(HotSpotVMConfig config, int tag) {
+            super(config, tag, COUNTER_DATA_SIZE);
         }
 
-        protected CounterData(Tag tag, int staticSize) {
-            super(tag, staticSize);
+        protected CounterData(HotSpotVMConfig config, int tag, int staticSize) {
+            super(config, tag, staticSize);
         }
 
         @Override
@@ -436,18 +324,18 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class JumpData extends AbstractMethodData {
+    static final int JUMP_DATA_SIZE = cellIndexToOffset(2);
+    static final int TAKEN_COUNT_OFFSET = cellIndexToOffset(config.jumpDataTakenOffset);
+    static final int TAKEN_DISPLACEMENT_OFFSET = cellIndexToOffset(config.jumpDataDisplacementOffset);
 
-        private static final int JUMP_DATA_SIZE = cellIndexToOffset(2);
-        protected static final int TAKEN_COUNT_OFFSET = cellIndexToOffset(config.jumpDataTakenOffset);
-        protected static final int TAKEN_DISPLACEMENT_OFFSET = cellIndexToOffset(config.jumpDataDisplacementOffset);
+    static class JumpData extends HotSpotMethodDataAccessor {
 
-        JumpData() {
-            super(Tag.JumpData, JUMP_DATA_SIZE);
+        JumpData(HotSpotVMConfig config, int tag) {
+            super(config, tag, JUMP_DATA_SIZE);
         }
 
-        protected JumpData(Tag tag, int staticSize) {
-            super(tag, staticSize);
+        protected JumpData(HotSpotVMConfig config, int tag, int staticSize) {
+            super(config, tag, staticSize);
         }
 
         @Override
@@ -484,16 +372,16 @@ public final class HotSpotMethodData {
         }
     }
 
-    private abstract static class AbstractTypeData extends CounterData {
+    static final int TYPE_DATA_ROW_SIZE = cellsToBytes(config.receiverTypeDataReceiverTypeRowCellCount);
 
-        protected static final int TYPE_DATA_ROW_SIZE = cellsToBytes(config.receiverTypeDataReceiverTypeRowCellCount);
+    static final int NONPROFILED_COUNT_OFFSET = cellIndexToOffset(config.receiverTypeDataNonprofiledCountOffset);
+    static final int TYPE_DATA_FIRST_TYPE_OFFSET = cellIndexToOffset(config.receiverTypeDataReceiver0Offset);
+    static final int TYPE_DATA_FIRST_TYPE_COUNT_OFFSET = cellIndexToOffset(config.receiverTypeDataCount0Offset);
 
-        protected static final int NONPROFILED_COUNT_OFFSET = cellIndexToOffset(config.receiverTypeDataNonprofiledCountOffset);
-        protected static final int TYPE_DATA_FIRST_TYPE_OFFSET = cellIndexToOffset(config.receiverTypeDataReceiver0Offset);
-        protected static final int TYPE_DATA_FIRST_TYPE_COUNT_OFFSET = cellIndexToOffset(config.receiverTypeDataCount0Offset);
+    abstract static class AbstractTypeData extends CounterData {
 
-        protected AbstractTypeData(Tag tag, int staticSize) {
-            super(tag, staticSize);
+        protected AbstractTypeData(HotSpotVMConfig config, int tag, int staticSize) {
+            super(config, tag, staticSize);
         }
 
         @Override
@@ -539,7 +427,7 @@ public final class HotSpotMethodData {
 
         protected abstract long getTypesNotRecordedExecutionCount(HotSpotMethodData data, int position);
 
-        private static JavaTypeProfile createTypeProfile(TriState nullSeen, RawItemProfile profile) {
+        private JavaTypeProfile createTypeProfile(TriState nullSeen, RawItemProfile profile) {
             if (profile.entries <= 0 || profile.totalCount <= 0) {
                 return null;
             }
@@ -583,16 +471,16 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class ReceiverTypeData extends AbstractTypeData {
+    static final int TYPE_CHECK_DATA_SIZE = cellIndexToOffset(2) + TYPE_DATA_ROW_SIZE * config.typeProfileWidth;
 
-        private static final int TYPE_CHECK_DATA_SIZE = cellIndexToOffset(2) + TYPE_DATA_ROW_SIZE * config.typeProfileWidth;
+    static class ReceiverTypeData extends AbstractTypeData {
 
-        ReceiverTypeData() {
-            super(Tag.ReceiverTypeData, TYPE_CHECK_DATA_SIZE);
+        ReceiverTypeData(HotSpotVMConfig config, int tag) {
+            super(config, tag, TYPE_CHECK_DATA_SIZE);
         }
 
-        protected ReceiverTypeData(Tag tag, int staticSize) {
-            super(tag, staticSize);
+        protected ReceiverTypeData(HotSpotVMConfig config, int tag, int staticSize) {
+            super(config, tag, staticSize);
         }
 
         @Override
@@ -606,18 +494,18 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class VirtualCallData extends ReceiverTypeData {
+    static final int VIRTUAL_CALL_DATA_SIZE = cellIndexToOffset(2) + TYPE_DATA_ROW_SIZE * (config.typeProfileWidth + config.methodProfileWidth);
+    static final int VIRTUAL_CALL_DATA_FIRST_METHOD_OFFSET = TYPE_DATA_FIRST_TYPE_OFFSET + TYPE_DATA_ROW_SIZE * config.typeProfileWidth;
+    static final int VIRTUAL_CALL_DATA_FIRST_METHOD_COUNT_OFFSET = TYPE_DATA_FIRST_TYPE_COUNT_OFFSET + TYPE_DATA_ROW_SIZE * config.typeProfileWidth;
 
-        private static final int VIRTUAL_CALL_DATA_SIZE = cellIndexToOffset(2) + TYPE_DATA_ROW_SIZE * (config.typeProfileWidth + config.methodProfileWidth);
-        private static final int VIRTUAL_CALL_DATA_FIRST_METHOD_OFFSET = TYPE_DATA_FIRST_TYPE_OFFSET + TYPE_DATA_ROW_SIZE * config.typeProfileWidth;
-        private static final int VIRTUAL_CALL_DATA_FIRST_METHOD_COUNT_OFFSET = TYPE_DATA_FIRST_TYPE_COUNT_OFFSET + TYPE_DATA_ROW_SIZE * config.typeProfileWidth;
+    static class VirtualCallData extends ReceiverTypeData {
 
-        VirtualCallData() {
-            super(Tag.VirtualCallData, VIRTUAL_CALL_DATA_SIZE);
+        VirtualCallData(HotSpotVMConfig config, int tag) {
+            super(config, tag, VIRTUAL_CALL_DATA_SIZE);
         }
 
-        protected VirtualCallData(Tag tag, int staticSize) {
-            super(tag, staticSize);
+        protected VirtualCallData(HotSpotVMConfig config, int tag, int staticSize) {
+            super(config, tag, staticSize);
         }
 
         @Override
@@ -647,7 +535,7 @@ public final class HotSpotMethodData {
             return createMethodProfile(getRawMethodProfile(data, position));
         }
 
-        private static RawItemProfile getRawMethodProfile(HotSpotMethodData data, int position) {
+        private RawItemProfile getRawMethodProfile(HotSpotMethodData data, int position) {
             int profileWidth = config.methodProfileWidth;
 
             ResolvedJavaMethod[] methods = new ResolvedJavaMethod[profileWidth];
@@ -671,7 +559,7 @@ public final class HotSpotMethodData {
             return new RawItemProfile<>(entries, methods, counts, totalCount);
         }
 
-        private static JavaMethodProfile createMethodProfile(RawItemProfile profile) {
+        private JavaMethodProfile createMethodProfile(RawItemProfile profile) {
             if (profile.entries <= 0 || profile.totalCount <= 0) {
                 return null;
             }
@@ -712,10 +600,10 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class VirtualCallTypeData extends VirtualCallData {
+    static class VirtualCallTypeData extends VirtualCallData {
 
-        VirtualCallTypeData() {
-            super(Tag.VirtualCallTypeData, 0);
+        VirtualCallTypeData(HotSpotVMConfig config, int tag) {
+            super(config, tag, 0);
         }
 
         @Override
@@ -725,23 +613,23 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class RetData extends CounterData {
+    static final int RET_DATA_ROW_SIZE = cellsToBytes(3);
+    static final int RET_DATA_SIZE = cellIndexToOffset(1) + RET_DATA_ROW_SIZE * config.bciProfileWidth;
 
-        private static final int RET_DATA_ROW_SIZE = cellsToBytes(3);
-        private static final int RET_DATA_SIZE = cellIndexToOffset(1) + RET_DATA_ROW_SIZE * config.bciProfileWidth;
+    static class RetData extends CounterData {
 
-        RetData() {
-            super(Tag.RetData, RET_DATA_SIZE);
+        RetData(HotSpotVMConfig config, int tag) {
+            super(config, tag, RET_DATA_SIZE);
         }
     }
 
-    private static class BranchData extends JumpData {
+    static final int BRANCH_DATA_SIZE = cellIndexToOffset(3);
+    static final int NOT_TAKEN_COUNT_OFFSET = cellIndexToOffset(config.branchDataNotTakenOffset);
 
-        private static final int BRANCH_DATA_SIZE = cellIndexToOffset(3);
-        private static final int NOT_TAKEN_COUNT_OFFSET = cellIndexToOffset(config.branchDataNotTakenOffset);
+    static class BranchData extends JumpData {
 
-        BranchData() {
-            super(Tag.BranchData, BRANCH_DATA_SIZE);
+        BranchData(HotSpotVMConfig config, int tag) {
+            super(config, tag, BRANCH_DATA_SIZE);
         }
 
         @Override
@@ -768,13 +656,13 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class ArrayData extends AbstractMethodData {
+    static final int ARRAY_DATA_LENGTH_OFFSET = cellIndexToOffset(config.arrayDataArrayLenOffset);
+    static final int ARRAY_DATA_START_OFFSET = cellIndexToOffset(config.arrayDataArrayStartOffset);
 
-        private static final int ARRAY_DATA_LENGTH_OFFSET = cellIndexToOffset(config.arrayDataArrayLenOffset);
-        protected static final int ARRAY_DATA_START_OFFSET = cellIndexToOffset(config.arrayDataArrayStartOffset);
+    static class ArrayData extends HotSpotMethodDataAccessor {
 
-        ArrayData(Tag tag, int staticSize) {
-            super(tag, staticSize);
+        ArrayData(HotSpotVMConfig config, int tag, int staticSize) {
+            super(config, tag, staticSize);
         }
 
         @Override
@@ -792,16 +680,16 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class MultiBranchData extends ArrayData {
+    static final int MULTI_BRANCH_DATA_SIZE = cellIndexToOffset(1);
+    static final int MULTI_BRANCH_DATA_ROW_SIZE_IN_CELLS = config.multiBranchDataPerCaseCellCount;
+    static final int MULTI_BRANCH_DATA_ROW_SIZE = cellsToBytes(MULTI_BRANCH_DATA_ROW_SIZE_IN_CELLS);
+    static final int MULTI_BRANCH_DATA_FIRST_COUNT_OFFSET = ARRAY_DATA_START_OFFSET + cellsToBytes(0);
+    static final int MULTI_BRANCH_DATA_FIRST_DISPLACEMENT_OFFSET = ARRAY_DATA_START_OFFSET + cellsToBytes(1);
 
-        private static final int MULTI_BRANCH_DATA_SIZE = cellIndexToOffset(1);
-        private static final int MULTI_BRANCH_DATA_ROW_SIZE_IN_CELLS = config.multiBranchDataPerCaseCellCount;
-        private static final int MULTI_BRANCH_DATA_ROW_SIZE = cellsToBytes(MULTI_BRANCH_DATA_ROW_SIZE_IN_CELLS);
-        private static final int MULTI_BRANCH_DATA_FIRST_COUNT_OFFSET = ARRAY_DATA_START_OFFSET + cellsToBytes(0);
-        private static final int MULTI_BRANCH_DATA_FIRST_DISPLACEMENT_OFFSET = ARRAY_DATA_START_OFFSET + cellsToBytes(1);
+    static class MultiBranchData extends ArrayData {
 
-        MultiBranchData() {
-            super(Tag.MultiBranchData, MULTI_BRANCH_DATA_SIZE);
+        MultiBranchData(HotSpotVMConfig config, int tag) {
+            super(config, tag, MULTI_BRANCH_DATA_SIZE);
         }
 
         @Override
@@ -878,18 +766,18 @@ public final class HotSpotMethodData {
         }
     }
 
-    private static class ArgInfoData extends ArrayData {
+    static final int ARG_INFO_DATA_SIZE = cellIndexToOffset(1);
 
-        private static final int ARG_INFO_DATA_SIZE = cellIndexToOffset(1);
+    static class ArgInfoData extends ArrayData {
 
-        ArgInfoData() {
-            super(Tag.ArgInfoData, ARG_INFO_DATA_SIZE);
+        ArgInfoData(HotSpotVMConfig config, int tag) {
+            super(config, tag, ARG_INFO_DATA_SIZE);
         }
     }
 
-    private static class UnknownProfileData extends AbstractMethodData {
-        UnknownProfileData(Tag tag) {
-            super(tag, 0);
+    static class UnknownProfileData extends HotSpotMethodDataAccessor {
+        UnknownProfileData(HotSpotVMConfig config, int tag) {
+            super(config, tag, 0);
         }
 
         @Override
@@ -900,7 +788,6 @@ public final class HotSpotMethodData {
 
         @Override
         public StringBuilder appendTo(StringBuilder sb, HotSpotMethodData data, int pos) {
-            // TODO Auto-generated method stub
             return null;
         }
     }
@@ -912,4 +799,41 @@ public final class HotSpotMethodData {
     public int getCompiledIRSize() {
         return UNSAFE.getInt(metaspaceMethodData + config.methodDataIRSizeOffset);
     }
+
+    // sorted by tag
+    // @formatter:off
+    static final HotSpotMethodDataAccessor[] PROFILE_DATA_ACCESSORS = {
+        null,
+        new BitData(config, config.dataLayoutBitDataTag),
+        new CounterData(config, config.dataLayoutCounterDataTag),
+        new JumpData(config, config.dataLayoutJumpDataTag),
+        new ReceiverTypeData(config, config.dataLayoutReceiverTypeDataTag),
+        new VirtualCallData(config, config.dataLayoutVirtualCallDataTag),
+        new RetData(config, config.dataLayoutRetDataTag),
+        new BranchData(config, config.dataLayoutBranchDataTag),
+        new MultiBranchData(config, config.dataLayoutMultiBranchDataTag),
+        new ArgInfoData(config, config.dataLayoutArgInfoDataTag),
+        new UnknownProfileData(config, config.dataLayoutCallTypeDataTag),
+        new VirtualCallTypeData(config, config.dataLayoutVirtualCallTypeDataTag),
+        new UnknownProfileData(config, config.dataLayoutParametersTypeDataTag),
+        new UnknownProfileData(config, config.dataLayoutSpeculativeTrapDataTag),
+    };
+
+    private static boolean checkAccessorTags() {
+        int expectedTag = 0;
+        for (HotSpotMethodDataAccessor accessor : PROFILE_DATA_ACCESSORS) {
+            if (expectedTag ==0 ) {
+                assert accessor == null;
+            } else {
+                assert accessor.tag == expectedTag: expectedTag + " != " + accessor.tag + " " + accessor;
+            }
+            expectedTag++;
+        }
+        return true;
+    }
+
+    static {
+        assert checkAccessorTags();
+    }
+    // @formatter:on
 }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java
index baf175f0e9a..6edff1da0a1 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodDataAccessor.java
@@ -1,110 +1,129 @@
-/*
- * Copyright (c) 2011, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 package jdk.vm.ci.hotspot;
 
-import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
 import jdk.vm.ci.meta.JavaMethodProfile;
 import jdk.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.TriState;
 
 /**
- * Interface for accessor objects that encapsulate the logic for accessing the different kinds of
- * data in a HotSpot methodDataOop. This interface is similar to the interface {@link ProfilingInfo}
- * , but most methods require a MethodDataObject and the exact position within the methodData.
+ * Base class for accessing the different kinds of data in a HotSpot {@code MethodData}. This is
+ * similar to {@link ProfilingInfo}, but most methods require a {@link HotSpotMethodData} and the
+ * exact position within the method data.
  */
-public interface HotSpotMethodDataAccessor {
+abstract class HotSpotMethodDataAccessor {
 
-    /**
-     * {@code DataLayout} tag values.
-     */
-    enum Tag {
-        No(config().dataLayoutNoTag),
-        BitData(config().dataLayoutBitDataTag),
-        CounterData(config().dataLayoutCounterDataTag),
-        JumpData(config().dataLayoutJumpDataTag),
-        ReceiverTypeData(config().dataLayoutReceiverTypeDataTag),
-        VirtualCallData(config().dataLayoutVirtualCallDataTag),
-        RetData(config().dataLayoutRetDataTag),
-        BranchData(config().dataLayoutBranchDataTag),
-        MultiBranchData(config().dataLayoutMultiBranchDataTag),
-        ArgInfoData(config().dataLayoutArgInfoDataTag),
-        CallTypeData(config().dataLayoutCallTypeDataTag),
-        VirtualCallTypeData(config().dataLayoutVirtualCallTypeDataTag),
-        ParametersTypeData(config().dataLayoutParametersTypeDataTag),
-        SpeculativeTrapData(config().dataLayoutSpeculativeTrapDataTag);
+    final int tag;
+    final int staticSize;
+    final HotSpotVMConfig config;
 
-        private final int value;
-
-        Tag(int value) {
-            this.value = value;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public static Tag getEnum(int value) {
-            Tag result = values()[value];
-            assert value == result.value;
-            return result;
-        }
+    protected HotSpotMethodDataAccessor(HotSpotVMConfig config, int tag, int staticSize) {
+        this.config = config;
+        this.tag = tag;
+        this.staticSize = staticSize;
     }
 
     /**
-     * Returns the {@link Tag} stored in the LayoutData header.
+     * Returns the tag stored in the LayoutData header.
      *
      * @return tag stored in the LayoutData header
      */
-    Tag getTag();
+    int getTag() {
+        return tag;
+    }
+
+    static int readTag(HotSpotVMConfig config, HotSpotMethodData data, int position) {
+        final int tag = data.readUnsignedByte(position, config.dataLayoutTagOffset);
+        assert tag >= config.dataLayoutNoTag && tag <= config.dataLayoutSpeculativeTrapDataTag : "profile data tag out of bounds: " + tag;
+        return tag;
+    }
 
     /**
      * Returns the BCI stored in the LayoutData header.
      *
-     * @return An integer ≥ 0 and ≤ Short.MAX_VALUE, or -1 if not supported.
+     * @return an integer between 0 and {@link Short#MAX_VALUE} inclusive, or -1 if not supported
      */
-    int getBCI(HotSpotMethodData data, int position);
+    int getBCI(HotSpotMethodData data, int position) {
+        return data.readUnsignedShort(position, config.dataLayoutBCIOffset);
+    }
 
     /**
      * Computes the size for the specific data at the given position.
      *
-     * @return An integer > 0.
+     * @return a value greater than 0
      */
-    int getSize(HotSpotMethodData data, int position);
+    final int getSize(HotSpotMethodData data, int position) {
+        int size = staticSize + getDynamicSize(data, position);
+        // Sanity check against VM
+        int vmSize = HotSpotJVMCIRuntime.runtime().compilerToVm.methodDataProfileDataSize(data.metaspaceMethodData, position);
+        assert size == vmSize : size + " != " + vmSize;
+        return size;
+    }
 
-    JavaTypeProfile getTypeProfile(HotSpotMethodData data, int position);
+    TriState getExceptionSeen(HotSpotMethodData data, int position) {
+        final int EXCEPTIONS_MASK = 1 << config.bitDataExceptionSeenFlag;
+        return TriState.get((getFlags(data, position) & EXCEPTIONS_MASK) != 0);
+    }
 
-    JavaMethodProfile getMethodProfile(HotSpotMethodData data, int position);
+    /**
+     * @param data
+     * @param position
+     */
+    JavaTypeProfile getTypeProfile(HotSpotMethodData data, int position) {
+        return null;
+    }
 
-    double getBranchTakenProbability(HotSpotMethodData data, int position);
+    /**
+     * @param data
+     * @param position
+     */
+    JavaMethodProfile getMethodProfile(HotSpotMethodData data, int position) {
+        return null;
+    }
 
-    double[] getSwitchProbabilities(HotSpotMethodData data, int position);
+    /**
+     * @param data
+     * @param position
+     */
+    double getBranchTakenProbability(HotSpotMethodData data, int position) {
+        return -1;
+    }
 
-    TriState getExceptionSeen(HotSpotMethodData data, int position);
+    /**
+     * @param data
+     * @param position
+     */
+    double[] getSwitchProbabilities(HotSpotMethodData data, int position) {
+        return null;
+    }
 
-    TriState getNullSeen(HotSpotMethodData data, int position);
+    /**
+     * @param data
+     * @param position
+     */
+    int getExecutionCount(HotSpotMethodData data, int position) {
+        return -1;
+    }
 
-    int getExecutionCount(HotSpotMethodData data, int position);
+    /**
+     * @param data
+     * @param position
+     */
+    TriState getNullSeen(HotSpotMethodData data, int position) {
+        return TriState.UNKNOWN;
+    }
 
-    StringBuilder appendTo(StringBuilder sb, HotSpotMethodData data, int pos);
-}
+    protected int getFlags(HotSpotMethodData data, int position) {
+        return data.readUnsignedByte(position, config.dataLayoutFlagsOffset);
+    }
+
+    /**
+     * @param data
+     * @param position
+     */
+    protected int getDynamicSize(HotSpotMethodData data, int position) {
+        return 0;
+    }
+
+    abstract StringBuilder appendTo(StringBuilder sb, HotSpotMethodData data, int pos);
+
+}
\ No newline at end of file
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java
index 8d88147688b..bb983c173e9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotReferenceMap.java
@@ -27,13 +27,25 @@ import java.util.Arrays;
 import jdk.vm.ci.code.Location;
 import jdk.vm.ci.code.ReferenceMap;
 
+/**
+ * Describes where the object references are in machine state, compliant with what HotSpot expects.
+ */
 public final class HotSpotReferenceMap extends ReferenceMap {
 
-    final Location[] objects;
-    final Location[] derivedBase;
-    final int[] sizeInBytes;
-    final int maxRegisterSize;
+    private final Location[] objects;
+    private final Location[] derivedBase;
+    private final int[] sizeInBytes;
+    private final int maxRegisterSize;
 
+    /**
+     *
+     * @param objects This array is now owned by this object and must not be mutated by the caller.
+     * @param derivedBase This array is now owned by this object and must not be mutated by the
+     *            caller.
+     * @param sizeInBytes This array is now owned by this object and must not be mutated by the
+     *            caller.
+     */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "caller transfers ownership of `objects`, `derivedBase` and `sizeInBytes`")
     public HotSpotReferenceMap(Location[] objects, Location[] derivedBase, int[] sizeInBytes, int maxRegisterSize) {
         this.objects = objects;
         this.derivedBase = derivedBase;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index fb98a0e6096..636c26c2c6c 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -591,7 +591,8 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
             // Get Klass::_fields
             final long metaspaceFields = UNSAFE.getAddress(getMetaspaceKlass() + config.instanceKlassFieldsOffset);
             assert config.fieldInfoFieldSlots == 6 : "revisit the field parsing code";
-            metaspaceData = metaspaceFields + config.arrayU2DataOffset + config.fieldInfoFieldSlots * Short.BYTES * index;
+            int offset = config.fieldInfoFieldSlots * Short.BYTES * index;
+            metaspaceData = metaspaceFields + config.arrayU2DataOffset + offset;
         }
 
         private int getAccessFlags() {
@@ -619,7 +620,8 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
          * on top an array of Java shorts.
          */
         private int readFieldSlot(int index) {
-            return UNSAFE.getChar(metaspaceData + Short.BYTES * index);
+            int offset = Short.BYTES * index;
+            return UNSAFE.getChar(metaspaceData + offset);
         }
 
         /**
@@ -628,7 +630,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
          */
         public String getName() {
             final int nameIndex = getNameIndex();
-            return isInternal() ? HotSpotVmSymbols.symbolAt(nameIndex) : getConstantPool().lookupUtf8(nameIndex);
+            return isInternal() ? config().symbolAt(nameIndex) : getConstantPool().lookupUtf8(nameIndex);
         }
 
         /**
@@ -637,7 +639,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
          */
         public String getSignature() {
             final int signatureIndex = getSignatureIndex();
-            return isInternal() ? HotSpotVmSymbols.symbolAt(signatureIndex) : getConstantPool().lookupUtf8(signatureIndex);
+            return isInternal() ? config().symbolAt(signatureIndex) : getConstantPool().lookupUtf8(signatureIndex);
         }
 
         public JavaType getType() {
@@ -658,6 +660,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         }
     }
 
+    @SuppressFBWarnings(value = "SE_COMPARATOR_SHOULD_BE_SERIALIZABLE", justification = "comparator is only used transiently")
     private static class OffsetComparator implements java.util.Comparator {
         @Override
         public int compare(HotSpotResolvedJavaField o1, HotSpotResolvedJavaField o2) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java
index 0cd643fa3ca..989c719144b 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationLog.java
@@ -35,7 +35,7 @@ public class HotSpotSpeculationLog implements SpeculationLog {
     /** Written by the C++ code that performs deoptimization. */
     private volatile Object lastFailed;
 
-    /** All speculations that have been a deoptimization reason. */
+    /** All speculations that have caused a deoptimization. */
     private Set failedSpeculations;
 
     /** Strong references to all reasons embedded in the current nmethod. */
@@ -54,7 +54,7 @@ public class HotSpotSpeculationLog implements SpeculationLog {
     }
 
     @Override
-    public boolean maySpeculate(SpeculationReason reason) {
+    public synchronized boolean maySpeculate(SpeculationReason reason) {
         if (failedSpeculations != null && failedSpeculations.contains(reason)) {
             return false;
         }
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
index 18fe6adc834..c446eda9aac 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
@@ -23,6 +23,9 @@
 package jdk.vm.ci.hotspot;
 
 import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
+import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
+
+import jdk.internal.misc.Unsafe;
 
 /**
  * Used to access native configuration details.
@@ -52,13 +55,13 @@ class HotSpotVMConfig extends HotSpotVMConfigAccess {
         String arch = System.getProperty("os.arch");
         switch (arch) {
             case "x86_64":
-                arch = "amd64";
-                break;
+                return "amd64";
+
             case "sparcv9":
-                arch = "sparc";
-                break;
+                return "sparc";
+            default:
+                return arch;
         }
-        return arch;
     }
 
     final boolean useDeferredInitBarriers = getFlag("ReduceInitialCardMarks", Boolean.class);
@@ -231,6 +234,21 @@ class HotSpotVMConfig extends HotSpotVMConfigAccess {
     final int vmSymbolsFirstSID = getConstant("vmSymbols::FIRST_SID", Integer.class);
     final int vmSymbolsSIDLimit = getConstant("vmSymbols::SID_LIMIT", Integer.class);
 
+    /**
+     * Returns the symbol in the {@code vmSymbols} table at position {@code index} as a
+     * {@link String}.
+     *
+     * @param index position in the symbol table
+     * @return the symbol at position id
+     */
+    String symbolAt(int index) {
+        HotSpotJVMCIRuntimeProvider runtime = runtime();
+        assert vmSymbolsFirstSID <= index && index < vmSymbolsSIDLimit : "index " + index + " is out of bounds";
+        assert symbolPointerSize == Unsafe.ADDRESS_SIZE : "the following address read is broken";
+        int offset = index * symbolPointerSize;
+        return runtime.getCompilerToVM().getSymbol(UNSAFE.getAddress(vmSymbolsSymbols + offset));
+    }
+
     final int universeBaseVtableSize = getFieldValue("CompilerToVM::Data::Universe_base_vtable_size", Integer.class, "int");
 
     final int baseVtableLength() {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java
index ab9ad6ea79a..73ce3c545f0 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java
@@ -126,7 +126,7 @@ public class HotSpotVMConfigAccess {
         if (entry.address != 0) {
             throw new JVMCIError("cannot get offset of static field " + name);
         }
-        return entry == null ? notPresent : type.cast(convertValue(name, type, entry.offset, cppType));
+        return type.cast(convertValue(name, type, entry.offset, cppType));
     }
 
     /**
@@ -173,7 +173,7 @@ public class HotSpotVMConfigAccess {
         if (entry.address == 0) {
             throw new JVMCIError(name + " is not a static field");
         }
-        return entry == null ? notPresent : entry.address;
+        return entry.address;
     }
 
     /**
@@ -313,7 +313,7 @@ public class HotSpotVMConfigAccess {
                 return (int) (long) value;
             }
         } else if (toType == Long.class) {
-            return (long) value;
+            return value;
         }
 
         throw new JVMCIError("cannot convert " + name + " of type " + value.getClass().getSimpleName() + (cppType == null ? "" : " [" + cppType + "]") + " to " + toType.getSimpleName());
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVmSymbols.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVmSymbols.java
deleted file mode 100644
index bcc2b8f99eb..00000000000
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVmSymbols.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2014, 2015, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.vm.ci.hotspot;
-
-import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
-import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
-import jdk.internal.misc.Unsafe;
-
-/**
- * Class to access the C++ {@code vmSymbols} table.
- */
-final class HotSpotVmSymbols {
-
-    /**
-     * Returns the symbol in the {@code vmSymbols} table at position {@code index} as {@link String}
-     * .
-     *
-     * @param index position in the symbol table
-     * @return the symbol at position id
-     */
-    static String symbolAt(int index) {
-        HotSpotJVMCIRuntimeProvider runtime = runtime();
-        HotSpotVMConfig config = runtime.getConfig();
-        assert config.vmSymbolsFirstSID <= index && index < config.vmSymbolsSIDLimit : "index " + index + " is out of bounds";
-        assert config.symbolPointerSize == Unsafe.ADDRESS_SIZE : "the following address read is broken";
-        return runtime.getCompilerToVM().getSymbol(UNSAFE.getAddress(config.vmSymbolsSymbols + index * config.symbolPointerSize));
-    }
-}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractJavaProfile.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractJavaProfile.java
index 27eac0ec032..4e703beddf6 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractJavaProfile.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractJavaProfile.java
@@ -37,6 +37,12 @@ public abstract class AbstractJavaProfile, U>
     private final double notRecordedProbability;
     private final T[] pitems;
 
+    /**
+     *
+     * @param notRecordedProbability
+     * @param pitems
+     */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "caller transfers ownership of the `pitems` array parameter")
     public AbstractJavaProfile(double notRecordedProbability, T[] pitems) {
         this.pitems = pitems;
         assert !Double.isNaN(notRecordedProbability);
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractProfiledItem.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractProfiledItem.java
index d4e551d40ae..87b8c99f1f6 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractProfiledItem.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/AbstractProfiledItem.java
@@ -51,14 +51,14 @@ public abstract class AbstractProfiledItem implements Comparable o) {
-        if (getProbability() > o.getProbability()) {
-            return -1;
-        } else if (getProbability() < o.getProbability()) {
-            return 1;
-        }
-        return 0;
+        // Need to swap the order of operands so that higher probabilities are sorted first
+        return Double.compare(o.getProbability(), getProbability());
     }
 
     @Override
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java
index d3b87f7d390..71109dccf1b 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LineNumberTable.java
@@ -22,24 +22,34 @@
  */
 package jdk.vm.ci.meta;
 
+/**
+ * Maps bytecode indexes to source line numbers.
+ *
+ * @see "https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.12"
+ */
 public class LineNumberTable {
 
     private final int[] lineNumbers;
     private final int[] bci;
 
+    /**
+     *
+     * @param lineNumbers an array or source line numbers. This array is now owned by this object
+     *            and should not be mutated by the caller.
+     * @param bci an array of bytecode indexes the same length at {@code lineNumbers} whose entries
+     *            are sorted in ascending order. This array is now owned by this object and must not
+     *            be mutated by the caller.
+     */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "caller transfers ownership of `lineNumbers` and `bcis`")
     public LineNumberTable(int[] lineNumbers, int[] bci) {
+        assert bci.length == lineNumbers.length;
         this.lineNumbers = lineNumbers;
         this.bci = bci;
     }
 
-    public int[] getLineNumberEntries() {
-        return lineNumbers;
-    }
-
-    public int[] getBciEntries() {
-        return bci;
-    }
-
+    /**
+     * Gets a source line number for {@code atBci}.
+     */
     public int getLineNumber(int atBci) {
         for (int i = 0; i < this.bci.length - 1; i++) {
             if (this.bci[i] <= atBci && atBci < this.bci[i + 1]) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java
index 285fdd72a0e..ff444ffe094 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Local.java
@@ -22,6 +22,9 @@
  */
 package jdk.vm.ci.meta;
 
+/**
+ * Describes the type and bytecode index range in which a local variable is live.
+ */
 public class Local {
 
     private final String name;
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java
index f8bf703bc38..b81ec8d3880 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/LocalVariableTable.java
@@ -25,10 +25,19 @@ package jdk.vm.ci.meta;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @see "https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.13"
+ */
 public class LocalVariableTable {
 
     private final Local[] locals;
 
+    /**
+     *
+     * @param locals array of objects describing local variables. This array is now owned by this
+     *            object and must not be mutated by the caller.
+     */
+    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "caller transfers ownership of `locals`")
     public LocalVariableTable(Local[] locals) {
         this.locals = locals;
     }
@@ -47,10 +56,6 @@ public class LocalVariableTable {
         return result;
     }
 
-    public Local[] getLocals() {
-        return locals;
-    }
-
     public Local[] getLocalsAt(int bci) {
         List result = new ArrayList<>();
         for (Local l : locals) {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SuppressFBWarnings.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SuppressFBWarnings.java
new file mode 100644
index 00000000000..5d28bd8f3db
--- /dev/null
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/SuppressFBWarnings.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.meta;
+
+/**
+ * Used to suppress FindBugs warnings.
+ */
+@interface SuppressFBWarnings {
+    /**
+     * The set of FindBugs
+     * warnings that are to be
+     * suppressed in annotated element. The value can be a bug category, kind or pattern.
+     */
+    String[] value();
+
+    /**
+     * Reason why the warning is suppressed.
+     */
+    String justification();
+}
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARC.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARC.java
index 7f99e331e1b..672970c2026 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARC.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.sparc/src/jdk/vm/ci/sparc/SPARC.java
@@ -32,6 +32,7 @@ import java.util.Set;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.Register.RegisterCategory;
+import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 
@@ -179,35 +180,35 @@ public class SPARC extends Architecture {
     public static final Register q60 = new Register(111, getQuadncoding(60), "q60", FPUq);
 
     // @formatter:off
-    public static final Register[] cpuRegisters = {
+    public static final RegisterArray cpuRegisters = new RegisterArray(
         g0,  g1,  g2,  g3,  g4,  g5,  g6,  g7,
         o0,  o1,  o2,  o3,  o4,  o5,  o6,  o7,
         l0,  l1,  l2,  l3,  l4,  l5,  l6,  l7,
         i0,  i1,  i2,  i3,  i4,  i5,  i6,  i7
-    };
+    );
 
-    public static final Register[] fpusRegisters = {
+    public static final RegisterArray fpusRegisters = new RegisterArray(
         f0,  f1,  f2,  f3,  f4,  f5,  f6,  f7,
         f8,  f9,  f10, f11, f12, f13, f14, f15,
         f16, f17, f18, f19, f20, f21, f22, f23,
         f24, f25, f26, f27, f28, f29, f30, f31
-    };
+    );
 
-    public static final Register[] fpudRegisters = {
+    public static final RegisterArray fpudRegisters = new RegisterArray(
         d0, d2, d4, d6, d8,  d10, d12, d14,
         d16, d18, d20, d22, d24, d26, d28, d30,
         d32, d34, d36, d38, d40, d42, d44, d46,
         d48, d50, d52, d54, d56, d58, d60, d62
-    };
+    );
 
-    public static final Register[] fpuqRegisters = {
+    public static final RegisterArray fpuqRegisters = new RegisterArray(
         q0, q4, q8, q12,
         q16, q20, q24, q28,
         q32, q36, q40, q44,
-        q48, q52, q56, q60,
-    };
+        q48, q52, q56, q60
+    );
 
-    public static final Register[] allRegisters = {
+    public static final RegisterArray allRegisters = new RegisterArray(
         g0,  g1,  g2,  g3,  g4,  g5,  g6,  g7,
         o0,  o1,  o2,  o3,  o4,  o5,  o6,  o7,
         l0,  l1,  l2,  l3,  l4,  l5,  l6,  l7,
@@ -226,8 +227,8 @@ public class SPARC extends Architecture {
         q0, q4, q8, q12,
         q16, q20, q24, q28,
         q32, q36, q40, q44,
-        q48, q52, q56, q60,
-    };
+        q48, q52, q56, q60
+    );
     // @formatter:on
 
     /**
@@ -248,7 +249,7 @@ public class SPARC extends Architecture {
     }
 
     @Override
-    public Register[] getAvailableValueRegisters() {
+    public RegisterArray getAvailableValueRegisters() {
         return allRegisters;
     }
 
diff --git a/hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java b/hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java
index 2d7617d778a..fd361bc9db6 100644
--- a/hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java
+++ b/hotspot/test/compiler/jvmci/errors/CodeInstallerTest.java
@@ -28,6 +28,7 @@ import java.lang.reflect.Method;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.site.DataPatch;
 import jdk.vm.ci.code.site.Site;
@@ -80,11 +81,11 @@ public class CodeInstallerTest {
 
     protected Register getRegister(PlatformKind kind, int index) {
         int idx = index;
-        Register[] allRegs = arch.getAvailableValueRegisters();
-        for (int i = 0; i < allRegs.length; i++) {
-            if (arch.canStoreValue(allRegs[i].getRegisterCategory(), kind)) {
+        RegisterArray allRegs = arch.getAvailableValueRegisters();
+        for (Register reg : allRegs) {
+            if (arch.canStoreValue(reg.getRegisterCategory(), kind)) {
                 if (idx-- == 0) {
-                    return allRegs[i];
+                    return reg;
                 }
             }
         }
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
index 0d6765b4bea..078af122e6b 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
@@ -85,12 +85,12 @@ public class AMD64TestAssembler extends TestAssembler {
 
     @Override
     public Register emitIntArg0() {
-        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCall, JavaKind.Int)[0];
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCall, JavaKind.Int).get(0);
     }
 
     @Override
     public Register emitIntArg1() {
-        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCall, JavaKind.Int)[1];
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCall, JavaKind.Int).get(1);
     }
 
     private void emitREX(boolean w, int r, int x, int b) {
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
index 89bc0575470..26826fa2fc0 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/sparc/SPARCTestAssembler.java
@@ -121,12 +121,12 @@ public class SPARCTestAssembler extends TestAssembler {
 
     @Override
     public Register emitIntArg0() {
-        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCallee, JavaKind.Int)[0];
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCallee, JavaKind.Int).get(0);
     }
 
     @Override
     public Register emitIntArg1() {
-        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCallee, JavaKind.Int)[1];
+        return codeCache.getRegisterConfig().getCallingConventionRegisters(HotSpotCallingConventionType.JavaCallee, JavaKind.Int).get(1);
     }
 
     @Override

From 7aca8d6fe4fdf869da6f82e724b3f2c30b7cbf80 Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko 
Date: Thu, 23 Jun 2016 17:39:06 +0300
Subject: [PATCH 057/111] 8158650: [jittester] when generating tests with
 default parameters, generation hangs after 98 test

Reviewed-by: kvn, iignatyev
---
 .../src/jdk/test/lib/jittester/IRNode.java    | 25 ++++++++++++++++
 .../ClassDefinitionBlockFactory.java          | 30 +++++++++----------
 .../jittester/factories/MainKlassFactory.java | 30 +++++++++----------
 3 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java
index 3ffa03e8669..c532d0cd3f8 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/IRNode.java
@@ -198,6 +198,31 @@ public abstract class IRNode {
         return result;
     }
 
+    public static long getModifiableNodesCount(List nodes) {
+        return nodes.stream()
+                .map(IRNode::getStackableLeaves)
+                .mapToInt(List::size)
+                .filter(i -> i > 0)
+                .count();
+    }
+
+    public static boolean tryToReduceNodesDepth(List nodes, int maxDepth) {
+        boolean allSucceed = true;
+        for (IRNode child : nodes) {
+            for (IRNode leaf : child.getDeviantBlocks(Math.max(child.countDepth(), maxDepth + 1))) {
+                if (child.countDepth() > maxDepth) {
+                    // doesn't remove control deviation block. Just some parts.
+                    leaf.removeSelf();
+                    boolean successfull = child.countDepth() > maxDepth;
+                    allSucceed &= successfull;
+                } else {
+                    break;
+                }
+            }
+        }
+        return allSucceed;
+    }
+
     // TODO: add field instead this function
     public boolean isCFDeviation() {
         return this instanceof If || this instanceof Switch
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java
index 822c99fada8..f2c5af8ebc5 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/ClassDefinitionBlockFactory.java
@@ -102,11 +102,16 @@ class ClassDefinitionBlockFactory extends Factory {
         addMoreChildren(childs, content, minDepth);
     }
 
-    private void addMoreChildren(List childs, Collection content, int minDepth)
-        throws ProductionFailedException {
-        while (!childs.isEmpty() && IRNode.countDepth(content) < minDepth) {
-            PseudoRandom.shuffle(childs);
-            IRNode randomChild = childs.get(0);
+    private void addMoreChildren(List children, Collection content, int minDepth)
+            throws ProductionFailedException {
+        /* check situation when no stackable leaves available in all children */
+        if (IRNode.getModifiableNodesCount(children) == 0L) {
+            return;
+        }
+        /* now let's try to add children */
+        while (!children.isEmpty() && IRNode.countDepth(content) < minDepth) {
+            PseudoRandom.shuffle(children);
+            IRNode randomChild = children.get(0);
             List leaves = randomChild.getStackableLeaves();
             if (!leaves.isEmpty()) {
                 Block randomLeaf = (Block) leaves.get(PseudoRandom.randomNotNegative(leaves.size()));
@@ -131,18 +136,11 @@ class ClassDefinitionBlockFactory extends Factory {
 
     private void ensureMaxDepth(Collection content) {
         int maxDepth = ProductionParams.maxCfgDepth.value();
-        List childs = content.stream()
+        List childrenClasses = content.stream()
                 .filter(c -> c instanceof Klass && c.countDepth() > maxDepth)
                 .collect(Collectors.toList());
-        for (IRNode ch : childs) {
-            List leaves;
-            do {
-                long depth = Math.max(ch.countDepth(), maxDepth + 1);
-                leaves = ch.getDeviantBlocks(depth);
-                if(leaves.size() > 0) {
-                    leaves.get(0).removeSelf();
-                }
-            } while (!leaves.isEmpty() && ch.countDepth() > maxDepth);
-        }
+        /* now attempt to reduce depth by removing optional parts of control deviation
+           blocks in case IRTree has oversized depth */
+        IRNode.tryToReduceNodesDepth(childrenClasses, maxDepth);
     }
 }
diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java
index 81a19675ca9..54237c5f1cc 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/MainKlassFactory.java
@@ -112,19 +112,14 @@ class MainKlassFactory extends Factory {
                 functionDefinitions, testFunction, printVariables);
     }
 
-    private void ensureMaxDepth(List childs) {
+    private void ensureMaxDepth(List children) {
         int maxDepth = ProductionParams.maxCfgDepth.value();
-        List filtered = childs.stream()
-            .filter(c -> c.isCFDeviation() && c.countDepth() > maxDepth)
-            .collect(Collectors.toList());
-        for (IRNode child : filtered) {
-            List leaves;
-            do {
-                long depth = Math.max(child.countDepth(), maxDepth + 1);
-                leaves = child.getDeviantBlocks(depth);
-                leaves.get(0).removeSelf();
-            } while (!leaves.isEmpty() && child.countDepth() > maxDepth);
-        }
+        List filtered = children.stream()
+                .filter(c -> c.isCFDeviation() && c.countDepth() > maxDepth)
+                .collect(Collectors.toList());
+        /* Now attempt to reduce depth by removing optional parts of control deviation
+           blocks in case IRTree has oversized depth */
+        IRNode.tryToReduceNodesDepth(filtered, maxDepth);
     }
 
     private void ensureMinDepth(List childs, IRNodeBuilder builder)
@@ -134,10 +129,15 @@ class MainKlassFactory extends Factory {
         addMoreChildren(filtered, minDepth, builder);
     }
 
-    private void addMoreChildren(List childs, int minDepth, IRNodeBuilder builder)
+    private void addMoreChildren(List children, int minDepth, IRNodeBuilder builder)
             throws ProductionFailedException {
-        while (!childs.isEmpty() && IRNode.countDepth(childs) < minDepth) {
-            IRNode randomChild = childs.get(PseudoRandom.randomNotNegative(childs.size()));
+        /* check situation when no stackable leaves available in all children */
+        if (IRNode.getModifiableNodesCount(children) == 0L) {
+            return;
+        }
+        /* now let's try to add children */
+        while (!children.isEmpty() && IRNode.countDepth(children) < minDepth) {
+            IRNode randomChild = children.get(PseudoRandom.randomNotNegative(children.size()));
             List leaves = randomChild.getStackableLeaves();
             if (!leaves.isEmpty()) {
                 Block randomLeaf = (Block) leaves.get(PseudoRandom.randomNotNegative(leaves.size()));

From 3ad2ec4ed461ba16b90166b7e8c0aaba3330c823 Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko 
Date: Thu, 23 Jun 2016 17:39:49 +0300
Subject: [PATCH 058/111] 8159803: Jittester: FileAlreadyExists exception
 during tests generation

Reviewed-by: iignatyev
---
 .../jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java
index 94957ba3202..ef969bf0f55 100644
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/ByteCodeGenerator.java
@@ -78,7 +78,7 @@ class ByteCodeGenerator extends TestsGenerator {
         } catch (Throwable t) {
             Path errFile = generatorDir.resolve(mainClassName + ".err");
             try (PrintWriter pw = new PrintWriter(Files.newOutputStream(errFile,
-                    StandardOpenOption.CREATE_NEW))) {
+                    StandardOpenOption.CREATE, StandardOpenOption.WRITE))) {
                 t.printStackTrace(pw);
             } catch (IOException e) {
                 t.printStackTrace();

From 8189de5608381e00741d2ed23a13db29ea114faf Mon Sep 17 00:00:00 2001
From: Dmitrij Pochepko 
Date: Thu, 23 Jun 2016 17:40:20 +0300
Subject: [PATCH 059/111] 8159730: compiler/jvmci/compilerToVM/IsMatureTest
 failed with "Multiple times invoked method should have method data (assert
 failed: 0 != 0)"

Reviewed-by: kvn
---
 .../jvmci/compilerToVM/IsMatureTest.java        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java b/hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java
index fe2f0259844..5d12742e972 100644
--- a/hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java
+++ b/hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java
@@ -74,11 +74,16 @@ public class IsMatureTest {
         }
         methodData = WB.getMethodData(method);
         isMature = CompilerToVMHelper.isMature(methodData);
-        Asserts.assertNE(methodData, 0L,
-                "Multiple times invoked method should have method data");
-        /* a method is not mature for -Xcomp and -Tiered,
-           see NonTieredCompPolicy::is_mature */
-        Asserts.assertEQ(isMature, !(IS_XCOMP && !TIERED),
-                "Unexpected isMature state for multiple times invoked method");
+        int compLevel = WB.getMethodCompilationLevel(method);
+        // methodData doesn't necessarily exist for interpreter and compilation level 1
+        if (compLevel != CompilerWhiteBoxTest.COMP_LEVEL_NONE
+                && compLevel != CompilerWhiteBoxTest.COMP_LEVEL_SIMPLE) {
+            Asserts.assertNE(methodData, 0L,
+                    "Multiple times invoked method should have method data");
+            /* a method is not mature in Xcomp mode with tiered compilation disabled,
+               see NonTieredCompPolicy::is_mature */
+            Asserts.assertEQ(isMature, !(IS_XCOMP && !TIERED),
+                    "Unexpected isMature state for multiple times invoked method");
+        }
     }
 }

From 1621ac0b427376d9b0123fad299913e4aa444ed2 Mon Sep 17 00:00:00 2001
From: Martin Doerr 
Date: Thu, 23 Jun 2016 17:38:29 +0200
Subject: [PATCH 060/111] 8159976: PPC64: Add missing intrinsics for sub-word
 atomics

Reviewed-by: shade, goetz
---
 hotspot/src/cpu/ppc/vm/assembler_ppc.hpp      |   18 +-
 .../src/cpu/ppc/vm/assembler_ppc.inline.hpp   |   12 +
 hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp |  681 ++++-------
 hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp |   90 +-
 hotspot/src/cpu/ppc/vm/ppc.ad                 | 1033 +++++++++--------
 5 files changed, 862 insertions(+), 972 deletions(-)

diff --git a/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp b/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
index 813580542e1..e81d08e848a 100644
--- a/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+++ b/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
@@ -706,9 +706,13 @@ class Assembler : public AbstractAssembler {
     TW_OPCODE      = (31u << OPCODE_SHIFT |    4u << 1),
 
     // Atomics.
+    LBARX_OPCODE   = (31u << OPCODE_SHIFT |   52u << 1),
+    LHARX_OPCODE   = (31u << OPCODE_SHIFT |  116u << 1),
     LWARX_OPCODE   = (31u << OPCODE_SHIFT |   20u << 1),
     LDARX_OPCODE   = (31u << OPCODE_SHIFT |   84u << 1),
     LQARX_OPCODE   = (31u << OPCODE_SHIFT |  276u << 1),
+    STBCX_OPCODE   = (31u << OPCODE_SHIFT |  694u << 1),
+    STHCX_OPCODE   = (31u << OPCODE_SHIFT |  726u << 1),
     STWCX_OPCODE   = (31u << OPCODE_SHIFT |  150u << 1),
     STDCX_OPCODE   = (31u << OPCODE_SHIFT |  214u << 1),
     STQCX_OPCODE   = (31u << OPCODE_SHIFT |  182u << 1)
@@ -1796,13 +1800,19 @@ class Assembler : public AbstractAssembler {
   inline void waitrsv(); // >=Power7
 
   // atomics
+  inline void lbarx_unchecked(Register d, Register a, Register b, int eh1 = 0); // >=Power 8
+  inline void lharx_unchecked(Register d, Register a, Register b, int eh1 = 0); // >=Power 8
   inline void lwarx_unchecked(Register d, Register a, Register b, int eh1 = 0);
   inline void ldarx_unchecked(Register d, Register a, Register b, int eh1 = 0);
-  inline void lqarx_unchecked(Register d, Register a, Register b, int eh1 = 0);
+  inline void lqarx_unchecked(Register d, Register a, Register b, int eh1 = 0); // >=Power 8
   inline bool lxarx_hint_exclusive_access();
+  inline void lbarx(  Register d, Register a, Register b, bool hint_exclusive_access = false);
+  inline void lharx(  Register d, Register a, Register b, bool hint_exclusive_access = false);
   inline void lwarx(  Register d, Register a, Register b, bool hint_exclusive_access = false);
   inline void ldarx(  Register d, Register a, Register b, bool hint_exclusive_access = false);
   inline void lqarx(  Register d, Register a, Register b, bool hint_exclusive_access = false);
+  inline void stbcx_( Register s, Register a, Register b);
+  inline void sthcx_( Register s, Register a, Register b);
   inline void stwcx_( Register s, Register a, Register b);
   inline void stdcx_( Register s, Register a, Register b);
   inline void stqcx_( Register s, Register a, Register b);
@@ -2169,12 +2179,18 @@ class Assembler : public AbstractAssembler {
   inline void dcbtstct(Register s2, int ct);
 
   // Atomics: use ra0mem to disallow R0 as base.
+  inline void lbarx_unchecked(Register d, Register b, int eh1);
+  inline void lharx_unchecked(Register d, Register b, int eh1);
   inline void lwarx_unchecked(Register d, Register b, int eh1);
   inline void ldarx_unchecked(Register d, Register b, int eh1);
   inline void lqarx_unchecked(Register d, Register b, int eh1);
+  inline void lbarx( Register d, Register b, bool hint_exclusive_access);
+  inline void lharx( Register d, Register b, bool hint_exclusive_access);
   inline void lwarx( Register d, Register b, bool hint_exclusive_access);
   inline void ldarx( Register d, Register b, bool hint_exclusive_access);
   inline void lqarx( Register d, Register b, bool hint_exclusive_access);
+  inline void stbcx_(Register s, Register b);
+  inline void sthcx_(Register s, Register b);
   inline void stwcx_(Register s, Register b);
   inline void stdcx_(Register s, Register b);
   inline void stqcx_(Register s, Register b);
diff --git a/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp b/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
index ca126170157..14f25e4eea8 100644
--- a/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+++ b/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
@@ -594,13 +594,19 @@ inline void Assembler::waitrsv() { emit_int32( WAIT_OPCODE | 1<<(31-10)); } // W
 
 // atomics
 // Use ra0mem to disallow R0 as base.
+inline void Assembler::lbarx_unchecked(Register d, Register a, Register b, int eh1)           { emit_int32( LBARX_OPCODE | rt(d) | ra0mem(a) | rb(b) | eh(eh1)); }
+inline void Assembler::lharx_unchecked(Register d, Register a, Register b, int eh1)           { emit_int32( LHARX_OPCODE | rt(d) | ra0mem(a) | rb(b) | eh(eh1)); }
 inline void Assembler::lwarx_unchecked(Register d, Register a, Register b, int eh1)           { emit_int32( LWARX_OPCODE | rt(d) | ra0mem(a) | rb(b) | eh(eh1)); }
 inline void Assembler::ldarx_unchecked(Register d, Register a, Register b, int eh1)           { emit_int32( LDARX_OPCODE | rt(d) | ra0mem(a) | rb(b) | eh(eh1)); }
 inline void Assembler::lqarx_unchecked(Register d, Register a, Register b, int eh1)           { emit_int32( LQARX_OPCODE | rt(d) | ra0mem(a) | rb(b) | eh(eh1)); }
 inline bool Assembler::lxarx_hint_exclusive_access()                                          { return VM_Version::has_lxarxeh(); }
+inline void Assembler::lbarx( Register d, Register a, Register b, bool hint_exclusive_access) { lbarx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lharx( Register d, Register a, Register b, bool hint_exclusive_access) { lharx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
 inline void Assembler::lwarx( Register d, Register a, Register b, bool hint_exclusive_access) { lwarx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
 inline void Assembler::ldarx( Register d, Register a, Register b, bool hint_exclusive_access) { ldarx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
 inline void Assembler::lqarx( Register d, Register a, Register b, bool hint_exclusive_access) { lqarx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::stbcx_(Register s, Register a, Register b)                             { emit_int32( STBCX_OPCODE | rs(s) | ra0mem(a) | rb(b) | rc(1)); }
+inline void Assembler::sthcx_(Register s, Register a, Register b)                             { emit_int32( STHCX_OPCODE | rs(s) | ra0mem(a) | rb(b) | rc(1)); }
 inline void Assembler::stwcx_(Register s, Register a, Register b)                             { emit_int32( STWCX_OPCODE | rs(s) | ra0mem(a) | rb(b) | rc(1)); }
 inline void Assembler::stdcx_(Register s, Register a, Register b)                             { emit_int32( STDCX_OPCODE | rs(s) | ra0mem(a) | rb(b) | rc(1)); }
 inline void Assembler::stqcx_(Register s, Register a, Register b)                             { emit_int32( STQCX_OPCODE | rs(s) | ra0mem(a) | rb(b) | rc(1)); }
@@ -933,12 +939,18 @@ inline void Assembler::dcbtst(  Register s2)          { emit_int32( DCBTST_OPCOD
 inline void Assembler::dcbtstct(Register s2, int ct)  { emit_int32( DCBTST_OPCODE | rb(s2) | thct(ct)); }
 
 // ra0 version
+inline void Assembler::lbarx_unchecked(Register d, Register b, int eh1)          { emit_int32( LBARX_OPCODE | rt(d) | rb(b) | eh(eh1)); }
+inline void Assembler::lharx_unchecked(Register d, Register b, int eh1)          { emit_int32( LHARX_OPCODE | rt(d) | rb(b) | eh(eh1)); }
 inline void Assembler::lwarx_unchecked(Register d, Register b, int eh1)          { emit_int32( LWARX_OPCODE | rt(d) | rb(b) | eh(eh1)); }
 inline void Assembler::ldarx_unchecked(Register d, Register b, int eh1)          { emit_int32( LDARX_OPCODE | rt(d) | rb(b) | eh(eh1)); }
 inline void Assembler::lqarx_unchecked(Register d, Register b, int eh1)          { emit_int32( LQARX_OPCODE | rt(d) | rb(b) | eh(eh1)); }
+inline void Assembler::lbarx( Register d, Register b, bool hint_exclusive_access){ lbarx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lharx( Register d, Register b, bool hint_exclusive_access){ lharx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
 inline void Assembler::lwarx( Register d, Register b, bool hint_exclusive_access){ lwarx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
 inline void Assembler::ldarx( Register d, Register b, bool hint_exclusive_access){ ldarx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
 inline void Assembler::lqarx( Register d, Register b, bool hint_exclusive_access){ lqarx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::stbcx_(Register s, Register b)                            { emit_int32( STBCX_OPCODE | rs(s) | rb(b) | rc(1)); }
+inline void Assembler::sthcx_(Register s, Register b)                            { emit_int32( STHCX_OPCODE | rs(s) | rb(b) | rc(1)); }
 inline void Assembler::stwcx_(Register s, Register b)                            { emit_int32( STWCX_OPCODE | rs(s) | rb(b) | rc(1)); }
 inline void Assembler::stdcx_(Register s, Register b)                            { emit_int32( STDCX_OPCODE | rs(s) | rb(b) | rc(1)); }
 inline void Assembler::stqcx_(Register s, Register b)                            { emit_int32( STQCX_OPCODE | rs(s) | rb(b) | rc(1)); }
diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
index d0b0fa8dbda..5d58dab4995 100644
--- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
@@ -1422,42 +1422,168 @@ void MacroAssembler::reserved_stack_check(Register return_pc) {
   bind(no_reserved_zone_enabling);
 }
 
-// CmpxchgX sets condition register to cmpX(current, compare).
-void MacroAssembler::cmpxchgw(ConditionRegister flag, Register dest_current_value,
-                              Register compare_value, Register exchange_value,
-                              Register addr_base, int semantics, bool cmpxchgx_hint,
-                              Register int_flag_success, bool contention_hint, bool weak) {
+void MacroAssembler::getandsetd(Register dest_current_value, Register exchange_value, Register addr_base,
+                                bool cmpxchgx_hint) {
   Label retry;
-  Label failed;
-  Label done;
-
-  // Save one branch if result is returned via register and
-  // result register is different from the other ones.
-  bool use_result_reg    = (int_flag_success != noreg);
-  bool preset_result_reg = (int_flag_success != dest_current_value && int_flag_success != compare_value &&
-                            int_flag_success != exchange_value && int_flag_success != addr_base);
-  assert(!weak || flag == CCR0, "weak only supported with CCR0");
-
-  if (use_result_reg && preset_result_reg) {
-    li(int_flag_success, 0); // preset (assume cas failed)
+  bind(retry);
+  ldarx(dest_current_value, addr_base, cmpxchgx_hint);
+  stdcx_(exchange_value, addr_base);
+  if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
+    bne_predict_not_taken(CCR0, retry); // StXcx_ sets CCR0.
+  } else {
+    bne(                  CCR0, retry); // StXcx_ sets CCR0.
   }
+}
 
-  // Add simple guard in order to reduce risk of starving under high contention (recommended by IBM).
-  if (contention_hint) { // Don't try to reserve if cmp fails.
-    lwz(dest_current_value, 0, addr_base);
-    cmpw(flag, dest_current_value, compare_value);
-    bne(flag, failed);
+void MacroAssembler::getandaddd(Register dest_current_value, Register inc_value, Register addr_base,
+                                Register tmp, bool cmpxchgx_hint) {
+  Label retry;
+  bind(retry);
+  ldarx(dest_current_value, addr_base, cmpxchgx_hint);
+  add(tmp, dest_current_value, inc_value);
+  stdcx_(tmp, addr_base);
+  if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
+    bne_predict_not_taken(CCR0, retry); // StXcx_ sets CCR0.
+  } else {
+    bne(                  CCR0, retry); // StXcx_ sets CCR0.
   }
+}
 
-  // release/fence semantics
-  if (semantics & MemBarRel) {
-    release();
+// Word/sub-word atomic helper functions
+
+// Temps and addr_base are killed if size < 4 and processor does not support respective instructions.
+// Only signed types are supported with size < 4.
+// Atomic add always kills tmp1.
+void MacroAssembler::atomic_get_and_modify_generic(Register dest_current_value, Register exchange_value,
+                                                   Register addr_base, Register tmp1, Register tmp2, Register tmp3,
+                                                   bool cmpxchgx_hint, bool is_add, int size) {
+  // Sub-word instructions are available since Power 8.
+  // For older processors, instruction_type != size holds, and we
+  // emulate the sub-word instructions by constructing a 4-byte value
+  // that leaves the other bytes unchanged.
+  const int instruction_type = VM_Version::has_lqarx() ? size : 4;
+
+  Label retry;
+  Register shift_amount = noreg,
+           val32 = dest_current_value,
+           modval = is_add ? tmp1 : exchange_value;
+
+  if (instruction_type != size) {
+    assert_different_registers(tmp1, tmp2, tmp3, dest_current_value, exchange_value, addr_base);
+    modval = tmp1;
+    shift_amount = tmp2;
+    val32 = tmp3;
+    // Need some preperation: Compute shift amount, align address. Note: shorts must be 2 byte aligned.
+#ifdef VM_LITTLE_ENDIAN
+    rldic(shift_amount, addr_base, 3, 64-5); // (dest & 3) * 8;
+    clrrdi(addr_base, addr_base, 2);
+#else
+    xori(shift_amount, addr_base, (size == 1) ? 3 : 2);
+    clrrdi(addr_base, addr_base, 2);
+    rldic(shift_amount, shift_amount, 3, 64-5); // byte: ((3-dest) & 3) * 8; short: ((1-dest/2) & 1) * 16;
+#endif
   }
 
   // atomic emulation loop
   bind(retry);
 
-  lwarx(dest_current_value, addr_base, cmpxchgx_hint);
+  switch (instruction_type) {
+    case 4: lwarx(val32, addr_base, cmpxchgx_hint); break;
+    case 2: lharx(val32, addr_base, cmpxchgx_hint); break;
+    case 1: lbarx(val32, addr_base, cmpxchgx_hint); break;
+    default: ShouldNotReachHere();
+  }
+
+  if (instruction_type != size) {
+    srw(dest_current_value, val32, shift_amount);
+  }
+
+  if (is_add) { add(modval, dest_current_value, exchange_value); }
+
+  if (instruction_type != size) {
+    // Transform exchange value such that the replacement can be done by one xor instruction.
+    xorr(modval, dest_current_value, is_add ? modval : exchange_value);
+    clrldi(modval, modval, (size == 1) ? 56 : 48);
+    slw(modval, modval, shift_amount);
+    xorr(modval, val32, modval);
+  }
+
+  switch (instruction_type) {
+    case 4: stwcx_(modval, addr_base); break;
+    case 2: sthcx_(modval, addr_base); break;
+    case 1: stbcx_(modval, addr_base); break;
+    default: ShouldNotReachHere();
+  }
+
+  if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
+    bne_predict_not_taken(CCR0, retry); // StXcx_ sets CCR0.
+  } else {
+    bne(                  CCR0, retry); // StXcx_ sets CCR0.
+  }
+
+  // l?arx zero-extends, but Java wants byte/short values sign-extended.
+  if (size == 1) {
+    extsb(dest_current_value, dest_current_value);
+  } else if (size == 2) {
+    extsh(dest_current_value, dest_current_value);
+  };
+}
+
+// Temps, addr_base and exchange_value are killed if size < 4 and processor does not support respective instructions.
+// Only signed types are supported with size < 4.
+void MacroAssembler::cmpxchg_loop_body(ConditionRegister flag, Register dest_current_value,
+                                       Register compare_value, Register exchange_value,
+                                       Register addr_base, Register tmp1, Register tmp2,
+                                       Label &retry, Label &failed, bool cmpxchgx_hint, int size) {
+  // Sub-word instructions are available since Power 8.
+  // For older processors, instruction_type != size holds, and we
+  // emulate the sub-word instructions by constructing a 4-byte value
+  // that leaves the other bytes unchanged.
+  const int instruction_type = VM_Version::has_lqarx() ? size : 4;
+
+  Register shift_amount = noreg,
+           val32 = dest_current_value,
+           modval = exchange_value;
+
+  if (instruction_type != size) {
+    assert_different_registers(tmp1, tmp2, dest_current_value, compare_value, exchange_value, addr_base);
+    shift_amount = tmp1;
+    val32 = tmp2;
+    modval = tmp2;
+    // Need some preperation: Compute shift amount, align address. Note: shorts must be 2 byte aligned.
+#ifdef VM_LITTLE_ENDIAN
+    rldic(shift_amount, addr_base, 3, 64-5); // (dest & 3) * 8;
+    clrrdi(addr_base, addr_base, 2);
+#else
+    xori(shift_amount, addr_base, (size == 1) ? 3 : 2);
+    clrrdi(addr_base, addr_base, 2);
+    rldic(shift_amount, shift_amount, 3, 64-5); // byte: ((3-dest) & 3) * 8; short: ((1-dest/2) & 1) * 16;
+#endif
+    // Transform exchange value such that the replacement can be done by one xor instruction.
+    xorr(exchange_value, compare_value, exchange_value);
+    clrldi(exchange_value, exchange_value, (size == 1) ? 56 : 48);
+    slw(exchange_value, exchange_value, shift_amount);
+  }
+
+  // atomic emulation loop
+  bind(retry);
+
+  switch (instruction_type) {
+    case 4: lwarx(val32, addr_base, cmpxchgx_hint); break;
+    case 2: lharx(val32, addr_base, cmpxchgx_hint); break;
+    case 1: lbarx(val32, addr_base, cmpxchgx_hint); break;
+    default: ShouldNotReachHere();
+  }
+
+  if (instruction_type != size) {
+    srw(dest_current_value, val32, shift_amount);
+  }
+  if (size == 1) {
+    extsb(dest_current_value, dest_current_value);
+  } else if (size == 2) {
+    extsh(dest_current_value, dest_current_value);
+  };
+
   cmpw(flag, dest_current_value, compare_value);
   if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
     bne_predict_not_taken(flag, failed);
@@ -1467,7 +1593,60 @@ void MacroAssembler::cmpxchgw(ConditionRegister flag, Register dest_current_valu
   // branch to done  => (flag == ne), (dest_current_value != compare_value)
   // fall through    => (flag == eq), (dest_current_value == compare_value)
 
-  stwcx_(exchange_value, addr_base);
+  if (instruction_type != size) {
+    xorr(modval, val32, exchange_value);
+  }
+
+  switch (instruction_type) {
+    case 4: stwcx_(modval, addr_base); break;
+    case 2: sthcx_(modval, addr_base); break;
+    case 1: stbcx_(modval, addr_base); break;
+    default: ShouldNotReachHere();
+  }
+}
+
+// CmpxchgX sets condition register to cmpX(current, compare).
+void MacroAssembler::cmpxchg_generic(ConditionRegister flag, Register dest_current_value,
+                                     Register compare_value, Register exchange_value,
+                                     Register addr_base, Register tmp1, Register tmp2,
+                                     int semantics, bool cmpxchgx_hint,
+                                     Register int_flag_success, bool contention_hint, bool weak, int size) {
+  Label retry;
+  Label failed;
+  Label done;
+
+  // Save one branch if result is returned via register and
+  // result register is different from the other ones.
+  bool use_result_reg    = (int_flag_success != noreg);
+  bool preset_result_reg = (int_flag_success != dest_current_value && int_flag_success != compare_value &&
+                            int_flag_success != exchange_value && int_flag_success != addr_base &&
+                            int_flag_success != tmp1 && int_flag_success != tmp2);
+  assert(!weak || flag == CCR0, "weak only supported with CCR0");
+  assert(size == 1 || size == 2 || size == 4, "unsupported");
+
+  if (use_result_reg && preset_result_reg) {
+    li(int_flag_success, 0); // preset (assume cas failed)
+  }
+
+  // Add simple guard in order to reduce risk of starving under high contention (recommended by IBM).
+  if (contention_hint) { // Don't try to reserve if cmp fails.
+    switch (size) {
+      case 1: lbz(dest_current_value, 0, addr_base); extsb(dest_current_value, dest_current_value); break;
+      case 2: lha(dest_current_value, 0, addr_base); break;
+      case 4: lwz(dest_current_value, 0, addr_base); break;
+      default: ShouldNotReachHere();
+    }
+    cmpw(flag, dest_current_value, compare_value);
+    bne(flag, failed);
+  }
+
+  // release/fence semantics
+  if (semantics & MemBarRel) {
+    release();
+  }
+
+  cmpxchg_loop_body(flag, dest_current_value, compare_value, exchange_value, addr_base, tmp1, tmp2,
+                    retry, failed, cmpxchgx_hint, size);
   if (!weak || use_result_reg) {
     if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
       bne_predict_not_taken(CCR0, weak ? failed : retry); // StXcx_ sets CCR0.
@@ -3751,454 +3930,6 @@ void MacroAssembler::has_negatives(Register src, Register cnt, Register result,
   bind(Ldone);
 }
 
-
-// Intrinsics for non-CompactStrings
-
-// Search for a single jchar in an jchar[].
-//
-// Assumes that result differs from all other registers.
-//
-// 'haystack' is the addresses of a jchar-array.
-// 'needle' is either the character to search for or R0.
-// 'needleChar' is the character to search for if 'needle' == R0..
-// 'haycnt' is the length of the haystack. We assume 'haycnt' >=1.
-//
-// Preserves haystack, haycnt, needle and kills all other registers.
-//
-// If needle == R0, we search for the constant needleChar.
-void MacroAssembler::string_indexof_1(Register result, Register haystack, Register haycnt,
-                                      Register needle, jchar needleChar,
-                                      Register tmp1, Register tmp2) {
-
-  assert_different_registers(result, haystack, haycnt, needle, tmp1, tmp2);
-
-  Label L_InnerLoop, L_FinalCheck, L_Found1, L_Found2, L_Found3, L_NotFound, L_End;
-  Register addr = tmp1,
-           ch1 = tmp2,
-           ch2 = R0;
-
-//3:
-   dcbtct(haystack, 0x00);                        // Indicate R/O access to haystack.
-
-   srwi_(tmp2, haycnt, 1);   // Shift right by exact_log2(UNROLL_FACTOR).
-   mr(addr, haystack);
-   beq(CCR0, L_FinalCheck);
-   mtctr(tmp2);              // Move to count register.
-//8:
-  bind(L_InnerLoop);             // Main work horse (2x unrolled search loop).
-   lhz(ch1, 0, addr);        // Load characters from haystack.
-   lhz(ch2, 2, addr);
-   (needle != R0) ? cmpw(CCR0, ch1, needle) : cmplwi(CCR0, ch1, needleChar);
-   (needle != R0) ? cmpw(CCR1, ch2, needle) : cmplwi(CCR1, ch2, needleChar);
-   beq(CCR0, L_Found1);   // Did we find the needle?
-   beq(CCR1, L_Found2);
-   addi(addr, addr, 4);
-   bdnz(L_InnerLoop);
-//16:
-  bind(L_FinalCheck);
-   andi_(R0, haycnt, 1);
-   beq(CCR0, L_NotFound);
-   lhz(ch1, 0, addr);        // One position left at which we have to compare.
-   (needle != R0) ? cmpw(CCR1, ch1, needle) : cmplwi(CCR1, ch1, needleChar);
-   beq(CCR1, L_Found3);
-//21:
-  bind(L_NotFound);
-   li(result, -1);           // Not found.
-   b(L_End);
-
-  bind(L_Found2);
-   addi(addr, addr, 2);
-//24:
-  bind(L_Found1);
-  bind(L_Found3);                  // Return index ...
-   subf(addr, haystack, addr); // relative to haystack,
-   srdi(result, addr, 1);      // in characters.
-  bind(L_End);
-}
-
-
-// Implementation of IndexOf for jchar arrays.
-//
-// The length of haystack and needle are not constant, i.e. passed in a register.
-//
-// Preserves registers haystack, needle.
-// Kills registers haycnt, needlecnt.
-// Assumes that result differs from all other registers.
-// Haystack, needle are the addresses of jchar-arrays.
-// Haycnt, needlecnt are the lengths of them, respectively.
-//
-// Needlecntval must be zero or 15-bit unsigned immediate and > 1.
-void MacroAssembler::string_indexof(Register result, Register haystack, Register haycnt,
-                                    Register needle, ciTypeArray* needle_values, Register needlecnt, int needlecntval,
-                                    Register tmp1, Register tmp2, Register tmp3, Register tmp4) {
-
-  // Ensure 0=2, bail out otherwise.
-  // **************************************************************************************************
-
-//1 (variable) or 3 (const):
-   dcbtct(needle, 0x00);    // Indicate R/O access to str1.
-   dcbtct(haystack, 0x00);  // Indicate R/O access to str2.
-
-  // Compute last haystack addr to use if no match gets found.
-  if (needlecntval == 0) { // variable needlecnt
-//3:
-   subf(ch1, needlecnt, haycnt);      // Last character index to compare is haycnt-needlecnt.
-   addi(addr, haystack, -2);          // Accesses use pre-increment.
-   cmpwi(CCR6, needlecnt, 2);
-   blt(CCR6, L_TooShort);          // Variable needlecnt: handle short needle separately.
-   slwi(ch1, ch1, 1);                 // Scale to number of bytes.
-   lwz(n_start, 0, needle);           // Load first 2 characters of needle.
-   add(last_addr, haystack, ch1);     // Point to last address to compare (haystack+2*(haycnt-needlecnt)).
-   addi(needlecnt, needlecnt, -2);    // Rest of needle.
-  } else { // constant needlecnt
-  guarantee(needlecntval != 1, "IndexOf with single-character needle must be handled separately");
-  assert((needlecntval & 0x7fff) == needlecntval, "wrong immediate");
-//5:
-   addi(ch1, haycnt, -needlecntval);  // Last character index to compare is haycnt-needlecnt.
-   lwz(n_start, 0, needle);           // Load first 2 characters of needle.
-   addi(addr, haystack, -2);          // Accesses use pre-increment.
-   slwi(ch1, ch1, 1);                 // Scale to number of bytes.
-   add(last_addr, haystack, ch1);     // Point to last address to compare (haystack+2*(haycnt-needlecnt)).
-   li(needlecnt, needlecntval-2);     // Rest of needle.
-  }
-
-  // Main Loop (now we have at least 3 characters).
-//11:
-  Label L_OuterLoop, L_InnerLoop, L_FinalCheck, L_Comp1, L_Comp2, L_Comp3;
-  bind(L_OuterLoop); // Search for 1st 2 characters.
-  Register addr_diff = tmp4;
-   subf(addr_diff, addr, last_addr); // Difference between already checked address and last address to check.
-   addi(addr, addr, 2);              // This is the new address we want to use for comparing.
-   srdi_(ch2, addr_diff, 2);
-   beq(CCR0, L_FinalCheck);       // 2 characters left?
-   mtctr(ch2);                       // addr_diff/4
-//16:
-  bind(L_InnerLoop);                // Main work horse (2x unrolled search loop)
-   lwz(ch1, 0, addr);           // Load 2 characters of haystack (ignore alignment).
-   lwz(ch2, 2, addr);
-   cmpw(CCR0, ch1, n_start); // Compare 2 characters (1 would be sufficient but try to reduce branches to CompLoop).
-   cmpw(CCR1, ch2, n_start);
-   beq(CCR0, L_Comp1);       // Did we find the needle start?
-   beq(CCR1, L_Comp2);
-   addi(addr, addr, 4);
-   bdnz(L_InnerLoop);
-//24:
-  bind(L_FinalCheck);
-   rldicl_(addr_diff, addr_diff, 64-1, 63); // Remaining characters not covered by InnerLoop: (addr_diff>>1)&1.
-   beq(CCR0, L_NotFound);
-   lwz(ch1, 0, addr);                       // One position left at which we have to compare.
-   cmpw(CCR1, ch1, n_start);
-   beq(CCR1, L_Comp3);
-//29:
-  bind(L_NotFound);
-   li(result, -1); // not found
-   b(L_End);
-
-
-   // **************************************************************************************************
-   // Special Case: unfortunately, the variable needle case can be called with needlecnt<2
-   // **************************************************************************************************
-//31:
- if ((needlecntval>>1) !=1 ) { // Const needlecnt is 2 or 3? Reduce code size.
-  int nopcnt = 5;
-  if (needlecntval !=0 ) ++nopcnt; // Balance alignment (other case: see below).
-  if (needlecntval == 0) {         // We have to handle these cases separately.
-  Label L_OneCharLoop;
-  bind(L_TooShort);
-   mtctr(haycnt);
-   lhz(n_start, 0, needle);    // First character of needle
-  bind(L_OneCharLoop);
-   lhzu(ch1, 2, addr);
-   cmpw(CCR1, ch1, n_start);
-   beq(CCR1, L_Found);      // Did we find the one character needle?
-   bdnz(L_OneCharLoop);
-   li(result, -1);             // Not found.
-   b(L_End);
-  } // 8 instructions, so no impact on alignment.
-  for (int x = 0; x < nopcnt; ++x) nop();
- }
-
-  // **************************************************************************************************
-  // Regular Case Part II: compare rest of needle (first 2 characters have been compared already)
-  // **************************************************************************************************
-
-  // Compare the rest
-//36 if needlecntval==0, else 37:
-  bind(L_Comp2);
-   addi(addr, addr, 2); // First comparison has failed, 2nd one hit.
-  bind(L_Comp1);            // Addr points to possible needle start.
-  bind(L_Comp3);            // Could have created a copy and use a different return address but saving code size here.
-  if (needlecntval != 2) {  // Const needlecnt==2?
-   if (needlecntval != 3) {
-    if (needlecntval == 0) beq(CCR6, L_Found); // Variable needlecnt==2?
-    Register ind_reg = tmp4;
-    li(ind_reg, 2*2);   // First 2 characters are already compared, use index 2.
-    mtctr(needlecnt);   // Decremented by 2, still > 0.
-//40:
-   Label L_CompLoop;
-   bind(L_CompLoop);
-    lhzx(ch2, needle, ind_reg);
-    lhzx(ch1, addr, ind_reg);
-    cmpw(CCR1, ch1, ch2);
-    bne(CCR1, L_OuterLoop);
-    addi(ind_reg, ind_reg, 2);
-    bdnz(L_CompLoop);
-   } else { // No loop required if there's only one needle character left.
-    lhz(ch2, 2*2, needle);
-    lhz(ch1, 2*2, addr);
-    cmpw(CCR1, ch1, ch2);
-    bne(CCR1, L_OuterLoop);
-   }
-  }
-  // Return index ...
-//46:
-  bind(L_Found);
-   subf(addr, haystack, addr); // relative to haystack, ...
-   srdi(result, addr, 1);      // in characters.
-//48:
-  bind(L_End);
-}
-
-// Implementation of Compare for jchar arrays.
-//
-// Kills the registers str1, str2, cnt1, cnt2.
-// Kills cr0, ctr.
-// Assumes that result differes from the input registers.
-void MacroAssembler::string_compare(Register str1_reg, Register str2_reg, Register cnt1_reg, Register cnt2_reg,
-                                    Register result_reg, Register tmp_reg) {
-   assert_different_registers(result_reg, str1_reg, str2_reg, cnt1_reg, cnt2_reg, tmp_reg);
-
-   Label Ldone, Lslow_case, Lslow_loop, Lfast_loop;
-   Register cnt_diff = R0,
-            limit_reg = cnt1_reg,
-            chr1_reg = result_reg,
-            chr2_reg = cnt2_reg,
-            addr_diff = str2_reg;
-
-   // 'cnt_reg' contains the number of characters in the string's character array for the
-   // pre-CompactStrings strings implementation and the number of bytes in the string's
-   // byte array for the CompactStrings strings implementation.
-   const int HAS_COMPACT_STRING = java_lang_String::has_coder_field() ? 1 : 0; // '1' = byte array, '0' = char array
-
-   // Offset 0 should be 32 byte aligned.
-//-6:
-    srawi(cnt1_reg, cnt1_reg, HAS_COMPACT_STRING);
-    srawi(cnt2_reg, cnt2_reg, HAS_COMPACT_STRING);
-//-4:
-    dcbtct(str1_reg, 0x00);  // Indicate R/O access to str1.
-    dcbtct(str2_reg, 0x00);  // Indicate R/O access to str2.
-//-2:
-   // Compute min(cnt1, cnt2) and check if 0 (bail out if we don't need to compare characters).
-    subf(result_reg, cnt2_reg, cnt1_reg);  // difference between cnt1/2
-    subf_(addr_diff, str1_reg, str2_reg);  // alias?
-    beq(CCR0, Ldone);                   // return cnt difference if both ones are identical
-    srawi(limit_reg, result_reg, 31);      // generate signmask (cnt1/2 must be non-negative so cnt_diff can't overflow)
-    mr(cnt_diff, result_reg);
-    andr(limit_reg, result_reg, limit_reg); // difference or zero (negative): cnt14 characters for fast loop
-    andi(limit_reg, tmp_reg, 4-1);            // remaining characters
-
-   // Adapt str1_reg str2_reg for the first loop iteration
-    mtctr(chr2_reg);                 // (min(cnt1, cnt2)-1)/4
-    addi(limit_reg, limit_reg, 4+1); // compare last 5-8 characters in slow_case if mismatch found in fast_loop
-//16:
-   // Compare the rest of the characters
-   bind(Lfast_loop);
-    ld(chr1_reg, 0, str1_reg);
-    ldx(chr2_reg, str1_reg, addr_diff);
-    cmpd(CCR0, chr2_reg, chr1_reg);
-    bne(CCR0, Lslow_case); // return chr1_reg
-    addi(str1_reg, str1_reg, 4*2);
-    bdnz(Lfast_loop);
-    addi(limit_reg, limit_reg, -4); // no mismatch found in fast_loop, only 1-4 characters missing
-//23:
-   bind(Lslow_case);
-    mtctr(limit_reg);
-//24:
-   bind(Lslow_loop);
-    lhz(chr1_reg, 0, str1_reg);
-    lhzx(chr2_reg, str1_reg, addr_diff);
-    subf_(result_reg, chr2_reg, chr1_reg);
-    bne(CCR0, Ldone); // return chr1_reg
-    addi(str1_reg, str1_reg, 1*2);
-    bdnz(Lslow_loop);
-//30:
-   // If strings are equal up to min length, return the length difference.
-    mr(result_reg, cnt_diff);
-    nop(); // alignment
-//32:
-   // Otherwise, return the difference between the first mismatched chars.
-   bind(Ldone);
-}
-
-
-// Compare char[] arrays.
-//
-// str1_reg   USE only
-// str2_reg   USE only
-// cnt_reg    USE_DEF, due to tmp reg shortage
-// result_reg DEF only, might compromise USE only registers
-void MacroAssembler::char_arrays_equals(Register str1_reg, Register str2_reg, Register cnt_reg, Register result_reg,
-                                        Register tmp1_reg, Register tmp2_reg, Register tmp3_reg, Register tmp4_reg,
-                                        Register tmp5_reg) {
-
-  // Str1 may be the same register as str2 which can occur e.g. after scalar replacement.
-  assert_different_registers(result_reg, str1_reg, cnt_reg, tmp1_reg, tmp2_reg, tmp3_reg, tmp4_reg, tmp5_reg);
-  assert_different_registers(result_reg, str2_reg, cnt_reg, tmp1_reg, tmp2_reg, tmp3_reg, tmp4_reg, tmp5_reg);
-
-  // Offset 0 should be 32 byte aligned.
-  Label Linit_cbc, Lcbc, Lloop, Ldone_true, Ldone_false;
-  Register index_reg = tmp5_reg;
-  Register cbc_iter  = tmp4_reg;
-
-  // 'cnt_reg' contains the number of characters in the string's character array for the
-  // pre-CompactStrings strings implementation and the number of bytes in the string's
-  // byte array for the CompactStrings strings implementation.
-  const int HAS_COMPACT_STRING = java_lang_String::has_coder_field() ? 1 : 0; // '1' = byte array, '0' = char array
-
-//-1:
-  dcbtct(str1_reg, 0x00);  // Indicate R/O access to str1.
-  dcbtct(str2_reg, 0x00);  // Indicate R/O access to str2.
-//1:
-  // cbc_iter: remaining characters after the '4 java characters per iteration' loop.
-  rlwinm(cbc_iter, cnt_reg, 32 - HAS_COMPACT_STRING, 30, 31); // (cnt_reg % (HAS_COMPACT_STRING ? 8 : 4)) >> HAS_COMPACT_STRING
-  li(index_reg, 0); // init
-  li(result_reg, 0); // assume false
-  // tmp2_reg: units of 4 java characters (i.e. 8 bytes) per iteration (main loop).
-  srwi_(tmp2_reg, cnt_reg, exact_log2(4 << HAS_COMPACT_STRING)); // cnt_reg / (HAS_COMPACT_STRING ? 8 : 4)
-
-  cmpwi(CCR1, cbc_iter, 0);             // CCR1 = (cbc_iter==0)
-  beq(CCR0, Linit_cbc);                 // too short
-    mtctr(tmp2_reg);
-//8:
-    bind(Lloop);
-      ldx(tmp1_reg, str1_reg, index_reg);
-      ldx(tmp2_reg, str2_reg, index_reg);
-      cmpd(CCR0, tmp1_reg, tmp2_reg);
-      bne(CCR0, Ldone_false);  // Unequal char pair found -> done.
-      addi(index_reg, index_reg, 4*sizeof(jchar));
-      bdnz(Lloop);
-//14:
-  bind(Linit_cbc);
-  beq(CCR1, Ldone_true);
-    mtctr(cbc_iter);
-//16:
-    bind(Lcbc);
-      lhzx(tmp1_reg, str1_reg, index_reg);
-      lhzx(tmp2_reg, str2_reg, index_reg);
-      cmpw(CCR0, tmp1_reg, tmp2_reg);
-      bne(CCR0, Ldone_false);  // Unequal char pair found -> done.
-      addi(index_reg, index_reg, 1*sizeof(jchar));
-      bdnz(Lcbc);
-    nop();
-  bind(Ldone_true);
-  li(result_reg, 1);
-//24:
-  bind(Ldone_false);
-}
-
-
-void MacroAssembler::char_arrays_equalsImm(Register str1_reg, Register str2_reg, int cntval, Register result_reg,
-                                           Register tmp1_reg, Register tmp2_reg) {
-  // Str1 may be the same register as str2 which can occur e.g. after scalar replacement.
-  assert_different_registers(result_reg, str1_reg, tmp1_reg, tmp2_reg);
-  assert_different_registers(result_reg, str2_reg, tmp1_reg, tmp2_reg);
-  assert(sizeof(jchar) == 2, "must be");
-  assert(cntval >= 0 && ((cntval & 0x7fff) == cntval), "wrong immediate");
-
-  // 'cntval' contains the number of characters in the string's character array for the
-  // pre-CompactStrings strings implementation and the number of bytes in the string's
-  // byte array for the CompactStrings strings implementation.
-  cntval >>= (java_lang_String::has_coder_field() ? 1 : 0); // '1' = byte array strings, '0' = char array strings
-
-  Label Ldone_false;
-
-  if (cntval < 16) { // short case
-    if (cntval != 0) li(result_reg, 0); // assume false
-
-    const int num_bytes = cntval*sizeof(jchar);
-    int index = 0;
-    for (int next_index; (next_index = index + 8) <= num_bytes; index = next_index) {
-      ld(tmp1_reg, index, str1_reg);
-      ld(tmp2_reg, index, str2_reg);
-      cmpd(CCR0, tmp1_reg, tmp2_reg);
-      bne(CCR0, Ldone_false);
-    }
-    if (cntval & 2) {
-      lwz(tmp1_reg, index, str1_reg);
-      lwz(tmp2_reg, index, str2_reg);
-      cmpw(CCR0, tmp1_reg, tmp2_reg);
-      bne(CCR0, Ldone_false);
-      index += 4;
-    }
-    if (cntval & 1) {
-      lhz(tmp1_reg, index, str1_reg);
-      lhz(tmp2_reg, index, str2_reg);
-      cmpw(CCR0, tmp1_reg, tmp2_reg);
-      bne(CCR0, Ldone_false);
-    }
-    // fallthrough: true
-  } else {
-    Label Lloop;
-    Register index_reg = tmp1_reg;
-    const int loopcnt = cntval/4;
-    assert(loopcnt > 0, "must be");
-    // Offset 0 should be 32 byte aligned.
-    //2:
-    dcbtct(str1_reg, 0x00);  // Indicate R/O access to str1.
-    dcbtct(str2_reg, 0x00);  // Indicate R/O access to str2.
-    li(tmp2_reg, loopcnt);
-    li(index_reg, 0); // init
-    li(result_reg, 0); // assume false
-    mtctr(tmp2_reg);
-    //8:
-    bind(Lloop);
-    ldx(R0, str1_reg, index_reg);
-    ldx(tmp2_reg, str2_reg, index_reg);
-    cmpd(CCR0, R0, tmp2_reg);
-    bne(CCR0, Ldone_false);  // Unequal char pair found -> done.
-    addi(index_reg, index_reg, 4*sizeof(jchar));
-    bdnz(Lloop);
-    //14:
-    if (cntval & 2) {
-      lwzx(R0, str1_reg, index_reg);
-      lwzx(tmp2_reg, str2_reg, index_reg);
-      cmpw(CCR0, R0, tmp2_reg);
-      bne(CCR0, Ldone_false);
-      if (cntval & 1) addi(index_reg, index_reg, 2*sizeof(jchar));
-    }
-    if (cntval & 1) {
-      lhzx(R0, str1_reg, index_reg);
-      lhzx(tmp2_reg, str2_reg, index_reg);
-      cmpw(CCR0, R0, tmp2_reg);
-      bne(CCR0, Ldone_false);
-    }
-    // fallthru: true
-  }
-  li(result_reg, 1);
-  bind(Ldone_false);
-}
-
 #endif // Compiler2
 
 // Helpers for Intrinsic Emitters
diff --git a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
index 003c27b4333..ed846efb580 100644
--- a/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+++ b/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
@@ -431,10 +431,81 @@ class MacroAssembler: public Assembler {
     MemBarAcq  = 2,
     MemBarFenceAfter = 4 // use powers of 2
   };
+ private:
+  // Helper functions for word/sub-word atomics.
+  void atomic_get_and_modify_generic(Register dest_current_value, Register exchange_value,
+                                     Register addr_base, Register tmp1, Register tmp2, Register tmp3,
+                                     bool cmpxchgx_hint, bool is_add, int size);
+  void cmpxchg_loop_body(ConditionRegister flag, Register dest_current_value,
+                         Register compare_value, Register exchange_value,
+                         Register addr_base, Register tmp1, Register tmp2,
+                         Label &retry, Label &failed, bool cmpxchgx_hint, int size);
+  void cmpxchg_generic(ConditionRegister flag,
+                       Register dest_current_value, Register compare_value, Register exchange_value, Register addr_base,
+                       Register tmp1, Register tmp2,
+                       int semantics, bool cmpxchgx_hint, Register int_flag_success, bool contention_hint, bool weak, int size);
+ public:
+  // Temps and addr_base are killed if processor does not support Power 8 instructions.
+  // Result will be sign extended.
+  void getandsetb(Register dest_current_value, Register exchange_value, Register addr_base,
+                  Register tmp1, Register tmp2, Register tmp3, bool cmpxchgx_hint) {
+    atomic_get_and_modify_generic(dest_current_value, exchange_value, addr_base, tmp1, tmp2, tmp3, cmpxchgx_hint, false, 1);
+  }
+  // Temps and addr_base are killed if processor does not support Power 8 instructions.
+  // Result will be sign extended.
+  void getandseth(Register dest_current_value, Register exchange_value, Register addr_base,
+                  Register tmp1, Register tmp2, Register tmp3, bool cmpxchgx_hint) {
+    atomic_get_and_modify_generic(dest_current_value, exchange_value, addr_base, tmp1, tmp2, tmp3, cmpxchgx_hint, false, 2);
+  }
+  void getandsetw(Register dest_current_value, Register exchange_value, Register addr_base,
+                  bool cmpxchgx_hint) {
+    atomic_get_and_modify_generic(dest_current_value, exchange_value, addr_base, noreg, noreg, noreg, cmpxchgx_hint, false, 4);
+  }
+  void getandsetd(Register dest_current_value, Register exchange_value, Register addr_base,
+                  bool cmpxchgx_hint);
+  // tmp2/3 and addr_base are killed if processor does not support Power 8 instructions (tmp1 is always needed).
+  // Result will be sign extended.
+  void getandaddb(Register dest_current_value, Register inc_value, Register addr_base,
+                  Register tmp1, Register tmp2, Register tmp3, bool cmpxchgx_hint) {
+    atomic_get_and_modify_generic(dest_current_value, inc_value, addr_base, tmp1, tmp2, tmp3, cmpxchgx_hint, true, 1);
+  }
+  // tmp2/3 and addr_base are killed if processor does not support Power 8 instructions (tmp1 is always needed).
+  // Result will be sign extended.
+  void getandaddh(Register dest_current_value, Register inc_value, Register addr_base,
+                  Register tmp1, Register tmp2, Register tmp3, bool cmpxchgx_hint) {
+    atomic_get_and_modify_generic(dest_current_value, inc_value, addr_base, tmp1, tmp2, tmp3, cmpxchgx_hint, true, 2);
+  }
+  void getandaddw(Register dest_current_value, Register inc_value, Register addr_base,
+                  Register tmp1, bool cmpxchgx_hint) {
+    atomic_get_and_modify_generic(dest_current_value, inc_value, addr_base, tmp1, noreg, noreg, cmpxchgx_hint, true, 4);
+  }
+  void getandaddd(Register dest_current_value, Register exchange_value, Register addr_base,
+                  Register tmp, bool cmpxchgx_hint);
+  // Temps, addr_base and exchange_value are killed if processor does not support Power 8 instructions.
+  // compare_value must be at least 32 bit sign extended. Result will be sign extended.
+  void cmpxchgb(ConditionRegister flag,
+                Register dest_current_value, Register compare_value, Register exchange_value, Register addr_base,
+                Register tmp1, Register tmp2, int semantics, bool cmpxchgx_hint = false,
+                Register int_flag_success = noreg, bool contention_hint = false, bool weak = false) {
+    cmpxchg_generic(flag, dest_current_value, compare_value, exchange_value, addr_base, tmp1, tmp2,
+                    semantics, cmpxchgx_hint, int_flag_success, contention_hint, weak, 1);
+  }
+  // Temps, addr_base and exchange_value are killed if processor does not support Power 8 instructions.
+  // compare_value must be at least 32 bit sign extended. Result will be sign extended.
+  void cmpxchgh(ConditionRegister flag,
+                Register dest_current_value, Register compare_value, Register exchange_value, Register addr_base,
+                Register tmp1, Register tmp2, int semantics, bool cmpxchgx_hint = false,
+                Register int_flag_success = noreg, bool contention_hint = false, bool weak = false) {
+    cmpxchg_generic(flag, dest_current_value, compare_value, exchange_value, addr_base, tmp1, tmp2,
+                    semantics, cmpxchgx_hint, int_flag_success, contention_hint, weak, 2);
+  }
   void cmpxchgw(ConditionRegister flag,
                 Register dest_current_value, Register compare_value, Register exchange_value, Register addr_base,
                 int semantics, bool cmpxchgx_hint = false,
-                Register int_flag_success = noreg, bool contention_hint = false, bool weak = false);
+                Register int_flag_success = noreg, bool contention_hint = false, bool weak = false) {
+    cmpxchg_generic(flag, dest_current_value, compare_value, exchange_value, addr_base, noreg, noreg,
+                    semantics, cmpxchgx_hint, int_flag_success, contention_hint, weak, 4);
+  }
   void cmpxchgd(ConditionRegister flag,
                 Register dest_current_value, RegisterOrConstant compare_value, Register exchange_value,
                 Register addr_base, int semantics, bool cmpxchgx_hint = false,
@@ -717,23 +788,6 @@ class MacroAssembler: public Assembler {
                            Register needle, jchar needleChar, Register tmp1, Register tmp2, bool is_byte);
 
   void has_negatives(Register src, Register cnt, Register result, Register tmp1, Register tmp2);
-
-  // Intrinsics for non-CompactStrings
-  // Needle of length 1.
-  void string_indexof_1(Register result, Register haystack, Register haycnt,
-                        Register needle, jchar needleChar,
-                        Register tmp1, Register tmp2);
-  // General indexof, eventually with constant needle length.
-  void string_indexof(Register result, Register haystack, Register haycnt,
-                      Register needle, ciTypeArray* needle_values, Register needlecnt, int needlecntval,
-                      Register tmp1, Register tmp2, Register tmp3, Register tmp4);
-  void string_compare(Register str1_reg, Register str2_reg, Register cnt1_reg, Register cnt2_reg,
-                      Register result_reg, Register tmp_reg);
-  void char_arrays_equals(Register str1_reg, Register str2_reg, Register cnt_reg, Register result_reg,
-                          Register tmp1_reg, Register tmp2_reg, Register tmp3_reg, Register tmp4_reg,
-                          Register tmp5_reg);
-  void char_arrays_equalsImm(Register str1_reg, Register str2_reg, int cntval, Register result_reg,
-                             Register tmp1_reg, Register tmp2_reg);
 #endif
 
   // Emitters for BigInteger.multiplyToLen intrinsic.
diff --git a/hotspot/src/cpu/ppc/vm/ppc.ad b/hotspot/src/cpu/ppc/vm/ppc.ad
index 8badeb041a1..2f4939fb9b9 100644
--- a/hotspot/src/cpu/ppc/vm/ppc.ad
+++ b/hotspot/src/cpu/ppc/vm/ppc.ad
@@ -965,41 +965,9 @@ static int cc_to_biint(int cc, int flags_reg) {
 // is the number of bytes (not instructions) which will be inserted before
 // the instruction. The padding must match the size of a NOP instruction.
 
-int string_indexOf_imm1_charNode::compute_padding(int current_offset) const {
-  return (3*4-current_offset)&31;  // see MacroAssembler::string_indexof_1
-}
-
-int string_indexOf_imm1Node::compute_padding(int current_offset) const {
-  return (3*4-current_offset)&31;  // see MacroAssembler::string_indexof_1
-}
-
-int string_indexOfCharNode::compute_padding(int current_offset) const {
-  return (3*4-current_offset)&31;  // see MacroAssembler::string_indexof_1
-}
-
-int string_indexOf_immNode::compute_padding(int current_offset) const {
-  return (3*4-current_offset)&31;  // see MacroAssembler::string_indexof(constant needlecount)
-}
-
-int string_indexOfNode::compute_padding(int current_offset) const {
-  return (1*4-current_offset)&31;  // see MacroAssembler::string_indexof(variable needlecount)
-}
-
-int string_compareNode::compute_padding(int current_offset) const {
-  return (2*4-current_offset)&31;  // see MacroAssembler::string_compare
-}
-
-int string_equals_immNode::compute_padding(int current_offset) const {
-  if (opnd_array(3)->constant() < 16) return 0; // For strlen < 16 no nops because loop completely unrolled
-  return (2*4-current_offset)&31;               // Genral case - see MacroAssembler::char_arrays_equalsImm
-}
-
-int string_equalsNode::compute_padding(int current_offset) const {
-  return (7*4-current_offset)&31;  // see MacroAssembler::char_arrays_equals
-}
-
 int inlineCallClearArrayNode::compute_padding(int current_offset) const {
-  return (2*4-current_offset)&31;  // see MacroAssembler::clear_memory_doubleword
+  int desired_padding = (2*4-current_offset)&31; // see MacroAssembler::clear_memory_doubleword
+  return (desired_padding <= 3*4) ? desired_padding : 0;
 }
 
 //=============================================================================
@@ -3064,121 +3032,6 @@ encode %{
     __ bind(done);
   %}
 
-  // New atomics.
-  enc_class enc_GetAndAddI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src) %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-
-    MacroAssembler _masm(&cbuf);
-    Register Rtmp   = R0;
-    Register Rres   = $res$$Register;
-    Register Rsrc   = $src$$Register;
-    Register Rptr   = $mem_ptr$$Register;
-    bool RegCollision = (Rres == Rsrc) || (Rres == Rptr);
-    Register Rold   = RegCollision ? Rtmp : Rres;
-
-    Label Lretry;
-    __ bind(Lretry);
-    __ lwarx(Rold, Rptr, MacroAssembler::cmpxchgx_hint_atomic_update());
-    __ add(Rtmp, Rsrc, Rold);
-    __ stwcx_(Rtmp, Rptr);
-    if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
-      __ bne_predict_not_taken(CCR0, Lretry);
-    } else {
-      __ bne(                  CCR0, Lretry);
-    }
-    if (RegCollision) __ subf(Rres, Rsrc, Rtmp);
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-
-  enc_class enc_GetAndAddL(iRegLdst res, iRegPdst mem_ptr, iRegLsrc src) %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-
-    MacroAssembler _masm(&cbuf);
-    Register Rtmp   = R0;
-    Register Rres   = $res$$Register;
-    Register Rsrc   = $src$$Register;
-    Register Rptr   = $mem_ptr$$Register;
-    bool RegCollision = (Rres == Rsrc) || (Rres == Rptr);
-    Register Rold   = RegCollision ? Rtmp : Rres;
-
-    Label Lretry;
-    __ bind(Lretry);
-    __ ldarx(Rold, Rptr, MacroAssembler::cmpxchgx_hint_atomic_update());
-    __ add(Rtmp, Rsrc, Rold);
-    __ stdcx_(Rtmp, Rptr);
-    if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
-      __ bne_predict_not_taken(CCR0, Lretry);
-    } else {
-      __ bne(                  CCR0, Lretry);
-    }
-    if (RegCollision) __ subf(Rres, Rsrc, Rtmp);
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-
-  enc_class enc_GetAndSetI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src) %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-
-    MacroAssembler _masm(&cbuf);
-    Register Rtmp   = R0;
-    Register Rres   = $res$$Register;
-    Register Rsrc   = $src$$Register;
-    Register Rptr   = $mem_ptr$$Register;
-    bool RegCollision = (Rres == Rsrc) || (Rres == Rptr);
-    Register Rold   = RegCollision ? Rtmp : Rres;
-
-    Label Lretry;
-    __ bind(Lretry);
-    __ lwarx(Rold, Rptr, MacroAssembler::cmpxchgx_hint_atomic_update());
-    __ stwcx_(Rsrc, Rptr);
-    if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
-      __ bne_predict_not_taken(CCR0, Lretry);
-    } else {
-      __ bne(                  CCR0, Lretry);
-    }
-    if (RegCollision) __ mr(Rres, Rtmp);
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-
-  enc_class enc_GetAndSetL(iRegLdst res, iRegPdst mem_ptr, iRegLsrc src) %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-
-    MacroAssembler _masm(&cbuf);
-    Register Rtmp   = R0;
-    Register Rres   = $res$$Register;
-    Register Rsrc   = $src$$Register;
-    Register Rptr   = $mem_ptr$$Register;
-    bool RegCollision = (Rres == Rsrc) || (Rres == Rptr);
-    Register Rold   = RegCollision ? Rtmp : Rres;
-
-    Label Lretry;
-    __ bind(Lretry);
-    __ ldarx(Rold, Rptr, MacroAssembler::cmpxchgx_hint_atomic_update());
-    __ stdcx_(Rsrc, Rptr);
-    if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
-      __ bne_predict_not_taken(CCR0, Lretry);
-    } else {
-      __ bne(                  CCR0, Lretry);
-    }
-    if (RegCollision) __ mr(Rres, Rtmp);
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-
   // This enc_class is needed so that scheduler gets proper
   // input mapping for latency computation.
   enc_class enc_andc(iRegIdst dst, iRegIsrc src1, iRegIsrc src2) %{
@@ -7575,11 +7428,90 @@ instruct loadPLocked(iRegPdst dst, memory mem) %{
 
 // Strong versions:
 
+instruct compareAndSwapB_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndSwapB mem_ptr (Binary src1 src2)));
+  predicate(VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "CMPXCHGB $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                $res$$Register, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndSwapB4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndSwapB mem_ptr (Binary src1 src2)));
+  predicate(!VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "CMPXCHGB $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                $res$$Register, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndSwapS_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndSwapS mem_ptr (Binary src1 src2)));
+  predicate(VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "CMPXCHGH $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                $res$$Register, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndSwapS4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndSwapS mem_ptr (Binary src1 src2)));
+  predicate(!VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "CMPXCHGH $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                $res$$Register, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 instruct compareAndSwapI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndSwapI mem_ptr (Binary src1 src2)));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "CMPXCHGW $res, $mem_ptr, $src1, $src2; as bool" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7597,9 +7529,8 @@ instruct compareAndSwapI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc
 
 instruct compareAndSwapN_regP_regN_regN(iRegIdst res, iRegPdst mem_ptr, iRegNsrc src1, iRegNsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndSwapN mem_ptr (Binary src1 src2)));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "CMPXCHGW $res, $mem_ptr, $src1, $src2; as bool" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7617,9 +7548,8 @@ instruct compareAndSwapN_regP_regN_regN(iRegIdst res, iRegPdst mem_ptr, iRegNsrc
 
 instruct compareAndSwapL_regP_regL_regL(iRegIdst res, iRegPdst mem_ptr, iRegLsrc src1, iRegLsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndSwapL mem_ptr (Binary src1 src2)));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "CMPXCHGD $res, $mem_ptr, $src1, $src2; as bool" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7637,9 +7567,8 @@ instruct compareAndSwapL_regP_regL_regL(iRegIdst res, iRegPdst mem_ptr, iRegLsrc
 
 instruct compareAndSwapP_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr, iRegPsrc src1, iRegPsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndSwapP mem_ptr (Binary src1 src2)));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "CMPXCHGD $res, $mem_ptr, $src1, $src2; as bool; ptr" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7657,12 +7586,131 @@ instruct compareAndSwapP_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr, iRegPsrc
 
 // Weak versions:
 
+instruct weakCompareAndSwapB_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapB mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "weak CMPXCHGB $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                MacroAssembler::MemBarNone,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapB4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapB mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && !VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "weak CMPXCHGB $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+                MacroAssembler::MemBarNone,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapB_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapB mem_ptr (Binary src1 src2)));
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "weak CMPXCHGB acq $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapB4_acq_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapB mem_ptr (Binary src1 src2)));
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && !VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "weak CMPXCHGB acq $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapS_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapS mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "weak CMPXCHGH $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                MacroAssembler::MemBarNone,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapS4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapS mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && !VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "weak CMPXCHGH $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+                MacroAssembler::MemBarNone,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapS_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapS mem_ptr (Binary src1 src2)));
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "weak CMPXCHGH acq $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct weakCompareAndSwapS4_acq_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
+  match(Set res (WeakCompareAndSwapS mem_ptr (Binary src1 src2)));
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && !VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
+  format %{ "weak CMPXCHGH acq $res, $mem_ptr, $src1, $src2; as bool" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
+                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, true, /*weak*/ true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 instruct weakCompareAndSwapI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapI mem_ptr (Binary src1 src2)));
   predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGW $res, $mem_ptr, $src1, $src2; as bool" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7676,9 +7724,8 @@ instruct weakCompareAndSwapI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iReg
 instruct weakCompareAndSwapI_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapI mem_ptr (Binary src1 src2)));
   predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGW acq $res, $mem_ptr, $src1, $src2; as bool" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7694,9 +7741,8 @@ instruct weakCompareAndSwapI_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr,
 instruct weakCompareAndSwapN_regP_regN_regN(iRegIdst res, iRegPdst mem_ptr, iRegNsrc src1, iRegNsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapN mem_ptr (Binary src1 src2)));
   predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGW $res, $mem_ptr, $src1, $src2; as bool" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7710,9 +7756,8 @@ instruct weakCompareAndSwapN_regP_regN_regN(iRegIdst res, iRegPdst mem_ptr, iReg
 instruct weakCompareAndSwapN_acq_regP_regN_regN(iRegIdst res, iRegPdst mem_ptr, iRegNsrc src1, iRegNsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapN mem_ptr (Binary src1 src2)));
   predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGW acq $res, $mem_ptr, $src1, $src2; as bool" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7728,9 +7773,8 @@ instruct weakCompareAndSwapN_acq_regP_regN_regN(iRegIdst res, iRegPdst mem_ptr,
 instruct weakCompareAndSwapL_regP_regL_regL(iRegIdst res, iRegPdst mem_ptr, iRegLsrc src1, iRegLsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapL mem_ptr (Binary src1 src2)));
   predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGD $res, $mem_ptr, $src1, $src2; as bool" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7745,9 +7789,8 @@ instruct weakCompareAndSwapL_regP_regL_regL(iRegIdst res, iRegPdst mem_ptr, iReg
 instruct weakCompareAndSwapL_acq_regP_regL_regL(iRegIdst res, iRegPdst mem_ptr, iRegLsrc src1, iRegLsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapL mem_ptr (Binary src1 src2)));
   predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGD acq $res, $mem_ptr, $src1, $src2; as bool" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7763,9 +7806,8 @@ instruct weakCompareAndSwapL_acq_regP_regL_regL(iRegIdst res, iRegPdst mem_ptr,
 instruct weakCompareAndSwapP_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr, iRegPsrc src1, iRegPsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapP mem_ptr (Binary src1 src2)));
   predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGD $res, $mem_ptr, $src1, $src2; as bool; ptr" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7779,9 +7821,8 @@ instruct weakCompareAndSwapP_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr, iReg
 instruct weakCompareAndSwapP_acq_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr, iRegPsrc src1, iRegPsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapP mem_ptr (Binary src1 src2)));
   predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGD acq $res, $mem_ptr, $src1, $src2; as bool; ptr" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7796,12 +7837,155 @@ instruct weakCompareAndSwapP_acq_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr,
 
 // CompareAndExchange
 
+instruct compareAndExchangeB_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeB mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGB $res, $mem_ptr, $src1, $src2; as int" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeB4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeB mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && !VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP cr0);
+  format %{ "CMPXCHGB $res, $mem_ptr, $src1, $src2; as int" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, R0,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeB_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeB mem_ptr (Binary src1 src2)));
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGB acq $res, $mem_ptr, $src1, $src2; as int" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeB4_acq_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeB mem_ptr (Binary src1 src2)));
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && !VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP cr0);
+  format %{ "CMPXCHGB acq $res, $mem_ptr, $src1, $src2; as int" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgb(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, R0,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeS_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeS mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGH $res, $mem_ptr, $src1, $src2; as int" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeS4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeS mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && !VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP cr0);
+  format %{ "CMPXCHGH $res, $mem_ptr, $src1, $src2; as int" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, R0,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeS_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeS mem_ptr (Binary src1 src2)));
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGH acq $res, $mem_ptr, $src1, $src2; as int" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct compareAndExchangeS4_acq_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeS mem_ptr (Binary src1 src2)));
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && !VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP cr0);
+  format %{ "CMPXCHGH acq $res, $mem_ptr, $src1, $src2; as int" %}
+  ins_encode %{
+    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
+    // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
+    __ cmpxchgh(CCR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, R0,
+                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
+                noreg, true);
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 instruct compareAndExchangeI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndExchangeI mem_ptr (Binary src1 src2)));
   predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGW $res, $mem_ptr, $src1, $src2; as int" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7817,7 +8001,6 @@ instruct compareAndExchangeI_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr,
   predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGW acq $res, $mem_ptr, $src1, $src2; as int" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7839,7 +8022,6 @@ instruct compareAndExchangeN_regP_regN_regN(iRegNdst res, iRegPdst mem_ptr, iReg
   predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGW $res, $mem_ptr, $src1, $src2; as narrow oop" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7855,7 +8037,6 @@ instruct compareAndExchangeN_acq_regP_regN_regN(iRegNdst res, iRegPdst mem_ptr,
   predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGW acq $res, $mem_ptr, $src1, $src2; as narrow oop" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7877,7 +8058,6 @@ instruct compareAndExchangeL_regP_regL_regL(iRegLdst res, iRegPdst mem_ptr, iReg
   predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGD $res, $mem_ptr, $src1, $src2; as long" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7893,7 +8073,6 @@ instruct compareAndExchangeL_acq_regP_regL_regL(iRegLdst res, iRegPdst mem_ptr,
   predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGD acq $res, $mem_ptr, $src1, $src2; as long" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7915,7 +8094,6 @@ instruct compareAndExchangeP_regP_regP_regP(iRegPdst res, iRegPdst mem_ptr, iReg
   predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGD $res, $mem_ptr, $src1, $src2; as ptr; ptr" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7931,7 +8109,6 @@ instruct compareAndExchangeP_acq_regP_regP_regP(iRegPdst res, iRegPdst mem_ptr,
   predicate(((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGD acq $res, $mem_ptr, $src1, $src2; as ptr; ptr" %}
-  // Variable size: instruction count smaller if regs are disjoint.
   ins_encode %{
     // TODO: PPC port $archOpcode(ppc64Opcode_compound);
     // CmpxchgX sets CCR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
@@ -7950,57 +8127,235 @@ instruct compareAndExchangeP_acq_regP_regP_regP(iRegPdst res, iRegPdst mem_ptr,
 
 // Special RMW
 
+instruct getAndAddB(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
+  match(Set res (GetAndAddB mem_ptr src));
+  predicate(VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "GetAndAddB $res, $mem_ptr, $src" %}
+  ins_encode %{
+    __ getandaddb($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  R0, noreg, noreg, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct getAndAddB4(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src, iRegIsrc tmp1, iRegIsrc tmp2, flagsRegCR0 cr0) %{
+  match(Set res (GetAndAddB mem_ptr src));
+  predicate(!VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0);
+  format %{ "GetAndAddB $res, $mem_ptr, $src" %}
+  ins_encode %{
+    __ getandaddb($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  R0, $tmp1$$Register, $tmp2$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct getAndAddS(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
+  match(Set res (GetAndAddS mem_ptr src));
+  predicate(VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "GetAndAddS $res, $mem_ptr, $src" %}
+  ins_encode %{
+    __ getandaddh($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  R0, noreg, noreg, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct getAndAddS4(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src, iRegIsrc tmp1, iRegIsrc tmp2, flagsRegCR0 cr0) %{
+  match(Set res (GetAndAddS mem_ptr src));
+  predicate(!VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0);
+  format %{ "GetAndAddS $res, $mem_ptr, $src" %}
+  ins_encode %{
+    __ getandaddh($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  R0, $tmp1$$Register, $tmp2$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 instruct getAndAddI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndAddI mem_ptr src));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndAddI $res, $mem_ptr, $src" %}
-  // Variable size: instruction count smaller if regs are disjoint.
-  ins_encode( enc_GetAndAddI(res, mem_ptr, src) );
+  ins_encode %{
+    __ getandaddw($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  R0, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
   ins_pipe(pipe_class_default);
 %}
 
 instruct getAndAddL(iRegLdst res, iRegPdst mem_ptr, iRegLsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndAddL mem_ptr src));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndAddL $res, $mem_ptr, $src" %}
-  // Variable size: instruction count smaller if regs are disjoint.
-  ins_encode( enc_GetAndAddL(res, mem_ptr, src) );
+  ins_encode %{
+    __ getandaddd($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  R0, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct getAndSetB(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
+  match(Set res (GetAndSetB mem_ptr src));
+  predicate(VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "GetAndSetB $res, $mem_ptr, $src" %}
+  ins_encode %{
+    __ getandsetb($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  noreg, noreg, noreg, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct getAndSetB4(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src, iRegIsrc tmp1, iRegIsrc tmp2, flagsRegCR0 cr0) %{
+  match(Set res (GetAndSetB mem_ptr src));
+  predicate(!VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0);
+  format %{ "GetAndSetB $res, $mem_ptr, $src" %}
+  ins_encode %{
+    __ getandsetb($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  R0, $tmp1$$Register, $tmp2$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct getAndSetS(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
+  match(Set res (GetAndSetS mem_ptr src));
+  predicate(VM_Version::has_lqarx());
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "GetAndSetS $res, $mem_ptr, $src" %}
+  ins_encode %{
+    __ getandseth($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  noreg, noreg, noreg, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct getAndSetS4(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src, iRegIsrc tmp1, iRegIsrc tmp2, flagsRegCR0 cr0) %{
+  match(Set res (GetAndSetS mem_ptr src));
+  predicate(!VM_Version::has_lqarx());
+  effect(TEMP_DEF res, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0);
+  format %{ "GetAndSetS $res, $mem_ptr, $src" %}
+  ins_encode %{
+    __ getandseth($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  R0, $tmp1$$Register, $tmp2$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
   ins_pipe(pipe_class_default);
 %}
 
 instruct getAndSetI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndSetI mem_ptr src));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndSetI $res, $mem_ptr, $src" %}
-  // Variable size: instruction count smaller if regs are disjoint.
-  ins_encode( enc_GetAndSetI(res, mem_ptr, src) );
+  ins_encode %{
+    __ getandsetw($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
   ins_pipe(pipe_class_default);
 %}
 
 instruct getAndSetL(iRegLdst res, iRegPdst mem_ptr, iRegLsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndSetL mem_ptr src));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndSetL $res, $mem_ptr, $src" %}
-  // Variable size: instruction count smaller if regs are disjoint.
-  ins_encode( enc_GetAndSetL(res, mem_ptr, src) );
+  ins_encode %{
+    __ getandsetd($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
   ins_pipe(pipe_class_default);
 %}
 
 instruct getAndSetP(iRegPdst res, iRegPdst mem_ptr, iRegPsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndSetP mem_ptr src));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndSetP $res, $mem_ptr, $src" %}
-  // Variable size: instruction count smaller if regs are disjoint.
-  ins_encode( enc_GetAndSetL(res, mem_ptr, src) );
+  ins_encode %{
+    __ getandsetd($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
   ins_pipe(pipe_class_default);
 %}
 
 instruct getAndSetN(iRegNdst res, iRegPdst mem_ptr, iRegNsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndSetN mem_ptr src));
-  effect(TEMP cr0);
+  effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndSetN $res, $mem_ptr, $src" %}
-  // Variable size: instruction count smaller if regs are disjoint.
-  ins_encode( enc_GetAndSetI(res, mem_ptr, src) );
+  ins_encode %{
+    __ getandsetw($res$$Register, $src$$Register, $mem_ptr$$Register,
+                  MacroAssembler::cmpxchgx_hint_atomic_update());
+    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+      __ isync();
+    } else {
+      __ sync();
+    }
+  %}
   ins_pipe(pipe_class_default);
 %}
 
@@ -11360,7 +11715,7 @@ instruct inlineCallClearArray(rarg1RegL cnt, rarg2RegP base, Universe dummy, reg
   effect(USE_KILL cnt, USE_KILL base, KILL ctr);
   ins_cost(MEMORY_REF_COST);
 
-  ins_alignment(8); // 'compute_padding()' gets called, up to this number-1 nops will get inserted.
+  ins_alignment(4); // 'compute_padding()' gets called, up to this number-1 nops will get inserted.
 
   format %{ "ClearArray $cnt, $base" %}
   ins_encode %{
@@ -11686,7 +12041,6 @@ instruct indexOfChar_U(iRegIdst result, iRegPsrc haystack, iRegIsrc haycnt,
                        flagsRegCR0 cr0, flagsRegCR1 cr1, regCTR ctr) %{
   match(Set result (StrIndexOfChar (Binary haystack haycnt) ch));
   effect(TEMP tmp1, TEMP tmp2, KILL cr0, KILL cr1, KILL ctr);
-  predicate(CompactStrings);
   ins_cost(180);
 
   format %{ "String IndexOfChar $haystack[0..$haycnt], $ch"
@@ -11948,283 +12302,6 @@ instruct encode_iso_array(rarg1RegP src, rarg2RegP dst, iRegIsrc len, iRegIdst r
 %}
 
 
-// String_IndexOf for needle of length 1.
-//
-// Match needle into immediate operands: no loadConP node needed. Saves one
-// register and two instructions over string_indexOf_imm1Node.
-//
-// Assumes register result differs from all input registers.
-//
-// Preserves registers haystack, haycnt
-// Kills     registers tmp1, tmp2
-// Defines   registers result
-//
-// Use dst register classes if register gets killed, as it is the case for tmp registers!
-//
-// Unfortunately this does not match too often. In many situations the AddP is used
-// by several nodes, even several StrIndexOf nodes, breaking the match tree.
-instruct string_indexOf_imm1_char(iRegIdst result, iRegPsrc haystack, iRegIsrc haycnt,
-                                  immP needleImm, immL offsetImm, immI_1 needlecntImm,
-                                  iRegIdst tmp1, iRegIdst tmp2,
-                                  flagsRegCR0 cr0, flagsRegCR1 cr1, regCTR ctr) %{
-  predicate(SpecialStringIndexOf && !CompactStrings);  // type check implicit by parameter type, See Matcher::match_rule_supported
-  match(Set result (StrIndexOf (Binary haystack haycnt) (Binary (AddP needleImm offsetImm) needlecntImm)));
-
-  effect(TEMP_DEF result, TEMP tmp1, TEMP tmp2, KILL cr0, KILL cr1, KILL ctr);
-
-  ins_cost(150);
-  format %{ "String IndexOf CSCL1 $haystack[0..$haycnt], $needleImm+$offsetImm[0..$needlecntImm]"
-            "-> $result \t// KILL $haycnt, $tmp1, $tmp2, $cr0, $cr1" %}
-
-  ins_alignment(8); // 'compute_padding()' gets called, up to this number-1 nops will get inserted
-  ins_encode %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-    immPOper *needleOper = (immPOper *)$needleImm;
-    const TypeOopPtr *t = needleOper->type()->isa_oopptr();
-    ciTypeArray* needle_values = t->const_oop()->as_type_array();  // Pointer to live char *
-    jchar chr;
-    if (java_lang_String::has_coder_field()) {
-      // New compact strings byte array strings
-#ifdef VM_LITTLE_ENDIAN
-    chr = (((jchar)(unsigned char)needle_values->element_value(1).as_byte()) << 8) |
-           ((jchar)(unsigned char)needle_values->element_value(0).as_byte());
-#else
-    chr = (((jchar)(unsigned char)needle_values->element_value(0).as_byte()) << 8) |
-           ((jchar)(unsigned char)needle_values->element_value(1).as_byte());
-#endif
-    } else {
-      // Old char array strings
-      chr = needle_values->char_at(0);
-    }
-    __ string_indexof_1($result$$Register,
-                        $haystack$$Register, $haycnt$$Register,
-                        R0, chr,
-                        $tmp1$$Register, $tmp2$$Register);
-  %}
-  ins_pipe(pipe_class_compare);
-%}
-
-// String_IndexOf for needle of length 1.
-//
-// Special case requires less registers and emits less instructions.
-//
-// Assumes register result differs from all input registers.
-//
-// Preserves registers haystack, haycnt
-// Kills     registers tmp1, tmp2, needle
-// Defines   registers result
-//
-// Use dst register classes if register gets killed, as it is the case for tmp registers!
-instruct string_indexOf_imm1(iRegIdst result, iRegPsrc haystack, iRegIsrc haycnt,
-                             rscratch2RegP needle, immI_1 needlecntImm,
-                             iRegIdst tmp1, iRegIdst tmp2,
-                             flagsRegCR0 cr0, flagsRegCR1 cr1, regCTR ctr) %{
-  match(Set result (StrIndexOf (Binary haystack haycnt) (Binary needle needlecntImm)));
-  effect(USE_KILL needle, /* TDEF needle, */ TEMP_DEF result,
-         TEMP tmp1, TEMP tmp2, KILL cr0, KILL cr1, KILL ctr);
-  // Required for EA: check if it is still a type_array.
-  predicate(SpecialStringIndexOf && !CompactStrings &&
-            n->in(3)->in(1)->bottom_type()->is_aryptr()->const_oop() &&
-            n->in(3)->in(1)->bottom_type()->is_aryptr()->const_oop()->is_type_array());
-  ins_cost(180);
-
-  ins_alignment(8); // 'compute_padding()' gets called, up to this number-1 nops will get inserted.
-
-  format %{ "String IndexOf SCL1 $haystack[0..$haycnt], $needle[0..$needlecntImm]"
-            " -> $result \t// KILL $haycnt, $needle, $tmp1, $tmp2, $cr0, $cr1" %}
-  ins_encode %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-    Node *ndl = in(operand_index($needle));  // The node that defines needle.
-    ciTypeArray* needle_values = ndl->bottom_type()->is_aryptr()->const_oop()->as_type_array();
-    guarantee(needle_values, "sanity");
-    jchar chr;
-    if (java_lang_String::has_coder_field()) {
-      // New compact strings byte array strings
-#ifdef VM_LITTLE_ENDIAN
-    chr = (((jchar)(unsigned char)needle_values->element_value(1).as_byte()) << 8) |
-           ((jchar)(unsigned char)needle_values->element_value(0).as_byte());
-#else
-    chr = (((jchar)(unsigned char)needle_values->element_value(0).as_byte()) << 8) |
-           ((jchar)(unsigned char)needle_values->element_value(1).as_byte());
-#endif
-    } else {
-      // Old char array strings
-      chr = needle_values->char_at(0);
-    }
-    __ string_indexof_1($result$$Register,
-                        $haystack$$Register, $haycnt$$Register,
-                        R0, chr,
-                        $tmp1$$Register, $tmp2$$Register);
-  %}
-  ins_pipe(pipe_class_compare);
-%}
-
-// String_IndexOfChar
-//
-// Assumes register result differs from all input registers.
-//
-// Preserves registers haystack, haycnt
-// Kills     registers tmp1, tmp2
-// Defines   registers result
-//
-// Use dst register classes if register gets killed, as it is the case for tmp registers!
-instruct string_indexOfChar(iRegIdst result, iRegPsrc haystack, iRegIsrc haycnt,
-                            iRegIsrc ch, iRegIdst tmp1, iRegIdst tmp2,
-                            flagsRegCR0 cr0, flagsRegCR1 cr1, regCTR ctr) %{
-  match(Set result (StrIndexOfChar (Binary haystack haycnt) ch));
-  effect(TEMP_DEF result, TEMP tmp1, TEMP tmp2, KILL cr0, KILL cr1, KILL ctr);
-  predicate(SpecialStringIndexOf && !CompactStrings);
-  ins_cost(180);
-
-  ins_alignment(8); // 'compute_padding()' gets called, up to this number-1 nops will get inserted.
-
-  format %{ "String IndexOfChar $haystack[0..$haycnt], $ch"
-            " -> $result \t// KILL $haycnt, $tmp1, $tmp2, $cr0, $cr1" %}
-  ins_encode %{
-    __ string_indexof_1($result$$Register,
-                        $haystack$$Register, $haycnt$$Register,
-                        $ch$$Register, 0 /* this is not used if the character is already in a register */,
-                        $tmp1$$Register, $tmp2$$Register);
-  %}
-  ins_pipe(pipe_class_compare);
-%}
-
-// String_IndexOf.
-//
-// Length of needle as immediate. This saves instruction loading constant needle
-// length.
-// @@@ TODO Specify rules for length < 8 or so, and roll out comparison of needle
-// completely or do it in vector instruction. This should save registers for
-// needlecnt and needle.
-//
-// Assumes register result differs from all input registers.
-// Overwrites haycnt, needlecnt.
-// Use dst register classes if register gets killed, as it is the case for tmp registers!
-instruct string_indexOf_imm(iRegIdst result, iRegPsrc haystack, rscratch1RegI haycnt,
-                            iRegPsrc needle, uimmI15 needlecntImm,
-                            iRegIdst tmp1, iRegIdst tmp2, iRegIdst tmp3, iRegIdst tmp4, iRegIdst tmp5,
-                            flagsRegCR0 cr0, flagsRegCR1 cr1, flagsRegCR6 cr6, regCTR ctr) %{
-  match(Set result (StrIndexOf (Binary haystack haycnt) (Binary needle needlecntImm)));
-  effect(USE_KILL haycnt, /* better: TDEF haycnt, */ TEMP_DEF result,
-         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP tmp5, KILL cr0, KILL cr1, KILL cr6, KILL ctr);
-  // Required for EA: check if it is still a type_array.
-  predicate(SpecialStringIndexOf && !CompactStrings && n->in(3)->in(1)->bottom_type()->is_aryptr()->const_oop() &&
-            n->in(3)->in(1)->bottom_type()->is_aryptr()->const_oop()->is_type_array());
-  ins_cost(250);
-
-  ins_alignment(8); // 'compute_padding()' gets called, up to this number-1 nops will get inserted.
-
-  format %{ "String IndexOf SCL $haystack[0..$haycnt], $needle[0..$needlecntImm]"
-            " -> $result \t// KILL $haycnt, $tmp1, $tmp2, $tmp3, $tmp4, $tmp5, $cr0, $cr1" %}
-  ins_encode %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-    Node *ndl = in(operand_index($needle));  // The node that defines needle.
-    ciTypeArray* needle_values = ndl->bottom_type()->is_aryptr()->const_oop()->as_type_array();
-
-    __ string_indexof($result$$Register,
-                      $haystack$$Register, $haycnt$$Register,
-                      $needle$$Register, needle_values, $tmp5$$Register, $needlecntImm$$constant,
-                      $tmp1$$Register, $tmp2$$Register, $tmp3$$Register, $tmp4$$Register);
-  %}
-  ins_pipe(pipe_class_compare);
-%}
-
-// StrIndexOf node.
-//
-// Assumes register result differs from all input registers.
-// Overwrites haycnt, needlecnt.
-// Use dst register classes if register gets killed, as it is the case for tmp registers!
-instruct string_indexOf(iRegIdst result, iRegPsrc haystack, rscratch1RegI haycnt, iRegPsrc needle, rscratch2RegI needlecnt,
-                        iRegLdst tmp1, iRegLdst tmp2, iRegLdst tmp3, iRegLdst tmp4,
-                        flagsRegCR0 cr0, flagsRegCR1 cr1, flagsRegCR6 cr6, regCTR ctr) %{
-  match(Set result (StrIndexOf (Binary haystack haycnt) (Binary needle needlecnt)));
-  effect(USE_KILL haycnt, USE_KILL needlecnt, /*better: TDEF haycnt, TDEF needlecnt,*/
-         TEMP_DEF result,
-         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr0, KILL cr1, KILL cr6, KILL ctr);
-  predicate(SpecialStringIndexOf && !CompactStrings);  // See Matcher::match_rule_supported.
-  ins_cost(300);
-
-  ins_alignment(8); // 'compute_padding()' gets called, up to this number-1 nops will get inserted.
-
-  format %{ "String IndexOf $haystack[0..$haycnt], $needle[0..$needlecnt]"
-             " -> $result \t// KILL $haycnt, $needlecnt, $tmp1, $tmp2, $tmp3, $tmp4, $cr0, $cr1" %}
-  ins_encode %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-    __ string_indexof($result$$Register,
-                      $haystack$$Register, $haycnt$$Register,
-                      $needle$$Register, NULL, $needlecnt$$Register, 0,  // needlecnt not constant.
-                      $tmp1$$Register, $tmp2$$Register, $tmp3$$Register, $tmp4$$Register);
-  %}
-  ins_pipe(pipe_class_compare);
-%}
-
-// String equals with immediate.
-instruct string_equals_imm(iRegPsrc str1, iRegPsrc str2, uimmI15 cntImm, iRegIdst result,
-                           iRegPdst tmp1, iRegPdst tmp2,
-                           flagsRegCR0 cr0, flagsRegCR6 cr6, regCTR ctr) %{
-  match(Set result (StrEquals (Binary str1 str2) cntImm));
-  effect(TEMP_DEF result, TEMP tmp1, TEMP tmp2,
-         KILL cr0, KILL cr6, KILL ctr);
-  predicate(SpecialStringEquals && !CompactStrings);  // See Matcher::match_rule_supported.
-  ins_cost(250);
-
-  ins_alignment(8); // 'compute_padding()' gets called, up to this number-1 nops will get inserted.
-
-  format %{ "String Equals SCL [0..$cntImm]($str1),[0..$cntImm]($str2)"
-            " -> $result \t// KILL $cr0, $cr6, $ctr, TEMP $result, $tmp1, $tmp2" %}
-  ins_encode %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-    __ char_arrays_equalsImm($str1$$Register, $str2$$Register, $cntImm$$constant,
-                             $result$$Register, $tmp1$$Register, $tmp2$$Register);
-  %}
-  ins_pipe(pipe_class_compare);
-%}
-
-// String equals.
-// Use dst register classes if register gets killed, as it is the case for TEMP operands!
-instruct string_equals(iRegPsrc str1, iRegPsrc str2, iRegIsrc cnt, iRegIdst result,
-                       iRegPdst tmp1, iRegPdst tmp2, iRegPdst tmp3, iRegPdst tmp4, iRegPdst tmp5,
-                       flagsRegCR0 cr0, flagsRegCR1 cr1, flagsRegCR6 cr6, regCTR ctr) %{
-  match(Set result (StrEquals (Binary str1 str2) cnt));
-  effect(TEMP_DEF result, TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP tmp5,
-         KILL cr0, KILL cr1, KILL cr6, KILL ctr);
-  predicate(SpecialStringEquals && !CompactStrings);  // See Matcher::match_rule_supported.
-  ins_cost(300);
-
-  ins_alignment(8); // 'compute_padding()' gets called, up to this number-1 nops will get inserted.
-
-  format %{ "String Equals [0..$cnt]($str1),[0..$cnt]($str2) -> $result"
-            " \t// KILL $cr0, $cr1, $cr6, $ctr, TEMP $result, $tmp1, $tmp2, $tmp3, $tmp4, $tmp5" %}
-  ins_encode %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-    __ char_arrays_equals($str1$$Register, $str2$$Register, $cnt$$Register, $result$$Register,
-                          $tmp1$$Register, $tmp2$$Register, $tmp3$$Register, $tmp4$$Register, $tmp5$$Register);
-  %}
-  ins_pipe(pipe_class_compare);
-%}
-
-// String compare.
-// Char[] pointers are passed in.
-// Use dst register classes if register gets killed, as it is the case for TEMP operands!
-instruct string_compare(rarg1RegP str1, rarg2RegP str2, rarg3RegI cnt1, rarg4RegI cnt2, iRegIdst result,
-                        iRegPdst tmp, flagsRegCR0 cr0, regCTR ctr) %{
-  predicate(!CompactStrings);
-  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(USE_KILL cnt1, USE_KILL cnt2, USE_KILL str1, USE_KILL str2, TEMP_DEF result, TEMP tmp, KILL cr0, KILL ctr);
-  ins_cost(300);
-
-  ins_alignment(8); // 'compute_padding()' gets called, up to this number-1 nops will get inserted.
-
-  format %{ "String Compare $str1[0..$cnt1], $str2[0..$cnt2] -> $result"
-            " \t// TEMP $tmp, $result KILLs $str1, $cnt1, $str2, $cnt2, $cr0, $ctr" %}
-  ins_encode %{
-    // TODO: PPC port $archOpcode(ppc64Opcode_compound);
-    __ string_compare($str1$$Register, $str2$$Register, $cnt1$$Register, $cnt2$$Register,
-                      $result$$Register, $tmp$$Register);
-  %}
-  ins_pipe(pipe_class_compare);
-%}
-
 //---------- Min/Max Instructions ---------------------------------------------
 
 instruct minI_reg_reg_Ex(iRegIdst dst, iRegIsrc src1, iRegIsrc src2) %{

From dd9f85e74d75f14cff0e302f7f63e78a8e428b29 Mon Sep 17 00:00:00 2001
From: Andrew Haley 
Date: Thu, 23 Jun 2016 16:27:34 +0000
Subject: [PATCH 061/111] 8160189: Fix for 8159335 breaks AArch64

Reviewed-by: kvn
---
 .../cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp
index 449cb3d9277..4c54f8e357e 100644
--- a/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp
@@ -682,7 +682,7 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(void) {
   __ mov(r0, overhead_size);
   __ add(r0, r0, r3, Assembler::LSL, Interpreter::logStackElementSize);  // 2 slots per parameter.
 
-  const Address stack_limit(rthread, Thread::stack_overflow_limit_offset());
+  const Address stack_limit(rthread, JavaThread::stack_overflow_limit_offset());
   __ ldr(rscratch1, stack_limit);
 
 #ifdef ASSERT
@@ -690,7 +690,7 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(void) {
   // Verify that thread stack limit is non-zero.
   __ cbnz(rscratch1, limit_okay);
   __ stop("stack overflow limit is zero");
-  __ bind(stack_base_okay);
+  __ bind(limit_okay);
 #endif
 
   // Add stack limit to locals.

From 9bea129ff75622c52800812003d40e3ca2712e60 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez 
Date: Thu, 23 Jun 2016 10:22:36 -0700
Subject: [PATCH 062/111] 8160197: [JVMCI] AllocatableValue.toString overrides
 are missing reference information

Reviewed-by: kvn
---
 .../jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java   |  2 +-
 .../src/jdk/vm/ci/meta/ValueKind.java              | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java
index 6d364d72f53..5118a90df5b 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Value.java
@@ -65,7 +65,7 @@ public abstract class Value {
      * {@link #toString()} implementation of subclasses.
      */
     protected final String getKindSuffix() {
-        return "|" + getPlatformKind().getTypeChar();
+        return "|" + valueKind.getKindSuffix();
     }
 
     public final ValueKind getValueKind() {
diff --git a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java
index 84a10ababfc..a4d5f2190d9 100644
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ValueKind.java
@@ -60,6 +60,11 @@ public abstract class ValueKind> {
         public IllegalValueKind changeType(PlatformKind newPlatformKind) {
             return this;
         }
+
+        @Override
+        public String toString() {
+            return "ILLEGAL";
+        }
     }
 
     /**
@@ -82,4 +87,13 @@ public abstract class ValueKind> {
      * override this to preserve the additional information added by the compiler.
      */
     public abstract K changeType(PlatformKind newPlatformKind);
+
+    /**
+     * Returns a String representation of the kind, which will be included at the end of
+     * {@link Value#toString()} implementation. Defaults to {@link #toString()} but can be
+     * overridden to provide something more specific.
+     */
+    public String getKindSuffix() {
+        return toString();
+    }
 }

From 4abb5e4aafe05871a07d510f002a38298fe4dbb2 Mon Sep 17 00:00:00 2001
From: Alex Henrie 
Date: Thu, 23 Jun 2016 16:46:41 -0400
Subject: [PATCH 063/111] 8157758: JDK9 does not compile on Linux with GCC 6.1
 because left-shifting a negative number has undefined behavior

Replace shifts of -1 with shifts of ~0u.

Reviewed-by: kbarrett, mockner
---
 hotspot/src/share/vm/code/dependencies.hpp | 2 +-
 hotspot/src/share/vm/oops/cpCache.hpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/code/dependencies.hpp b/hotspot/src/share/vm/code/dependencies.hpp
index 22a2fd2ce53..eeedcb10e8b 100644
--- a/hotspot/src/share/vm/code/dependencies.hpp
+++ b/hotspot/src/share/vm/code/dependencies.hpp
@@ -168,7 +168,7 @@ class Dependencies: public ResourceObj {
     LG2_TYPE_LIMIT = 4,  // assert(TYPE_LIMIT <= (1<
Date: Fri, 24 Jun 2016 12:08:32 +0300
Subject: [PATCH 064/111] 8160102: Typo in message for NULL memory size
 arguments in diagnosticArgument.cpp

Reviewed-by: dholmes, rehn
---
 hotspot/src/share/vm/services/diagnosticArgument.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/services/diagnosticArgument.cpp b/hotspot/src/share/vm/services/diagnosticArgument.cpp
index 85db9623169..0c51a708e9a 100644
--- a/hotspot/src/share/vm/services/diagnosticArgument.cpp
+++ b/hotspot/src/share/vm/services/diagnosticArgument.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -280,7 +280,7 @@ template <> void DCmdArgument::parse_value(const char* str,
                                                   size_t len, TRAPS) {
   if (str == NULL) {
     THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
-              "Integer parsing error nanotime value: syntax error");
+               "Parsing error memory size value: syntax error, value is null");
   }
 
   if (*str == '-') {

From 990315c8ce326d535b7be966188bb4799f96b347 Mon Sep 17 00:00:00 2001
From: Dmitry Fazunenko 
Date: Fri, 24 Jun 2016 19:52:31 +0400
Subject: [PATCH 065/111] 8160088: update hotspot tests depending on GC to use
 @requires vm.gc.X

Reviewed-by: iignatyev, mchernov, dholmes
---
 hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java    | 4 ++--
 hotspot/test/gc/TestCardTablePageCommits.java                 | 2 +-
 hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java           | 2 +-
 .../test/gc/arguments/TestG1ConcMarkStepDurationMillis.java   | 4 ++--
 hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java    | 2 +-
 hotspot/test/gc/arguments/TestG1HeapRegionSize.java           | 4 ++--
 hotspot/test/gc/arguments/TestG1HeapSizeFlags.java            | 2 +-
 hotspot/test/gc/arguments/TestG1PercentageOptions.java        | 2 +-
 hotspot/test/gc/arguments/TestInitialTenuringThreshold.java   | 2 +-
 hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java      | 4 ++--
 hotspot/test/gc/arguments/TestObjectTenuringFlags.java        | 2 +-
 hotspot/test/gc/cms/DisableResizePLAB.java                    | 4 ++--
 hotspot/test/gc/cms/TestBubbleUpRef.java                      | 2 +-
 hotspot/test/gc/cms/TestCMSScavengeBeforeRemark.java          | 4 ++--
 hotspot/test/gc/cms/TestMBeanCMS.java                         | 2 +-
 hotspot/test/gc/g1/Test2GbHeap.java                           | 2 +-
 hotspot/test/gc/g1/TestGreyReclaimedHumongousObjects.java     | 2 +-
 hotspot/test/gc/g1/TestHumongousShrinkHeap.java               | 4 ++--
 hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java          | 4 ++--
 hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java  | 4 ++--
 hotspot/test/gc/g1/TestPLABOutput.java                        | 2 +-
 hotspot/test/gc/g1/TestPLABSizeBounds.java                    | 4 ++--
 hotspot/test/gc/g1/TestRegionAlignment.java                   | 4 ++--
 hotspot/test/gc/g1/TestRegionLivenessPrint.java               | 2 +-
 hotspot/test/gc/g1/TestRemsetLogging.java                     | 4 ++--
 hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java            | 4 ++--
 hotspot/test/gc/g1/TestRemsetLoggingThreads.java              | 4 ++--
 hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java             | 2 +-
 hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java             | 2 +-
 hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java             | 2 +-
 hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java             | 2 +-
 hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java             | 2 +-
 hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java             | 2 +-
 hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java             | 2 +-
 hotspot/test/gc/g1/TestShrinkToOneRegion.java                 | 4 ++--
 hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java     | 2 +-
 .../test/gc/g1/humongousObjects/TestHumongousClassLoader.java | 2 +-
 .../test/gc/g1/humongousObjects/TestHumongousMovement.java    | 4 ++--
 .../g1/humongousObjects/TestHumongousNonArrayAllocation.java  | 4 ++--
 .../test/gc/g1/humongousObjects/TestHumongousThreshold.java   | 2 +-
 hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java  | 4 ++--
 .../objectGraphTest/TestObjectGraphAfterGC.java               | 2 +-
 hotspot/test/gc/g1/ihop/TestIHOPErgo.java                     | 2 +-
 hotspot/test/gc/g1/ihop/TestIHOPStatic.java                   | 2 +-
 hotspot/test/gc/g1/mixedgc/TestLogging.java                   | 2 +-
 hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java        | 2 +-
 hotspot/test/gc/g1/plab/TestPLABPromotion.java                | 2 +-
 hotspot/test/gc/g1/plab/TestPLABResize.java                   | 2 +-
 hotspot/test/gc/metaspace/G1AddMetaspaceDependency.java       | 4 ++--
 hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java | 4 ++--
 hotspot/test/gc/parallel/TestDynShrinkHeap.java               | 2 +-
 hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java       | 2 +-
 hotspot/test/gc/stress/TestMultiThreadStressRSet.java         | 2 +-
 hotspot/test/gc/stress/TestStressG1Humongous.java             | 2 +-
 hotspot/test/gc/stress/TestStressIHOPMultiThread.java         | 2 +-
 hotspot/test/gc/stress/TestStressRSetCoarsening.java          | 2 +-
 hotspot/test/gc/whitebox/TestConcMarkCycleWB.java             | 4 ++--
 hotspot/test/runtime/SharedArchiveFile/SharedStrings.java     | 2 +-
 .../test/runtime/SharedArchiveFile/SharedStringsRunAuto.java  | 4 ++--
 59 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java b/hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java
index f8fc1879644..cf7b65b6dc9 100644
--- a/hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java
+++ b/hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,7 +24,7 @@
 /*
  * @test
  * @bug 8027751
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary C1 crashes generating G1 post-barrier in Unsafe.getAndSetObject() intrinsic because of the new value spill
  * @run main/othervm -XX:+UseG1GC C1ObjectSpillInLogicOp
  *
diff --git a/hotspot/test/gc/TestCardTablePageCommits.java b/hotspot/test/gc/TestCardTablePageCommits.java
index b3b4e13a898..3577ebfe8fa 100644
--- a/hotspot/test/gc/TestCardTablePageCommits.java
+++ b/hotspot/test/gc/TestCardTablePageCommits.java
@@ -31,7 +31,7 @@ import jdk.test.lib.Platform;
  * @key gc
  * @bug 8059066
  * @summary Tests that the card table does not commit the same page twice
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java b/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java
index 2e9e329f9d4..4e5fa74818c 100644
--- a/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java
+++ b/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java
@@ -25,7 +25,7 @@
  * @test TestCMSHeapSizeFlags
  * @key gc
  * @bug 8006088
- * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+ * @requires vm.gc.ConcMarkSweep
  * @summary Tests argument processing for initial and maximum heap size for the CMS collector
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java b/hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java
index 9a1eb442905..bd9e73a6b49 100644
--- a/hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java
+++ b/hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 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,7 +24,7 @@
 /*
  * @test TestG1ConcMarkStepDurationMillis
  * @key gc
- * @requires vm.gc=="null" | vm.gc=="G1"
+ * @requires vm.gc.G1
  * @summary Tests argument processing for double type flag, G1ConcMarkStepDurationMillis
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java b/hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java
index 25b8e34414a..fb91b9e4154 100644
--- a/hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java
+++ b/hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java
@@ -25,7 +25,7 @@
  * @test TestG1ConcRefinementThreads
  * @key gc
  * @bug 8047976
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Tests argument processing for G1ConcRefinementThreads
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/arguments/TestG1HeapRegionSize.java b/hotspot/test/gc/arguments/TestG1HeapRegionSize.java
index 1864a472ea5..7dd0fc5aa54 100644
--- a/hotspot/test/gc/arguments/TestG1HeapRegionSize.java
+++ b/hotspot/test/gc/arguments/TestG1HeapRegionSize.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 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,7 +25,7 @@
  * @test TestG1HeapRegionSize
  * @key gc
  * @bug 8021879
- * @requires vm.gc=="null" | vm.gc=="G1"
+ * @requires vm.gc.G1
  * @summary Verify that the flag G1HeapRegionSize is updated properly
  * @modules java.base/jdk.internal.misc
  * @modules java.management/sun.management
diff --git a/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java b/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java
index 440a963f318..034938862ec 100644
--- a/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java
+++ b/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java
@@ -25,7 +25,7 @@
  * @test TestG1HeapSizeFlags
  * @key gc
  * @bug 8006088
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Tests argument processing for initial and maximum heap size for the G1 collector
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/arguments/TestG1PercentageOptions.java b/hotspot/test/gc/arguments/TestG1PercentageOptions.java
index 27d1e0b9cf3..db193ef7184 100644
--- a/hotspot/test/gc/arguments/TestG1PercentageOptions.java
+++ b/hotspot/test/gc/arguments/TestG1PercentageOptions.java
@@ -25,7 +25,7 @@
  * @test TestG1PercentageOptions
  * @key gc
  * @bug 8068942
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Test argument processing of various percentage options
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/arguments/TestInitialTenuringThreshold.java b/hotspot/test/gc/arguments/TestInitialTenuringThreshold.java
index 82a4dca1456..a25e19e88b1 100644
--- a/hotspot/test/gc/arguments/TestInitialTenuringThreshold.java
+++ b/hotspot/test/gc/arguments/TestInitialTenuringThreshold.java
@@ -25,7 +25,7 @@
  * @test TestInitialTenuringThreshold
  * @key gc
  * @bug 8014765
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @summary Tests argument processing for initial tenuring threshold
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java b/hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java
index ce5aa179e79..d10dcf69660 100644
--- a/hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java
+++ b/hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 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
@@ -27,7 +27,7 @@
  * @bug 8144527
  * @summary Tests argument processing for NewSizeThreadIncrease
  * @library /testlibrary
- * @requires vm.gc=="Serial" | vm.gc=="null"
+ * @requires vm.gc.Serial
  * @modules java.base/jdk.internal.misc
  *          java.management
  */
diff --git a/hotspot/test/gc/arguments/TestObjectTenuringFlags.java b/hotspot/test/gc/arguments/TestObjectTenuringFlags.java
index fde3e607177..b30b365b95d 100644
--- a/hotspot/test/gc/arguments/TestObjectTenuringFlags.java
+++ b/hotspot/test/gc/arguments/TestObjectTenuringFlags.java
@@ -25,7 +25,7 @@
  * @test TestObjectTenuringFlags
  * @key gc
  * @bug 6521376
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @summary Tests argument processing for NeverTenure, AlwaysTenure,
  * and MaxTenuringThreshold
  * @library /testlibrary
diff --git a/hotspot/test/gc/cms/DisableResizePLAB.java b/hotspot/test/gc/cms/DisableResizePLAB.java
index d1e4e681eb1..c5509811262 100644
--- a/hotspot/test/gc/cms/DisableResizePLAB.java
+++ b/hotspot/test/gc/cms/DisableResizePLAB.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, 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
@@ -26,7 +26,7 @@
  * @key gc
  * @bug 8060467
  * @author filipp.zhinkin@oracle.com, john.coomes@oracle.com
- * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+ * @requires vm.gc.ConcMarkSweep
  * @summary Run CMS with PLAB resizing disabled and a small OldPLABSize
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:-ResizePLAB -XX:OldPLABSize=1k -Xmx256m -Xlog:gc=debug DisableResizePLAB
  */
diff --git a/hotspot/test/gc/cms/TestBubbleUpRef.java b/hotspot/test/gc/cms/TestBubbleUpRef.java
index 58fdd710ebf..9cc5ffd2fd3 100644
--- a/hotspot/test/gc/cms/TestBubbleUpRef.java
+++ b/hotspot/test/gc/cms/TestBubbleUpRef.java
@@ -28,7 +28,7 @@ import java.util.ListIterator;
 
 /*
  * @test
- * @requires vm.gc=="ConcMarkSweep" | vm.gc == "null"
+ * @requires vm.gc.ConcMarkSweep
  * @key cte_test
  * @bug 4950157
  * @summary Stress the behavior of ergonomics when the heap is nearly full and
diff --git a/hotspot/test/gc/cms/TestCMSScavengeBeforeRemark.java b/hotspot/test/gc/cms/TestCMSScavengeBeforeRemark.java
index 91376c18ced..515a97a7f2e 100644
--- a/hotspot/test/gc/cms/TestCMSScavengeBeforeRemark.java
+++ b/hotspot/test/gc/cms/TestCMSScavengeBeforeRemark.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 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,7 +25,7 @@
  * @test TestCMSScavengeBeforeRemark
  * @key gc
  * @bug 8139868
- * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+ * @requires vm.gc.ConcMarkSweep
  * @summary Run CMS with CMSScavengeBeforeRemark
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:+CMSScavengeBeforeRemark -XX:+ExplicitGCInvokesConcurrent -Xmx256m -Xlog:gc=debug TestCMSScavengeBeforeRemark
  */
diff --git a/hotspot/test/gc/cms/TestMBeanCMS.java b/hotspot/test/gc/cms/TestMBeanCMS.java
index 045ac3ce314..633c78a06ba 100644
--- a/hotspot/test/gc/cms/TestMBeanCMS.java
+++ b/hotspot/test/gc/cms/TestMBeanCMS.java
@@ -24,7 +24,7 @@
 /*
  * @test TestMBeanCMS.java
  * @bug 6581734
- * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+ * @requires vm.gc.ConcMarkSweep
  * @summary CMS Old Gen's collection usage is zero after GC which is incorrect
  * @modules java.management
  * @run main/othervm -Xmx512m -verbose:gc -XX:+UseConcMarkSweepGC TestMBeanCMS
diff --git a/hotspot/test/gc/g1/Test2GbHeap.java b/hotspot/test/gc/g1/Test2GbHeap.java
index c81f69e4bd8..66bc2c74604 100644
--- a/hotspot/test/gc/g1/Test2GbHeap.java
+++ b/hotspot/test/gc/g1/Test2GbHeap.java
@@ -26,7 +26,7 @@
  * @bug 8031686
  * @summary Regression test to ensure we can start G1 with 2gb heap.
  * Skip test on 32 bit system: it typically does not support the many and large virtual memory reservations needed.
- * @requires (vm.gc == "G1" | vm.gc == "null")
+ * @requires vm.gc.G1
  * @requires vm.bits != "32"
  * @key gc
  * @key regression
diff --git a/hotspot/test/gc/g1/TestGreyReclaimedHumongousObjects.java b/hotspot/test/gc/g1/TestGreyReclaimedHumongousObjects.java
index f572ed0b757..3d5cea2457c 100644
--- a/hotspot/test/gc/g1/TestGreyReclaimedHumongousObjects.java
+++ b/hotspot/test/gc/g1/TestGreyReclaimedHumongousObjects.java
@@ -24,7 +24,7 @@
 /*
  * @test TestGreyReclaimedHumongousObjects.java
  * @bug 8069367
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @summary Test handling of marked but unscanned reclaimed humongous objects.
  * @key gc
  * @modules jdk.management
diff --git a/hotspot/test/gc/g1/TestHumongousShrinkHeap.java b/hotspot/test/gc/g1/TestHumongousShrinkHeap.java
index da1c08a1be8..62c452a715d 100644
--- a/hotspot/test/gc/g1/TestHumongousShrinkHeap.java
+++ b/hotspot/test/gc/g1/TestHumongousShrinkHeap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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,7 +24,7 @@
 /**
  * @test TestHumongousShrinkHeap
  * @bug 8036025 8056043
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Verify that heap shrinks after GC in the presence of fragmentation
  * due to humongous objects
  * @library /testlibrary
diff --git a/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java b/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java
index 463fadcbbb8..844e1524db5 100644
--- a/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java
+++ b/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -28,7 +28,7 @@
  * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
- * @requires (vm.gc=="G1" | vm.gc=="null")
+ * @requires vm.gc.G1
  * @build jdk.test.lib.* sun.hotspot.WhiteBox
  * @build TestLargePageUseForAuxMemory
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java b/hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java
index 2fd5f6cba2f..5a1eefe7309 100644
--- a/hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java
+++ b/hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -27,7 +27,7 @@
  * @summary Test to check that a live humongous object is not eagerly reclaimed. This is a regression test for
  *          8139424 and the test will crash if an eager reclaim occur. The test is not 100% deterministic and
  *          might pass even if there are problems in the code, but it will never crash unless there is a problem.
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @key gc
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestPLABOutput.java b/hotspot/test/gc/g1/TestPLABOutput.java
index f7d7cebf89c..2f53c5c8a8b 100644
--- a/hotspot/test/gc/g1/TestPLABOutput.java
+++ b/hotspot/test/gc/g1/TestPLABOutput.java
@@ -25,7 +25,7 @@
  * @test TestPLABOutput
  * @bug 8140585
  * @summary Check that G1 does not report empty PLAB statistics in the first evacuation.
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @key gc
  * @modules java.base/jdk.internal.misc
  * @library /testlibrary /test/lib
diff --git a/hotspot/test/gc/g1/TestPLABSizeBounds.java b/hotspot/test/gc/g1/TestPLABSizeBounds.java
index df1c05e8888..e4faca68e44 100644
--- a/hotspot/test/gc/g1/TestPLABSizeBounds.java
+++ b/hotspot/test/gc/g1/TestPLABSizeBounds.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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,7 +25,7 @@
  * @test TestPLABSizeBounds
  * @bug 8134857
  * @summary Regression test to ensure that G1 supports PLAB sizes of half a region size.
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @key gc
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestRegionAlignment.java b/hotspot/test/gc/g1/TestRegionAlignment.java
index 7c7600f8be1..dea1e90b50d 100644
--- a/hotspot/test/gc/g1/TestRegionAlignment.java
+++ b/hotspot/test/gc/g1/TestRegionAlignment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,7 +24,7 @@
 /*
  * @test TestRegionAlignment.java
  * @bug 8013791
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Make sure that G1 ergonomics pick a heap size that is aligned with the region size
  * @run main/othervm -XX:+UseG1GC -XX:G1HeapRegionSize=32m -XX:MaxRAM=555m TestRegionAlignment
  *
diff --git a/hotspot/test/gc/g1/TestRegionLivenessPrint.java b/hotspot/test/gc/g1/TestRegionLivenessPrint.java
index 9abbe4c1570..8e79b1efe32 100644
--- a/hotspot/test/gc/g1/TestRegionLivenessPrint.java
+++ b/hotspot/test/gc/g1/TestRegionLivenessPrint.java
@@ -24,7 +24,7 @@
 /*
  * @test TestRegionLivenessPrint.java
  * @bug 8151920
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Make sure that G1 does not assert when printing region liveness data on a humongous continues region.
  * @key gc
  * @library /testlibrary /test/lib
diff --git a/hotspot/test/gc/g1/TestRemsetLogging.java b/hotspot/test/gc/g1/TestRemsetLogging.java
index 77d8b492386..146a16f9a87 100644
--- a/hotspot/test/gc/g1/TestRemsetLogging.java
+++ b/hotspot/test/gc/g1/TestRemsetLogging.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test TestRemsetLogging.java
- * @requires vm.gc=="G1" | vm.gc =="null"
+ * @requires vm.gc.G1
  * @bug 8013895 8129977 8145534
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java b/hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java
index 7567caf8e44..e60d191940c 100644
--- a/hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java
+++ b/hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test TestRemsetLoggingPerRegion.java
- * @requires vm.gc=="G1" | vm.gc =="null"
+ * @requires vm.gc.G1
  * @bug 8014078 8129977 8145534
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestRemsetLoggingThreads.java b/hotspot/test/gc/g1/TestRemsetLoggingThreads.java
index c26727f9d83..2f0c712a87c 100644
--- a/hotspot/test/gc/g1/TestRemsetLoggingThreads.java
+++ b/hotspot/test/gc/g1/TestRemsetLoggingThreads.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test TestRemsetLoggingThreads
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @bug 8025441 8145534
  * @key gc
  * @library /testlibrary
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java
index c013c903121..baed161da93 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java
@@ -26,7 +26,7 @@
  * @bug 8038423 8061715
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java
index d12dc31769a..846f91de654 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java
@@ -26,7 +26,7 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java
index e530a73186a..05b041da715 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java
@@ -26,7 +26,7 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java
index bae6d66da80..ec0623bdf58 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java
@@ -26,7 +26,7 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java
index b9f6834a271..a89eb284a9d 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java
@@ -26,7 +26,7 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java
index 3b5382af5c8..50d5d912169 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java
@@ -26,7 +26,7 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java b/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java
index 9007d909c0d..6432cdad2e0 100644
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java
@@ -26,7 +26,7 @@
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/TestShrinkToOneRegion.java b/hotspot/test/gc/g1/TestShrinkToOneRegion.java
index 0821223c6c0..c5e3f38d146 100644
--- a/hotspot/test/gc/g1/TestShrinkToOneRegion.java
+++ b/hotspot/test/gc/g1/TestShrinkToOneRegion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,7 +24,7 @@
 /*
  * @test TestShrinkToOneRegion.java
  * @bug 8013872
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Shrinking the heap down to one region used to hit an assert
  * @run main/othervm -XX:+UseG1GC -XX:G1HeapRegionSize=32m -Xmx256m TestShrinkToOneRegion
  *
diff --git a/hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java b/hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java
index 7fe5262b7f8..28bc484f4a2 100644
--- a/hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java
+++ b/hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java
@@ -37,7 +37,7 @@ import java.util.List;
 /**
  * @test TestHeapCounters
  * @summary Checks that heap counters work as expected after humongous allocations/deallocations
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
diff --git a/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java b/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java
index 03952363fb4..86bc2d22c9f 100644
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java
@@ -38,7 +38,7 @@ import java.nio.file.Paths;
 /**
  * @test gc.g1.humongousObjects.TestHumongousClassLoader
  * @summary Checks that unreachable classes and unreachable humongous class loader are unloaded after GC
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.G1HeapRegionSize == "null" | vm.opt.G1HeapRegionSize == "1M"
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /testlibrary /test/lib /
diff --git a/hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java b/hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java
index a7d1cc852e8..a90c98d6953 100644
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
 /**
  * @test TestHumongousMovement
  * @summary Checks that Humongous objects are not moved during GC
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
diff --git a/hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java b/hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java
index e1ad30c56f0..fcc9d7dedd3 100644
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -37,7 +37,7 @@ import java.nio.file.Paths;
 /**
  * @test gc.g1.humongousObjects.TestHumongousNonArrayAllocation
  * @summary Checks that huge class' instances (ie with huge amount of fields) are allocated successfully
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.G1HeapRegionSize == "null" | vm.opt.G1HeapRegionSize == "1M"
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java b/hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java
index 8ff4a568600..cc1660e540e 100644
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java
@@ -31,7 +31,7 @@ import sun.hotspot.WhiteBox;
 /**
  * @test TestHumongousThreshold
  * @summary Checks that objects larger than half a region are allocated as humongous
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
diff --git a/hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java b/hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java
index f5f5484b946..0cf5e2ce8d3 100644
--- a/hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java
+++ b/hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -37,7 +37,7 @@ import java.lang.ref.WeakReference;
  * @test TestObjectCollected
  * @summary checks that after different type of GCs weak/soft references to humongous object behave correspondingly to
  * actual object behavior
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
diff --git a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java b/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java
index 8e028973547..c7a4f2ff081 100644
--- a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java
+++ b/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java
@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
 /**
  * @test TestObjectGraphAfterGC
  * @summary Checks that objects' graph behave as expected after gc
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /testlibrary /test/lib /
  * @modules java.management java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/ihop/TestIHOPErgo.java b/hotspot/test/gc/g1/ihop/TestIHOPErgo.java
index 0332844da07..f187d629842 100644
--- a/hotspot/test/gc/g1/ihop/TestIHOPErgo.java
+++ b/hotspot/test/gc/g1/ihop/TestIHOPErgo.java
@@ -25,7 +25,7 @@
  * @test TestIHOPErgo
  * @bug 8148397
  * @summary Test checks that behavior of Adaptive and Static IHOP at concurrent cycle initiation
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @requires vm.opt.MaxGCPauseMillis == "null"
diff --git a/hotspot/test/gc/g1/ihop/TestIHOPStatic.java b/hotspot/test/gc/g1/ihop/TestIHOPStatic.java
index 7fc78cf80fc..0529af84206 100644
--- a/hotspot/test/gc/g1/ihop/TestIHOPStatic.java
+++ b/hotspot/test/gc/g1/ihop/TestIHOPStatic.java
@@ -25,7 +25,7 @@
  * @test TestIHOPStatic
  * @bug 8148397
  * @summary Test checks concurrent cycle initiation which depends on IHOP value.
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /testlibrary /
diff --git a/hotspot/test/gc/g1/mixedgc/TestLogging.java b/hotspot/test/gc/g1/mixedgc/TestLogging.java
index 0e232a6f174..29fd37f3201 100644
--- a/hotspot/test/gc/g1/mixedgc/TestLogging.java
+++ b/hotspot/test/gc/g1/mixedgc/TestLogging.java
@@ -24,7 +24,7 @@
 /*
  * @test TestLogging
  * @summary Check that a mixed GC is reflected in the gc logs
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires vm.opt.MaxGCPauseMillis == "null"
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java b/hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java
index 6aa5834a79f..77f43d254a8 100644
--- a/hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java
+++ b/hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java
@@ -25,7 +25,7 @@
  * @test TestPLABEvacuationFailure
  * @bug 8148376
  * @summary Checks PLAB statistics on evacuation failure
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @library /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @modules java.management
diff --git a/hotspot/test/gc/g1/plab/TestPLABPromotion.java b/hotspot/test/gc/g1/plab/TestPLABPromotion.java
index 0f4a84c5104..95177e8b876 100644
--- a/hotspot/test/gc/g1/plab/TestPLABPromotion.java
+++ b/hotspot/test/gc/g1/plab/TestPLABPromotion.java
@@ -25,7 +25,7 @@
  * @test TestPLABPromotion
  * @bug 8141278 8141141
  * @summary Test PLAB promotion
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/g1/plab/TestPLABResize.java b/hotspot/test/gc/g1/plab/TestPLABResize.java
index b065abb57e5..7b45914c1b9 100644
--- a/hotspot/test/gc/g1/plab/TestPLABResize.java
+++ b/hotspot/test/gc/g1/plab/TestPLABResize.java
@@ -25,7 +25,7 @@
  * @test TestPLABResize
  * @bug 8141278 8141141
  * @summary Test for PLAB resizing
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @library /testlibrary /test/lib /
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/metaspace/G1AddMetaspaceDependency.java b/hotspot/test/gc/metaspace/G1AddMetaspaceDependency.java
index 5c6256290b7..544bc1c8a97 100644
--- a/hotspot/test/gc/metaspace/G1AddMetaspaceDependency.java
+++ b/hotspot/test/gc/metaspace/G1AddMetaspaceDependency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,7 +24,7 @@
 /*
  * @test G1AddMetaspaceDependency
  * @bug 8010196
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @summary Checks that we don't get locking problems when adding metaspace dependencies with the G1 update buffer monitor
  * @run main/othervm -XX:+UseG1GC -XX:G1UpdateBufferSize=1 G1AddMetaspaceDependency
  */
diff --git a/hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java b/hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java
index 7a5e8c7da2c..d42e51afdd8 100644
--- a/hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java
+++ b/hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -30,7 +30,7 @@ import static jdk.test.lib.Asserts.*;
 /* @test TestPerfCountersAndMemoryPools
  * @bug 8023476
  * @library /testlibrary
- * @requires vm.gc=="Serial" | vm.gc=="null"
+ * @requires vm.gc.Serial
  * @summary Tests that a MemoryPoolMXBeans and PerfCounters for metaspace
  *          report the same data.
  * @modules java.base/jdk.internal.misc
diff --git a/hotspot/test/gc/parallel/TestDynShrinkHeap.java b/hotspot/test/gc/parallel/TestDynShrinkHeap.java
index 809706f8e32..06534328c7c 100644
--- a/hotspot/test/gc/parallel/TestDynShrinkHeap.java
+++ b/hotspot/test/gc/parallel/TestDynShrinkHeap.java
@@ -24,7 +24,7 @@
 /**
  * @test TestDynShrinkHeap
  * @bug 8016479
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @summary Verify that the heap shrinks after full GC according to the current values of the Min/MaxHeapFreeRatio flags
  * @modules java.base/jdk.internal.misc
  * @modules jdk.management
diff --git a/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java b/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java
index 17fd5ece8b2..e25e0cebc6b 100644
--- a/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java
+++ b/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java
@@ -26,7 +26,7 @@
  * @bug 8016740
  * @summary Tests that jvm with maximally verbose GC logging does not crash when ParOldGC has no memory
  * @key gc
- * @requires vm.gc=="Parallel" | vm.gc=="null"
+ * @requires vm.gc.Parallel
  * @modules java.base/jdk.internal.misc
  * @library /testlibrary
  * @run main/othervm -Xmx50m -XX:+UseParallelGC -Xlog:gc*=trace TestPrintGCDetailsVerbose
diff --git a/hotspot/test/gc/stress/TestMultiThreadStressRSet.java b/hotspot/test/gc/stress/TestMultiThreadStressRSet.java
index 336b0614bd7..dcfdb6c29e8 100644
--- a/hotspot/test/gc/stress/TestMultiThreadStressRSet.java
+++ b/hotspot/test/gc/stress/TestMultiThreadStressRSet.java
@@ -31,7 +31,7 @@ import sun.hotspot.WhiteBox;
 /*
  * @test TestMultiThreadStressRSet.java
  * @key stress
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires os.maxMemory > 2G
  * @requires vm.opt.MaxGCPauseMillis == "null"
  *
diff --git a/hotspot/test/gc/stress/TestStressG1Humongous.java b/hotspot/test/gc/stress/TestStressG1Humongous.java
index de9e1be4555..6b507e40827 100644
--- a/hotspot/test/gc/stress/TestStressG1Humongous.java
+++ b/hotspot/test/gc/stress/TestStressG1Humongous.java
@@ -26,7 +26,7 @@
  * @key gc
  * @key stress
  * @summary Stress G1 by humongous allocations in situation near OOM
- * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.gc.G1
  * @requires !vm.flightRecorder
  * @run main/othervm/timeout=200 -Xlog:gc=debug -Xmx1g -XX:+UseG1GC -XX:G1HeapRegionSize=4m
  *              -Dtimeout=120 -Dthreads=3 -Dhumongoussize=1.1 -Dregionsize=4 TestStressG1Humongous
diff --git a/hotspot/test/gc/stress/TestStressIHOPMultiThread.java b/hotspot/test/gc/stress/TestStressIHOPMultiThread.java
index b83422c0d7e..e0514b124f1 100644
--- a/hotspot/test/gc/stress/TestStressIHOPMultiThread.java
+++ b/hotspot/test/gc/stress/TestStressIHOPMultiThread.java
@@ -26,7 +26,7 @@
  * @bug 8148397
  * @key stress
  * @summary Stress test for IHOP
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @run main/othervm/timeout=200 -Xmx128m -XX:G1HeapWastePercent=0 -XX:G1MixedGCCountTarget=1
  *              -XX:+UseG1GC -XX:G1HeapRegionSize=1m -XX:+G1UseAdaptiveIHOP
  *              -Xlog:gc+ihop=debug,gc+ihop+ergo=debug,gc+ergo=debug:TestStressIHOPMultiThread1.log
diff --git a/hotspot/test/gc/stress/TestStressRSetCoarsening.java b/hotspot/test/gc/stress/TestStressRSetCoarsening.java
index a0d581b0656..bb621bb28ff 100644
--- a/hotspot/test/gc/stress/TestStressRSetCoarsening.java
+++ b/hotspot/test/gc/stress/TestStressRSetCoarsening.java
@@ -28,7 +28,7 @@ import sun.hotspot.WhiteBox;
  * @test TestStressRSetCoarsening.java
  * @key stress
  * @bug 8146984 8147087
- * @requires vm.gc=="G1" | vm.gc=="null"
+ * @requires vm.gc.G1
  * @requires os.maxMemory > 3G
  * @requires vm.opt.MaxGCPauseMillis == "null"
  *
diff --git a/hotspot/test/gc/whitebox/TestConcMarkCycleWB.java b/hotspot/test/gc/whitebox/TestConcMarkCycleWB.java
index 4c76852f25b..ea3b30af1b6 100644
--- a/hotspot/test/gc/whitebox/TestConcMarkCycleWB.java
+++ b/hotspot/test/gc/whitebox/TestConcMarkCycleWB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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,7 +24,7 @@
 /*
  * @test TestConMarkCycleWB
  * @bug 8065579
- * @requires vm.gc=="null" | vm.gc=="G1"
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.compiler
diff --git a/hotspot/test/runtime/SharedArchiveFile/SharedStrings.java b/hotspot/test/runtime/SharedArchiveFile/SharedStrings.java
index ec7bf3aaa1f..06feba0d586 100644
--- a/hotspot/test/runtime/SharedArchiveFile/SharedStrings.java
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedStrings.java
@@ -28,7 +28,7 @@
  * Feature support: G1GC only, compressed oops/kptrs, 64-bit os, not on windows
  * @requires (sun.arch.data.model != "32") & (os.family != "windows")
  * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
- * @requires (vm.gc=="G1" | vm.gc=="null")
+ * @requires vm.gc.G1
  * @library /testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java b/hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java
index 1f90fd02931..d4290fe6568 100644
--- a/hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -27,7 +27,7 @@
  * Feature support: G1GC only, compressed oops/kptrs, 64-bit os, not on windows
  * @requires (sun.arch.data.model != "32") & (os.family != "windows")
  * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
- * @requires (vm.gc=="G1" | vm.gc=="null")
+ * @requires vm.gc.G1
  * @library /testlibrary
  * @modules java.base/jdk.internal.misc
  *          java.management

From 1bcb5e51569e0ad0b2831c84b5b33c720ec0070d Mon Sep 17 00:00:00 2001
From: Ioi Lam 
Date: Sun, 26 Jun 2016 20:00:45 -0700
Subject: [PATCH 066/111] 8148813: Windows os::check_heap needs more
 information

Added ring buffer to log info while walking the heap

Reviewed-by: mgronlun, dholmes, ccheung
---
 hotspot/src/os/windows/vm/os_windows.cpp | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index 4c67dbd7e90..23a06c9db24 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -5250,6 +5250,12 @@ int os::fork_and_exec(char* cmd) {
 
 static int mallocDebugIntervalCounter = 0;
 static int mallocDebugCounter = 0;
+
+// For debugging possible bugs inside HeapWalk (a ring buffer)
+#define SAVE_COUNT 8
+static PROCESS_HEAP_ENTRY saved_heap_entries[SAVE_COUNT];
+static int saved_heap_entry_index;
+
 bool os::check_heap(bool force) {
   if (++mallocDebugCounter < MallocVerifyStart && !force) return true;
   if (++mallocDebugIntervalCounter >= MallocVerifyInterval || force) {
@@ -5270,13 +5276,28 @@ bool os::check_heap(bool force) {
     if (HeapLock(heap) != 0) {
       PROCESS_HEAP_ENTRY phe;
       phe.lpData = NULL;
+      memset(saved_heap_entries, 0, sizeof(saved_heap_entries));
+      saved_heap_entry_index = 0;
+      int count = 0;
+
       while (HeapWalk(heap, &phe) != 0) {
+        count ++;
         if ((phe.wFlags & PROCESS_HEAP_ENTRY_BUSY) &&
             !HeapValidate(heap, 0, phe.lpData)) {
           tty->print_cr("C heap has been corrupted (time: %d allocations)", mallocDebugCounter);
-          tty->print_cr("corrupted block near address %#x, length %d", phe.lpData, phe.cbData);
+          tty->print_cr("corrupted block near address %#x, length %d, count %d", phe.lpData, phe.cbData, count);
           HeapUnlock(heap);
           fatal("corrupted C heap");
+        } else {
+          // Save previous seen entries in a ring buffer. We have seen strange
+          // heap corruption fatal errors that produced mdmp files, but when we load
+          // these mdmp files in WinDBG, "!heap -triage" shows no error.
+          // We can examine the saved_heap_entries[] array in the mdmp file to
+          // diagnose such seemingly spurious errors reported by HeapWalk.
+          saved_heap_entries[saved_heap_entry_index++] = phe;
+          if (saved_heap_entry_index >= SAVE_COUNT) {
+            saved_heap_entry_index = 0;
+          }
         }
       }
       DWORD err = GetLastError();

From e7a6ecea86448b362901635f95851942e0faff01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20Lid=C3=A9n?= 
Date: Mon, 27 Jun 2016 09:35:18 +0200
Subject: [PATCH 067/111] 8158871: Long response times with G1 and
 StringDeduplication

Reviewed-by: stefank, sjohanss, tschatzl, dfazunen
---
 .../src/share/vm/gc/g1/g1StringDedupTable.cpp | 111 ++++++++++++------
 .../src/share/vm/gc/g1/g1StringDedupTable.hpp |   6 +-
 .../share/vm/gc/g1/g1StringDedupThread.cpp    |   5 +-
 3 files changed, 80 insertions(+), 42 deletions(-)

diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupTable.cpp b/hotspot/src/share/vm/gc/g1/g1StringDedupTable.cpp
index 3075c269ebc..01ef9dcc3c2 100644
--- a/hotspot/src/share/vm/gc/g1/g1StringDedupTable.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -37,16 +37,16 @@
 #include "runtime/mutexLocker.hpp"
 
 //
-// Freelist in the deduplication table entry cache. Links table
+// List of deduplication table entries. Links table
 // entries together using their _next fields.
 //
-class G1StringDedupEntryFreeList : public CHeapObj {
+class G1StringDedupEntryList : public CHeapObj {
 private:
   G1StringDedupEntry* _list;
   size_t              _length;
 
 public:
-  G1StringDedupEntryFreeList() :
+  G1StringDedupEntryList() :
     _list(NULL),
     _length(0) {
   }
@@ -66,6 +66,12 @@ public:
     return entry;
   }
 
+  G1StringDedupEntry* remove_all() {
+    G1StringDedupEntry* list = _list;
+    _list = NULL;
+    return list;
+  }
+
   size_t length() {
     return _length;
   }
@@ -87,43 +93,53 @@ public:
 //
 class G1StringDedupEntryCache : public CHeapObj {
 private:
-  // One freelist per GC worker to allow lock less freeing of
-  // entries while doing a parallel scan of the table. Using
-  // PaddedEnd to avoid false sharing.
-  PaddedEnd* _lists;
-  size_t                                 _nlists;
+  // One cache/overflow list per GC worker to allow lock less freeing of
+  // entries while doing a parallel scan of the table. Using PaddedEnd to
+  // avoid false sharing.
+  size_t                             _nlists;
+  size_t                             _max_list_length;
+  PaddedEnd* _cached;
+  PaddedEnd* _overflowed;
 
 public:
-  G1StringDedupEntryCache();
+  G1StringDedupEntryCache(size_t max_size);
   ~G1StringDedupEntryCache();
 
-  // Get a table entry from the cache freelist, or allocate a new
-  // entry if the cache is empty.
+  // Set max number of table entries to cache.
+  void set_max_size(size_t max_size);
+
+  // Get a table entry from the cache, or allocate a new entry if the cache is empty.
   G1StringDedupEntry* alloc();
 
-  // Insert a table entry into the cache freelist.
+  // Insert a table entry into the cache.
   void free(G1StringDedupEntry* entry, uint worker_id);
 
   // Returns current number of entries in the cache.
   size_t size();
 
-  // If the cache has grown above the given max size, trim it down
-  // and deallocate the memory occupied by trimmed of entries.
-  void trim(size_t max_size);
+  // Deletes overflowed entries.
+  void delete_overflowed();
 };
 
-G1StringDedupEntryCache::G1StringDedupEntryCache() {
-  _nlists = ParallelGCThreads;
-  _lists = PaddedArray::create_unfreeable((uint)_nlists);
+G1StringDedupEntryCache::G1StringDedupEntryCache(size_t max_size) :
+  _nlists(ParallelGCThreads),
+  _max_list_length(0),
+  _cached(PaddedArray::create_unfreeable((uint)_nlists)),
+  _overflowed(PaddedArray::create_unfreeable((uint)_nlists)) {
+  set_max_size(max_size);
 }
 
 G1StringDedupEntryCache::~G1StringDedupEntryCache() {
   ShouldNotReachHere();
 }
 
+void G1StringDedupEntryCache::set_max_size(size_t size) {
+  _max_list_length = size / _nlists;
+}
+
 G1StringDedupEntry* G1StringDedupEntryCache::alloc() {
   for (size_t i = 0; i < _nlists; i++) {
-    G1StringDedupEntry* entry = _lists[i].remove();
+    G1StringDedupEntry* entry = _cached[i].remove();
     if (entry != NULL) {
       return entry;
     }
@@ -134,31 +150,53 @@ G1StringDedupEntry* G1StringDedupEntryCache::alloc() {
 void G1StringDedupEntryCache::free(G1StringDedupEntry* entry, uint worker_id) {
   assert(entry->obj() != NULL, "Double free");
   assert(worker_id < _nlists, "Invalid worker id");
+
   entry->set_obj(NULL);
   entry->set_hash(0);
-  _lists[worker_id].add(entry);
+
+  if (_cached[worker_id].length() < _max_list_length) {
+    // Cache is not full
+    _cached[worker_id].add(entry);
+  } else {
+    // Cache is full, add to overflow list for later deletion
+    _overflowed[worker_id].add(entry);
+  }
 }
 
 size_t G1StringDedupEntryCache::size() {
   size_t size = 0;
   for (size_t i = 0; i < _nlists; i++) {
-    size += _lists[i].length();
+    size += _cached[i].length();
   }
   return size;
 }
 
-void G1StringDedupEntryCache::trim(size_t max_size) {
-  size_t cache_size = 0;
+void G1StringDedupEntryCache::delete_overflowed() {
+  double start = os::elapsedTime();
+  uintx count = 0;
+
   for (size_t i = 0; i < _nlists; i++) {
-    G1StringDedupEntryFreeList* list = &_lists[i];
-    cache_size += list->length();
-    while (cache_size > max_size) {
-      G1StringDedupEntry* entry = list->remove();
-      assert(entry != NULL, "Should not be null");
-      cache_size--;
+    G1StringDedupEntry* entry;
+
+    {
+      // The overflow list can be modified during safepoints, therefore
+      // we temporarily join the suspendible thread set while removing
+      // all entries from the list.
+      SuspendibleThreadSetJoiner sts_join;
+      entry = _overflowed[i].remove_all();
+    }
+
+    // Delete all entries
+    while (entry != NULL) {
+      G1StringDedupEntry* next = entry->next();
       delete entry;
+      entry = next;
+      count++;
     }
   }
+
+  double end = os::elapsedTime();
+  log_trace(gc, stringdedup)("Deleted " UINTX_FORMAT " entries, " G1_STRDEDUP_TIME_FORMAT, count, end - start);
 }
 
 G1StringDedupTable*      G1StringDedupTable::_table = NULL;
@@ -195,7 +233,7 @@ G1StringDedupTable::~G1StringDedupTable() {
 
 void G1StringDedupTable::create() {
   assert(_table == NULL, "One string deduplication table allowed");
-  _entry_cache = new G1StringDedupEntryCache();
+  _entry_cache = new G1StringDedupEntryCache(_min_size * _max_cache_factor);
   _table = new G1StringDedupTable(_min_size);
 }
 
@@ -389,6 +427,9 @@ G1StringDedupTable* G1StringDedupTable::prepare_resize() {
   // Update statistics
   _resize_count++;
 
+  // Update max cache size
+  _entry_cache->set_max_size(size * _max_cache_factor);
+
   // Allocate the new table. The new table will be populated by workers
   // calling unlink_or_oops_do() and finally installed by finish_resize().
   return new G1StringDedupTable(size, _table->_hash_seed);
@@ -441,7 +482,7 @@ void G1StringDedupTable::unlink_or_oops_do(G1StringDedupUnlinkOrOopsDoClosure* c
     removed += unlink_or_oops_do(cl, table_half + partition_begin, table_half + partition_end, worker_id);
   }
 
-  // Delayed update avoid contention on the table lock
+  // Delayed update to avoid contention on the table lock
   if (removed > 0) {
     MutexLockerEx ml(StringDedupTable_lock, Mutex::_no_safepoint_check_flag);
     _table->_entries -= removed;
@@ -563,10 +604,8 @@ void G1StringDedupTable::verify() {
   }
 }
 
-void G1StringDedupTable::trim_entry_cache() {
-  MutexLockerEx ml(StringDedupTable_lock, Mutex::_no_safepoint_check_flag);
-  size_t max_cache_size = (size_t)(_table->_size * _max_cache_factor);
-  _entry_cache->trim(max_cache_size);
+void G1StringDedupTable::clean_entry_cache() {
+  _entry_cache->delete_overflowed();
 }
 
 void G1StringDedupTable::print_statistics() {
diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupTable.hpp b/hotspot/src/share/vm/gc/g1/g1StringDedupTable.hpp
index 4375f4dafb3..c30d0403ead 100644
--- a/hotspot/src/share/vm/gc/g1/g1StringDedupTable.hpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -229,8 +229,8 @@ public:
   // and deletes the previously active table.
   static void finish_rehash(G1StringDedupTable* rehashed_table);
 
-  // If the table entry cache has grown too large, trim it down according to policy
-  static void trim_entry_cache();
+  // If the table entry cache has grown too large, delete overflowed entries.
+  static void clean_entry_cache();
 
   static void unlink_or_oops_do(G1StringDedupUnlinkOrOopsDoClosure* cl, uint worker_id);
 
diff --git a/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp b/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp
index 4c6dc45fc90..57337d1d7dd 100644
--- a/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp
@@ -121,16 +121,15 @@ void G1StringDedupThread::run_service() {
         }
       }
 
-      G1StringDedupTable::trim_entry_cache();
-
       stat.mark_done();
 
       // Print statistics
       total_stat.add(stat);
       print(stat, total_stat);
     }
-  }
 
+    G1StringDedupTable::clean_entry_cache();
+  }
 }
 
 void G1StringDedupThread::stop_service() {

From eae3102646f01937cc535c5216a8bfb3014db31f Mon Sep 17 00:00:00 2001
From: Erik Joelsson 
Date: Thu, 30 Jun 2016 17:35:35 +0200
Subject: [PATCH 068/111] 8160490: "installer-only" top level target is broken

Reviewed-by: asemenyuk, tbell
---
 make/Main.gmk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/make/Main.gmk b/make/Main.gmk
index 7962a49722c..d21b88e527d 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -931,10 +931,6 @@ create-main-targets-include:
 
 ################################################################################
 
-
-# workaround issue when building open targets when closed jib-profiles.js is used
-installer: product-images test-image
-
 .PHONY: $(ALL_TARGETS)
 
 FRC: # Force target

From def98f36d4edfd8363d831737d6341f23c234133 Mon Sep 17 00:00:00 2001
From: Bhavesh Patel 
Date: Tue, 5 Jul 2016 13:30:40 -0700
Subject: [PATCH 069/111] 8157987: overview-summary.html generated by javadoc
 should include module information

Reviewed-by: jjg, ksrini
---
 .../doclets/formats/html/HtmlDoclet.java      |   6 +-
 .../formats/html/ModuleIndexWriter.java       | 289 ++++++++++++++++++
 .../doclet/testModules/TestModules.java       |  84 ++++-
 .../TestClassNoModulePkg1.java                |  28 ++
 4 files changed, 404 insertions(+), 3 deletions(-)
 create mode 100644 langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
 create mode 100644 langtools/test/jdk/javadoc/doclet/testModules/testpkgnomodule1/TestClassNoModulePkg1.java

diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
index b85d8fccbf9..4c289cccdde 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
@@ -153,7 +153,11 @@ public class HtmlDoclet extends AbstractDoclet {
         FrameOutputWriter.generate(configuration);
 
         if (configuration.createoverview) {
-            PackageIndexWriter.generate(configuration);
+            if (configuration.showModules) {
+                ModuleIndexWriter.generate(configuration);
+            } else {
+                PackageIndexWriter.generate(configuration);
+            }
         }
         if (configuration.helpfile.length() == 0 &&
             !configuration.nohelp) {
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
new file mode 100644
index 00000000000..29f0b79cdd2
--- /dev/null
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.javadoc.internal.doclets.formats.html;
+
+import java.io.*;
+import java.util.*;
+
+import javax.lang.model.element.ModuleElement;
+import javax.lang.model.element.PackageElement;
+
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
+import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
+import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException;
+import jdk.javadoc.internal.doclets.toolkit.util.Group;
+
+/**
+ * Generate the module index page "overview-summary.html" for the right-hand
+ * frame.
+ *
+ *  
    This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.
+ *
+ * @author Bhavesh Patel
+ */
+public class ModuleIndexWriter extends AbstractModuleIndexWriter {
+
+    /**
+     * Set representing the modules.
+     *
+     * @see Group
+     */
+    private final SortedSet modules;
+
+    /**
+     * HTML tree for main tag.
+     */
+    private HtmlTree htmlTree = HtmlTree.MAIN();
+
+    /**
+     * Construct the ModuleIndexWriter.
+     * @param configuration the configuration object
+     * @param filename the name of the generated file
+     * @throws java.io.IOException
+     */
+    public ModuleIndexWriter(ConfigurationImpl configuration, DocPath filename) throws IOException {
+        super(configuration, filename);
+        modules = configuration.modules;
+    }
+
+    /**
+     * Generate the module index page for the right-hand frame.
+     *
+     * @param configuration the current configuration of the doclet.
+     */
+    public static void generate(ConfigurationImpl configuration) {
+        ModuleIndexWriter mdlgen;
+        DocPath filename = DocPaths.OVERVIEW_SUMMARY;
+        try {
+            mdlgen = new ModuleIndexWriter(configuration, filename);
+            mdlgen.buildModuleIndexFile("doclet.Window_Overview_Summary", true);
+            mdlgen.close();
+        } catch (IOException exc) {
+            configuration.standardmessage.error(
+                        "doclet.exception_encountered",
+                        exc.toString(), filename);
+            throw new DocletAbortException(exc);
+        }
+    }
+
+    /**
+     * Add the module index.
+     *
+     * @param body the documentation tree to which the index will be added
+     */
+    protected void addIndex(Content body) {
+        if (modules != null && !modules.isEmpty()) {
+            addIndexContents(configuration.getText("doclet.Modules"),
+                    configuration.getText("doclet.Member_Table_Summary",
+                            configuration.getText("doclet.Module_Summary"),
+                            configuration.getText("doclet.modules")), body);
+        }
+    }
+
+    /**
+     * Adds module index contents.
+     *
+     * @param title the title of the section
+     * @param tableSummary summary for the table
+     * @param body the document tree to which the index contents will be added
+     */
+    protected void addIndexContents(String title, String tableSummary, Content body) {
+        HtmlTree htmltree = (configuration.allowTag(HtmlTag.NAV))
+                ? HtmlTree.NAV()
+                : new HtmlTree(HtmlTag.DIV);
+        htmltree.addStyle(HtmlStyle.indexNav);
+        HtmlTree ul = new HtmlTree(HtmlTag.UL);
+        addAllClassesLink(ul);
+        if (configuration.showModules) {
+            addAllModulesLink(ul);
+        }
+        htmltree.addContent(ul);
+        body.addContent(htmltree);
+        addModulesList(title, tableSummary, body);
+    }
+
+    /**
+     * Add the list of modules.
+     *
+     * @param text The table caption
+     * @param tableSummary the summary of the table tag
+     * @param body the content tree to which the module list will be added
+     */
+    protected void addModulesList(String text, String tableSummary, Content body) {
+        Content table = (configuration.isOutputHtml5())
+                ? HtmlTree.TABLE(HtmlStyle.overviewSummary, getTableCaption(new RawHtml(text)))
+                : HtmlTree.TABLE(HtmlStyle.overviewSummary, tableSummary, getTableCaption(new RawHtml(text)));
+        table.addContent(getSummaryTableHeader(moduleTableHeader, "col"));
+        Content tbody = new HtmlTree(HtmlTag.TBODY);
+        addModulesList(tbody);
+        table.addContent(tbody);
+        Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table);
+        if (configuration.allowTag(HtmlTag.MAIN)) {
+            htmlTree.addContent(div);
+        } else {
+            body.addContent(div);
+        }
+    }
+
+    /**
+     * Adds list of modules in the index table. Generate link to each module.
+     *
+     * @param tbody the documentation tree to which the list will be added
+     */
+    protected void addModulesList(Content tbody) {
+        boolean altColor = true;
+        for (ModuleElement mdle : modules) {
+            if (!mdle.isUnnamed()) {
+                Content moduleLinkContent = getModuleLink(mdle, new StringContent(mdle.getQualifiedName().toString()));
+                Content tdModule = HtmlTree.TD(HtmlStyle.colFirst, moduleLinkContent);
+                HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
+                tdSummary.addStyle(HtmlStyle.colLast);
+                addSummaryComment(mdle, tdSummary);
+                HtmlTree tr = HtmlTree.TR(tdModule);
+                tr.addContent(tdSummary);
+                tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
+                tbody.addContent(tr);
+            }
+            altColor = !altColor;
+        }
+    }
+
+    /**
+     * Adds the overview summary comment for this documentation. Add one line
+     * summary at the top of the page and generate a link to the description,
+     * which is added at the end of this page.
+     *
+     * @param body the documentation tree to which the overview header will be added
+     */
+    protected void addOverviewHeader(Content body) {
+        addConfigurationTitle(body);
+        if (!utils.getBody(configuration.overviewElement).isEmpty()) {
+            HtmlTree subTitleDiv = new HtmlTree(HtmlTag.DIV);
+            subTitleDiv.addStyle(HtmlStyle.subTitle);
+            addSummaryComment(configuration.overviewElement, subTitleDiv);
+            Content div = HtmlTree.DIV(HtmlStyle.header, subTitleDiv);
+            Content see = seeLabel;
+            see.addContent(" ");
+            Content descPara = HtmlTree.P(see);
+            Content descLink = getHyperLink(getDocLink(
+                    SectionName.OVERVIEW_DESCRIPTION),
+                    descriptionLabel, "", "");
+            descPara.addContent(descLink);
+            div.addContent(descPara);
+            if (configuration.allowTag(HtmlTag.MAIN)) {
+                htmlTree.addContent(div);
+            } else {
+                body.addContent(div);
+            }
+        }
+    }
+
+    /**
+     * Adds the overview comment as provided in the file specified by the
+     * "-overview" option on the command line.
+     *
+     * @param htmltree the documentation tree to which the overview comment will
+     *                 be added
+     */
+    protected void addOverviewComment(Content htmltree) {
+        if (!utils.getBody(configuration.overviewElement).isEmpty()) {
+            htmltree.addContent(getMarkerAnchor(SectionName.OVERVIEW_DESCRIPTION));
+            addInlineComment(configuration.overviewElement, htmltree);
+        }
+    }
+
+    /**
+     * Adds the tag information as provided in the file specified by the
+     * "-overview" option on the command line.
+     *
+     * @param body the documentation tree to which the overview will be added
+     * @throws java.io.IOException
+     */
+    protected void addOverview(Content body) throws IOException {
+        HtmlTree div = new HtmlTree(HtmlTag.DIV);
+        div.addStyle(HtmlStyle.contentContainer);
+        addOverviewComment(div);
+        if (configuration.allowTag(HtmlTag.MAIN)) {
+            htmlTree.addContent(div);
+            body.addContent(htmlTree);
+        } else {
+            body.addContent(div);
+        }
+    }
+
+    /**
+     * Adds the top text (from the -top option), the upper
+     * navigation bar, and then the title (from the"-title"
+     * option), at the top of page.
+     *
+     * @param body the documentation tree to which the navigation bar header will be added
+     */
+    protected void addNavigationBarHeader(Content body) {
+        Content htmlTree = (configuration.allowTag(HtmlTag.HEADER))
+                ? HtmlTree.HEADER()
+                : body;
+        addTop(htmlTree);
+        addNavLinks(true, htmlTree);
+        if (configuration.allowTag(HtmlTag.HEADER)) {
+            body.addContent(htmlTree);
+        }
+    }
+
+    /**
+     * Adds the lower navigation bar and the bottom text
+     * (from the -bottom option) at the bottom of page.
+     *
+     * @param body the documentation tree to which the navigation bar footer will be added
+     */
+    protected void addNavigationBarFooter(Content body) {
+        Content htmltree = (configuration.allowTag(HtmlTag.FOOTER))
+                ? HtmlTree.FOOTER()
+                : body;
+        addNavLinks(false, htmltree);
+        addBottom(htmltree);
+        if (configuration.allowTag(HtmlTag.FOOTER)) {
+            body.addContent(htmltree);
+        }
+    }
+
+    protected void addModulePackagesList(Map> modules, String text,
+            String tableSummary, Content body, ModuleElement mdle) {
+    }
+
+    protected void addModulesList(Map> modules, String text,
+            String tableSummary, Content body) {
+    }
+}
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java
index ad94fd0739c..dfcbb880c40 100644
--- a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8154119 8154262 8156077
+ * @bug 8154119 8154262 8156077 8157987
  * @summary Test modules support in javadoc.
  * @author bpatel
  * @library ../lib
@@ -48,6 +48,7 @@ public class TestModules extends JavadocTester {
         checkExit(Exit.OK);
         testDescription(true);
         testNoDescription(false);
+        testOverviewSummaryModules();
         testModuleLink();
     }
 
@@ -60,6 +61,7 @@ public class TestModules extends JavadocTester {
         checkExit(Exit.OK);
         testHtml5Description(true);
         testHtml5NoDescription(false);
+        testHtml5OverviewSummaryModules();
         testModuleLink();
     }
 
@@ -91,8 +93,9 @@ public class TestModules extends JavadocTester {
     void test5() {
         javadoc("-d", "out-nomodule", "-use",
                 "-sourcepath", testSrc,
-                "testpkgnomodule");
+                "testpkgnomodule", "testpkgnomodule1");
         checkExit(Exit.OK);
+        testOverviewSummaryPackages();
     }
 
    @Test
@@ -107,6 +110,15 @@ public class TestModules extends JavadocTester {
         testModuleTags();
     }
 
+   @Test
+    void test8() {
+        javadoc("-d", "out-html5-nomodule", "-html5", "-use",
+                "-sourcepath", testSrc,
+                "testpkgnomodule", "testpkgnomodule1");
+        checkExit(Exit.OK);
+        testHtml5OverviewSummaryPackages();
+    }
+
     void testDescription(boolean found) {
         checkOutput("module1-summary.html", found,
                 "\n"
@@ -233,4 +245,72 @@ public class TestModules extends JavadocTester {
                 "
    Module Tag:
    \n"
                 + "
    Just a simple module tag.
    ");
     }
+
+    void testOverviewSummaryModules() {
+        checkOutput("overview-summary.html", true,
+                "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "");
+        checkOutput("overview-summary.html", false,
+                "
    Modules 
    ModuleDescription
    \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "");
+    }
+
+    void testOverviewSummaryPackages() {
+        checkOutput("overview-summary.html", false,
+                "
    Packages 
    PackageDescription
    \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "");
+        checkOutput("overview-summary.html", true,
+                "
    Modules 
    ModuleDescription
    \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "");
+    }
+
+    void testHtml5OverviewSummaryModules() {
+        checkOutput("overview-summary.html", true,
+                "
    Packages 
    PackageDescription
    \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "");
+        checkOutput("overview-summary.html", false,
+                "
    Modules 
    ModuleDescription
    \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "");
+    }
+
+    void testHtml5OverviewSummaryPackages() {
+        checkOutput("overview-summary.html", false,
+                "
    Packages 
    PackageDescription
    \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "");
+        checkOutput("overview-summary.html", true,
+                "
    Modules 
    ModuleDescription
    \n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "\n"
+                + "");
+    }
 }
diff --git a/langtools/test/jdk/javadoc/doclet/testModules/testpkgnomodule1/TestClassNoModulePkg1.java b/langtools/test/jdk/javadoc/doclet/testModules/testpkgnomodule1/TestClassNoModulePkg1.java
new file mode 100644
index 00000000000..127437fda6b
--- /dev/null
+++ b/langtools/test/jdk/javadoc/doclet/testModules/testpkgnomodule1/TestClassNoModulePkg1.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package testpkgnomodule1;
+
+public class TestClassNoModulePkg1 {
+}

From 3360117337c9cd98d11aba6e88509ab29d272720 Mon Sep 17 00:00:00 2001
From: Vicente Romero 
Date: Wed, 6 Jul 2016 09:42:27 -0700
Subject: [PATCH 070/111] 8160891: javac, remove unused options, step 3

Reviewed-by: mcimadamore
---
 .../classes/com/sun/tools/javac/comp/LambdaToMethod.java | 9 +--------
 .../classes/com/sun/tools/javac/jvm/ClassReader.java     | 2 +-
 .../classes/com/sun/tools/javac/main/JavaCompiler.java   | 2 +-
 .../share/classes/jdk/jshell/SourceCodeAnalysisImpl.java | 2 +-
 langtools/test/tools/javac/MethodParametersTest.java     | 4 ++--
 .../annotations/typeAnnotations/8047024/T8047024.java    | 2 +-
 .../attributes/LocalVariableTable/T8136453/T8136453.java | 2 +-
 7 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 73533e7ab43..870d296904b 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -106,9 +106,6 @@ public class LambdaToMethod extends TreeTranslator {
     /** dump statistics about lambda code generation */
     private boolean dumpLambdaToMethodStats;
 
-    /** force serializable representation, for stress testing **/
-    private final boolean forceSerializable;
-
     /** Flag for alternate metafactories indicating the lambda object is intended to be serializable */
     public static final int FLAG_SERIALIZABLE = 1 << 0;
 
@@ -144,7 +141,6 @@ public class LambdaToMethod extends TreeTranslator {
         Options options = Options.instance(context);
         dumpLambdaToMethodStats = options.isSet("dumpLambdaToMethodStats");
         attr = Attr.instance(context);
-        forceSerializable = options.isSet("forceSerializable");
     }
     // 
 
@@ -1829,9 +1825,6 @@ public class LambdaToMethod extends TreeTranslator {
 
             /** does this functional expression require serialization support? */
             boolean isSerializable() {
-                if (forceSerializable) {
-                    return true;
-                }
                 for (Type target : tree.targets) {
                     if (types.asSuper(target, syms.serializableType.tsym) != null) {
                         return true;
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index b48bd81db34..92d2abc4ea5 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -242,7 +242,7 @@ public class ClassReader {
         allowSimplifiedVarargs = source.allowSimplifiedVarargs();
         allowModules     = source.allowModules();
 
-        saveParameterNames = options.isSet("save-parameter-names");
+        saveParameterNames = options.isSet(PARAMETERS);
 
         profile = Profile.instance(context);
 
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 4e5f8016d96..00978dd4291 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -1108,7 +1108,7 @@ public class JavaCompiler {
             processAnnotations = procEnvImpl.atLeastOneProcessor();
 
             if (processAnnotations) {
-                options.put("save-parameter-names", "save-parameter-names");
+                options.put("parameters", "parameters");
                 reader.saveParameterNames = true;
                 keepComments = true;
                 genEndPos = true;
diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
index 07e81732daf..422b8ef7a61 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
@@ -996,7 +996,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
     //tweaked by tests to disable reading parameter names from classfiles so that tests using
     //JDK's classes are stable for both release and fastdebug builds:
     private final String[] keepParameterNames = new String[] {
-        "-XDsave-parameter-names=true"
+        "-parameters"
     };
 
     private String documentationImpl(String code, int cursor) {
diff --git a/langtools/test/tools/javac/MethodParametersTest.java b/langtools/test/tools/javac/MethodParametersTest.java
index ba909b1de14..ebb277efc63 100644
--- a/langtools/test/tools/javac/MethodParametersTest.java
+++ b/langtools/test/tools/javac/MethodParametersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -116,7 +116,7 @@ public class MethodParametersTest {
     void inspectBaz() throws Exception {
         final File Qux_java =
             writeFile(classesdir, Qux_name + ".java", Qux_contents);
-        final String[] args = { "-XDsave-parameter-names", "-d",
+        final String[] args = { "-parameters", "-d",
                                 classesdir.getPath(),
                                 "-cp", classesdir.getPath(),
                                 Qux_java.getPath() };
diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/8047024/T8047024.java b/langtools/test/tools/javac/annotations/typeAnnotations/8047024/T8047024.java
index e749bc73b15..26af8d21023 100644
--- a/langtools/test/tools/javac/annotations/typeAnnotations/8047024/T8047024.java
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/8047024/T8047024.java
@@ -26,7 +26,7 @@
  * @bug 8047024
  * @summary AssertionError: exception_index already contains a bytecode offset
  * @compile T8047024_01.java
- * @compile -XDsave-parameter-names=true T8047024.java
+ * @compile -parameters T8047024.java
  */
 
 public class T8047024 {
diff --git a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T8136453.java b/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T8136453.java
index baf472a3824..d3e3798014e 100644
--- a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T8136453.java
+++ b/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/T8136453/T8136453.java
@@ -50,7 +50,7 @@ public class T8136453 {
 
     void run() {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
-        List opts = Arrays.asList("-XDsave-parameter-names");
+        List opts = Arrays.asList("-parameters");
         JavacTask task = (JavacTask) compiler.getTask(null, null, null, opts, null, null);
         TypeElement t = task.getElements().getTypeElement("T");
         ExecutableElement testMethod = ElementFilter.methodsIn(t.getEnclosedElements()).get(0);

From 249f04613a637dc6c85a520cd56ed6051e606354 Mon Sep 17 00:00:00 2001
From: Vicente Romero 
Date: Wed, 6 Jul 2016 12:46:37 -0700
Subject: [PATCH 071/111] 8160915: javac, option forceSerializable should be
 restored

Reviewed-by: jjg
---
 .../classes/com/sun/tools/javac/comp/LambdaToMethod.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 870d296904b..50aa6b2ddc4 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -106,6 +106,9 @@ public class LambdaToMethod extends TreeTranslator {
     /** dump statistics about lambda code generation */
     private boolean dumpLambdaToMethodStats;
 
+    /** force serializable representation, for stress testing **/
+    private final boolean forceSerializable;
+
     /** Flag for alternate metafactories indicating the lambda object is intended to be serializable */
     public static final int FLAG_SERIALIZABLE = 1 << 0;
 
@@ -141,6 +144,7 @@ public class LambdaToMethod extends TreeTranslator {
         Options options = Options.instance(context);
         dumpLambdaToMethodStats = options.isSet("dumpLambdaToMethodStats");
         attr = Attr.instance(context);
+        forceSerializable = options.isSet("forceSerializable");
     }
     // 
 
@@ -1825,6 +1829,9 @@ public class LambdaToMethod extends TreeTranslator {
 
             /** does this functional expression require serialization support? */
             boolean isSerializable() {
+                if (forceSerializable) {
+                    return true;
+                }
                 for (Type target : tree.targets) {
                     if (types.asSuper(target, syms.serializableType.tsym) != null) {
                         return true;

From 57474ae8fb5fbefdfc3125f810718eb6cd7fc38f Mon Sep 17 00:00:00 2001
From: Vicente Romero 
Date: Wed, 6 Jul 2016 15:27:36 -0700
Subject: [PATCH 072/111] 8048543: JLS8 18.5.3: inference variable seems to be
 instantiated unexpectedly

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Infer.java       | 13 ++-----
 ...eVariableInstantiatedUnexpectedlyTest.java | 39 +++++++++++++++++++
 .../test/tools/javac/lambda/TargetType19.java |  4 +-
 3 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 langtools/test/tools/javac/T8048543/InferenceVariableInstantiatedUnexpectedlyTest.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
index 3a57b0fe561..31ecc2e8cc0 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -56,6 +56,7 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.function.BiFunction;
@@ -675,18 +676,12 @@ public class Infer {
                 paramTypes = paramTypes.tail;
             }
 
-            try {
-                funcInterfaceContext.solve(funcInterfaceContext.boundedVars(), types.noWarnings);
-            } catch (InferenceException ex) {
-                checkContext.report(pos, diags.fragment("no.suitable.functional.intf.inst", funcInterface));
-            }
-
             List actualTypeargs = funcInterface.getTypeArguments();
             for (Type t : funcInterfaceContext.undetvars) {
                 UndetVar uv = (UndetVar)t;
-                if (uv.getInst() == null) {
-                    uv.setInst(actualTypeargs.head);
-                }
+                Optional inst = uv.getBounds(InferenceBound.EQ).stream()
+                        .filter(b -> !b.containsAny(formalInterface.getTypeArguments())).findFirst();
+                uv.setInst(inst.orElse(actualTypeargs.head));
                 actualTypeargs = actualTypeargs.tail;
             }
 
diff --git a/langtools/test/tools/javac/T8048543/InferenceVariableInstantiatedUnexpectedlyTest.java b/langtools/test/tools/javac/T8048543/InferenceVariableInstantiatedUnexpectedlyTest.java
new file mode 100644
index 00000000000..5fdae756325
--- /dev/null
+++ b/langtools/test/tools/javac/T8048543/InferenceVariableInstantiatedUnexpectedlyTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8048543
+ * @summary JLS8 18.5.3: inference variable seems to be instantiated unexpectedly
+ * @compile InferenceVariableInstantiatedUnexpectedlyTest.java
+ */
+
+public class InferenceVariableInstantiatedUnexpectedlyTest {
+    interface Iface {
+        String m(A1 t);
+    }
+
+    public void run() {
+        Iface i = (Integer a) -> a.toString();
+    }
+}
diff --git a/langtools/test/tools/javac/lambda/TargetType19.java b/langtools/test/tools/javac/lambda/TargetType19.java
index 736168ded6f..9d623f42157 100644
--- a/langtools/test/tools/javac/lambda/TargetType19.java
+++ b/langtools/test/tools/javac/lambda/TargetType19.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -39,5 +39,5 @@ class TargetType19 {
 
      void call(SAM s, Z z) {  }
 
-   { call((List p) -> { }, 1); }
+    { call((List p) -> { }, 1); }
 }

From e4f12b7b1e401d5412db51c5373bd9e837109ea6 Mon Sep 17 00:00:00 2001
From: Robert Field 
Date: Wed, 6 Jul 2016 20:53:55 -0700
Subject: [PATCH 073/111] 8160035: JShell API: Add javadoc overview and package
 files

Reviewed-by: jlahoda
---
 .../jdk/jshell/execution/package-info.java    | 34 +++++++++++++++++
 .../share/classes/jdk/jshell/overview.html    | 38 +++++++++++++++++++
 .../classes/jdk/jshell/package-info.java      |  5 ++-
 .../classes/jdk/jshell/spi/package-info.java  | 10 ++---
 .../jdk.jshell/share/classes/module-info.java |  6 +++
 5 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/package-info.java
 create mode 100644 langtools/src/jdk.jshell/share/classes/jdk/jshell/overview.html

diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/package-info.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/package-info.java
new file mode 100644
index 00000000000..6127c103353
--- /dev/null
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides implementation support for building JShell execution engines.
+ * Includes concrete and abstract implementations of the
+ * {@link jdk.jshell.spi.ExecutionControl} interface.
+ * Also, provides related communication utilities.
+ * This package may be used to define alternative execution engines.
+ * The default JShell execution engine is included.
+ */
+package jdk.jshell.execution;
diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/overview.html b/langtools/src/jdk.jshell/share/classes/jdk/jshell/overview.html
new file mode 100644
index 00000000000..251c00910f0
--- /dev/null
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/overview.html
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+This document is the API specification for JShell -- support for
+Java™ Programming Language 'snippet' evaluating tools, such as
+Read-Eval-Print Loops (REPLs).
+
+
+
diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/package-info.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/package-info.java
index 5d9df00951c..3556132596a 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/package-info.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/package-info.java
@@ -38,7 +38,8 @@
  * {@link jdk.jshell.Snippet}. For example, a statement is represented by an
  * instance of {@link jdk.jshell.StatementSnippet}, and a method declaration is
  * represented by an instance of {@link jdk.jshell.MethodSnippet}.
- * Snippets are created when {@link jdk.jshell.JShell#eval(java.lang.String)}
+ * Snippets are created when
+ * {@link jdk.jshell.JShell#eval(java.lang.String) JShell.eval(String)}
  * is invoked with an input which includes one or more snippets of code.
  * 
    
  * Any change to the compilation status of a snippet is reported with a
@@ -84,7 +85,7 @@
  *                     if (input == null) {
  *                         break;
  *                     }
- *                     List<SnippetEvent> events = js.eval(input);
+ *                     List events = js.eval(input);
  *                     for (SnippetEvent e : events) {
  *                         StringBuilder sb = new StringBuilder();
  *                         if (e.causeSnippet == null) {
diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/package-info.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/package-info.java
index 744e13b74e4..fd98e00175a 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/package-info.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/spi/package-info.java
@@ -24,16 +24,16 @@
  */
 
 /**
- * Provides support for alternate implementations of the JShell execution
- * engine.  The JShell core tracks and compiles Snippets then sends them
+ * Defines the Service Provider Interface for pluggable JShell execution engines.
+ * The JShell core tracks and compiles Snippets then sends them
  * (represented in a wrapper class) to the execution engine for loading,
  * and in the case of executable Snippets, execution.  The JShell
  * implementation includes a default execution engine (currently a remote
  * process which is JDI controlled).  By implementing the
- * {@link ExecutionControl} interface and installing it with
+ * {@link jdk.jshell.spi.ExecutionControl} interface and installing it with
  * {@link jdk.jshell.JShell.Builder#executionEngine(jdk.jshell.spi.ExecutionControl) }
  * other execution engines can be used.
- * 
    
- * This is not a part of the JShell API.
+ *
+ * @see jdk.jshell.execution jdk.jshell.execution for execution implementation support
  */
 package jdk.jshell.spi;
diff --git a/langtools/src/jdk.jshell/share/classes/module-info.java b/langtools/src/jdk.jshell/share/classes/module-info.java
index 0959583f16f..b6c1b522bbc 100644
--- a/langtools/src/jdk.jshell/share/classes/module-info.java
+++ b/langtools/src/jdk.jshell/share/classes/module-info.java
@@ -23,6 +23,11 @@
  * questions.
  */
 
+/**
+ * This document is the API specification for JShell -- support for
+ * Java™ Programming Language 'snippet' evaluating tools, such as
+ * Read-Eval-Print Loops (REPLs).
+ */
 module jdk.jshell {
     requires public java.compiler;
     requires java.desktop;
@@ -33,4 +38,5 @@ module jdk.jshell {
 
     exports jdk.jshell;
     exports jdk.jshell.spi;
+    exports jdk.jshell.execution;
 }

From 627e6c6bfa96130df05bed64e6f77d89a672f8dc Mon Sep 17 00:00:00 2001
From: Robert Field 
Date: Wed, 6 Jul 2016 20:56:27 -0700
Subject: [PATCH 074/111] 8160009: JShell: Add SPI and execution to generated
 JShell javadoc (root ws)

Reviewed-by: jlahoda
---
 make/Javadoc.gmk              | 5 ++---
 make/common/NON_CORE_PKGS.gmk | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index 4d946139940..00ec8ef62b3 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -1223,8 +1223,7 @@ JSHELLAPI_DOCTITLE := JShell API
 JSHELLAPI_WINDOWTITLE := JShell API
 JSHELLAPI_HEADER := JSHELL API
 JSHELLAPI_BOTTOM := $(call CommonBottom,$(JSHELLAPI_FIRST_COPYRIGHT_YEAR))
-JSHELLAPI_GROUPNAME := Packages
-JSHELLAPI_REGEXP := jdk.jshell.*
+JSHELLAPI_OVERVIEW := $(LANGTOOLS_TOPDIR)/src/jdk.jshell/share/classes/jdk/jshell/overview.html
 # JSHELLAPI_PKGS is located in NON_CORE_PKGS.gmk
 
 JSHELLAPI_INDEX_HTML = $(JSHELLAPI_DOCDIR)/index.html
@@ -1256,11 +1255,11 @@ $(JSHELLAPI_OPTIONS_FILE):
 	  $(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
 	  $(call OptionPair,-addmods,$(JSHELLAPI_MODULES)) ; \
 	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionPair,-overview,$(JSHELLAPI_OVERVIEW)) ; \
 	  $(call OptionPair,-doctitle,$(JSHELLAPI_DOCTITLE)) ; \
 	  $(call OptionPair,-windowtitle,$(JSHELLAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
 	  $(call OptionPair,-header,$(JSHELLAPI_HEADER)$(DRAFT_HEADER)) ; \
 	  $(call OptionPair,-bottom,$(JSHELLAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(JSHELLAPI_GROUPNAME),$(JSHELLAPI_REGEXP)); \
 	  $(call OptionTrip,-linkoffline,$(JSHELLAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
 	) >> $@
 
diff --git a/make/common/NON_CORE_PKGS.gmk b/make/common/NON_CORE_PKGS.gmk
index b6ef5a9d450..ad546a4456d 100644
--- a/make/common/NON_CORE_PKGS.gmk
+++ b/make/common/NON_CORE_PKGS.gmk
@@ -81,7 +81,9 @@ ATTACH_PKGS = com.sun.tools.attach \
 
 JCONSOLE_PKGS = com.sun.tools.jconsole
 
-JSHELLAPI_PKGS = jdk.jshell
+JSHELLAPI_PKGS = jdk.jshell \
+    jdk.jshell.spi \
+    jdk.jshell.execution
 
 TREEAPI_PKGS = com.sun.source.doctree \
     com.sun.source.tree \

From 7aca6deaf8cc65d5430ecdc90e23a6d8cc23f154 Mon Sep 17 00:00:00 2001
From: Robert Field 
Date: Thu, 7 Jul 2016 00:10:24 -0700
Subject: [PATCH 075/111] 8160935: JShell: Without at least one source file
 8160035 breaks build

Reviewed-by: jlahoda
---
 .../jdk/jshell/execution/Internal.java        | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Internal.java

diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Internal.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Internal.java
new file mode 100644
index 00000000000..bfb1cd8d61e
--- /dev/null
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Internal.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jshell.execution;
+
+/**
+ * Temp class needed so the package exists.
+ */
+class Internal {}

From 3f37187f5fa87efe545dceaba6e3b0677ea78316 Mon Sep 17 00:00:00 2001
From: Alejandro Murillo 
Date: Thu, 7 Jul 2016 18:21:20 +0000
Subject: [PATCH 076/111] Added tag jdk-9+126 for changeset 492d4508ddf4

---
 .hgtags-top-repo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 27eb593b749..783312526e8 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -368,3 +368,4 @@ cae471d3b87783e0a3deea658e1e1c84b2485b6c jdk-9+121
 405d811c0d7b9b48ff718ae6c240b732f098c028 jdk-9+123
 f80c841ae2545eaf9acd2724bccc305d98cefbe2 jdk-9+124
 9aa7d40f3a453f51e47f4c1b19eff5740a74a9f8 jdk-9+125
+3a58466296d36944454756ef01e7513ac5e14a16 jdk-9+126

From 038c476b1f6a6de21408c11bb4a8e484addde6d9 Mon Sep 17 00:00:00 2001
From: Alejandro Murillo 
Date: Thu, 7 Jul 2016 18:21:21 +0000
Subject: [PATCH 077/111] Added tag jdk-9+126 for changeset c2c8f6b847e5

---
 corba/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/corba/.hgtags b/corba/.hgtags
index 81364a38dbc..d514b137ea5 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -368,3 +368,4 @@ a39131aafc51a6fd8836e6ebe1b04458702ce7d6 jdk-9+122
 e33a34cc551907617d8129c4faaf1a5a7e61d21c jdk-9+123
 45121d5afb9d5bfadab75378572ad96832e0809e jdk-9+124
 1d48e67d1b91eb9f72e49e69a4021edb85e357fc jdk-9+125
+c7f5ba08fcd4b8416e62c21229f9a07c95498919 jdk-9+126

From fe993c849578ae7b10e28dfad94f6307bab85aa8 Mon Sep 17 00:00:00 2001
From: Alejandro Murillo 
Date: Thu, 7 Jul 2016 18:21:22 +0000
Subject: [PATCH 078/111] Added tag jdk-9+126 for changeset 0517ab37a67c

---
 hotspot/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 91141129553..393252486a7 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -528,3 +528,4 @@ af6b4ad908e732d23021f12e8322b204433d5cf6 jdk-9+122
 75f81e1fecfb444f34f357295fe06af60e2762d9 jdk-9+123
 479631362b4930be985245ea063d87d821a472eb jdk-9+124
 bb640b49741af3f57f9994129934c46fc173219f jdk-9+125
+adc8c84b7cf8c540d920182f78a2bc982366432a jdk-9+126

From 0850b26185906ea3eec8ab0487bcd895379ac379 Mon Sep 17 00:00:00 2001
From: Alejandro Murillo 
Date: Thu, 7 Jul 2016 18:21:23 +0000
Subject: [PATCH 079/111] Added tag jdk-9+126 for changeset c74ef1ce07fb

---
 jaxp/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index ffd6b13eb86..a9a25f979d4 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -368,3 +368,4 @@ f8899b1884e2c4a000dbcc5b1a80954245fe462e jdk-9+122
 3c19ab8742c196ac267b3d87e1d19ec3472c708d jdk-9+123
 e04a15153cc293f05fcd60bc98236f50e16af46a jdk-9+124
 493eb91ec32a6dea7604cfbd86c10045ad9af15b jdk-9+125
+15722f71281f034bc696d8b96136da2ef34da44f jdk-9+126

From 0d9a27322a9b3b75b30aab43ccc77c964ae577bd Mon Sep 17 00:00:00 2001
From: Alejandro Murillo 
Date: Thu, 7 Jul 2016 18:21:23 +0000
Subject: [PATCH 080/111] Added tag jdk-9+126 for changeset dd877a53f8d8

---
 jaxws/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index b236a042d5c..cd59b05a750 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -371,3 +371,4 @@ fb771fa3a986ccfcb00d743b1956b98c380d1dd8 jdk-9+121
 c42decd28bbfa817347112ed6053b5fbd30517a2 jdk-9+123
 1600da1665cd2cc127014e8c002b328ec33a9147 jdk-9+124
 5b0570e3db29f6b8c80a4beac70d51284507b203 jdk-9+125
+264a44128cd6286e598d5a849ceeb613c06269d0 jdk-9+126

From 3fff40c074c2af8fead75cd619dbffc5eb3d1543 Mon Sep 17 00:00:00 2001
From: Alejandro Murillo 
Date: Thu, 7 Jul 2016 18:21:25 +0000
Subject: [PATCH 081/111] Added tag jdk-9+126 for changeset a42db8c180c3

---
 langtools/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/langtools/.hgtags b/langtools/.hgtags
index b93caea928d..7677d43f11d 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -368,3 +368,4 @@ cba09a2e6ae969b029783eb59bb01017b78f8eef jdk-9+114
 d0c742ddfb01ebe427720798c4c8335023ae20f8 jdk-9+123
 26aa3caa778eab1c931910149c414783ee83bce7 jdk-9+124
 2d65e127e93d5ff0df61bf78e57d7f46a2f1edeb jdk-9+125
+ea4eea2997b9e2f26cd7965839921710ff4065c8 jdk-9+126

From 9b6e1e12c1d5ce149aed5db3a9d8719863502c17 Mon Sep 17 00:00:00 2001
From: Alejandro Murillo 
Date: Thu, 7 Jul 2016 18:21:25 +0000
Subject: [PATCH 082/111] Added tag jdk-9+126 for changeset 5c06a5663124

---
 nashorn/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index f7b3d05812c..e724c480a5e 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -359,3 +359,4 @@ b1de131a3fed6845c78bdda358ee127532f16a3f jdk-9+122
 9ed859b4faaf9ff7cd35f9e7f51c7e630303067a jdk-9+123
 5d68f5155dded7efec7d5aca5d631caa7ee1042b jdk-9+124
 a32d419d73fe881a935b567c57dab9bfe3ed5f92 jdk-9+125
+ee90c69a18409533df8f7b602044bf966a28381a jdk-9+126

From a89ed8318b35605dadf2976de8a5c5d41e8d1328 Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan 
Date: Thu, 7 Jul 2016 14:51:08 -0700
Subject: [PATCH 083/111] 8160998: GPL header contains "(config)" in first line
 - not swapped in licensee bundles

Reviewed-by: vromero
---
 .../jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java
index d0bac0192cc..7df9f8b6f5b 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MetaKeywords.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (config) 2002, 2016, 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

From 1931ac419659c69f674964c581ffd99af24fb567 Mon Sep 17 00:00:00 2001
From: Weijun Wang 
Date: Tue, 12 Jul 2016 09:41:49 +0800
Subject: [PATCH 084/111] 8130302: jarsigner and keytool -providerClass needs
 be re-examined for modules

Reviewed-by: valeriep, mchung, mullan
---
 .../sun/security/tools/KeyStoreUtil.java      |  68 ++++++
 .../sun/security/tools/keytool/Main.java      | 214 ++++++++++--------
 .../sun/security/tools/keytool/Resources.java |  18 +-
 .../java.base/share/conf/security/java.policy |   3 +-
 .../security/ucrypto/UcryptoProvider.java     |  13 +-
 .../sun/security/tools/jarsigner/Main.java    |  81 ++++---
 .../security/tools/jarsigner/Resources.java   |  17 +-
 .../security/pkcs11/fips/ImportKeyStore.java  |   2 +-
 .../security/tools/jarsigner/AltProvider.java | 161 +++++++++++++
 .../jarsigner/alt/test.dummy/module-info.java |  26 +++
 .../org/test/dummy}/DummyProvider.java        |  18 +-
 .../security/tools/keytool/AltProviderPath.sh | 122 ----------
 .../security/tools/keytool/KeyToolTest.java   |  11 +-
 jdk/test/sun/security/tools/keytool/i18n.html |  20 +-
 14 files changed, 490 insertions(+), 284 deletions(-)
 create mode 100644 jdk/test/sun/security/tools/jarsigner/AltProvider.java
 create mode 100644 jdk/test/sun/security/tools/jarsigner/alt/test.dummy/module-info.java
 rename jdk/test/sun/security/tools/{keytool => jarsigner/alt/test.dummy/org/test/dummy}/DummyProvider.java (89%)
 delete mode 100644 jdk/test/sun/security/tools/keytool/AltProviderPath.sh

diff --git a/jdk/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java b/jdk/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java
index 4d59e69be75..7c33d0753f6 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java
@@ -38,6 +38,8 @@ import java.net.URL;
 
 import java.security.KeyStore;
 
+import java.security.Provider;
+import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.text.Collator;
 
@@ -46,6 +48,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import java.util.ServiceLoader;
 
 import sun.security.util.PropertyExpander;
 
@@ -209,6 +212,7 @@ public class KeyStoreUtil {
 
     /**
      * Prepends matched options from a pre-configured options file.
+     *
      * @param tool the name of the tool, can be "keytool" or "jarsigner"
      * @param file the pre-configured options file
      * @param c1 the name of the command, with the "-" prefix,
@@ -259,4 +263,68 @@ public class KeyStoreUtil {
             return result.toArray(new String[result.size()]);
         }
     }
+
+    /**
+     * Loads a security provider as a service.
+     *
+     * @param provName the name
+     * @param arg optional arg
+     * @throws IllegalArgumentException if no provider matches the name
+     */
+    public static void loadProviderByName(String provName, String arg) {
+        Provider loaded = Security.getProvider(provName);
+        if (loaded != null) {
+            if (arg != null) {
+                loaded = loaded.configure(arg);
+                Security.addProvider(loaded);
+            }
+            return;
+        }
+        for (Provider p : ServiceLoader.load(Provider.class,
+                ClassLoader.getSystemClassLoader())) {
+            if (p.getName().equals(provName)) {
+                if (arg != null) {
+                    p = p.configure(arg);
+                }
+                Security.addProvider(p);
+                return;
+            }
+        }
+        throw new IllegalArgumentException("No provider found");
+    }
+
+    /**
+     * Loads a security provider by a fully-qualified class name.
+     *
+     * @param provClass the class name
+     * @param arg optional arg
+     * @param cl optional class loader
+     * @throws IllegalArgumentException if no provider matches the class name
+     * @throws ClassCastException if the class has not extended Provider
+     */
+    public static void loadProviderByClass(
+            String provClass, String arg, ClassLoader cl) {
+
+        // For compatibility, SunPKCS11 and OracleUcrypto can still be
+        // loadable with -providerClass.
+        if (provClass.equals("sun.security.pkcs11.SunPKCS11")) {
+            loadProviderByName("SunPKCS11", arg);
+            return;
+        } else if (provClass.equals("com.oracle.security.crypto.UcryptoProvider")) {
+            loadProviderByName("OracleUcrypto", arg);
+            return;
+        }
+
+        Provider prov;
+        try {
+            Class clazz = Class.forName(provClass, false, cl);
+            prov = (Provider) clazz.getConstructor().newInstance();
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalArgumentException(e);
+        }
+        if (arg != null) {
+            prov = prov.configure(arg);
+        }
+        Security.addProvider(prov);
+    }
 }
diff --git a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index 2832c0d8390..b5ac0930cbd 100644
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -33,13 +33,11 @@ import java.security.MessageDigest;
 import java.security.Key;
 import java.security.PublicKey;
 import java.security.PrivateKey;
-import java.security.Security;
 import java.security.Signature;
 import java.security.Timestamp;
 import java.security.UnrecoverableEntryException;
 import java.security.UnrecoverableKeyException;
 import java.security.Principal;
-import java.security.Provider;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.CertStoreException;
@@ -128,6 +126,7 @@ public final class Main {
     // them through the command line.
 
     private Set> providers = null;
+    private Set> providerClasses = null;
     private String storetype = null;
     private boolean hasStoretypeOption = false;
     private String srcProviderName = null;
@@ -166,57 +165,57 @@ public final class Main {
     enum Command {
         CERTREQ("Generates.a.certificate.request",
             ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME,
-            STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
-            PROVIDERARG, PROVIDERPATH, V, PROTECTED),
+            STOREPASS, STORETYPE, PROVIDERNAME, ADDPROVIDER,
+            PROVIDERCLASS, PROVIDERPATH, V, PROTECTED),
         CHANGEALIAS("Changes.an.entry.s.alias",
             ALIAS, DESTALIAS, KEYPASS, KEYSTORE, STOREPASS,
-            STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
+            STORETYPE, PROVIDERNAME, ADDPROVIDER, PROVIDERCLASS,
             PROVIDERPATH, V, PROTECTED),
         DELETE("Deletes.an.entry",
             ALIAS, KEYSTORE, STOREPASS, STORETYPE,
-            PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
+            PROVIDERNAME, ADDPROVIDER, PROVIDERCLASS,
             PROVIDERPATH, V, PROTECTED),
         EXPORTCERT("Exports.certificate",
             RFC, ALIAS, FILEOUT, KEYSTORE, STOREPASS,
-            STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
+            STORETYPE, PROVIDERNAME, ADDPROVIDER, PROVIDERCLASS,
             PROVIDERPATH, V, PROTECTED),
         GENKEYPAIR("Generates.a.key.pair",
             ALIAS, KEYALG, KEYSIZE, SIGALG, DESTALIAS, DNAME,
             STARTDATE, EXT, VALIDITY, KEYPASS, KEYSTORE,
-            STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
-            PROVIDERARG, PROVIDERPATH, V, PROTECTED),
+            STOREPASS, STORETYPE, PROVIDERNAME, ADDPROVIDER,
+            PROVIDERCLASS, PROVIDERPATH, V, PROTECTED),
         GENSECKEY("Generates.a.secret.key",
             ALIAS, KEYPASS, KEYALG, KEYSIZE, KEYSTORE,
-            STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
-            PROVIDERARG, PROVIDERPATH, V, PROTECTED),
+            STOREPASS, STORETYPE, PROVIDERNAME, ADDPROVIDER,
+            PROVIDERCLASS, PROVIDERPATH, V, PROTECTED),
         GENCERT("Generates.certificate.from.a.certificate.request",
             RFC, INFILE, OUTFILE, ALIAS, SIGALG, DNAME,
             STARTDATE, EXT, VALIDITY, KEYPASS, KEYSTORE,
-            STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
-            PROVIDERARG, PROVIDERPATH, V, PROTECTED),
+            STOREPASS, STORETYPE, PROVIDERNAME, ADDPROVIDER,
+            PROVIDERCLASS, PROVIDERPATH, V, PROTECTED),
         IMPORTCERT("Imports.a.certificate.or.a.certificate.chain",
             NOPROMPT, TRUSTCACERTS, PROTECTED, ALIAS, FILEIN,
             KEYPASS, KEYSTORE, STOREPASS, STORETYPE,
-            PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
+            PROVIDERNAME, ADDPROVIDER, PROVIDERCLASS,
             PROVIDERPATH, V),
         IMPORTPASS("Imports.a.password",
             ALIAS, KEYPASS, KEYALG, KEYSIZE, KEYSTORE,
-            STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
-            PROVIDERARG, PROVIDERPATH, V, PROTECTED),
+            STOREPASS, STORETYPE, PROVIDERNAME, ADDPROVIDER,
+            PROVIDERCLASS, PROVIDERPATH, V, PROTECTED),
         IMPORTKEYSTORE("Imports.one.or.all.entries.from.another.keystore",
             SRCKEYSTORE, DESTKEYSTORE, SRCSTORETYPE,
             DESTSTORETYPE, SRCSTOREPASS, DESTSTOREPASS,
             SRCPROTECTED, DESTPROTECTED, SRCPROVIDERNAME, DESTPROVIDERNAME,
             SRCALIAS, DESTALIAS, SRCKEYPASS, DESTKEYPASS,
-            NOPROMPT, PROVIDERCLASS, PROVIDERARG, PROVIDERPATH,
+            NOPROMPT, ADDPROVIDER, PROVIDERCLASS, PROVIDERPATH,
             V),
         KEYPASSWD("Changes.the.key.password.of.an.entry",
             ALIAS, KEYPASS, NEW, KEYSTORE, STOREPASS,
-            STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
+            STORETYPE, PROVIDERNAME, ADDPROVIDER, PROVIDERCLASS,
             PROVIDERPATH, V),
         LIST("Lists.entries.in.a.keystore",
             RFC, ALIAS, KEYSTORE, STOREPASS, STORETYPE,
-            PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
+            PROVIDERNAME, ADDPROVIDER, PROVIDERCLASS,
             PROVIDERPATH, V, PROTECTED),
         PRINTCERT("Prints.the.content.of.a.certificate",
             RFC, FILEIN, SSLSERVER, JARFILE, V),
@@ -226,26 +225,26 @@ public final class Main {
             FILEIN, V),
         STOREPASSWD("Changes.the.store.password.of.a.keystore",
             NEW, KEYSTORE, STOREPASS, STORETYPE, PROVIDERNAME,
-            PROVIDERCLASS, PROVIDERARG, PROVIDERPATH, V),
+            ADDPROVIDER, PROVIDERCLASS, PROVIDERPATH, V),
 
         // Undocumented start here, KEYCLONE is used a marker in -help;
 
         KEYCLONE("Clones.a.key.entry",
             ALIAS, DESTALIAS, KEYPASS, NEW, STORETYPE,
-            KEYSTORE, STOREPASS, PROVIDERNAME, PROVIDERCLASS,
-            PROVIDERARG, PROVIDERPATH, V),
+            KEYSTORE, STOREPASS, PROVIDERNAME, ADDPROVIDER,
+            PROVIDERCLASS, PROVIDERPATH, V),
         SELFCERT("Generates.a.self.signed.certificate",
             ALIAS, SIGALG, DNAME, STARTDATE, VALIDITY, KEYPASS,
             STORETYPE, KEYSTORE, STOREPASS, PROVIDERNAME,
-            PROVIDERCLASS, PROVIDERARG, PROVIDERPATH, V),
+            ADDPROVIDER, PROVIDERCLASS, PROVIDERPATH, V),
         GENCRL("Generates.CRL",
             RFC, FILEOUT, ID,
             ALIAS, SIGALG, EXT, KEYPASS, KEYSTORE,
-            STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
-            PROVIDERARG, PROVIDERPATH, V, PROTECTED),
+            STOREPASS, STORETYPE, PROVIDERNAME, ADDPROVIDER,
+            PROVIDERCLASS, PROVIDERPATH, V, PROTECTED),
         IDENTITYDB("Imports.entries.from.a.JDK.1.1.x.style.identity.database",
             FILEIN, STORETYPE, KEYSTORE, STOREPASS, PROVIDERNAME,
-            PROVIDERCLASS, PROVIDERARG, PROVIDERPATH, V);
+            ADDPROVIDER, PROVIDERCLASS, PROVIDERPATH, V);
 
         final String description;
         final Option[] options;
@@ -289,48 +288,48 @@ public final class Main {
 
     enum Option {
         ALIAS("alias", "", "alias.name.of.the.entry.to.process"),
-        DESTALIAS("destalias", "", "destination.alias"),
+        DESTALIAS("destalias", "", "destination.alias"),
         DESTKEYPASS("destkeypass", "", "destination.key.password"),
-        DESTKEYSTORE("destkeystore", "", "destination.keystore.name"),
+        DESTKEYSTORE("destkeystore", "", "destination.keystore.name"),
         DESTPROTECTED("destprotected", null, "destination.keystore.password.protected"),
-        DESTPROVIDERNAME("destprovidername", "", "destination.keystore.provider.name"),
+        DESTPROVIDERNAME("destprovidername", "", "destination.keystore.provider.name"),
         DESTSTOREPASS("deststorepass", "", "destination.keystore.password"),
-        DESTSTORETYPE("deststoretype", "", "destination.keystore.type"),
-        DNAME("dname", "", "distinguished.name"),
+        DESTSTORETYPE("deststoretype", "", "destination.keystore.type"),
+        DNAME("dname", "", "distinguished.name"),
         EXT("ext", "", "X.509.extension"),
-        FILEOUT("file", "", "output.file.name"),
-        FILEIN("file", "", "input.file.name"),
+        FILEOUT("file", "", "output.file.name"),
+        FILEIN("file", "", "input.file.name"),
         ID("id", "", "Serial.ID.of.cert.to.revoke"),
-        INFILE("infile", "", "input.file.name"),
-        KEYALG("keyalg", "", "key.algorithm.name"),
+        INFILE("infile", "", "input.file.name"),
+        KEYALG("keyalg", "", "key.algorithm.name"),
         KEYPASS("keypass", "", "key.password"),
-        KEYSIZE("keysize", "", "key.bit.size"),
+        KEYSIZE("keysize", "", "key.bit.size"),
         KEYSTORE("keystore", "", "keystore.name"),
         NEW("new", "", "new.password"),
         NOPROMPT("noprompt", null, "do.not.prompt"),
-        OUTFILE("outfile", "", "output.file.name"),
+        OUTFILE("outfile", "", "output.file.name"),
         PROTECTED("protected", null, "password.through.protected.mechanism"),
-        PROVIDERARG("providerarg", "", "provider.argument"),
-        PROVIDERCLASS("providerclass", "", "provider.class.name"),
-        PROVIDERNAME("providername", "", "provider.name"),
-        PROVIDERPATH("providerpath", "", "provider.classpath"),
+        PROVIDERCLASS("providerclass", "\n[-providerarg ]", "provider.class.option"),
+        ADDPROVIDER("addprovider", "\n[-providerarg ]", "addprovider.option"),
+        PROVIDERNAME("providername", "", "provider.name"),
+        PROVIDERPATH("providerpath", "", "provider.classpath"),
         RFC("rfc", null, "output.in.RFC.style"),
-        SIGALG("sigalg", "", "signature.algorithm.name"),
-        SRCALIAS("srcalias", "", "source.alias"),
+        SIGALG("sigalg", "", "signature.algorithm.name"),
+        SRCALIAS("srcalias", "", "source.alias"),
         SRCKEYPASS("srckeypass", "", "source.key.password"),
-        SRCKEYSTORE("srckeystore", "", "source.keystore.name"),
+        SRCKEYSTORE("srckeystore", "", "source.keystore.name"),
         SRCPROTECTED("srcprotected", null, "source.keystore.password.protected"),
-        SRCPROVIDERNAME("srcprovidername", "", "source.keystore.provider.name"),
+        SRCPROVIDERNAME("srcprovidername", "", "source.keystore.provider.name"),
         SRCSTOREPASS("srcstorepass", "", "source.keystore.password"),
-        SRCSTORETYPE("srcstoretype", "", "source.keystore.type"),
+        SRCSTORETYPE("srcstoretype", "", "source.keystore.type"),
         SSLSERVER("sslserver", "", "SSL.server.host.and.port"),
-        JARFILE("jarfile", "", "signed.jar.file"),
-        STARTDATE("startdate", "", "certificate.validity.start.date.time"),
+        JARFILE("jarfile", "", "signed.jar.file"),
+        STARTDATE("startdate", "", "certificate.validity.start.date.time"),
         STOREPASS("storepass", "", "keystore.password"),
-        STORETYPE("storetype", "", "keystore.type"),
+        STORETYPE("storetype", "", "keystore.type"),
         TRUSTCACERTS("trustcacerts", null, "trust.certificates.from.cacerts"),
         V("v", null, "verbose.output"),
-        VALIDITY("validity", "", "validity.number.of.days");
+        VALIDITY("validity", "", "validity.number.of.days");
 
         final String name, arg, description;
         Option(String name, String arg, String description) {
@@ -344,8 +343,6 @@ public final class Main {
         }
     };
 
-    private static final Class[] PARAM_STRING = { String.class };
-
     private static final String NONE = "NONE";
     private static final String P11KEYSTORE = "PKCS11";
     private static final String P12KEYSTORE = "PKCS12";
@@ -549,10 +546,10 @@ public final class Main {
                 jarfile = args[++i];
             } else if (collator.compare(flags, "-srckeystore") == 0) {
                 srcksfname = args[++i];
-            } else if ((collator.compare(flags, "-provider") == 0) ||
-                        (collator.compare(flags, "-providerclass") == 0)) {
-                if (providers == null) {
-                    providers = new HashSet> (3);
+            } else if (collator.compare(flags, "-provider") == 0 ||
+                        collator.compare(flags, "-providerclass") == 0) {
+                if (providerClasses == null) {
+                    providerClasses = new HashSet> (3);
                 }
                 String providerClass = args[++i];
                 String providerArg = null;
@@ -565,8 +562,25 @@ public final class Main {
                         i += 2;
                     }
                 }
-                providers.add(
+                providerClasses.add(
                         Pair.of(providerClass, providerArg));
+            } else if (collator.compare(flags, "-addprovider") == 0) {
+                if (providers == null) {
+                    providers = new HashSet> (3);
+                }
+                String provider = args[++i];
+                String providerArg = null;
+
+                if (args.length > (i+1)) {
+                    flags = args[i+1];
+                    if (collator.compare(flags, "-providerarg") == 0) {
+                        if (args.length == (i+2)) errorNeedArgument(flags);
+                        providerArg = args[i+2];
+                        i += 2;
+                    }
+                }
+                providers.add(
+                        Pair.of(provider, providerArg));
             }
 
             /*
@@ -617,7 +631,6 @@ public final class Main {
         return cmd != PRINTCERT && cmd != PRINTCERTREQ;
     }
 
-
     /**
      * Execute the commands.
      */
@@ -703,6 +716,20 @@ public final class Main {
 
         // Try to load and install specified provider
         if (providers != null) {
+            for (Pair provider : providers) {
+                try {
+                    KeyStoreUtil.loadProviderByName(
+                            provider.fst, provider.snd);
+                    if (debug) {
+                        System.out.println("loadProviderByName: " + provider.fst);
+                    }
+                } catch (IllegalArgumentException e) {
+                    throw new Exception(String.format(rb.getString(
+                            "provider.name.not.found"), provider.fst));
+                }
+            }
+        }
+        if (providerClasses != null) {
             ClassLoader cl = null;
             if (pathlist != null) {
                 String path = null;
@@ -717,30 +744,20 @@ public final class Main {
             } else {
                 cl = ClassLoader.getSystemClassLoader();
             }
-
-            for (Pair  provider: providers) {
-                String provName = provider.fst;
-                Class provClass;
-                if (cl != null) {
-                    provClass = cl.loadClass(provName);
-                } else {
-                    provClass = Class.forName(provName);
+            for (Pair provider : providerClasses) {
+                try {
+                    KeyStoreUtil.loadProviderByClass(
+                            provider.fst, provider.snd, cl);
+                    if (debug) {
+                        System.out.println("loadProviderByClass: " + provider.fst);
+                    }
+                } catch (ClassCastException cce) {
+                    throw new Exception(String.format(rb.getString(
+                            "provclass.not.a.provider"), provider.fst));
+                } catch (IllegalArgumentException e) {
+                    throw new Exception(String.format(rb.getString(
+                            "provider.class.not.found"), provider.fst), e.getCause());
                 }
-
-                @SuppressWarnings("deprecation")
-                Object obj = provClass.newInstance();
-                if (!(obj instanceof Provider)) {
-                    MessageFormat form = new MessageFormat
-                        (rb.getString("provName.not.a.provider"));
-                    Object[] source = {provName};
-                    throw new Exception(form.format(source));
-                }
-                Provider p = (Provider) obj;
-                String provArg = provider.snd;
-                if (provArg != null) {
-                    p = p.configure(provArg);
-                }
-                Security.addProvider(p);
             }
         }
 
@@ -4132,27 +4149,40 @@ public final class Main {
             System.err.println(rb.getString("Options."));
             System.err.println();
 
-            // Left and right sides of the options list
+            // Left and right sides of the options list. Both might
+            // contain "\n" and span multiple lines
             String[] left = new String[command.options.length];
             String[] right = new String[command.options.length];
 
-            // Check if there's an unknown option
-            boolean found = false;
-
             // Length of left side of options list
             int lenLeft = 0;
-            for (int j=0; j lenLeft) {
-                    lenLeft = left[j].length();
+                if (opt.arg != null) {
+                    left[j] += " " + opt.arg;
+                }
+                String[] lefts = left[j].split("\n");
+                for (String s : lefts) {
+                    if (s.length() > lenLeft) {
+                        lenLeft = s.length();
+                    }
                 }
                 right[j] = rb.getString(opt.description);
             }
-            for (int j=0; j>", "read";
 };
 
 grant codeBase "jrt:/java.sql" {
diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoProvider.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoProvider.java
index 35cceda0757..661b50dafdb 100644
--- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoProvider.java
+++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoProvider.java
@@ -235,13 +235,14 @@ public final class UcryptoProvider extends Provider {
 
     @Override
     public Provider configure(String configArg) throws InvalidParameterException {
-        // default policy entry only grants read access to default config
-        if (!defConfigName.equals(configArg)) {
-            throw new InvalidParameterException("Ucrypto provider can only be " +
-                "configured with default configuration file");
+        try {
+            init(configArg);
+        } catch (UcryptoException ue) {
+            InvalidParameterException ipe =
+                    new InvalidParameterException("Error using " + configArg);
+            ipe.initCause(ue.getCause());
+            throw ipe;
         }
-        // re-read the config
-        init(defConfigName);
         return this;
     }
 
diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
index c0ea87c8986..10dcb2731b9 100644
--- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -118,7 +118,8 @@ public class Main {
     boolean protectedPath; // protected authentication path
     String storetype; // keystore type
     String providerName; // provider name
-    Vector providers = null; // list of providers
+    List providers = null; // list of provider names
+    List providerClasses = null; // list of provider classes
     // arguments for provider constructors
     HashMap providerArgs = new HashMap<>();
     char[] keypass; // private key password
@@ -174,30 +175,36 @@ public class Main {
 
             // Try to load and install the specified providers
             if (providers != null) {
-                ClassLoader cl = ClassLoader.getSystemClassLoader();
-                Enumeration e = providers.elements();
-                while (e.hasMoreElements()) {
-                    String provName = e.nextElement();
-                    Class provClass;
-                    if (cl != null) {
-                        provClass = cl.loadClass(provName);
-                    } else {
-                        provClass = Class.forName(provName);
+                for (String provName: providers) {
+                    try {
+                        KeyStoreUtil.loadProviderByName(provName,
+                                providerArgs.get(provName));
+                        if (debug) {
+                            System.out.println("loadProviderByName: " + provName);
+                        }
+                    } catch (IllegalArgumentException e) {
+                        throw new Exception(String.format(rb.getString(
+                                "provider.name.not.found"), provName));
                     }
+                }
+            }
 
-                    Object obj = provClass.newInstance();
-                    if (!(obj instanceof Provider)) {
-                        MessageFormat form = new MessageFormat(rb.getString
-                            ("provName.not.a.provider"));
-                        Object[] source = {provName};
-                        throw new Exception(form.format(source));
+            if (providerClasses != null) {
+                ClassLoader cl = ClassLoader.getSystemClassLoader();
+                for (String provClass: providerClasses) {
+                    try {
+                        KeyStoreUtil.loadProviderByClass(provClass,
+                                providerArgs.get(provClass), cl);
+                        if (debug) {
+                            System.out.println("loadProviderByClass: " + provClass);
+                        }
+                    } catch (ClassCastException cce) {
+                        throw new Exception(String.format(rb.getString(
+                                "provclass.not.a.provider"), provClass));
+                    } catch (IllegalArgumentException e) {
+                        throw new Exception(String.format(rb.getString(
+                                "provider.class.not.found"), provClass), e.getCause());
                     }
-                    Provider p = (Provider) obj;
-                    String provArg = providerArgs.get(provName);
-                    if (provArg != null) {
-                        p = p.configure(provArg);
-                    }
-                    Security.addProvider(p);
                 }
             }
 
@@ -335,11 +342,26 @@ public class Main {
             } else if (collator.compare(flags, "-providerName") ==0) {
                 if (++n == args.length) usageNoArg();
                 providerName = args[n];
-            } else if ((collator.compare(flags, "-provider") == 0) ||
-                        (collator.compare(flags, "-providerClass") == 0)) {
+            } else if (collator.compare(flags, "-provider") == 0 ||
+                        collator.compare(flags, "-providerClass") == 0) {
+                if (++n == args.length) usageNoArg();
+                if (providerClasses == null) {
+                    providerClasses = new ArrayList<>(3);
+                }
+                providerClasses.add(args[n]);
+
+                if (args.length > (n+1)) {
+                    flags = args[n+1];
+                    if (collator.compare(flags, "-providerArg") == 0) {
+                        if (args.length == (n+2)) usageNoArg();
+                        providerArgs.put(args[n], args[n+2]);
+                        n += 2;
+                    }
+                }
+            } else if (collator.compare(flags, "-addprovider") == 0) {
                 if (++n == args.length) usageNoArg();
                 if (providers == null) {
-                    providers = new Vector(3);
+                    providers = new ArrayList<>(3);
                 }
                 providers.add(args[n]);
 
@@ -584,9 +606,14 @@ public class Main {
                 (".providerName.name.provider.name"));
         System.out.println();
         System.out.println(rb.getString
-                (".providerClass.class.name.of.cryptographic.service.provider.s"));
+                (".add.provider.option"));
         System.out.println(rb.getString
-                (".providerArg.arg.master.class.file.and.constructor.argument"));
+                (".providerArg.option.1"));
+        System.out.println();
+        System.out.println(rb.getString
+                (".providerClass.option"));
+        System.out.println(rb.getString
+                (".providerArg.option.2"));
         System.out.println();
         System.out.println(rb.getString
                 (".strict.treat.warnings.as.errors"));
diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
index 87c72f2046c..6198cd40ce9 100644
--- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
+++ b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
@@ -40,8 +40,9 @@ public class Resources extends java.util.ListResourceBundle {
         {"6SPACE", "      "},
         {"COMMA", ", "},
 
-        {"provName.not.a.provider", "{0} not a provider"},
-        {"signerClass.is.not.a.signing.mechanism", "{0} is not a signing mechanism"},
+        {"provclass.not.a.provider", "%s not a provider"},
+        {"provider.name.not.found", "Provider named \"%s\" not found"},
+        {"provider.class.not.found", "Provider \"%s\" not found"},
         {"jarsigner.error.", "jarsigner error: "},
         {"Illegal.option.", "Illegal option: "},
         {"This.option.is.deprecated", "This option is deprecated: "},
@@ -105,10 +106,14 @@ public class Resources extends java.util.ListResourceBundle {
                 "[-protected]                keystore has protected authentication path"},
         {".providerName.name.provider.name",
                 "[-providerName ]      provider name"},
-        {".providerClass.class.name.of.cryptographic.service.provider.s",
-                "[-providerClass      name of cryptographic service provider's"},
-        {".providerArg.arg.master.class.file.and.constructor.argument",
-                "  [-providerArg ]] ... master class file and constructor argument"},
+        {".add.provider.option",
+                "[-addprovider         add security provider by name (e.g. SunPKCS11)"},
+        {".providerArg.option.1",
+                "  [-providerArg ]] ... configure argument for -addprovider"},
+        {".providerClass.option",
+                "[-providerClass      add security provider by fully-qualified class name"},
+        {".providerArg.option.2",
+                "  [-providerArg ]] ... configure argument for -providerClass"},
         {".strict.treat.warnings.as.errors",
                 "[-strict]                   treat warnings as errors"},
         {".conf.url.specify.a.pre.configured.options.file",
diff --git a/jdk/test/sun/security/pkcs11/fips/ImportKeyStore.java b/jdk/test/sun/security/pkcs11/fips/ImportKeyStore.java
index 302df9280e6..8fecb2b2692 100644
--- a/jdk/test/sun/security/pkcs11/fips/ImportKeyStore.java
+++ b/jdk/test/sun/security/pkcs11/fips/ImportKeyStore.java
@@ -37,7 +37,7 @@ setenv LD_LIBRARY_PATH $WS/test/sun/security/pkcs11/nss/lib/solaris-sparc
 modutil -create -dbdir .
 modutil -changepw "NSS Internal PKCS #11 Module" -dbdir .
 
-$JHOME/bin/keytool -list -storetype PKCS11 -providerclass sun.security.pkcs11.SunPKCS11 -providerarg "--name=NSS\nnssSecmodDirectory=." -v -storepass test12
+$JHOME/bin/keytool -list -storetype PKCS11 -addprovider SunPKCS11 -providerarg "--name=NSS\nnssSecmodDirectory=." -v -storepass test12
 
 modutil -fips true -dbdir .
 
diff --git a/jdk/test/sun/security/tools/jarsigner/AltProvider.java b/jdk/test/sun/security/tools/jarsigner/AltProvider.java
new file mode 100644
index 00000000000..5c7e5a286c0
--- /dev/null
+++ b/jdk/test/sun/security/tools/jarsigner/AltProvider.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4906940 8130302
+ * @summary -providerPath, -providerClass, -addprovider, and -providerArg
+ * @library /lib/testlibrary /test/lib/share/classes
+ * @modules java.base/jdk.internal.misc
+ */
+
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.testlibrary.JarUtils;
+
+import java.nio.file.*;
+
+public class AltProvider {
+
+    private static final String TEST_SRC =
+            Paths.get(System.getProperty("test.src")).toString();
+
+    private static final Path MOD_SRC_DIR = Paths.get(TEST_SRC, "alt");
+    private static final Path MOD_DEST_DIR = Paths.get("mods");
+
+    private static final String ktCommand = "-keystore x.jks " +
+            "-storepass changeit -storetype dummyks -list -debug";
+
+    private static final String jsCommand = "-keystore x.jks " +
+            "-storepass changeit -storetype dummyks -debug x.jar x";
+
+    public static void main(String[] args) throws Throwable {
+
+        // Compile the provider
+        CompilerUtils.compile(
+                MOD_SRC_DIR, MOD_DEST_DIR,
+                "-modulesourcepath",
+                MOD_SRC_DIR.toString());
+
+        // Create a keystore
+        tool("keytool", "-keystore x.jks -storetype jks -genkeypair" +
+                " -storepass changeit -keypass changeit -alias x -dname CN=X")
+                .shouldHaveExitValue(0);
+
+        // Create a jar file
+        JarUtils.createJar("x.jar", "x.jks");
+
+        // Test starts here
+
+        // Without new provider
+        testBoth("", 1, "DUMMYKS not found");
+
+        // legacy use (-providerPath only supported by keytool)
+        testKeytool("-providerPath mods/test.dummy " +
+                "-providerClass org.test.dummy.DummyProvider -providerArg full",
+                0, "loadProviderByClass: org.test.dummy.DummyProvider");
+
+        // legacy, on classpath
+        testBoth("-J-cp -Jmods/test.dummy " +
+                "-providerClass org.test.dummy.DummyProvider -providerArg full",
+                0, "loadProviderByClass: org.test.dummy.DummyProvider");
+
+        // Wrong name
+        testBoth("-J-cp -Jmods/test.dummy " +
+                "-providerClass org.test.dummy.Dummy -providerArg full",
+                1, "Provider \"org.test.dummy.Dummy\" not found");
+
+        // Not a provider name
+        testBoth("-J-cp -Jmods/test.dummy " +
+                "-providerClass java.lang.Object -providerArg full",
+                1, "java.lang.Object not a provider");
+
+        // without arg
+        testBoth("-J-cp -Jmods/test.dummy " +
+                "-providerClass org.test.dummy.DummyProvider",
+                1, "DUMMYKS not found");
+
+        // old -provider still works
+        testBoth("-J-cp -Jmods/test.dummy " +
+                "-provider org.test.dummy.DummyProvider -providerArg full",
+                0, "loadProviderByClass: org.test.dummy.DummyProvider");
+
+        // name in a module
+        testBoth("-J-mp -Jmods " +
+                "-addprovider Dummy -providerArg full",
+                0, "loadProviderByName: Dummy");
+
+        // -providerClass does not work
+        testBoth("-J-mp -Jmods " +
+                "-providerClass org.test.dummy.DummyProvider -providerArg full",
+                1, "Provider \"org.test.dummy.DummyProvider\" not found");
+
+        // -addprovider with class does not work
+        testBoth("-J-mp -Jmods " +
+                "-addprovider org.test.dummy.DummyProvider -providerArg full",
+                1, "Provider named \"org.test.dummy.DummyProvider\" not found");
+
+        // -addprovider without arg does not work
+        testBoth("-J-mp -Jmods " +
+                "-addprovider Dummy",
+                1, "DUMMYKS not found");
+    }
+
+    // Test both tools with the same extra options
+    private static void testBoth(String args, int exitValue, String contains)
+            throws Throwable {
+        testKeytool(args, exitValue, contains);
+        testJarsigner(args, exitValue, contains);
+    }
+
+    // Test keytool with extra options and check exitValue and output
+    private static void testKeytool(String args, int exitValue, String contains)
+            throws Throwable {
+        tool("keytool", ktCommand + " " + args)
+                .shouldHaveExitValue(exitValue)
+                .shouldContain(contains);
+    }
+
+    // Test jarsigner with extra options and check exitValue and output
+    private static void testJarsigner(String args, int exitValue, String contains)
+            throws Throwable {
+        tool("jarsigner", jsCommand + " " + args)
+                .shouldHaveExitValue(exitValue)
+                .shouldContain(contains);
+    }
+
+    // Launch a tool with args (space separated string)
+    private static OutputAnalyzer tool(String tool, String args)
+            throws Throwable {
+        JDKToolLauncher l = JDKToolLauncher.createUsingTestJDK(tool);
+        for (String a: args.split("\\s+")) {
+            if (a.startsWith("-J")) {
+                l.addVMArg(a.substring(2));
+            } else {
+                l.addToolArg(a);
+            }
+        }
+        return ProcessTools.executeCommand(l.getCommand());
+    }
+}
diff --git a/jdk/test/sun/security/tools/jarsigner/alt/test.dummy/module-info.java b/jdk/test/sun/security/tools/jarsigner/alt/test.dummy/module-info.java
new file mode 100644
index 00000000000..503e64f365a
--- /dev/null
+++ b/jdk/test/sun/security/tools/jarsigner/alt/test.dummy/module-info.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module test.dummy {
+    provides java.security.Provider with org.test.dummy.DummyProvider;
+}
diff --git a/jdk/test/sun/security/tools/keytool/DummyProvider.java b/jdk/test/sun/security/tools/jarsigner/alt/test.dummy/org/test/dummy/DummyProvider.java
similarity index 89%
rename from jdk/test/sun/security/tools/keytool/DummyProvider.java
rename to jdk/test/sun/security/tools/jarsigner/alt/test.dummy/org/test/dummy/DummyProvider.java
index 6ff07b39ec4..99647e31e08 100644
--- a/jdk/test/sun/security/tools/keytool/DummyProvider.java
+++ b/jdk/test/sun/security/tools/jarsigner/alt/test.dummy/org/test/dummy/DummyProvider.java
@@ -21,22 +21,22 @@
  * questions.
  */
 
-/*
- *
- *
- * @bug 4906490
- * @summary Dummy security service provider.
- *          It is cited by the AltProviderPath.sh script.
- */
 package org.test.dummy;
 
-import java.util.*;
 import java.security.*;
 
 public class DummyProvider extends Provider {
     public DummyProvider() {
-        super("Dummy", 0.1, "Dummy Provider");
+        super("Dummy", 0.1, "Dummy Provider with nothing");
+    }
 
+    @Override
+    public Provider configure(String configArg) {
+        return new DummyProvider(configArg);
+    }
+
+    private DummyProvider(String arg) {
+        super("Dummy", 0.2, "Dummy Provider with " + arg);
         //
         // KeyStore
         //
diff --git a/jdk/test/sun/security/tools/keytool/AltProviderPath.sh b/jdk/test/sun/security/tools/keytool/AltProviderPath.sh
deleted file mode 100644
index d19ace1a8d2..00000000000
--- a/jdk/test/sun/security/tools/keytool/AltProviderPath.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# Copyright (c) 2004, 2013, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4906940
-# @summary Add -providerPath option for keytool allowing one to specify
-#          an additional classpath to search for providers.
-# @author Andrew Fan
-#
-# @run build DummyProvider
-# @run shell AltProviderPath.sh
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
-  TESTSRC="."
-fi
-if [ "${TESTCLASSES}" = "" ] ; then
-  TESTCLASSES="."
-fi
-if [ "${TESTJAVA}" = "" ] ; then
-  echo "TESTJAVA not set.  Test cannot execute."
-  echo "FAILED!!!"
-  exit 1
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
-  SunOS | Linux | Darwin | AIX )
-    NULL=/dev/null
-    PS=":"
-    FS="/"
-    ;;
-  CYGWIN* )
-    NULL=/dev/null
-    PS=";"
-    FS="/"
-    ;;
-  Windows_* )
-    NULL=NUL
-    PS=";"
-    FS="\\"
-    ;;
-  * )
-    echo "Unrecognized operating system!"
-    exit 1;
-    ;;
-esac
-
-# the test code
-#genkey
-${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -genkey -v -alias dummyTestCA \
-    -keyalg "RSA" -keysize 1024 -sigalg "ShA1WithRSA" \
-    -dname "cn=Dummy Test CA, ou=JSN, o=JavaSoft, c=US" -validity 3650 \
-    -keypass storepass -keystore keystoreCA.dks -storepass storepass \
-    -storetype "dummyks" -provider "org.test.dummy.DummyProvider" \
-    -providerPath ${TESTCLASSES}
-
-if [ $? -ne 0 ]; then
-    exit 1
-fi
-
-#Change keystore password
-${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepasswd -new storepass2 \
-    -keystore keystoreCA.dks -storetype "dummyks" -storepass storepass \
-    -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
-
-if [ $? -ne 0 ]; then
-    exit 1
-fi
-
-
-#Change keystore key password
-${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -keypasswd -alias "dummyTestCA" \
-    -keypass storepass -new keypass -keystore keystoreCA.dks \
-    -storetype "dummyks" -storepass storepass2 \
-    -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
-
-if [ $? -ne 0 ]; then
-    exit 1
-fi
-
-#Export certificate
-${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -v -export -rfc -alias "dummyTestCA" \
-    -file "dummyTestCA.der" -keystore keystoreCA.dks -storetype "dummyks" \
-    -storepass storepass2 -provider "org.test.dummy.DummyProvider" \
-    -providerPath ${TESTCLASSES}
-
-if [ $? -ne 0 ]; then
-    exit 1
-fi
-
-#list keystore
-${TESTJAVA}${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -v -list -keystore keystoreCA.dks \
-    -storetype "dummyks" -storepass storepass2 \
-    -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
-
-if [ $? -ne 0 ]; then
-    exit 1
-fi
-
-exit 0
diff --git a/jdk/test/sun/security/tools/keytool/KeyToolTest.java b/jdk/test/sun/security/tools/keytool/KeyToolTest.java
index a036db96da0..a783c4e9dbd 100644
--- a/jdk/test/sun/security/tools/keytool/KeyToolTest.java
+++ b/jdk/test/sun/security/tools/keytool/KeyToolTest.java
@@ -82,8 +82,9 @@ public class KeyToolTest {
 
     static final String NSS_P11_ARG =
             "-keystore NONE -storetype PKCS11 -providerName SunPKCS11-nss " +
-            "-providerClass sun.security.pkcs11.SunPKCS11 " +
+            "-addprovider SunPKCS11 " +
             "-providerArg p11-nss.txt ";
+    // Use -providerClass here, to confirm it still works for SunPKCS11.
     static final String NSS_SRC_P11_ARG =
             "-srckeystore NONE -srcstoretype PKCS11 " +
             "-srcproviderName SunPKCS11-nss " +
@@ -91,12 +92,12 @@ public class KeyToolTest {
             "-providerArg p11-nss.txt ";
     static final String NZZ_P11_ARG =
             "-keystore NONE -storetype PKCS11 -providerName SunPKCS11-nzz " +
-            "-providerClass sun.security.pkcs11.SunPKCS11 " +
+            "-addprovider SunPKCS11 " +
             "-providerArg p11-nzz.txt ";
     static final String NZZ_SRC_P11_ARG =
             "-srckeystore NONE -srcstoretype PKCS11 " +
             "-srcproviderName SunPKCS11-nzz " +
-            "-providerClass sun.security.pkcs11.SunPKCS11 " +
+            "-addprovider SunPKCS11 " +
             "-providerArg p11-nzz.txt ";
     static final String SUN_P11_ARG = "-keystore NONE -storetype PKCS11 ";
     static final String SUN_SRC_P11_ARG =
@@ -1715,9 +1716,9 @@ public class KeyToolTest {
         //  14. keytool -printcert -file cert
         testOK("", "-printcert -file cert -keystore x.jks -storetype JKS");
         remove("cert");
-        //  15. keytool -list -storepass password -provider sun.security.provider.Sun
+        //  15. keytool -list -storepass password -addprovider SUN
         testOK("", "-list -storepass password" +
-                " -provider sun.security.provider.Sun" +
+                " -addprovider SUN" +
                 " -keystore x.jks -storetype JKS");
 
         //Error tests
diff --git a/jdk/test/sun/security/tools/keytool/i18n.html b/jdk/test/sun/security/tools/keytool/i18n.html
index 4803c3d24bb..86d125a5e52 100644
--- a/jdk/test/sun/security/tools/keytool/i18n.html
+++ b/jdk/test/sun/security/tools/keytool/i18n.html
@@ -50,7 +50,7 @@ from keytool is correct (you can read everything in english fine).
 
  • 	keytool -import -v -file /tmp/cert -storepass password
 	Check error (Certificate reply and cert are the same)
 
  • 	keytool -printcert -file /tmp/cert
-
  • 	keytool -list -storepass password -provider sun.security.provider.Sun
+
  • 	keytool -list -storepass password -addprovider SUN
 
 
 Error tests
@@ -93,19 +93,19 @@ PKCS#11 tests
 
      
 
    1. 	sccs edit cert8.db key3.db
 
-
    2. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -providerClass sun.security.pkcs11.SunPKCS11 -providerArg p11-nss.txt -genkey -alias genkey -dname cn=genkey -keysize 512 -keyalg rsa
-
    3. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -providerClass sun.security.pkcs11.SunPKCS11 -providerArg p11-nss.txt -list
-
    4. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -providerClass sun.security.pkcs11.SunPKCS11 -providerArg p11-nss.txt -list -alias genkey
-
    5. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -providerClass sun.security.pkcs11.SunPKCS11 -providerArg p11-nss.txt -certreq -alias genkey -file genkey.certreq
-
    6. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -providerClass sun.security.pkcs11.SunPKCS11 -providerArg p11-nss.txt -export -alias genkey -file genkey.cert
+
    7. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -addprovider SunPKCS11 -providerArg p11-nss.txt -genkey -alias genkey -dname cn=genkey -keysize 512 -keyalg rsa
+
    8. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -addprovider SunPKCS11 -providerArg p11-nss.txt -list
+
    9. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -addprovider SunPKCS11 -providerArg p11-nss.txt -list -alias genkey
+
    10. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -addprovider SunPKCS11 -providerArg p11-nss.txt -certreq -alias genkey -file genkey.certreq
+
    11. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -addprovider SunPKCS11 -providerArg p11-nss.txt -export -alias genkey -file genkey.cert
 
    12. 	keytool -printcert -file genkey.cert
-
    13. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -providerClass sun.security.pkcs11.SunPKCS11 -providerArg p11-nss.txt -selfcert -alias genkey -dname cn=selfCert
+
    14. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -addprovider SunPKCS11 -providerArg p11-nss.txt -selfcert -alias genkey -dname cn=selfCert
 
-
    15. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -providerClass sun.security.pkcs11.SunPKCS11 -providerArg p11-nss.txt -list -alias genkey -v
+
    16. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -addprovider SunPKCS11 -providerArg p11-nss.txt -list -alias genkey -v
 (check that cert subject DN is [cn=selfCert])
 
-
    17. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -providerClass sun.security.pkcs11.SunPKCS11 -providerArg p11-nss.txt -delete -alias genkey
-
    18. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -providerClass sun.security.pkcs11.SunPKCS11 -providerArg p11-nss.txt -list
+
    19. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -addprovider SunPKCS11 -providerArg p11-nss.txt -delete -alias genkey
+
    20. 	keytool -keystore NONE -storepass test12 -storetype PKCS11 -providerName SunPKCS11-nss -addprovider SunPKCS11 -providerArg p11-nss.txt -list
 (check for empty database listing)
 
 
    21. 	sccs unedit cert8.db key3.db

From d5e84de014424422748dd1cda4fdedc5a72cef30 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs 
Date: Tue, 12 Jul 2016 11:29:01 +0100
Subject: [PATCH 085/111] 8159245: Loggers created by system classes are not
 initialized correctly when configured programmatically from application code

Loggers of the same name now share the same configuration.

Reviewed-by: mchung, mli
---
 .../classes/java/util/logging/LogManager.java |  18 +-
 .../classes/java/util/logging/Logger.java     | 243 ++++++++--
 .../Logger/default/DefaultLoggerTest.java     |   8 +-
 .../DefaultLoggerFinderTest.java              |   7 +-
 .../DefaultLoggerBridgeTest.java              |  14 +-
 .../DefaultPlatformLoggerTest.java            |  13 +-
 .../util/logging/SystemLoggerConfigTest.java  | 423 ++++++++++++++++++
 7 files changed, 673 insertions(+), 53 deletions(-)
 create mode 100644 jdk/test/java/util/logging/SystemLoggerConfigTest.java

diff --git a/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java b/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java
index f429452419e..e8f96449fae 100644
--- a/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java
+++ b/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -387,11 +387,15 @@ public class LogManager {
                         assert rootLogger == null;
                         assert initializedCalled && !initializationDone;
 
+                        // create root logger before reading primordial
+                        // configuration - to ensure that it will be added
+                        // before the global logger, and not after.
+                        owner.rootLogger = owner.new RootLogger();
+
                         // Read configuration.
                         owner.readPrimordialConfiguration();
 
                         // Create and retain Logger for the root of the namespace.
-                        owner.rootLogger = owner.new RootLogger();
                         owner.addLogger(owner.rootLogger);
                         if (!owner.rootLogger.isLevelInitialized()) {
                             owner.rootLogger.setLevel(defaultLevel);
@@ -516,7 +520,7 @@ public class LogManager {
         if (result == null) {
             // only allocate the new logger once
             Logger newLogger = new Logger(name, resourceBundleName,
-                    module == null ? null : module, this, false);
+                                          module, this, false);
             do {
                 if (addLogger(newLogger)) {
                     // We successfully added the new Logger that we
@@ -569,15 +573,13 @@ public class LogManager {
         } while (logger == null);
 
         // LogManager will set the sysLogger's handlers via LogManager.addLogger method.
-        if (logger != sysLogger && sysLogger.accessCheckedHandlers().length == 0) {
-            // if logger already exists but handlers not set
+        if (logger != sysLogger) {
+            // if logger already exists we merge the two logger configurations.
             final Logger l = logger;
             AccessController.doPrivileged(new PrivilegedAction() {
                 @Override
                 public Void run() {
-                    for (Handler hdl : l.accessCheckedHandlers()) {
-                        sysLogger.addHandler(hdl);
-                    }
+                    l.mergeWithSystemLogger(sysLogger);
                     return null;
                 }
             });
diff --git a/jdk/src/java.logging/share/classes/java/util/logging/Logger.java b/jdk/src/java.logging/share/classes/java/util/logging/Logger.java
index ca055b06af1..b196283a6bd 100644
--- a/jdk/src/java.logging/share/classes/java/util/logging/Logger.java
+++ b/jdk/src/java.logging/share/classes/java/util/logging/Logger.java
@@ -259,13 +259,185 @@ public class Logger {
     private static final RuntimePermission GET_CLASS_LOADER_PERMISSION =
             new RuntimePermission("getClassLoader");
 
+    // A value class that holds the logger configuration data.
+    // This configuration can be shared between an application logger
+    // and a system logger of the same name.
+    private static final class ConfigurationData {
+
+        // The delegate field is used to avoid races while
+        // merging configuration. This will ensure that any pending
+        // configuration action on an application logger will either
+        // be finished before the merge happens, or will be forwarded
+        // to the system logger configuration after the merge is completed.
+        // By default delegate=this.
+        private volatile ConfigurationData delegate;
+
+        volatile boolean useParentHandlers;
+        volatile Filter filter;
+        volatile Level levelObject;
+        volatile int levelValue;  // current effective level value
+        final CopyOnWriteArrayList handlers =
+            new CopyOnWriteArrayList<>();
+
+        ConfigurationData() {
+            delegate = this;
+            useParentHandlers = true;
+            levelValue = Level.INFO.intValue();
+        }
+
+        void setUseParentHandlers(boolean flag) {
+            useParentHandlers = flag;
+            if (delegate != this) {
+                // merge in progress - propagate value to system peer.
+                final ConfigurationData system = delegate;
+                synchronized (system) {
+                    system.useParentHandlers = useParentHandlers;
+                }
+            }
+        }
+
+        void setFilter(Filter f) {
+            filter = f;
+            if (delegate != this) {
+                // merge in progress - propagate value to system peer.
+                final ConfigurationData system = delegate;
+                synchronized (system) {
+                    system.filter = filter;
+                }
+            }
+        }
+
+        void setLevelObject(Level l) {
+            levelObject = l;
+            if (delegate != this) {
+                // merge in progress - propagate value to system peer.
+                final ConfigurationData system = delegate;
+                synchronized (system) {
+                    system.levelObject = levelObject;
+                }
+            }
+        }
+
+        void setLevelValue(int v) {
+            levelValue = v;
+            if (delegate != this) {
+                // merge in progress - propagate value to system peer.
+                final ConfigurationData system = delegate;
+                synchronized (system) {
+                    system.levelValue = levelValue;
+                }
+            }
+        }
+
+        void addHandler(Handler h) {
+            if (handlers.add(h)) {
+                if (delegate != this) {
+                    // merge in progress - propagate value to system peer.
+                    final ConfigurationData system = delegate;
+                    synchronized (system) {
+                        system.handlers.addIfAbsent(h);
+                    }
+                }
+            }
+        }
+
+        void removeHandler(Handler h) {
+            if (handlers.remove(h)) {
+                if (delegate != this) {
+                    // merge in progress - propagate value to system peer.
+                    final ConfigurationData system = delegate;
+                    synchronized (system) {
+                        system.handlers.remove(h);
+                    }
+                }
+            }
+        }
+
+        ConfigurationData merge(Logger systemPeer) {
+            if (!systemPeer.isSystemLogger) {
+                // should never come here
+                throw new InternalError("not a system logger");
+            }
+
+            ConfigurationData system = systemPeer.config;
+
+            if (system == this) {
+                // nothing to do
+                return system;
+            }
+
+            synchronized (system) {
+                // synchronize before checking on delegate to counter
+                // race conditions where two threads might attempt to
+                // merge concurrently
+                if (delegate == system) {
+                    // merge already performed;
+                    return system;
+                }
+
+                // publish system as the temporary delegate configuration.
+                // This should take care of potential race conditions where
+                // an other thread might attempt to call e.g. setlevel on
+                // the application logger while merge is in progress.
+                // (see implementation of ConfigurationData::setLevel)
+                delegate = system;
+
+                // merge this config object data into the system config
+                system.useParentHandlers = useParentHandlers;
+                system.filter = filter;
+                system.levelObject = levelObject;
+                system.levelValue = levelValue;
+
+                // Prevent race condition in case two threads attempt to merge
+                // configuration and add handlers at the same time. We don't want
+                // to add the same handlers twice.
+                //
+                // Handlers are created and loaded by LogManager.addLogger. If we
+                // reach here, then it means that the application logger has
+                // been created first and added with LogManager.addLogger, and the
+                // system logger was created after - and no handler has been added
+                // to it by LogManager.addLogger. Therefore, system.handlers
+                // should be empty.
+                //
+                // A non empty cfg.handlers list indicates a race condition
+                // where two threads might attempt to merge the configuration
+                // or add handlers concurrently. Though of no consequence for
+                // the other data (level etc...) this would be an issue if we
+                // added the same handlers twice.
+                //
+                for (Handler h : handlers) {
+                    if (!system.handlers.contains(h)) {
+                        systemPeer.addHandler(h);
+                    }
+                }
+                system.handlers.retainAll(handlers);
+                system.handlers.addAllAbsent(handlers);
+            }
+
+            // sanity: update effective level after merging
+            synchronized(treeLock) {
+                systemPeer.updateEffectiveLevel();
+            }
+
+            return system;
+        }
+
+    }
+
+    // The logger configuration data. Ideally, this should be final
+    // for system loggers, and replace-once for application loggers.
+    // When an application requests a logger by name, we do not know a-priori
+    // whether that corresponds to a system logger name or not.
+    // So if no system logger by that name already exists, we simply return an
+    // application logger.
+    // If a system class later requests a system logger of the same name, then
+    // the application logger and system logger configurations will be merged
+    // in a single instance of ConfigurationData that both loggers will share.
+    private volatile ConfigurationData config;
+
     private volatile LogManager manager;
     private String name;
-    private final CopyOnWriteArrayList handlers =
-        new CopyOnWriteArrayList<>();
     private volatile LoggerBundle loggerBundle = NO_RESOURCE_BUNDLE;
-    private volatile boolean useParentHandlers = true;
-    private volatile Filter filter;
     private boolean anonymous;
 
     // Cache to speed up behavior of findResourceBundle:
@@ -280,8 +452,6 @@ public class Logger {
     // references from children to parents.
     private volatile Logger parent;    // our nearest parent.
     private ArrayList kids;   // WeakReferences to loggers that have us as parent
-    private volatile Level levelObject;
-    private volatile int levelValue;  // current effective level value
     private WeakReference callerModuleRef;
     private final boolean isSystemLogger;
 
@@ -384,9 +554,29 @@ public class Logger {
            LogManager manager, boolean isSystemLogger) {
         this.manager = manager;
         this.isSystemLogger = isSystemLogger;
-        setupResourceInfo(resourceBundleName, caller);
+        this.config = new ConfigurationData();
         this.name = name;
-        levelValue = Level.INFO.intValue();
+        setupResourceInfo(resourceBundleName, caller);
+    }
+
+    // Called by LogManager when a system logger is created
+    // after a user logger of the same name.
+    // Ensure that both loggers will share the same
+    // configuration.
+    final void mergeWithSystemLogger(Logger system) {
+        // sanity checks
+        if (!system.isSystemLogger
+                || anonymous
+                || name == null
+                || !name.equals(system.name)) {
+            // should never come here
+            throw new InternalError("invalid logger merge");
+        }
+        checkPermission();
+        final ConfigurationData cfg = config;
+        if (cfg != system.config) {
+            config = cfg.merge(system);
+        }
     }
 
     private void setCallerModuleRef(Module callerModule) {
@@ -408,7 +598,7 @@ public class Logger {
         // The manager field is not initialized here.
         this.name = name;
         this.isSystemLogger = true;
-        levelValue = Level.INFO.intValue();
+        config = new ConfigurationData();
     }
 
     // It is called from LoggerContext.addLocalLogger() when the logger
@@ -451,7 +641,7 @@ public class Logger {
     private static Logger demandLogger(String name, String resourceBundleName, Class caller) {
         LogManager manager = LogManager.getLogManager();
         if (!SystemLoggerHelper.disableCallerCheck) {
-            if (caller.getClassLoader() == null) {
+            if (isSystem(caller.getModule())) {
                 return manager.demandSystemLogger(name, resourceBundleName, caller);
             }
         }
@@ -740,7 +930,7 @@ public class Logger {
      */
     public void setFilter(Filter newFilter) throws SecurityException {
         checkPermission();
-        filter = newFilter;
+        config.setFilter(newFilter);
     }
 
     /**
@@ -749,7 +939,7 @@ public class Logger {
      * @return  a filter object (may be null)
      */
     public Filter getFilter() {
-        return filter;
+        return config.filter;
     }
 
     /**
@@ -765,7 +955,7 @@ public class Logger {
         if (!isLoggable(record.getLevel())) {
             return;
         }
-        Filter theFilter = filter;
+        Filter theFilter = config.filter;
         if (theFilter != null && !theFilter.isLoggable(record)) {
             return;
         }
@@ -784,7 +974,7 @@ public class Logger {
             }
 
             final boolean useParentHdls = isSystemLogger
-                ? logger.useParentHandlers
+                ? logger.config.useParentHandlers
                 : logger.getUseParentHandlers();
 
             if (!useParentHdls) {
@@ -1804,13 +1994,13 @@ public class Logger {
     public void setLevel(Level newLevel) throws SecurityException {
         checkPermission();
         synchronized (treeLock) {
-            levelObject = newLevel;
+            config.setLevelObject(newLevel);
             updateEffectiveLevel();
         }
     }
 
     final boolean isLevelInitialized() {
-        return levelObject != null;
+        return config.levelObject != null;
     }
 
     /**
@@ -1821,7 +2011,7 @@ public class Logger {
      * @return  this Logger's level
      */
     public Level getLevel() {
-        return levelObject;
+        return config.levelObject;
     }
 
     /**
@@ -1833,6 +2023,7 @@ public class Logger {
      * @return  true if the given message level is currently being logged.
      */
     public boolean isLoggable(Level level) {
+        int levelValue = config.levelValue;
         if (level.intValue() < levelValue || levelValue == offValue) {
             return false;
         }
@@ -1862,7 +2053,7 @@ public class Logger {
     public void addHandler(Handler handler) throws SecurityException {
         Objects.requireNonNull(handler);
         checkPermission();
-        handlers.add(handler);
+        config.addHandler(handler);
     }
 
     /**
@@ -1880,7 +2071,7 @@ public class Logger {
         if (handler == null) {
             return;
         }
-        handlers.remove(handler);
+        config.removeHandler(handler);
     }
 
     /**
@@ -1895,7 +2086,7 @@ public class Logger {
     // This method should ideally be marked final - but unfortunately
     // it needs to be overridden by LogManager.RootLogger
     Handler[] accessCheckedHandlers() {
-        return handlers.toArray(emptyHandlers);
+        return config.handlers.toArray(emptyHandlers);
     }
 
     /**
@@ -1912,7 +2103,7 @@ public class Logger {
      */
     public void setUseParentHandlers(boolean useParentHandlers) {
         checkPermission();
-        this.useParentHandlers = useParentHandlers;
+        config.setUseParentHandlers(useParentHandlers);
     }
 
     /**
@@ -1922,7 +2113,7 @@ public class Logger {
      * @return  true if output is to be sent to the logger's parent
      */
     public boolean getUseParentHandlers() {
-        return useParentHandlers;
+        return config.useParentHandlers;
     }
 
     /**
@@ -2256,11 +2447,13 @@ public class Logger {
 
         // Figure out our current effective level.
         int newLevelValue;
+        final ConfigurationData cfg = config;
+        final Level levelObject = cfg.levelObject;
         if (levelObject != null) {
             newLevelValue = levelObject.intValue();
         } else {
             if (parent != null) {
-                newLevelValue = parent.levelValue;
+                newLevelValue = parent.config.levelValue;
             } else {
                 // This may happen during initialization.
                 newLevelValue = Level.INFO.intValue();
@@ -2268,11 +2461,11 @@ public class Logger {
         }
 
         // If our effective value hasn't changed, we're done.
-        if (levelValue == newLevelValue) {
+        if (cfg.levelValue == newLevelValue) {
             return;
         }
 
-        levelValue = newLevelValue;
+        cfg.setLevelValue(newLevelValue);
 
         // System.err.println("effective level: \"" + getName() + "\" := " + level);
 
diff --git a/jdk/test/java/lang/System/Logger/default/DefaultLoggerTest.java b/jdk/test/java/lang/System/Logger/default/DefaultLoggerTest.java
index 63ab20e2777..4a2be556bf9 100644
--- a/jdk/test/java/lang/System/Logger/default/DefaultLoggerTest.java
+++ b/jdk/test/java/lang/System/Logger/default/DefaultLoggerTest.java
@@ -539,6 +539,7 @@ public class DefaultLoggerTest {
             throw new RuntimeException("identical loggers");
         }
 
+        final java.util.logging.Logger sink;
         final java.util.logging.Logger appSink;
         final java.util.logging.Logger sysSink;
         final java.util.logging.Handler appHandler;
@@ -548,10 +549,9 @@ public class DefaultLoggerTest {
         try {
             appSink = java.util.logging.Logger.getLogger("foo");
             sysSink = accessSystemLogger.demandSystemLogger("foo");
-            appSink.addHandler(appHandler = new MyHandler());
-            sysSink.addHandler(sysHandler = new MyHandler());
-            appSink.setUseParentHandlers(false);
-            sysSink.setUseParentHandlers(false);
+            sink = java.util.logging.Logger.getLogger("foo");
+            sink.addHandler(appHandler = sysHandler = new MyHandler());
+            sink.setUseParentHandlers(false);
             provider = LoggerFinder.getLoggerFinder();
         } finally {
             allowAll.get().set(false);
diff --git a/jdk/test/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java b/jdk/test/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java
index 43150eb0f00..5a84b16a0ed 100644
--- a/jdk/test/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java
+++ b/jdk/test/java/lang/System/LoggerFinder/DefaultLoggerFinderTest/DefaultLoggerFinderTest.java
@@ -299,10 +299,9 @@ public class DefaultLoggerFinderTest {
 
         final java.util.logging.Logger appSink = java.util.logging.Logger.getLogger("foo");
         final java.util.logging.Logger sysSink = accessSystemLogger.demandSystemLogger("foo");
-        appSink.addHandler(new MyHandler());
-        sysSink.addHandler(new MyHandler());
-        appSink.setUseParentHandlers(VERBOSE);
-        sysSink.setUseParentHandlers(VERBOSE);
+        final java.util.logging.Logger sink = java.util.logging.Logger.getLogger("foo");
+        sink.addHandler(new MyHandler());
+        sink.setUseParentHandlers(VERBOSE);
 
         Stream.of(args).map(TestCases::valueOf).forEach((testCase) -> {
             LoggerFinder provider;
diff --git a/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java b/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java
index c796cd1888d..cba6f7b1b44 100644
--- a/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java
+++ b/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -390,6 +390,7 @@ public class DefaultLoggerBridgeTest {
             throw new RuntimeException("identical loggers");
         }
 
+        final java.util.logging.Logger sink;
         final java.util.logging.Logger appSink;
         final java.util.logging.Logger sysSink;
         final MyHandler appHandler;
@@ -404,10 +405,13 @@ public class DefaultLoggerBridgeTest {
             if (appSink == sysSink) {
                 throw new RuntimeException("identical backend loggers");
             }
-            appSink.addHandler(appHandler = new MyHandler());
-            sysSink.addHandler(sysHandler = new MyHandler());
-            appSink.setUseParentHandlers(VERBOSE);
-            sysSink.setUseParentHandlers(VERBOSE);
+            sink = java.util.logging.Logger.getLogger("foo");
+            if (appSink != sink) {
+                throw new RuntimeException("expected same application logger");
+            }
+
+            sink.addHandler(appHandler = sysHandler = new MyHandler());
+            sink.setUseParentHandlers(VERBOSE);
         } finally {
             allowAll.get().set(old);
         }
diff --git a/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java b/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java
index 99b7ee38b2a..200b169b7c7 100644
--- a/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java
+++ b/jdk/test/java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -42,9 +42,9 @@ import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.lang.System.LoggerFinder;
+import java.util.logging.Logger;
 import sun.util.logging.PlatformLogger;
 import sun.util.logging.internal.LoggingProviderImpl;
-import java.lang.reflect.Module;
 
 /**
  * @test
@@ -248,10 +248,9 @@ public class DefaultPlatformLoggerTest {
                         DefaultPlatformLoggerTest.class.getModule());
         java.util.logging.Logger sysSink = LoggingProviderImpl.getLogManagerAccess()
                 .demandLoggerFor(LogManager.getLogManager(),"foo", Thread.class.getModule());
-        appSink.addHandler(new MyHandler());
-        sysSink.addHandler(new MyHandler());
-        appSink.setUseParentHandlers(VERBOSE);
-        sysSink.setUseParentHandlers(VERBOSE);
+        java.util.logging.Logger sink = Logger.getLogger("foo");
+        sink.addHandler(new MyHandler());
+        sink.setUseParentHandlers(VERBOSE);
 
         System.out.println("\n*** Without Security Manager\n");
         test(provider, true, appSink, sysSink);
@@ -274,7 +273,7 @@ public class DefaultPlatformLoggerTest {
     public static void test(LoggerFinder provider, boolean hasRequiredPermissions,
             java.util.logging.Logger appSink, java.util.logging.Logger sysSink) throws Exception {
 
-        // No way to giva a resource bundle to a platform logger.
+        // No way to give a resource bundle to a platform logger.
         // ResourceBundle loggerBundle = ResourceBundle.getBundle(MyLoggerBundle.class.getName());
         final Map loggerDescMap = new HashMap<>();
 
diff --git a/jdk/test/java/util/logging/SystemLoggerConfigTest.java b/jdk/test/java/util/logging/SystemLoggerConfigTest.java
new file mode 100644
index 00000000000..501e3124bce
--- /dev/null
+++ b/jdk/test/java/util/logging/SystemLoggerConfigTest.java
@@ -0,0 +1,423 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.lang.ref.Reference;
+import java.security.Permission;
+import java.security.Policy;
+import java.security.ProtectionDomain;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import sun.util.logging.PlatformLogger;
+
+
+/**
+ * @test
+ * @bug     8159245
+ * @summary Tests configuration of loggers.
+ * @modules java.logging/sun.util.logging.internal java.base/sun.util.logging
+ * @run  main/othervm SystemLoggerConfigTest NOSECURITY
+ * @run  main/othervm SystemLoggerConfigTest WITHSECURITY
+ *
+ * @author danielfuchs
+ */
+public class SystemLoggerConfigTest {
+
+    static Logger createSystemLogger(String name) {
+        return sun.util.logging.internal.LoggingProviderImpl.getLogManagerAccess()
+                .demandLoggerFor(LogManager.getLogManager(), name,
+                                 Thread.class.getModule());
+    }
+
+    static PlatformLogger createPlatformLogger(String name) {
+        return PlatformLogger.getLogger(name);
+    }
+
+    private static void assertFalse(boolean value, String msg) {
+        assertEquals(false, value, msg);
+    }
+    private static void assertEquals(boolean expected, boolean actual, String msg) {
+        if (expected != actual) {
+            throw new AssertionError(msg+": expected: " + expected + " actual: " + actual);
+        }
+    }
+    private static void assertEquals(int expected, int actual, String msg) {
+        if (expected != actual) {
+            throw new AssertionError(msg+": expected: " + expected + " actual: " + actual);
+        }
+    }
+    private static void assertEquals(long expected, long actual, String msg) {
+        if (expected != actual) {
+            throw new AssertionError(msg+": expected: " + expected + " actual: " + actual);
+        }
+    }
+    private static void assertEquals(Object expected, Object actual, String msg) {
+        if (!Objects.equals(expected, actual)) {
+            throw new AssertionError(msg+": expected: " + expected + " actual: " + actual);
+        }
+    }
+
+    static class TestHandler extends Handler {
+        private final List records = new CopyOnWriteArrayList<>();
+        public TestHandler() {
+            super();
+            setLevel(Level.ALL);
+        }
+
+        @Override
+        public void publish(LogRecord lr) {
+            records.add(lr);
+        }
+
+        public List drain() {
+            List list = new ArrayList<>(records);
+            records.clear();
+            return list;
+        }
+
+        public void close() {
+            records.clear();
+        }
+
+        public void flush() {
+        }
+
+    }
+
+    public static class TestHandler1 extends TestHandler {
+        final static AtomicLong COUNT = new AtomicLong();
+        public TestHandler1() {
+            COUNT.incrementAndGet();
+        }
+    }
+
+    public static class TestHandler2 extends TestHandler {
+        final static AtomicLong COUNT = new AtomicLong();
+        public TestHandler2() {
+            COUNT.incrementAndGet();
+        }
+    }
+
+    static enum TestCase { WITHSECURITY, NOSECURITY }
+
+    public static void main(String[] args) {
+        if (args == null || args.length == 0) {
+            args = Stream.of(TestCase.values())
+                    .map(String::valueOf)
+                    .collect(Collectors.toList())
+                    .toArray(new String[0]);
+        }
+        Stream.of(args)
+              .map(TestCase::valueOf)
+              .forEach(SystemLoggerConfigTest::launch);
+    }
+
+    public static void launch(TestCase test) {
+        switch(test) {
+            case WITHSECURITY:
+                Policy.setPolicy(new Policy() {
+                    @Override
+                    public boolean implies(ProtectionDomain domain, Permission permission) {
+                        return true;
+                    }
+                });
+                System.setSecurityManager(new SecurityManager());
+                break;
+            case NOSECURITY:
+                break;
+            default:
+                throw new InternalError("Unexpected enum: " + test);
+        }
+        try {
+            test(test.name(), ".1", ".child");
+            test(test.name(), ".2", "");
+            testUpdateConfiguration(test.name(), ".3");
+            testSetPlatformLevel(test.name(), ".4");
+        } catch (IOException io) {
+            throw new UncheckedIOException(io);
+        }
+    }
+
+    public static void test(String name, String step, String ext)
+            throws IOException {
+
+        System.out.println("\n*** Testing " + name + step + ext);
+
+        final String systemName1a = "system.logger.one.a." + name + step + ext;
+        final String systemName1b = "system.logger.one.b." + name + step + ext;
+        final String appName1a = "system.logger.one.a." + name + step;
+        final String appName1b = "system.logger.one.b." + name + step;
+        final String msg1a = "logger name: " + systemName1a;
+        final String msg1b = "logger name: " + systemName1b;
+        final String systemName2 = "system.logger.two." + name + step + ext;
+        final String appName2 = "system.logger.two." + name + step;
+        final String msg2 = "logger name: " + systemName2;
+        final String systemName3 = "system.logger.three." + name + step + ext;
+        final String appName3 = "system.logger.three." + name + step;
+        final String msg3 = "logger name: " + systemName3;
+        List records;
+
+        System.out.println("\n[Case #1] Creating platform logger: " + systemName1a);
+        PlatformLogger system1a = createPlatformLogger(systemName1a);
+        System.out.println("    Creating platform logger: " + systemName1b);
+        PlatformLogger system1b = createPlatformLogger(systemName1b);
+        System.out.println("    Adding handler on root logger...");
+        TestHandler test1 = new TestHandler();
+        Logger.getLogger("").addHandler(test1);
+
+        System.out.println("    Creating and configuring app logger: " + appName1a
+                + ", " + appName1b);
+        Logger app1a = Logger.getLogger(appName1a);
+        app1a.setLevel(Level.INFO);
+        Logger app1b = Logger.getLogger(appName1b);
+        app1b.setLevel(Level.INFO);
+        assertFalse(system1a.isLoggable(PlatformLogger.Level.FINEST),
+                "Unexpected level for " + system1a);
+        System.out.println("    Configuring root logger...");
+        Logger.getLogger("").setLevel(Level.FINEST);
+        System.out.println("    Logging through system logger: " + systemName1a);
+        system1a.finest(msg1a);
+        Reference.reachabilityFence(app1a);
+        records = test1.drain();
+        assertEquals(0, records.size(), "Unexpected size for " + records.toString());
+        System.out.println("    Logging through system logger: " + systemName1b);
+        system1b.finest(msg1b);
+        Reference.reachabilityFence(app1b);
+        records = test1.drain();
+        assertEquals(0, records.size(), "Unexpected size for " + records.toString());
+        Logger.getLogger("system.logger.one.a").finest("system.logger.one.a");
+        records = test1.drain();
+        assertEquals("system.logger.one.a", records.get(0).getMessage(), "Unexpected message: ");
+        Logger.getLogger("").setLevel(Level.INFO);
+        Logger.getLogger("system.logger.one.a").finest("system.logger.one.a");
+        records = test1.drain();
+        assertEquals(0, records.size(), "Unexpected size for " + records.toString());
+
+        Reference.reachabilityFence(system1a);
+        Reference.reachabilityFence(system1b);
+
+        System.out.println("\n[Case #2] Creating system logger: " + systemName2);
+        Logger system2 = createSystemLogger(systemName2);
+        System.out.println("    Creating app logger: " + appName2);
+        Logger app2 = Logger.getLogger(appName2);
+        System.out.println("    Configuring app logger...");
+        TestHandler test2 = new TestHandler();
+        app2.setLevel(Level.ALL);
+        app2.setUseParentHandlers(false);
+        app2.addHandler(test2);
+        System.out.println("    Logging through system logger: " + systemName2);
+        system2.finest(msg2);
+        records = test2.drain();
+        assertEquals(1, records.size(), "Unexpected size for " + records.toString());
+        assertEquals(msg2, records.get(0).getMessage(), "Unexpected message: ");
+        records = test1.drain();
+        assertEquals(0, records.size(), "Unexpected size for " + records.toString());
+
+        Reference.reachabilityFence(app2);
+        Reference.reachabilityFence(system2);
+
+        System.out.println("\n[Case #3] Creating app logger: " + appName3);
+        Logger app3 = Logger.getLogger(appName3);
+        System.out.println("    Configuring app logger...");
+        TestHandler test3 = new TestHandler();
+        app3.setLevel(Level.ALL);
+        app3.setUseParentHandlers(false);
+        app3.addHandler(test3);
+        System.out.println("    Creating system logger: " + systemName3);
+        Logger system3 = createSystemLogger(systemName3);
+        System.out.println("    Logging through system logger: " + systemName3);
+        system3.finest(msg3);
+        records = test3.drain();
+        assertEquals(1, records.size(), "Unexpected size for " + records.toString());
+        assertEquals(msg3, records.get(0).getMessage(), "Unexpected message: ");
+        records = test1.drain();
+        assertEquals(0, records.size(), "Unexpected size for " + records.toString());
+
+        Reference.reachabilityFence(app3);
+        Reference.reachabilityFence(system3);
+        System.gc();
+
+    }
+
+    @SuppressWarnings("deprecated")
+    static void setPlatformLevel(PlatformLogger logger, PlatformLogger.Level level) {
+        logger.setLevel(level);
+    }
+
+    public static void testSetPlatformLevel(String name, String step) {
+        System.out.println("\n*** Testing PlatformLogger.setLevel " + name + step);
+
+        System.out.println("\n[Case #5] Creating app logger: " + name + step);
+        // this should return named logger in the global context
+        Logger foo = Logger.getLogger(name + step);
+        foo.setLevel(Level.FINE);
+
+        System.out.println("    Creating platform logger: " + name + step);
+        PlatformLogger foo1 = PlatformLogger.getLogger(name + step);
+        System.out.println("    Configuring platform logger...");
+        setPlatformLevel(foo1, PlatformLogger.Level.INFO);
+
+        System.out.println("    Checking levels...");
+        assertEquals(foo.getName(), foo1.getName(), "Bad logger names");
+         // both logger share the same config
+        assertEquals(foo.getLevel(), Level.INFO, "Bad level for user logger");
+        assertEquals(foo1.level(), PlatformLogger.Level.INFO,
+                "Bad level for platform logger");
+
+    }
+
+    static void updateConfiguration(Properties props) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        props.store(baos, "");
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        LogManager.getLogManager().updateConfiguration(bais, (k) -> (o,n) -> n != null ? n : o);
+    }
+
+    static void readConfiguration(Properties props) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        props.store(baos, "");
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        LogManager.getLogManager().readConfiguration(bais);
+    }
+
+    // Tests that though two loggers exist, only one handler is created for the
+    // pair when reading configuration.
+    //
+    public static void testUpdateConfiguration(String name, String step) throws IOException {
+
+        System.out.println("\n*** Testing LogManager.updateConfiguration " + name + step);
+
+        final String name1a = "system.logger.one.a." + name + step;
+        final String name1b = "system.logger.one.b." + name + step;
+        final String msg1a = "logger name: " + name1a;
+        final String msg1b = "logger name: " + name1b;
+        List records;
+
+        TestHandler1.COUNT.set(0);
+        TestHandler2.COUNT.set(0);
+        Properties props = new Properties();
+        props.setProperty(name1a+".handlers", TestHandler1.class.getName());
+        updateConfiguration(props);
+        assertEquals(0, TestHandler1.COUNT.get(), "Bad instance count for "
+                + TestHandler1.class.getName());
+        assertEquals(0, TestHandler2.COUNT.get(), "Bad instance count for "
+                + TestHandler2.class.getName());
+
+        System.out.println("\n[Case #4] Creating app logger: " + name1a);
+        Logger app1a = Logger.getLogger(name1a);
+        System.out.println("    Configuring app logger...");
+        TestHandler test1 = new TestHandler();
+        app1a.setLevel(Level.ALL);
+        app1a.setUseParentHandlers(false);
+        app1a.addHandler(test1);
+        assertEquals(1, TestHandler1.COUNT.get(), "Bad instance count for "
+                + TestHandler1.class.getName());
+        assertEquals(0, TestHandler2.COUNT.get(), "Bad instance count for "
+                + TestHandler2.class.getName());
+
+        System.out.println("    Creating system logger: " + name1a);
+        Logger system1a = createSystemLogger(name1a);
+        assertEquals(Level.ALL, system1a.getLevel(), "Bad level for system logger " + name1a);
+        System.out.println("    Logging through system logger: " + name1a);
+        system1a.finest(msg1a);
+        records = test1.drain();
+        assertEquals(1, records.size(), "Unexpected size for " + records.toString());
+        assertEquals(msg1a, records.get(0).getMessage(), "Unexpected message: ");
+        records = test1.drain();
+        assertEquals(0, records.size(), "Unexpected size for " + records.toString());
+
+        assertEquals(1, TestHandler1.COUNT.get(), "Bad instance count for "
+                + TestHandler1.class.getName());
+        assertEquals(0, TestHandler2.COUNT.get(), "Bad instance count for "
+                + TestHandler2.class.getName());
+
+        props.setProperty(name1a+".handlers", TestHandler2.class.getName());
+        updateConfiguration(props);
+
+        assertEquals(1, TestHandler1.COUNT.get(), "Bad instance count for "
+                + TestHandler1.class.getName());
+        assertEquals(1, TestHandler2.COUNT.get(), "Bad instance count for "
+                + TestHandler2.class.getName());
+
+        updateConfiguration(props);
+
+        assertEquals(1, TestHandler1.COUNT.get(), "Bad instance count for "
+                + TestHandler1.class.getName());
+        assertEquals(1, TestHandler2.COUNT.get(), "Bad instance count for "
+                + TestHandler2.class.getName());
+
+        readConfiguration(props);
+
+        assertEquals(1, TestHandler1.COUNT.get(), "Bad instance count for "
+                + TestHandler1.class.getName());
+        // readConfiguration reset handlers but does not recreate them
+        assertEquals(1, TestHandler2.COUNT.get(), "Bad instance count for "
+                + TestHandler2.class.getName());
+
+        updateConfiguration(props);
+
+        assertEquals(1, TestHandler1.COUNT.get(), "Bad instance count for "
+                + TestHandler1.class.getName());
+        assertEquals(1, TestHandler2.COUNT.get(), "Bad instance count for "
+                + TestHandler2.class.getName());
+
+        LogManager.getLogManager().reset();
+        updateConfiguration(props);
+
+        assertEquals(1, TestHandler1.COUNT.get(), "Bad instance count for "
+                + TestHandler1.class.getName());
+        assertEquals(2, TestHandler2.COUNT.get(), "Bad instance count for "
+                + TestHandler2.class.getName());
+
+        props.setProperty(name1a+".handlers",
+                TestHandler2.class.getName() + "," + TestHandler1.class.getName());
+        updateConfiguration(props);
+
+        assertEquals(2, TestHandler1.COUNT.get(), "Bad instance count for "
+                + TestHandler1.class.getName());
+        assertEquals(3, TestHandler2.COUNT.get(), "Bad instance count for "
+                + TestHandler2.class.getName());
+
+        Reference.reachabilityFence(app1a);
+        Reference.reachabilityFence(system1a);
+
+        LogManager.getLogManager().readConfiguration();
+        System.gc();
+    }
+
+
+
+}

From e4226ff2f23607e4d98ba15731636ec30c96be68 Mon Sep 17 00:00:00 2001
From: Jim Laskey 
Date: Tue, 12 Jul 2016 10:58:58 -0300
Subject: [PATCH 086/111] 8161067: jlink: Enable plugins to use the module pool
 for class lookup

Reviewed-by: sundar, psandoz
---
 .../jlink/internal/ImagePluginStack.java      |  8 +++++++
 .../jlink/internal/ModuleEntryFactory.java    | 24 +++++++++++++++----
 .../tools/jlink/internal/ModulePoolImpl.java  | 19 +++++++++++++++
 .../internal/plugins/ClassForNamePlugin.java  | 21 +++++++---------
 .../jdk/tools/jlink/plugin/ModulePool.java    | 11 ++++++++-
 jdk/test/tools/jlink/JLinkPluginsTest.java    |  8 +++++++
 6 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java
index b8f44d84906..f49683f2fee 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java
@@ -399,6 +399,14 @@ public final class ImagePluginStack {
             return res.isPresent()? Optional.of(getUncompressed(res.get())) : Optional.empty();
         }
 
+        @Override
+        public Optional findEntryInContext(String path, ModuleEntry context) {
+            Objects.requireNonNull(path);
+            Objects.requireNonNull(context);
+            Optional res = pool.findEntryInContext(path, context);
+            return res.map(this::getUncompressed);
+        }
+
         @Override
         public boolean contains(ModuleEntry res) {
             return pool.contains(res);
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleEntryFactory.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleEntryFactory.java
index 620e8ffef0b..3d685f00cab 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleEntryFactory.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModuleEntryFactory.java
@@ -51,16 +51,32 @@ public final class ModuleEntryFactory {
                 original.getPath(), original.getType(), file);
     }
 
-    private static String moduleFrom(String path) {
+    static String moduleFrom(String path) {
         Objects.requireNonNull(path);
         if (path.isEmpty() || path.charAt(0) != '/') {
             throw new IllegalArgumentException(path + " must start with /");
         }
-        String noRoot = path.substring(1);
-        int idx = noRoot.indexOf('/');
+        int idx = path.indexOf('/', 1);
         if (idx == -1) {
             throw new IllegalArgumentException("/ missing after module: " + path);
         }
-        return noRoot.substring(0, idx);
+        return path.substring(1, idx);
+    }
+
+    static String packageFrom(String path) {
+        Objects.requireNonNull(path);
+        int idx = path.lastIndexOf('/');
+        if (idx == -1) {
+            throw new IllegalArgumentException("/ missing from path: " + path);
+        }
+        if (path.startsWith("/")) {
+            int jdx = path.indexOf('/', 1);
+            if (jdx == -1) {
+                throw new IllegalArgumentException("/ missing after module: " + path);
+            }
+            return path.substring(jdx + 1, idx);
+        } else {
+            return path.substring(0, idx);
+        }
     }
 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModulePoolImpl.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModulePoolImpl.java
index 467da23ae68..172e21cbb26 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModulePoolImpl.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ModulePoolImpl.java
@@ -264,6 +264,25 @@ public class ModulePoolImpl implements ModulePool {
         return Optional.ofNullable(resources.get(path));
     }
 
+    /**
+     * Get the ModuleEntry for the passed path restricted to supplied context.
+     *
+     * @param path A data path
+     * @param context A context of the search
+     * @return A ModuleEntry instance or null if the data is not found
+     */
+    @Override
+    public Optional findEntryInContext(String path, ModuleEntry context) {
+        Objects.requireNonNull(path);
+        Objects.requireNonNull(context);
+        LinkModule module = modules.get(context.getModule());
+        Objects.requireNonNull(module);
+        Optional entry = module.findEntry(path);
+        // Navigating other modules via requires and exports is problematic
+        // since we cannot construct the runtime model of loaders and layers.
+        return entry;
+     }
+
     /**
      * Check if the ModulePool contains the given ModuleEntry.
      *
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java
index 7f126e4f203..1c8c54705c3 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java
@@ -28,7 +28,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
+import java.util.Optional;
 import jdk.tools.jlink.plugin.ModulePool;
 import jdk.tools.jlink.plugin.Plugin.Category;
 import jdk.internal.org.objectweb.asm.ClassReader;
@@ -67,7 +67,7 @@ public final class ClassForNamePlugin implements Plugin {
         return index == -1 ? "" : binaryName.substring(0, index);
     }
 
-    private ModuleEntry transform(ModuleEntry resource, Map classes) {
+    private ModuleEntry transform(ModuleEntry resource, ModulePool pool) {
         byte[] inBytes = resource.getBytes();
         ClassReader cr = new ClassReader(inBytes);
         ClassNode cn = new ClassNode();
@@ -96,10 +96,11 @@ public final class ClassForNamePlugin implements Plugin {
                         min.desc.equals("(Ljava/lang/String;)Ljava/lang/Class;")) {
                         String ldcClassName = ldc.cst.toString();
                         String thatClassName = ldcClassName.replaceAll("\\.", "/");
-                        ModuleEntry thatClass = classes.get(thatClassName);
+                        Optional thatClass =
+                            pool.findEntryInContext(thatClassName + ".class", resource);
 
-                        if (thatClass != null) {
-                            int thatAccess = getAccess(thatClass);
+                        if (thatClass.isPresent()) {
+                            int thatAccess = getAccess(thatClass.get());
                             String thatPackage = getPackage(thatClassName);
 
                             if ((thatAccess & Opcodes.ACC_PRIVATE) != Opcodes.ACC_PRIVATE &&
@@ -142,19 +143,13 @@ public final class ClassForNamePlugin implements Plugin {
     public void visit(ModulePool in, ModulePool out) {
         Objects.requireNonNull(in);
         Objects.requireNonNull(out);
-        Map classes = in.entries()
-            .filter(resource -> resource != null &&
-                    resource.getPath().endsWith(".class") &&
-                    !resource.getPath().endsWith("/module-info.class"))
-            .collect(Collectors.toMap(resource -> binaryClassName(resource.getPath()),
-                                      resource -> resource));
+
         in.entries()
-            .filter(resource -> resource != null)
             .forEach(resource -> {
                 String path = resource.getPath();
 
                 if (path.endsWith(".class") && !path.endsWith("/module-info.class")) {
-                    out.add(transform(resource, classes));
+                    out.add(transform(resource, in));
                 } else {
                     out.add(resource);
                 }
diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModulePool.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModulePool.java
index 4d0f230e1c6..de24a417293 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModulePool.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ModulePool.java
@@ -89,7 +89,16 @@ public interface ModulePool {
      * @param path A data path
      * @return A ModuleEntry instance or null if the data is not found
      */
-   public Optional findEntry(String path);
+    public Optional findEntry(String path);
+
+    /**
+     * Get the ModuleEntry for the passed path restricted to supplied context.
+     *
+     * @param path A data path
+     * @param context A context of the search
+     * @return A ModuleEntry instance or null if the data is not found
+     */
+    public Optional findEntryInContext(String path, ModuleEntry context);
 
     /**
      * Check if the ModulePool contains the given ModuleEntry.
diff --git a/jdk/test/tools/jlink/JLinkPluginsTest.java b/jdk/test/tools/jlink/JLinkPluginsTest.java
index 560fc53f9a3..da9e112238b 100644
--- a/jdk/test/tools/jlink/JLinkPluginsTest.java
+++ b/jdk/test/tools/jlink/JLinkPluginsTest.java
@@ -75,5 +75,13 @@ public class JLinkPluginsTest {
             Path imageDir = helper.generateDefaultImage(userOptions, moduleName).assertSuccess();
             helper.checkImage(imageDir, moduleName, res, null);
         }
+        {
+            // Optimize Class.forName
+            String[] userOptions = {"--class-for-name"};
+            String moduleName = "classforname";
+            helper.generateDefaultJModule(moduleName, "composite2");
+            Path imageDir = helper.generateDefaultImage(userOptions, moduleName).assertSuccess();
+            helper.checkImage(imageDir, moduleName, null, null);
+        }
     }
 }

From cd2dd88b9eb786d78acab960a8c63e687160c768 Mon Sep 17 00:00:00 2001
From: Rajan Halade 
Date: Tue, 12 Jul 2016 14:39:08 -0700
Subject: [PATCH 087/111] 8161233: ProblemList
 sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java on macOS

Reviewed-by: ascarpino
---
 jdk/test/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 167e2493cf3..2214bd66fc1 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -284,6 +284,7 @@ sun/security/pkcs11/tls/TestPremaster.java                      8077138,8023434
 sun/security/krb5/auto/HttpNegotiateServer.java                 8038079 generic-all
 
 sun/security/tools/keytool/autotest.sh                          8130302 generic-all
+sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java         8161232 macosx-all
 
 ############################################################################
 

From caddf21da808c1f4a86ef7f61aa6f8da8a9d5b37 Mon Sep 17 00:00:00 2001
From: Amy Lu 
Date: Wed, 13 Jul 2016 10:26:11 +0800
Subject: [PATCH 088/111] 8132548: java/lang/ThreadGroup/Stop.java fails with
 "RuntimeException: Failure"

Reviewed-by: dholmes, martin, darcy
---
 jdk/test/java/lang/ThreadGroup/Stop.java | 75 +++++++++---------------
 1 file changed, 28 insertions(+), 47 deletions(-)

diff --git a/jdk/test/java/lang/ThreadGroup/Stop.java b/jdk/test/java/lang/ThreadGroup/Stop.java
index 156bc9d4bdd..c0be8c08fca 100644
--- a/jdk/test/java/lang/ThreadGroup/Stop.java
+++ b/jdk/test/java/lang/ThreadGroup/Stop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -28,60 +28,41 @@
  *          unpredictable results.
  */
 
-public class Stop implements Runnable {
-    private static boolean groupStopped = false ;
-    private static final Object lock = new Object();
+import java.util.concurrent.CountDownLatch;
 
-    private static final ThreadGroup group = new ThreadGroup("");
-    private static final Thread first = new Thread(group, new Stop());
-    private static final Thread second = new Thread(group, new Stop());
-
-    public void run() {
-        while (true) {
-            // Give the other thread a chance to start
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-            }
-
-            // When the first thread runs, it will stop the group.
-            if (Thread.currentThread() == first) {
-                synchronized (lock) {
-                    try {
-                        group.stop();
-                    } finally {
-                        // Signal the main thread it is time to check
-                        // that the stopped thread group was successful
-                        groupStopped = true;
-                        lock.notifyAll();
-                    }
-                }
-            }
-        }
-    }
+public class Stop {
 
     public static void main(String[] args) throws Exception {
+        final CountDownLatch ready = new CountDownLatch(1);
+        final ThreadGroup group = new ThreadGroup("");
+
+        final Thread second = new Thread(group, () -> {
+            ready.countDown();
+            while (true) {
+                try {
+                    Thread.sleep(60000);
+                } catch (InterruptedException shouldNotHappen) {
+                }
+            }
+        });
+
+        final Thread first = new Thread(group, () -> {
+            // Wait until "second" is started
+            try {
+                ready.await();
+            } catch (InterruptedException shouldNotHappen) {
+            }
+            // Now stop the group
+            group.stop();
+        });
+
         // Launch two threads as part of the same thread group
         first.start();
         second.start();
 
-        // Wait for the thread group stop to be issued
-        synchronized(lock){
-            while (!groupStopped) {
-                lock.wait();
-                // Give the other thread a chance to stop
-                Thread.sleep(1000);
-            }
-        }
-
         // Check that the second thread is terminated when the
         // first thread terminates the thread group.
-        boolean failed = second.isAlive();
-
-        // Clean up any threads that may have not been terminated
-        first.stop();
-        second.stop();
-        if (failed)
-            throw new RuntimeException("Failure.");
+        second.join();
+        // Test passed - if never get here the test times out and fails.
     }
 }

From e4a671e63585264d1020a8c12b41123c1e5d9fec Mon Sep 17 00:00:00 2001
From: Steve Drach 
Date: Tue, 12 Jul 2016 11:05:27 -0700
Subject: [PATCH 089/111] 8155770: Correct URLClassLoader API documentation to
 explicitly say jar-scheme URL's are accepted

Reviewed-by: psandoz
---
 .../share/classes/java/net/URLClassLoader.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/net/URLClassLoader.java b/jdk/src/java.base/share/classes/java/net/URLClassLoader.java
index 025e9467811..0808a6e9962 100644
--- a/jdk/src/java.base/share/classes/java/net/URLClassLoader.java
+++ b/jdk/src/java.base/share/classes/java/net/URLClassLoader.java
@@ -59,9 +59,11 @@ import sun.security.util.SecurityConstants;
 
 /**
  * This class loader is used to load classes and resources from a search
- * path of URLs referring to both JAR files and directories. Any URL that
- * ends with a '/' is assumed to refer to a directory. Otherwise, the URL
- * is assumed to refer to a JAR file which will be opened as needed.
+ * path of URLs referring to both JAR files and directories. Any {@code jar:}
+ * scheme URL (see {@link java.net.JarURLConnection}) is assumed to refer to a
+ * JAR file.  Any {@code file:} scheme URL that ends with a '/' is assumed to
+ * refer to a directory. Otherwise, the URL is assumed to refer to a JAR file
+ * which will be opened as needed.
  * 
      
  * The AccessControlContext of the thread that created the instance of
  * URLClassLoader will be used when subsequently loading classes and
@@ -83,9 +85,11 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
     /**
      * Constructs a new URLClassLoader for the given URLs. The URLs will be
      * searched in the order specified for classes and resources after first
-     * searching in the specified parent class loader. Any URL that ends with
-     * a '/' is assumed to refer to a directory. Otherwise, the URL is assumed
-     * to refer to a JAR file which will be downloaded and opened as needed.
+     * searching in the specified parent class loader.  Any {@code jar:}
+     * scheme URL is assumed to refer to a JAR file.  Any {@code file:} scheme
+     * URL that ends with a '/' is assumed to refer to a directory.  Otherwise,
+     * the URL is assumed to refer to a JAR file which will be downloaded and
+     * opened as needed.
      *
      * 
      If there is a security manager, this method first
      * calls the security manager's {@code checkCreateClassLoader} method

From c748cd54ac5c8f29bd52fe021b10dc485989a6c7 Mon Sep 17 00:00:00 2001
From: Rob McKenna 
Date: Wed, 13 Jul 2016 14:56:00 +0100
Subject: [PATCH 090/111] 8141148: LDAP "follow" throws ClassCastException with
 Java 8

Reviewed-by: prappo, xuelei
---
 .../com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java    | 4 ++--
 .../classes/com/sun/jndi/ldap/LdapBindingEnumeration.java   | 4 ++--
 .../classes/com/sun/jndi/ldap/LdapNamingEnumeration.java    | 4 ++--
 .../classes/com/sun/jndi/ldap/LdapSearchEnumeration.java    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java
index be3315674fa..8bef0da95ca 100644
--- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java
+++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java
@@ -300,7 +300,7 @@ abstract class AbstractLdapNamingEnumeration
         errEx = e;
     }
 
-    protected abstract AbstractLdapNamingEnumeration getReferredResults(
+    protected abstract AbstractLdapNamingEnumeration getReferredResults(
             LdapReferralContext refCtx) throws NamingException;
 
     /*
@@ -360,7 +360,7 @@ abstract class AbstractLdapNamingEnumeration
      * Merge the entries and/or referrals from the supplied enumeration
      * with those of the current enumeration.
      */
-    protected void update(AbstractLdapNamingEnumeration ne) {
+    protected void update(AbstractLdapNamingEnumeration ne) {
         // Cleanup previous context first
         homeCtx.decEnumCount();
 
diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java
index 65c80512596..8d385d3d7e7 100644
--- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java
+++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java
@@ -104,9 +104,9 @@ final class LdapBindingEnumeration
     }
 
     @Override
-    protected LdapBindingEnumeration getReferredResults(
+    protected AbstractLdapNamingEnumeration getReferredResults(
             LdapReferralContext refCtx) throws NamingException{
         // repeat the original operation at the new context
-        return (LdapBindingEnumeration)refCtx.listBindings(listArg);
+        return (AbstractLdapNamingEnumeration)refCtx.listBindings(listArg);
     }
 }
diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java
index 422ce79b5fd..c923fda26f7 100644
--- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java
+++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java
@@ -72,9 +72,9 @@ final class LdapNamingEnumeration
     }
 
     @Override
-    protected LdapNamingEnumeration getReferredResults(
+    protected AbstractLdapNamingEnumeration getReferredResults(
             LdapReferralContext refCtx) throws NamingException {
         // repeat the original operation at the new context
-        return (LdapNamingEnumeration)refCtx.list(listArg);
+        return (AbstractLdapNamingEnumeration)refCtx.list(listArg);
     }
 }
diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java
index 4af58a8b0dd..43d040a1c44 100644
--- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java
+++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java
@@ -199,15 +199,15 @@ final class LdapSearchEnumeration
     }
 
     @Override
-    protected LdapSearchEnumeration getReferredResults(
+    protected AbstractLdapNamingEnumeration getReferredResults(
             LdapReferralContext refCtx) throws NamingException {
         // repeat the original operation at the new context
-        return (LdapSearchEnumeration)refCtx.search(
+        return (AbstractLdapNamingEnumeration)refCtx.search(
                 searchArgs.name, searchArgs.filter, searchArgs.cons);
     }
 
     @Override
-    protected void update(AbstractLdapNamingEnumeration ne) {
+    protected void update(AbstractLdapNamingEnumeration ne) {
         super.update(ne);
 
         // Update search-specific variables

From d996c5d95f88f76fea828c8566ac92217c48171c Mon Sep 17 00:00:00 2001
From: Henry Jen 
Date: Thu, 7 Jul 2016 21:15:24 -0700
Subject: [PATCH 091/111] 8132379: -J options can cause crash or "Warning: app
 args parsing error passing arguments as-is"

Reviewed-by: ksrini
---
 jdk/src/java.base/share/native/libjli/args.c  |  2 +-
 .../java.base/windows/native/libjli/java_md.c | 67 +++++++++----------
 jdk/test/tools/launcher/Arrrghs.java          |  8 ++-
 3 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/jdk/src/java.base/share/native/libjli/args.c b/jdk/src/java.base/share/native/libjli/args.c
index 268046cd693..55f67f355ce 100644
--- a/jdk/src/java.base/share/native/libjli/args.c
+++ b/jdk/src/java.base/share/native/libjli/args.c
@@ -130,7 +130,7 @@ static void checkArg(const char *arg) {
         expectingNoDashArg = JNI_FALSE;
     }
     // only update on java mode and not yet found main class
-    if (firstAppArgIndex == -1 && idx != 0) {
+    if (firstAppArgIndex == NOT_FOUND && idx != 0) {
         firstAppArgIndex = (int) idx;
     }
 }
diff --git a/jdk/src/java.base/windows/native/libjli/java_md.c b/jdk/src/java.base/windows/native/libjli/java_md.c
index 65422bc039f..ffe4358e81d 100644
--- a/jdk/src/java.base/windows/native/libjli/java_md.c
+++ b/jdk/src/java.base/windows/native/libjli/java_md.c
@@ -943,26 +943,6 @@ ProcessPlatformOption(const char *arg)
     return JNI_FALSE;
 }
 
-int
-filterArgs(StdArg *stdargs, const int nargc, StdArg **pargv) {
-    StdArg* argv = NULL;
-    int nargs = 0;
-    int i;
-
-    /* Copy the non-vm args */
-    for (i = 0; i < nargc ; i++) {
-        const char *arg = stdargs[i].arg;
-        if (arg[0] == '-' && arg[1] == 'J')
-            continue;
-        argv = (StdArg*) JLI_MemRealloc(argv, (nargs+1) * sizeof(StdArg));
-        argv[nargs].arg = JLI_StringDup(arg);
-        argv[nargs].has_wildcard = stdargs[i].has_wildcard;
-        nargs++;
-    }
-    *pargv = argv;
-    return nargs;
-}
-
 /*
  * At this point we have the arguments to the application, and we need to
  * check with original stdargs in order to compare which of these truly
@@ -975,12 +955,13 @@ CreateApplicationArgs(JNIEnv *env, char **strv, int argc)
     int i, j, idx;
     size_t tlen;
     jobjectArray outArray, inArray;
-    char *ostart, *astart, **nargv;
+    char *arg, **nargv;
     jboolean needs_expansion = JNI_FALSE;
     jmethodID mid;
-    int filteredargc, stdargc;
+    int stdargc;
     StdArg *stdargs;
-    StdArg *filteredargs;
+    int *appArgIdx;
+    int isTool;
     jclass cls = GetLauncherHelperClass(env);
     NULL_CHECK0(cls);
 
@@ -991,8 +972,6 @@ CreateApplicationArgs(JNIEnv *env, char **strv, int argc)
     stdargs = JLI_GetStdArgs();
     stdargc = JLI_GetStdArgc();
 
-    filteredargc = filterArgs(stdargs, stdargc, &filteredargs);
-
     // sanity check, this should never happen
     if (argc > stdargc) {
         JLI_TraceLauncher("Warning: app args is larger than the original, %d %d\n", argc, stdargc);
@@ -1001,22 +980,35 @@ CreateApplicationArgs(JNIEnv *env, char **strv, int argc)
     }
 
     // sanity check, match the args we have, to the holy grail
-    idx = filteredargc - argc;
-    ostart = filteredargs[idx].arg;
-    astart = strv[0];
-    // sanity check, ensure that the first argument of the arrays are the same
-    if (JLI_StrCmp(ostart, astart) != 0) {
-        // some thing is amiss the args don't match
-        JLI_TraceLauncher("Warning: app args parsing error\n");
-        JLI_TraceLauncher("passing arguments as-is\n");
+    idx = JLI_GetAppArgIndex();
+    isTool = (idx == 0);
+    if (isTool) { idx++; } // skip tool name
+    JLI_TraceLauncher("AppArgIndex: %d points to %s\n", idx, stdargs[idx].arg);
+
+    appArgIdx = calloc(argc, sizeof(int));
+    for (i = idx, j = 0; i < stdargc; i++) {
+        if (isTool) { // filter -J used by tools to pass JVM options
+            arg = stdargs[i].arg;
+            if (arg[0] == '-' && arg[1] == 'J') {
+                continue;
+            }
+        }
+        appArgIdx[j++] = i;
+    }
+    // sanity check, ensure same number of arguments for application
+    if (j != argc) {
+        JLI_TraceLauncher("Warning: app args count doesn't match, %d %d\n", j, argc);
+        JLI_TraceLauncher("passing arguments as-is.\n");
+        JLI_MemFree(appArgIdx);
         return NewPlatformStringArray(env, strv, argc);
     }
 
     // make a copy of the args which will be expanded in java if required.
     nargv = (char **)JLI_MemAlloc(argc * sizeof(char*));
-    for (i = 0, j = idx; i < argc; i++, j++) {
-        jboolean arg_expand = (JLI_StrCmp(filteredargs[j].arg, strv[i]) == 0)
-                                ? filteredargs[j].has_wildcard
+    for (i = 0; i < argc; i++) {
+        j = appArgIdx[i];
+        jboolean arg_expand = (JLI_StrCmp(stdargs[j].arg, strv[i]) == 0)
+                                ? stdargs[j].has_wildcard
                                 : JNI_FALSE;
         if (needs_expansion == JNI_FALSE)
             needs_expansion = arg_expand;
@@ -1039,6 +1031,7 @@ CreateApplicationArgs(JNIEnv *env, char **strv, int argc)
             JLI_MemFree(nargv[i]);
         }
         JLI_MemFree(nargv);
+        JLI_MemFree(appArgIdx);
         return NewPlatformStringArray(env, strv, argc);
     }
     NULL_CHECK0(mid = (*env)->GetStaticMethodID(env, cls,
@@ -1053,6 +1046,6 @@ CreateApplicationArgs(JNIEnv *env, char **strv, int argc)
         JLI_MemFree(nargv[i]);
     }
     JLI_MemFree(nargv);
-    JLI_MemFree(filteredargs);
+    JLI_MemFree(appArgIdx);
     return outArray;
 }
diff --git a/jdk/test/tools/launcher/Arrrghs.java b/jdk/test/tools/launcher/Arrrghs.java
index 4d799f35efe..f9bc9f955da 100644
--- a/jdk/test/tools/launcher/Arrrghs.java
+++ b/jdk/test/tools/launcher/Arrrghs.java
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 5030233 6214916 6356475 6571029 6684582 6742159 4459600 6758881 6753938
- *      6894719 6968053 7151434 7146424 8007333 8077822 8143640
+ *      6894719 6968053 7151434 7146424 8007333 8077822 8143640 8132379
  * @summary Argument parsing validation.
  * @compile -XDignore.symbol.file Arrrghs.java
  * @run main/othervm Arrrghs
@@ -383,6 +383,12 @@ public class Arrrghs extends TestHelper {
         checkArgumentWildcard("empty\\*?", "empty\\*?");
         checkArgumentWildcard("empty\\?*", "empty\\?*");
 
+        // 8132379: java should not filter out -J options for application
+        String[] args = { "-J-one", "-Jtwo", "lib\\???.java", "-J-Dsomething",
+           "a", "-J-Dlast.arg" };
+        String[] expected = { "-J-one", "-Jtwo", "lib\\Fbo.java",
+           "lib\\Foo.java", "-J-Dsomething", "a", "-J-Dlast.arg" };
+        checkArgumentWildcard(args, expected);
     }
 
     void doArgumentCheck(String inArgs, String... expArgs) {

From 95cf491fcc57da92f0ceb0fa470ecd31c686c69f Mon Sep 17 00:00:00 2001
From: Erik Joelsson 
Date: Fri, 8 Jul 2016 08:55:54 +0200
Subject: [PATCH 092/111] 8003593: build-infra: Paths to optional
 platform-specific files should not be hardwired to src/closed

Reviewed-by: dholmes, prr
---
 common/autoconf/generated-configure.sh | 57 ++++++--------------------
 common/autoconf/hotspot.m4             |  5 +--
 common/autoconf/jdk-options.m4         | 35 ++++------------
 common/autoconf/libraries.m4           |  6 +--
 common/autoconf/spec.gmk.in            |  1 -
 make/CompileJavaModules.gmk            |  5 ---
 make/Images.gmk                        |  6 ---
 make/Javadoc.gmk                       | 21 ++++------
 8 files changed, 30 insertions(+), 106 deletions(-)

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 2c98c488849..e8b5461b512 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -976,7 +976,6 @@ JVM_VARIANTS
 DEBUG_LEVEL
 HOTSPOT_DEBUG_LEVEL
 JDK_VARIANT
-SET_OPENJDK
 USERNAME
 CANONICAL_TOPDIR
 ORIGINAL_TOPDIR
@@ -5095,7 +5094,7 @@ VS_SDK_PLATFORM_NAME_2013=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1467223237
+DATE_WHEN_GENERATED=1467960715
 
 ###############################################################################
 #
@@ -16592,41 +16591,17 @@ else
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5
-$as_echo_n "checking for presence of closed sources... " >&6; }
-  if test -d "$SRC_ROOT/jdk/src/closed"; then
-    CLOSED_SOURCE_PRESENT=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if custom source is suppressed (openjdk-only)" >&5
+$as_echo_n "checking if custom source is suppressed (openjdk-only)... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_openjdk_only" >&5
+$as_echo "$enable_openjdk_only" >&6; }
+  if test "x$enable_openjdk_only" = "xyes"; then
+    SUPPRESS_CUSTOM_EXTENSIONS="true"
+  elif test "x$enable_openjdk_only" = "xno"; then
+    SUPPRESS_CUSTOM_EXTENSIONS="false"
   else
-    CLOSED_SOURCE_PRESENT=no
+    as_fn_error $? "Invalid value for --enable-openjdk-only: $enable_openjdk_only" "$LINENO" 5
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5
-$as_echo "$CLOSED_SOURCE_PRESENT" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is suppressed (openjdk-only)" >&5
-$as_echo_n "checking if closed source is suppressed (openjdk-only)... " >&6; }
-  SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPPRESS_CLOSED_SOURCE" >&5
-$as_echo "$SUPPRESS_CLOSED_SOURCE" >&6; }
-
-  if test "x$CLOSED_SOURCE_PRESENT" = xno; then
-    OPENJDK=true
-    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5
-$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;}
-    fi
-  else
-    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
-      OPENJDK=true
-    else
-      OPENJDK=false
-    fi
-  fi
-
-  if test "x$OPENJDK" = "xtrue"; then
-    SET_OPENJDK="OPENJDK=true"
-  fi
-
-
 
   # custom-make-dir is deprecated. Please use your custom-hook.m4 to override
   # the IncludeCustomExtension macro.
@@ -53313,11 +53288,7 @@ $as_echo "yes, forced" >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5
 $as_echo "no, forced" >&6; }
   elif test "x$enable_dtrace" = "xauto" || test "x$enable_dtrace" = "x"; then
-    if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK" != "xtrue"; then
-      INCLUDE_DTRACE=false
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, non-open linux build" >&5
-$as_echo "no, non-open linux build" >&6; }
-    elif test "x$DTRACE_DEP_MISSING" = "xtrue"; then
+    if test "x$DTRACE_DEP_MISSING" = "xtrue"; then
       INCLUDE_DTRACE=false
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, missing dependencies" >&5
 $as_echo "no, missing dependencies" >&6; }
@@ -53596,11 +53567,9 @@ $as_echo "yes" >&6; }
     NEEDS_LIB_CUPS=true
   fi
 
-  # Check if freetype is needed
-  if test "x$OPENJDK" = "xtrue"; then
+  # A custom hook may have set this already
+  if test "x$NEEDS_LIB_FREETYPE" = "x"; then
     NEEDS_LIB_FREETYPE=true
-  else
-    NEEDS_LIB_FREETYPE=false
   fi
 
   # Check if alsa is needed
diff --git a/common/autoconf/hotspot.m4 b/common/autoconf/hotspot.m4
index 3886ea86f65..306e2db5502 100644
--- a/common/autoconf/hotspot.m4
+++ b/common/autoconf/hotspot.m4
@@ -161,10 +161,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_DTRACE],
     INCLUDE_DTRACE=false
     AC_MSG_RESULT([no, forced])
   elif test "x$enable_dtrace" = "xauto" || test "x$enable_dtrace" = "x"; then
-    if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK" != "xtrue"; then
-      INCLUDE_DTRACE=false
-      AC_MSG_RESULT([no, non-open linux build])
-    elif test "x$DTRACE_DEP_MISSING" = "xtrue"; then
+    if test "x$DTRACE_DEP_MISSING" = "xtrue"; then
       INCLUDE_DTRACE=false
       AC_MSG_RESULT([no, missing dependencies])
     else
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
index 71e442ae4b4..d6aa389f3ae 100644
--- a/common/autoconf/jdk-options.m4
+++ b/common/autoconf/jdk-options.m4
@@ -117,36 +117,15 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
   AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
       [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
 
-  AC_MSG_CHECKING([for presence of closed sources])
-  if test -d "$SRC_ROOT/jdk/src/closed"; then
-    CLOSED_SOURCE_PRESENT=yes
+  AC_MSG_CHECKING([if custom source is suppressed (openjdk-only)])
+  AC_MSG_RESULT([$enable_openjdk_only])
+  if test "x$enable_openjdk_only" = "xyes"; then
+    SUPPRESS_CUSTOM_EXTENSIONS="true"
+  elif test "x$enable_openjdk_only" = "xno"; then
+    SUPPRESS_CUSTOM_EXTENSIONS="false"
   else
-    CLOSED_SOURCE_PRESENT=no
+    AC_MSG_ERROR([Invalid value for --enable-openjdk-only: $enable_openjdk_only])
   fi
-  AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
-
-  AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)])
-  SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
-  AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE])
-
-  if test "x$CLOSED_SOURCE_PRESENT" = xno; then
-    OPENJDK=true
-    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
-      AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
-    fi
-  else
-    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
-      OPENJDK=true
-    else
-      OPENJDK=false
-    fi
-  fi
-
-  if test "x$OPENJDK" = "xtrue"; then
-    SET_OPENJDK="OPENJDK=true"
-  fi
-
-  AC_SUBST(SET_OPENJDK)
 
   # custom-make-dir is deprecated. Please use your custom-hook.m4 to override
   # the IncludeCustomExtension macro.
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
index 88412842bde..1e408ef022b 100644
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
@@ -59,11 +59,9 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
     NEEDS_LIB_CUPS=true
   fi
 
-  # Check if freetype is needed
-  if test "x$OPENJDK" = "xtrue"; then
+  # A custom hook may have set this already
+  if test "x$NEEDS_LIB_FREETYPE" = "x"; then
     NEEDS_LIB_FREETYPE=true
-  else
-    NEEDS_LIB_FREETYPE=false
   fi
 
   # Check if alsa is needed
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index 8ddc28f53aa..26705337a95 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -108,7 +108,6 @@ OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
 REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@
 REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@
 
-@SET_OPENJDK@
 LIBM:=@LIBM@
 LIBDL:=@LIBDL@
 
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index ed603cd8717..a53f2b13887 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -205,11 +205,6 @@ ifdef BUILD_HEADLESS_ONLY
   java.desktop_EXCLUDES += sun/applet
 endif
 
-# Why is this in the open source tree?
-ifdef OPENJDK
-  java.desktop_EXCLUDES += sun/dc
-endif
-
 # Used on windows and macosx
 ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
   java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
diff --git a/make/Images.gmk b/make/Images.gmk
index 385b741bb58..7ba95286f91 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -207,12 +207,6 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
       tnameserv.1 \
       unpack200.1
 
-  ifndef OPENJDK
-    ifneq ($(OPENJDK_TARGET_OS), solaris)
-      JRE_MAN_PAGES += javaws.1
-    endif
-  endif
-
   JDK_MAN_PAGES += \
       $(JRE_MAN_PAGES) \
       appletviewer.1 \
diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index 00ec8ef62b3..f194dd95f89 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -290,19 +290,15 @@ $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
 
 # Common javadoc options used by all bundles
 
-ifdef OPENJDK
-  ADDITIONAL_JAVADOCFLAGS = \
-      -Xdocrootparent $(DOCS_BASE_URL)
-else
-  ADDITIONAL_JAVADOCFLAGS =
-endif
+# This flag may be overridden from a custom makefile
+DOCROOTPARENT_FLAG = -Xdocrootparent $(DOCS_BASE_URL)
 
 define COMMON_JAVADOCFLAGS
     $(call OptionOnly,-XDignore.symbol.file=true) ; \
     $(call OptionOnly,-quiet) ; \
     $(call OptionOnly,-use) ; \
     $(call OptionOnly,-keywords) ; \
-    $(call OptionOnly,$(ADDITIONAL_JAVADOCFLAGS))
+    $(call OptionOnly,$(DOCROOTPARENT_FLAG))
 endef
 
 # Common javadoc tags used by all bundles
@@ -1038,8 +1034,6 @@ ALL_OTHER_TARGETS += mgmtdocs
 
 MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
 MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
-JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/jdk.snmp/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
 MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
 MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
 MGMT_HEADER := Monitoring and Management Interface for the Java Platform
@@ -1063,11 +1057,6 @@ $(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
 # Run javadoc if the index file is out of date or missing
 $(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
-	@if [ -f $(JVM_MIB_SRC) ] ; then \
-	  $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
-	else \
-	  $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
-	fi
 	$(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
 	$(JAVADOC_CMD_SMALL) -d $(@D) \
 	    @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
@@ -1704,3 +1693,7 @@ $(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
 #############################################################
 .PHONY: all docs coredocs otherdocs \
      $(ALL_OTHER_TARGETS) zip-docs
+
+################################################################################
+
+$(eval $(call IncludeCustomExtension, , Javadoc-post.gmk))

From 018bd862efa4018ca27ace1818c91a072d437765 Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff 
Date: Fri, 8 Jul 2016 20:11:22 +0300
Subject: [PATCH 093/111] 8161074: Quarantine
 jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java in JDK9-dev

Quarantine the test

Reviewed-by: dcubed, gtriantafill
---
 .../jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java
index dedb1cffcd2..110615dc48d 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java
@@ -29,6 +29,7 @@
  * @modules jdk.vm.ci/jdk.vm.ci.meta
  *          jdk.vm.ci/jdk.vm.ci.runtime
  *          jdk.vm.ci/jdk.vm.ci.hotspot
+ * @ignore 8161068
  * @run testng/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
  *      jdk.vm.ci.hotspot.test.MethodHandleAccessProviderTest
  */

From bec16625dc9c1a5990e3ab3d554388455169d3ae Mon Sep 17 00:00:00 2001
From: Vicente Romero 
Date: Fri, 8 Jul 2016 16:47:13 -0700
Subject: [PATCH 094/111] 8153407: javac, fold debug options

Reviewed-by: mcimadamore, jjg
---
 .../com/sun/tools/javac/comp/Infer.java       |  6 ++--
 .../sun/tools/javac/comp/LambdaToMethod.java  |  6 ++--
 .../com/sun/tools/javac/comp/Resolve.java     |  2 +-
 .../com/sun/tools/javac/jvm/ClassWriter.java  | 29 +++++++++----------
 .../classes/com/sun/tools/javac/jvm/Gen.java  |  3 +-
 .../com/sun/tools/javac/main/Main.java        |  2 +-
 .../com/sun/tools/javac/main/Option.java      | 25 +++++++++++++---
 .../sun/tools/javac/util/Dependencies.java    |  8 ++---
 .../com/sun/tools/sjavac/options/Options.java |  2 +-
 .../ClassFileModifiers/ClassModifiers.java    |  4 +--
 .../ClassFileModifiers/MemberModifiers.java   |  4 +--
 .../javac/completionDeps/DepsAndAnno.java     |  2 +-
 .../javac/completionDeps/DepsAndDocLint.java  |  4 +--
 .../tools/javac/diags/CheckResourceKeys.java  |  3 ++
 .../diags/examples/ApplicableMethodFound.java |  4 +--
 .../examples/ApplicableMethodFound1.java      |  4 +--
 .../diags/examples/DeferredMethodInst.java    |  4 +--
 .../javac/diags/examples/LambdaStat.java      |  4 +--
 .../tools/javac/diags/examples/MrefStat.java  |  4 +--
 .../tools/javac/diags/examples/MrefStat1.java |  4 +--
 .../examples/NotApplicableMethodFound.java    |  4 +--
 .../javac/diags/examples/PartialInstSig.java  |  4 +--
 .../diags/examples/VerboseResolveMulti.java   |  4 +--
 .../diags/examples/VerboseResolveMulti1.java  |  4 +--
 .../generics/inference/8158355/T8158355.java  |  2 +-
 .../tools/javac/lambda/MostSpecific09.java    |  2 +-
 .../tools/javac/lambda/MostSpecific09.out     |  4 +--
 .../javac/lambda/TestLambdaToMethodStats.java |  4 +--
 .../lambda/XDdumpLambdaToMethodStats.java     |  4 +--
 .../lambda/bridge/TestMetafactoryBridges.java |  4 +--
 .../StructuralMostSpecificTest.java           |  4 +--
 .../tools/javac/resolve/ResolveHarness.java   |  4 +--
 .../test/tools/sjavac/JavacOptionPrep.java    |  2 +-
 33 files changed, 96 insertions(+), 74 deletions(-)

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
index 31ecc2e8cc0..4bb5b7e1f69 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -62,6 +62,8 @@ import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
 
+import com.sun.tools.javac.main.Option;
+
 import static com.sun.tools.javac.code.TypeTag.*;
 
 /** Helper class for type parameter inference, used by the attribution phase.
@@ -87,7 +89,7 @@ public class Infer {
     /**
      * folder in which the inference dependency graphs should be written.
      */
-    final private String dependenciesFolder;
+    private final String dependenciesFolder;
 
     /**
      * List of graphs awaiting to be dumped to a file.
@@ -114,7 +116,7 @@ public class Infer {
         Options options = Options.instance(context);
         allowGraphInference = Source.instance(context).allowGraphInference()
                 && options.isUnset("useLegacyInference");
-        dependenciesFolder = options.get("dumpInferenceGraphsTo");
+        dependenciesFolder = options.get("debug.dumpInferenceGraphsTo");
         pendingGraphs = List.nil();
 
         emptyContext = new InferenceContext(this, List.nil());
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 50aa6b2ddc4..9e691e3039b 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -68,6 +68,8 @@ import static com.sun.tools.javac.tree.JCTree.Tag.*;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.type.TypeKind;
 
+import com.sun.tools.javac.main.Option;
+
 /**
  * This pass desugars lambda expressions into static methods
  *
@@ -104,7 +106,7 @@ public class LambdaToMethod extends TreeTranslator {
     private KlassInfo kInfo;
 
     /** dump statistics about lambda code generation */
-    private boolean dumpLambdaToMethodStats;
+    private final boolean dumpLambdaToMethodStats;
 
     /** force serializable representation, for stress testing **/
     private final boolean forceSerializable;
@@ -142,7 +144,7 @@ public class LambdaToMethod extends TreeTranslator {
         transTypes = TransTypes.instance(context);
         analyzer = new LambdaAnalyzerPreprocessor();
         Options options = Options.instance(context);
-        dumpLambdaToMethodStats = options.isSet("dumpLambdaToMethodStats");
+        dumpLambdaToMethodStats = options.isSet("debug.dumpLambdaToMethodStats");
         attr = Attr.instance(context);
         forceSerializable = options.isSet("forceSerializable");
     }
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index 0304d4180f9..bf919e862ab 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -180,7 +180,7 @@ public class Resolve {
         }
 
         static EnumSet getVerboseResolutionMode(Options opts) {
-            String s = opts.get("verboseResolution");
+            String s = opts.get("debug.verboseResolution");
             EnumSet res = EnumSet.noneOf(VerboseResolutionMode.class);
             if (s == null) return res;
             if (s.contains("all")) {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index ff02a24d375..4abefda20b0 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -47,6 +47,7 @@ import com.sun.tools.javac.jvm.Pool.DynamicMethod;
 import com.sun.tools.javac.jvm.Pool.Method;
 import com.sun.tools.javac.jvm.Pool.MethodHandle;
 import com.sun.tools.javac.jvm.Pool.Variable;
+import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.util.*;
 
 import static com.sun.tools.javac.code.Flags.*;
@@ -84,7 +85,7 @@ public class ClassWriter extends ClassFile {
 
     /** Switch: describe the generated stackmap.
      */
-    boolean debugstackmap;
+    private boolean debugstackmap;
 
     /**
      * Target class version.
@@ -181,20 +182,18 @@ public class ClassWriter extends ClassFile {
 
         verbose        = options.isSet(VERBOSE);
         genCrt         = options.isSet(XJCOV);
-        debugstackmap  = options.isSet("debugstackmap");
+        debugstackmap = options.isSet("debug.stackmap");
 
         emitSourceFile = options.isUnset(G_CUSTOM) ||
                             options.isSet(G_CUSTOM, "source");
 
-        String dumpModFlags = options.get("dumpmodifiers");
-        dumpClassModifiers =
-            (dumpModFlags != null && dumpModFlags.indexOf('c') != -1);
-        dumpFieldModifiers =
-            (dumpModFlags != null && dumpModFlags.indexOf('f') != -1);
-        dumpInnerClassModifiers =
-            (dumpModFlags != null && dumpModFlags.indexOf('i') != -1);
-        dumpMethodModifiers =
-            (dumpModFlags != null && dumpModFlags.indexOf('m') != -1);
+        String modifierFlags = options.get("debug.dumpmodifiers");
+        if (modifierFlags != null) {
+            dumpClassModifiers = modifierFlags.indexOf('c') != -1;
+            dumpFieldModifiers = modifierFlags.indexOf('f') != -1;
+            dumpInnerClassModifiers = modifierFlags.indexOf('i') != -1;
+            dumpMethodModifiers = modifierFlags.indexOf('m') != -1;
+        }
     }
 
 /******************************************************************
@@ -210,10 +209,10 @@ public class ClassWriter extends ClassFile {
      *  For example, to dump everything:
      *    javac -XDdumpmodifiers=cifm MyProg.java
      */
-    private final boolean dumpClassModifiers; // -XDdumpmodifiers=c
-    private final boolean dumpFieldModifiers; // -XDdumpmodifiers=f
-    private final boolean dumpInnerClassModifiers; // -XDdumpmodifiers=i
-    private final boolean dumpMethodModifiers; // -XDdumpmodifiers=m
+    private boolean dumpClassModifiers; // -XDdumpmodifiers=c
+    private boolean dumpFieldModifiers; // -XDdumpmodifiers=f
+    private boolean dumpInnerClassModifiers; // -XDdumpmodifiers=i
+    private boolean dumpMethodModifiers; // -XDdumpmodifiers=m
 
 
     /** Return flags as a string, separated by " ".
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
index 4941b17c096..55ad6a47c33 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -38,6 +38,7 @@ import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.jvm.Code.*;
 import com.sun.tools.javac.jvm.Items.*;
+import com.sun.tools.javac.main.Option;
 import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree.*;
 
@@ -124,7 +125,7 @@ public class Gen extends JCTree.Visitor {
             ? options.isSet(G)
             : options.isSet(G_CUSTOM, "vars");
         genCrt = options.isSet(XJCOV);
-        debugCode = options.isSet("debugcode");
+        debugCode = options.isSet("debug.code");
         allowBetterNullChecks = target.hasObjects();
         pool = new Pool(types);
 
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java
index e1f2a557533..e65b4367c00 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java
@@ -243,7 +243,7 @@ public class Main {
             return Result.OK;
 
         // init Dependencies
-        if (options.isSet("completionDeps")) {
+        if (options.isSet("debug.completionDeps")) {
             Dependencies.GraphDependencies.preRegister(context);
         }
 
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index cac30109a9f..1b72985f74b 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -517,15 +517,32 @@ public enum Option {
         }
         @Override
         public boolean process(OptionHelper helper, String option) {
-            option = option.substring(text.length());
-            int eq = option.indexOf('=');
-            String key = (eq < 0) ? option : option.substring(0, eq);
-            String value = (eq < 0) ? option : option.substring(eq+1);
+            return process(helper, option, option.substring(text.length()));
+        }
+
+        @Override
+        public boolean process(OptionHelper helper, String option, String arg) {
+            int eq = arg.indexOf('=');
+            String key = (eq < 0) ? arg : arg.substring(0, eq);
+            String value = (eq < 0) ? arg : arg.substring(eq+1);
             helper.put(key, value);
             return false;
         }
     },
 
+    XDEBUG("-Xdebug:", null, HIDDEN, BASIC) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            String p = option.substring(option.indexOf(':') + 1).trim();
+            String[] subOptions = p.split(";");
+            for (String subOption : subOptions) {
+                subOption = "debug." + subOption.trim();
+                XD.process(helper, subOption, subOption);
+            }
+            return false;
+        }
+    },
+
     XADDEXPORTS("-XaddExports:", "opt.arg.addExports", "opt.addExports", EXTENDED, BASIC) {
         @Override
         public boolean process(OptionHelper helper, String option) {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java
index f4273718329..4b302ee0e99 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Dependencies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -47,8 +47,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Stack;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.tools.JavaFileObject;
 
@@ -126,9 +124,9 @@ public abstract class Dependencies {
          */
         GraphDependencies(Context context) {
             super(context);
-            Options options = Options.instance(context);
             //fetch filename
-            String[] modes = options.get("completionDeps").split(",");
+            Options options = Options.instance(context);
+            String[] modes = options.get("debug.completionDeps").split(",");
             for (String mode : modes) {
                 if (mode.startsWith("file=")) {
                     dependenciesFile = mode.substring(5);
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
index c2e0177119d..f3a3f8fadc1 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
@@ -313,7 +313,7 @@ public class Options {
         }
 
         // Enable dependency generation
-        args.add("-XDcompletionDeps=source,class");
+        args.add("-Xdebug:completionDeps=source,class");
 
         // This can't be anything but 'none'. Enforced by sjavac main method.
         args.add("-implicit:" + implicitPolicy);
diff --git a/langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.java b/langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.java
index a2041abad1d..728ddbda217 100644
--- a/langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.java
+++ b/langtools/test/tools/javac/ClassFileModifiers/ClassModifiers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -28,7 +28,7 @@
  * file are correct, including those within InnerClasses attributes.
  * @author John Rose (jrose). Entered as a regression test by Bill Maddox (maddox).
  *
- * @compile/ref=ClassModifiers.out  -XDdumpmodifiers=ci ClassModifiers.java
+ * @compile/ref=ClassModifiers.out  -Xdebug:dumpmodifiers=ci ClassModifiers.java
  *
  */
 
diff --git a/langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.java b/langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.java
index d581bcf2d1d..b6697d0afa0 100644
--- a/langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.java
+++ b/langtools/test/tools/javac/ClassFileModifiers/MemberModifiers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -26,7 +26,7 @@
  * @bug 4249112 4785453
  * @summary Verify that implicit member modifiers are set correctly.
  *
- * @compile/ref=MemberModifiers.out -XDdumpmodifiers=cfm MemberModifiers.java
+ * @compile/ref=MemberModifiers.out -Xdebug:dumpmodifiers=cfm MemberModifiers.java
  */
 
 // Currently, we check only that members of final classes are not final.
diff --git a/langtools/test/tools/javac/completionDeps/DepsAndAnno.java b/langtools/test/tools/javac/completionDeps/DepsAndAnno.java
index edf111f77ae..072010bc40e 100644
--- a/langtools/test/tools/javac/completionDeps/DepsAndAnno.java
+++ b/langtools/test/tools/javac/completionDeps/DepsAndAnno.java
@@ -47,7 +47,7 @@ public class DepsAndAnno {
     public static void main(String[] args) {
         ToolBox toolBox = new ToolBox();
         new JavacTask(toolBox, Task.Mode.CMDLINE)
-               .options("-XDcompletionDeps")
+               .options("-Xdebug:completionDeps")
                .outdir(".")
                .files(ToolBox.testSrc + "/DepsAndAnno.java")
                .run();
diff --git a/langtools/test/tools/javac/completionDeps/DepsAndDocLint.java b/langtools/test/tools/javac/completionDeps/DepsAndDocLint.java
index 886ae5e0384..86501ea091d 100644
--- a/langtools/test/tools/javac/completionDeps/DepsAndDocLint.java
+++ b/langtools/test/tools/javac/completionDeps/DepsAndDocLint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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,7 +25,7 @@
  * @test
  * @bug 8078389
  * @summary Make sure there is no interference between completionDeps and doclint
- * @compile -XDcompletionDeps -Xdoclint DepsAndDocLint.java
+ * @compile -Xdebug:completionDeps -Xdoclint DepsAndDocLint.java
  */
 
 public class DepsAndDocLint {
diff --git a/langtools/test/tools/javac/diags/CheckResourceKeys.java b/langtools/test/tools/javac/diags/CheckResourceKeys.java
index ddd2c9ad691..80c9fe052c7 100644
--- a/langtools/test/tools/javac/diags/CheckResourceKeys.java
+++ b/langtools/test/tools/javac/diags/CheckResourceKeys.java
@@ -257,6 +257,9 @@ public class CheckResourceKeys {
                 // ignore package and class names
                 if (cs.matches("(com|java|javax|jdk|sun)\\.[A-Za-z.]+"))
                     continue;
+                // ignore debug flag names
+                if (cs.startsWith("debug."))
+                    continue;
                 // explicit known exceptions
                 if (noResourceRequired.contains(cs))
                     continue;
diff --git a/langtools/test/tools/javac/diags/examples/ApplicableMethodFound.java b/langtools/test/tools/javac/diags/examples/ApplicableMethodFound.java
index 675544939b3..8eb43ad566a 100644
--- a/langtools/test/tools/javac/diags/examples/ApplicableMethodFound.java
+++ b/langtools/test/tools/javac/diags/examples/ApplicableMethodFound.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -23,7 +23,7 @@
 
 // key: compiler.misc.applicable.method.found
 // key: compiler.note.verbose.resolve.multi
-// options: -XDverboseResolution=applicable,success
+// options: -Xdebug:verboseResolution=applicable,success
 
 class ApplicableMethodFound {
 
diff --git a/langtools/test/tools/javac/diags/examples/ApplicableMethodFound1.java b/langtools/test/tools/javac/diags/examples/ApplicableMethodFound1.java
index 0780b320d08..67e70c3423e 100644
--- a/langtools/test/tools/javac/diags/examples/ApplicableMethodFound1.java
+++ b/langtools/test/tools/javac/diags/examples/ApplicableMethodFound1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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,7 +24,7 @@
 // key: compiler.misc.applicable.method.found.1
 // key: compiler.note.verbose.resolve.multi
 // key: compiler.misc.partial.inst.sig
-// options: -XDverboseResolution=applicable,success
+// options: -Xdebug:verboseResolution=applicable,success
 
 class ApplicableMethodFound1 {
 
diff --git a/langtools/test/tools/javac/diags/examples/DeferredMethodInst.java b/langtools/test/tools/javac/diags/examples/DeferredMethodInst.java
index ff56e5e0212..f0c2c853dad 100644
--- a/langtools/test/tools/javac/diags/examples/DeferredMethodInst.java
+++ b/langtools/test/tools/javac/diags/examples/DeferredMethodInst.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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,7 +25,7 @@
 // key: compiler.note.verbose.resolve.multi
 // key: compiler.note.deferred.method.inst
 // key: compiler.misc.partial.inst.sig
-// options: -XDverboseResolution=applicable,success,deferred-inference
+// options: -Xdebug:verboseResolution=applicable,success,deferred-inference
 
 class DeferredMethodInst {
 
diff --git a/langtools/test/tools/javac/diags/examples/LambdaStat.java b/langtools/test/tools/javac/diags/examples/LambdaStat.java
index 2eb894a54dd..a57b4e33778 100644
--- a/langtools/test/tools/javac/diags/examples/LambdaStat.java
+++ b/langtools/test/tools/javac/diags/examples/LambdaStat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.note.lambda.stat
-// options: -XDdumpLambdaToMethodStats
+// options: -Xdebug:dumpLambdaToMethodStats
 
 class LambdaStat {
     Runnable r = ()->{};
diff --git a/langtools/test/tools/javac/diags/examples/MrefStat.java b/langtools/test/tools/javac/diags/examples/MrefStat.java
index d87e66546fa..5d79977c1f1 100644
--- a/langtools/test/tools/javac/diags/examples/MrefStat.java
+++ b/langtools/test/tools/javac/diags/examples/MrefStat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.note.mref.stat
-// options: -XDdumpLambdaToMethodStats
+// options: -Xdebug:dumpLambdaToMethodStats
 
 class MrefStat {
     Runnable r = MrefStat::m;
diff --git a/langtools/test/tools/javac/diags/examples/MrefStat1.java b/langtools/test/tools/javac/diags/examples/MrefStat1.java
index 6318e3c755f..b3128eedbe7 100644
--- a/langtools/test/tools/javac/diags/examples/MrefStat1.java
+++ b/langtools/test/tools/javac/diags/examples/MrefStat1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.note.mref.stat.1
-// options: -XDdumpLambdaToMethodStats
+// options: -Xdebug:dumpLambdaToMethodStats
 
 class MrefStat1 {
 
diff --git a/langtools/test/tools/javac/diags/examples/NotApplicableMethodFound.java b/langtools/test/tools/javac/diags/examples/NotApplicableMethodFound.java
index c1e41ac2357..edbaabe8c6e 100644
--- a/langtools/test/tools/javac/diags/examples/NotApplicableMethodFound.java
+++ b/langtools/test/tools/javac/diags/examples/NotApplicableMethodFound.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -26,7 +26,7 @@
 // key: compiler.err.cant.apply.symbol
 // key: compiler.misc.no.conforming.assignment.exists
 // key: compiler.misc.inconvertible.types
-// options: -XDverboseResolution=inapplicable,failure
+// options: -Xdebug:verboseResolution=inapplicable,failure
 
 class NotApplicableMethodFound {
 
diff --git a/langtools/test/tools/javac/diags/examples/PartialInstSig.java b/langtools/test/tools/javac/diags/examples/PartialInstSig.java
index c095bdd1c9b..e2a9c8e0aa0 100644
--- a/langtools/test/tools/javac/diags/examples/PartialInstSig.java
+++ b/langtools/test/tools/javac/diags/examples/PartialInstSig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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,7 +24,7 @@
 // key: compiler.misc.applicable.method.found.1
 // key: compiler.note.verbose.resolve.multi
 // key: compiler.misc.partial.inst.sig
-// options: -XDverboseResolution=applicable,success
+// options: -Xdebug:verboseResolution=applicable,success
 
 class PartialInstSig {
 
diff --git a/langtools/test/tools/javac/diags/examples/VerboseResolveMulti.java b/langtools/test/tools/javac/diags/examples/VerboseResolveMulti.java
index 59a8d3c8716..40108785d0e 100644
--- a/langtools/test/tools/javac/diags/examples/VerboseResolveMulti.java
+++ b/langtools/test/tools/javac/diags/examples/VerboseResolveMulti.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -23,7 +23,7 @@
 
 // key: compiler.misc.applicable.method.found
 // key: compiler.note.verbose.resolve.multi
-// options: -XDverboseResolution=applicable,success
+// options: -Xdebug:verboseResolution=applicable,success
 
 class VerboseResolveMulti {
 
diff --git a/langtools/test/tools/javac/diags/examples/VerboseResolveMulti1.java b/langtools/test/tools/javac/diags/examples/VerboseResolveMulti1.java
index 99c90e24212..d9a5b8bcc3e 100644
--- a/langtools/test/tools/javac/diags/examples/VerboseResolveMulti1.java
+++ b/langtools/test/tools/javac/diags/examples/VerboseResolveMulti1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -26,7 +26,7 @@
 // key: compiler.err.cant.apply.symbol
 // key: compiler.misc.no.conforming.assignment.exists
 // key: compiler.misc.inconvertible.types
-// options: -XDverboseResolution=inapplicable,failure
+// options: -Xdebug:verboseResolution=inapplicable,failure
 
 class VerboseResolveMulti1 {
 
diff --git a/langtools/test/tools/javac/generics/inference/8158355/T8158355.java b/langtools/test/tools/javac/generics/inference/8158355/T8158355.java
index 8b92f5ab3db..a123a33ab91 100644
--- a/langtools/test/tools/javac/generics/inference/8158355/T8158355.java
+++ b/langtools/test/tools/javac/generics/inference/8158355/T8158355.java
@@ -27,7 +27,7 @@
  * @test
  * @bug 8158355
  * @summary Inference graph dot support broken
- * @compile -XDdumpInferenceGraphsTo=. T8158355.java
+ * @compile -Xdebug:dumpInferenceGraphsTo=. T8158355.java
  */
 import java.util.List;
 
diff --git a/langtools/test/tools/javac/lambda/MostSpecific09.java b/langtools/test/tools/javac/lambda/MostSpecific09.java
index be291a32652..d38370a6440 100644
--- a/langtools/test/tools/javac/lambda/MostSpecific09.java
+++ b/langtools/test/tools/javac/lambda/MostSpecific09.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8029718
  * @summary Should always use lambda body structure to disambiguate overload resolution
- * @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics -XDshouldStopPolicy=ATTR -XDverboseResolution=applicable,success MostSpecific09.java
+ * @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics -XDshouldStopPolicy=ATTR -Xdebug:verboseResolution=applicable,success MostSpecific09.java
  */
 
 class MostSpecific09 {
diff --git a/langtools/test/tools/javac/lambda/MostSpecific09.out b/langtools/test/tools/javac/lambda/MostSpecific09.out
index 6d645cfa79a..9876f67ffb5 100644
--- a/langtools/test/tools/javac/lambda/MostSpecific09.out
+++ b/langtools/test/tools/javac/lambda/MostSpecific09.out
@@ -3,7 +3,7 @@ MostSpecific09.java:26:9: compiler.note.verbose.resolve.multi: foo, MostSpecific
 MostSpecific09.java:27:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.J), null)}
 MostSpecific09.java:27:32: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
 MostSpecific09.java:28:13: compiler.err.lambda.body.neither.value.nor.void.compatible
-MostSpecific09.java:28:9: compiler.err.cant.apply.symbols: kindname.method, foo, @680,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
+MostSpecific09.java:28:9: compiler.err.cant.apply.symbols: kindname.method, foo, @685,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
 MostSpecific09.java:28:43: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
 MostSpecific09.java:29:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(MostSpecific09.I), MostSpecific09, kindname.method, foo(MostSpecific09.J), MostSpecific09
 MostSpecific09.java:29:28: compiler.note.verbose.resolve.multi: , java.lang.RuntimeException, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, java.lang.RuntimeException(), null)}
@@ -11,7 +11,7 @@ MostSpecific09.java:30:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(
 MostSpecific09.java:32:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(MostSpecific09.I), MostSpecific09, kindname.method, foo(MostSpecific09.J), MostSpecific09
 MostSpecific09.java:33:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.I), null)}
 MostSpecific09.java:42:13: compiler.err.lambda.body.neither.value.nor.void.compatible
-MostSpecific09.java:42:9: compiler.err.cant.apply.symbols: kindname.method, foo, @1129,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
+MostSpecific09.java:42:9: compiler.err.cant.apply.symbols: kindname.method, foo, @1134,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
 MostSpecific09.java:46:23: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
 MostSpecific09.java:49:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.J), null)}
 MostSpecific09.java:56:25: compiler.note.verbose.resolve.multi: , Bar, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, Bar(), null)}
diff --git a/langtools/test/tools/javac/lambda/TestLambdaToMethodStats.java b/langtools/test/tools/javac/lambda/TestLambdaToMethodStats.java
index b00de4864a9..b7d2e0f9f6d 100644
--- a/langtools/test/tools/javac/lambda/TestLambdaToMethodStats.java
+++ b/langtools/test/tools/javac/lambda/TestLambdaToMethodStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -122,7 +122,7 @@ public class TestLambdaToMethodStats extends ComboInstance
Date: Mon, 11 Jul 2016 18:13:42 +0530
Subject: [PATCH 095/111] 8160928: javac incorrectly copies over interior type
 annotations to bridge method

Reviewed-by: mcimadamore
---
 .../sun/tools/javac/code/SymbolMetadata.java  |  22 +++-
 ...geShouldHaveNoInteriorAnnotationsTest.java | 110 ++++++++++++++++++
 2 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 langtools/test/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
index ca7c9ff634b..e0ae12f4f63 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
@@ -26,8 +26,11 @@
 package com.sun.tools.javac.code;
 
 
+import com.sun.tools.javac.code.Attribute.TypeCompound;
+import com.sun.tools.javac.code.Kinds.Kind;
 import com.sun.tools.javac.util.Assert;
 import com.sun.tools.javac.util.List;
+import com.sun.tools.javac.util.ListBuffer;
 
 /**
  * Container for all annotations (attributes in javac) on a Symbol.
@@ -142,9 +145,22 @@ public class SymbolMetadata {
             throw new NullPointerException();
         }
         setDeclarationAttributes(other.getDeclarationAttributes());
-        setTypeAttributes(other.getTypeAttributes());
-        setInitTypeAttributes(other.getInitTypeAttributes());
-        setClassInitTypeAttributes(other.getClassInitTypeAttributes());
+        if ((sym.flags() & Flags.BRIDGE) != 0) {
+            Assert.check(other.sym.kind == Kind.MTH);
+            ListBuffer typeAttributes = new ListBuffer<>();
+            for (TypeCompound tc : other.getTypeAttributes()) {
+                // Carry over only contractual type annotations: i.e nothing interior to method body.
+                if (!tc.position.type.isLocal())
+                    typeAttributes.append(tc);
+            }
+            setTypeAttributes(typeAttributes.toList());
+        } else {
+            setTypeAttributes(other.getTypeAttributes());
+        }
+        if (sym.kind == Kind.TYP) {
+            setInitTypeAttributes(other.getInitTypeAttributes());
+            setClassInitTypeAttributes(other.getClassInitTypeAttributes());
+        }
     }
 
     public SymbolMetadata reset() {
diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java
new file mode 100644
index 00000000000..5d154a4fcd3
--- /dev/null
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/BridgeShouldHaveNoInteriorAnnotationsTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8160928
+ * @summary javac incorrectly copies over interior type annotations to bridge method
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.jdeps/com.sun.tools.javap
+ * @build toolbox.ToolBox toolbox.JavapTask
+ * @run compile -g BridgeShouldHaveNoInteriorAnnotationsTest.java
+ * @run main BridgeShouldHaveNoInteriorAnnotationsTest
+ */
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+import toolbox.JavapTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+class Pair_8160928 {
+}
+
+public class BridgeShouldHaveNoInteriorAnnotationsTest
+                   implements java.util.Iterator> {
+
+    @Override
+    public boolean hasNext() {
+        throw new RuntimeException();
+    }
+
+    @Override
+    public Pair_8160928<@NonNull Object, Object> next() {
+        Comparable<@NonNull Object> cble1 = (Comparable<@NonNull Object>) null;
+        return null;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+
+    @Target(ElementType.TYPE_USE)
+    public @interface NonNull {
+    };
+
+
+    // Expected output can't be directly encoded into NestedLambdasCastedTest !!!
+    static class OutputExpectedOnceHolder {
+        public String[] outputs = {
+            "0: #61(): CAST, offset=1, type_index=0, location=[TYPE_ARGUMENT(0)]",
+            "1: #61(): LOCAL_VARIABLE, {start_pc=5, length=2, index=1}, location=[TYPE_ARGUMENT(0)]",
+        };
+    }
+
+    static class OutputExpectedTwiceHolder {
+        public String[] outputs = {
+            "0: #61(): METHOD_RETURN, location=[TYPE_ARGUMENT(0)]",
+        };
+    }
+
+    public static strictfp void main(String args[]) throws Exception {
+        ToolBox tb = new ToolBox();
+        Path classPath = Paths.get(ToolBox.testClasses, "BridgeShouldHaveNoInteriorAnnotationsTest.class");
+        String javapOut = new JavapTask(tb)
+                .options("-v", "-p")
+                .classes(classPath.toString())
+                .run()
+                .getOutput(Task.OutputKind.DIRECT);
+
+        OutputExpectedOnceHolder holder = new OutputExpectedOnceHolder();
+        for (String s : holder.outputs) {
+            String newOutput = javapOut.replace(s, "");
+            if (((javapOut.length() - newOutput.length()) / s.length()) != 1)
+                throw new AssertionError("Interior annotations carried over to bridge ?");
+        }
+        OutputExpectedTwiceHolder holder2 = new OutputExpectedTwiceHolder();
+        for (String s : holder2.outputs) {
+            String newOutput = javapOut.replace(s, "");
+            if (((javapOut.length() - newOutput.length()) / s.length()) != 2)
+                throw new AssertionError("Exterior annotations not properly carried over to bridge");
+        }
+    }
+}

From a7e2ba66155812918d34bf7b18f9e6ef20252bd2 Mon Sep 17 00:00:00 2001
From: Martin Walsh 
Date: Mon, 11 Jul 2016 14:46:21 -0700
Subject: [PATCH 096/111] 8160831: GioFileTypeDetector always calls deprecated
 g_type_init

Ensure that g_type_init is non-null before using it.

Reviewed-by: alanb
---
 .../linux/native/libnio/fs/GioFileTypeDetector.c     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jdk/src/java.base/linux/native/libnio/fs/GioFileTypeDetector.c b/jdk/src/java.base/linux/native/libnio/fs/GioFileTypeDetector.c
index ad46a144fdf..61e9118af06 100644
--- a/jdk/src/java.base/linux/native/libnio/fs/GioFileTypeDetector.c
+++ b/jdk/src/java.base/linux/native/libnio/fs/GioFileTypeDetector.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, 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
@@ -91,7 +91,6 @@ Java_sun_nio_fs_GioFileTypeDetector_initializeGio
     }
 
     g_type_init = (g_type_init_func)dlsym(gio_handle, "g_type_init");
-    (*g_type_init)();
 
     g_object_unref = (g_object_unref_func)dlsym(gio_handle, "g_object_unref");
 
@@ -104,9 +103,7 @@ Java_sun_nio_fs_GioFileTypeDetector_initializeGio
     g_file_info_get_content_type = (g_file_info_get_content_type_func)
         dlsym(gio_handle, "g_file_info_get_content_type");
 
-
-    if (g_type_init == NULL ||
-        g_object_unref == NULL ||
+    if (g_object_unref == NULL ||
         g_file_new_for_path == NULL ||
         g_file_query_info == NULL ||
         g_file_info_get_content_type == NULL)
@@ -115,7 +112,10 @@ Java_sun_nio_fs_GioFileTypeDetector_initializeGio
         return JNI_FALSE;
     }
 
-    (*g_type_init)();
+    if (g_type_init != NULL) {
+        (*g_type_init)();
+    }
+
     return JNI_TRUE;
 }
 

From a7cc024b53cdf249c001c965629d38659ebb7852 Mon Sep 17 00:00:00 2001
From: Vicente Romero 
Date: Mon, 11 Jul 2016 15:27:52 -0700
Subject: [PATCH 097/111] 8161020: javac, fold stop compilation options

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/main/JavaCompiler.java   | 16 ++++++++--------
 .../classes/com/sun/tools/javac/main/Option.java | 13 +++++++++++++
 .../share/classes/jdk/jshell/TaskFactory.java    |  2 +-
 ...ypeAnnotationsCrashWithErroneousTreeTest.java |  2 +-
 .../VerifyErroneousAnnotationsAttributed.java    |  4 ++--
 .../newlocations/AfterMethodTypeParams.java      |  4 ++--
 .../api/taskListeners/EventsBalancedTest.java    |  8 ++++----
 .../tools/javac/diags/CheckResourceKeys.java     |  3 +++
 .../javac/failover/CheckAttributedTree.java      |  4 ++--
 .../test/tools/javac/failover/FailOver01.java    |  2 +-
 .../test/tools/javac/failover/FailOver02.java    |  2 +-
 .../test/tools/javac/failover/FailOver03.java    |  2 +-
 .../test/tools/javac/failover/FailOver04.java    |  2 +-
 .../test/tools/javac/failover/FailOver05.java    |  2 +-
 .../test/tools/javac/failover/FailOver06.java    |  2 +-
 .../test/tools/javac/failover/FailOver07.java    |  2 +-
 .../test/tools/javac/failover/FailOver08.java    |  2 +-
 .../test/tools/javac/failover/FailOver09.java    |  2 +-
 .../test/tools/javac/failover/FailOver10.java    |  2 +-
 .../test/tools/javac/failover/FailOver11.java    |  2 +-
 .../test/tools/javac/failover/FailOver12.java    |  2 +-
 .../test/tools/javac/failover/FailOver13.java    |  2 +-
 .../test/tools/javac/failover/FailOver14.java    |  2 +-
 .../test/tools/javac/failover/FailOver15.java    |  2 +-
 .../test/tools/javac/lambda/MostSpecific09.java  |  2 +-
 .../test/tools/javac/lambda/MostSpecific09.out   |  4 ++--
 .../test/tools/javac/modules/AddLimitMods.java   | 14 +++++++-------
 .../test/tools/javac/policy/test3/Test.java      |  6 +++---
 .../tools/javac/positions/TreeEndPosTest.java    |  4 ++--
 .../test/tools/javac/resolve/ResolveHarness.java |  2 +-
 30 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 00978dd4291..115dd82ba7b 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -425,8 +425,8 @@ public class JavaCompiler {
 
         verboseCompilePolicy = options.isSet("verboseCompilePolicy");
 
-        if (options.isSet("shouldStopPolicy") &&
-            CompileState.valueOf(options.get("shouldStopPolicy")) == CompileState.ATTR)
+        if (options.isSet("shouldstop.at") &&
+            CompileState.valueOf(options.get("shouldstop.at")) == CompileState.ATTR)
             compilePolicy = CompilePolicy.ATTR_ONLY;
         else
             compilePolicy = CompilePolicy.decode(options.get("compilePolicy"));
@@ -439,14 +439,14 @@ public class JavaCompiler {
             : null;
 
         shouldStopPolicyIfError =
-            options.isSet("shouldStopPolicy") // backwards compatible
-            ? CompileState.valueOf(options.get("shouldStopPolicy"))
-            : options.isSet("shouldStopPolicyIfError")
-            ? CompileState.valueOf(options.get("shouldStopPolicyIfError"))
+            options.isSet("shouldstop.at") // backwards compatible
+            ? CompileState.valueOf(options.get("shouldstop.at"))
+            : options.isSet("shouldstop.ifError")
+            ? CompileState.valueOf(options.get("shouldstop.ifError"))
             : CompileState.INIT;
         shouldStopPolicyIfNoError =
-            options.isSet("shouldStopPolicyIfNoError")
-            ? CompileState.valueOf(options.get("shouldStopPolicyIfNoError"))
+            options.isSet("shouldstop.ifNoError")
+            ? CompileState.valueOf(options.get("shouldstop.ifNoError"))
             : CompileState.GENERATE;
 
         if (options.isUnset("oldDiags"))
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index 1b72985f74b..e5995523986 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -543,6 +543,19 @@ public enum Option {
         }
     },
 
+    XSHOULDSTOP("-Xshouldstop:", null, HIDDEN, BASIC) {
+        @Override
+        public boolean process(OptionHelper helper, String option) {
+            String p = option.substring(option.indexOf(':') + 1).trim();
+            String[] subOptions = p.split(";");
+            for (String subOption : subOptions) {
+                subOption = "shouldstop." + subOption.trim();
+                XD.process(helper, subOption, subOption);
+            }
+            return false;
+        }
+    },
+
     XADDEXPORTS("-XaddExports:", "opt.arg.addExports", "opt.addExports", EXTENDED, BASIC) {
         @Override
         public boolean process(OptionHelper helper, String option) {
diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
index 8fbc2346132..1ed81427997 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
@@ -222,7 +222,7 @@ class TaskFactory {
             this(wraps.stream(),
                     new WrapSourceHandler(),
                     Util.join(new String[] {
-                        "-XDshouldStopPolicy=FLOW", "-Xlint:unchecked",
+                        "-Xshouldstop:at=FLOW", "-Xlint:unchecked",
                         "-XaddExports:jdk.jshell/jdk.internal.jshell.remote=ALL-UNNAMED",
                         "-proc:none"
                     }, extraArgs));
diff --git a/langtools/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java b/langtools/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java
index 366c5d81689..83707369e62 100644
--- a/langtools/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java
+++ b/langtools/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8026963
  * @summary type annotations code crashes for lambdas with void argument
- * @compile/fail/ref=TypeAnnotationsCrashWithErroneousTreeTest.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW TypeAnnotationsCrashWithErroneousTreeTest.java
+ * @compile/fail/ref=TypeAnnotationsCrashWithErroneousTreeTest.out -XDrawDiagnostics -Xshouldstop:at=FLOW TypeAnnotationsCrashWithErroneousTreeTest.java
  */
 
 public class TypeAnnotationsCrashWithErroneousTreeTest {
diff --git a/langtools/test/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java b/langtools/test/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java
index acccb7d46c5..61809f98a25 100644
--- a/langtools/test/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java
+++ b/langtools/test/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -237,7 +237,7 @@ public class VerifyErroneousAnnotationsAttributed {
         JavacTask task = tool.getTask(null,
                                       fm,
                                       devNull,
-                                      Arrays.asList("-XDshouldStopPolicy=FLOW"),
+                                      Arrays.asList("-Xshouldstop:at=FLOW"),
                                       null,
                                       Arrays.asList(new MyFileObject(code)));
 
diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java
index 3845fa261db..0fae6e01d5d 100644
--- a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -54,7 +54,7 @@ public class AfterMethodTypeParams {
             String test = TEMPLATE.replace("CONTENT", tc.snippet);
             List files = Arrays.asList(new MyFileObject(test));
             StringWriter out = new StringWriter();
-            List options = Arrays.asList("-XDrawDiagnostics", "-XDshouldStopPolicy=FLOW");
+            List options = Arrays.asList("-XDrawDiagnostics", "-Xshouldstop:at=FLOW");
             JavacTask task = (JavacTask) compiler.getTask(out, null, null, options, null, files);
 
             new TreePathScanner() {
diff --git a/langtools/test/tools/javac/api/taskListeners/EventsBalancedTest.java b/langtools/test/tools/javac/api/taskListeners/EventsBalancedTest.java
index 62b92bcc15a..1b51e2af078 100644
--- a/langtools/test/tools/javac/api/taskListeners/EventsBalancedTest.java
+++ b/langtools/test/tools/javac/api/taskListeners/EventsBalancedTest.java
@@ -63,11 +63,11 @@ public class EventsBalancedTest {
         test(null, Arrays.asList(b, a));
 
         for (CompileState stop : CompileState.values()) {
-            test(Arrays.asList("-XDshouldStopPolicyIfNoError=" + stop,
-                               "-XDshouldStopPolicyIfError=" + stop),
+            test(Arrays.asList("-Xshouldstop:ifNoError=" + stop,
+                               "-Xshouldstop:ifError=" + stop),
                  Arrays.asList(a, b));
-            test(Arrays.asList("-XDshouldStopPolicyIfNoError=" + stop,
-                               "-XDshouldStopPolicyIfError=" + stop),
+            test(Arrays.asList("-Xshouldstop:ifNoError=" + stop,
+                               "-Xshouldstop:ifError=" + stop),
                  Arrays.asList(b, a));
         }
     }
diff --git a/langtools/test/tools/javac/diags/CheckResourceKeys.java b/langtools/test/tools/javac/diags/CheckResourceKeys.java
index 80c9fe052c7..0b8560dd687 100644
--- a/langtools/test/tools/javac/diags/CheckResourceKeys.java
+++ b/langtools/test/tools/javac/diags/CheckResourceKeys.java
@@ -260,6 +260,9 @@ public class CheckResourceKeys {
                 // ignore debug flag names
                 if (cs.startsWith("debug."))
                     continue;
+                // ignore shouldstop flag names
+                if (cs.startsWith("shouldstop."))
+                    continue;
                 // explicit known exceptions
                 if (noResourceRequired.contains(cs))
                     continue;
diff --git a/langtools/test/tools/javac/failover/CheckAttributedTree.java b/langtools/test/tools/javac/failover/CheckAttributedTree.java
index d0d37bcda41..b9bb22bac2d 100644
--- a/langtools/test/tools/javac/failover/CheckAttributedTree.java
+++ b/langtools/test/tools/javac/failover/CheckAttributedTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -311,7 +311,7 @@ public class CheckAttributedTree {
                 final List trees = new ArrayList<>();
                 Iterable elems = newCompilationTask()
                     .withWriter(pw)
-                        .withOption("-XDshouldStopPolicy=ATTR")
+                        .withOption("-Xshouldstop:at=ATTR")
                         .withOption("-XDverboseCompilePolicy")
                         .withSource(files.iterator().next())
                         .withListener(new TaskListener() {
diff --git a/langtools/test/tools/javac/failover/FailOver01.java b/langtools/test/tools/javac/failover/FailOver01.java
index 69ee5c46dbf..473adfd4759 100644
--- a/langtools/test/tools/javac/failover/FailOver01.java
+++ b/langtools/test/tools/javac/failover/FailOver01.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver01.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver01.java
+ * @compile/fail/ref=FailOver01.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver01.java
  */
 
 class Test { { x = "" } }
diff --git a/langtools/test/tools/javac/failover/FailOver02.java b/langtools/test/tools/javac/failover/FailOver02.java
index 83b72f000c5..75c44665418 100644
--- a/langtools/test/tools/javac/failover/FailOver02.java
+++ b/langtools/test/tools/javac/failover/FailOver02.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver02.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver02.java
+ * @compile/fail/ref=FailOver02.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver02.java
  */
 
 class Test implements AutoCloseable {
diff --git a/langtools/test/tools/javac/failover/FailOver03.java b/langtools/test/tools/javac/failover/FailOver03.java
index eb13040ae3b..268f8acd044 100644
--- a/langtools/test/tools/javac/failover/FailOver03.java
+++ b/langtools/test/tools/javac/failover/FailOver03.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver03.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver03.java
+ * @compile/fail/ref=FailOver03.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver03.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver04.java b/langtools/test/tools/javac/failover/FailOver04.java
index 2c57d52078e..e8b72ddd521 100644
--- a/langtools/test/tools/javac/failover/FailOver04.java
+++ b/langtools/test/tools/javac/failover/FailOver04.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver04.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver04.java
+ * @compile/fail/ref=FailOver04.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver04.java
  */
 
 class Test {
diff --git a/langtools/test/tools/javac/failover/FailOver05.java b/langtools/test/tools/javac/failover/FailOver05.java
index dd6a4464628..5209373272a 100644
--- a/langtools/test/tools/javac/failover/FailOver05.java
+++ b/langtools/test/tools/javac/failover/FailOver05.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver05.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver05.java
+ * @compile/fail/ref=FailOver05.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver05.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver06.java b/langtools/test/tools/javac/failover/FailOver06.java
index 88f87c60a5b..fb28274cde7 100644
--- a/langtools/test/tools/javac/failover/FailOver06.java
+++ b/langtools/test/tools/javac/failover/FailOver06.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver06.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver06.java
+ * @compile/fail/ref=FailOver06.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver06.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver07.java b/langtools/test/tools/javac/failover/FailOver07.java
index d66738e6f5d..216c462d50a 100644
--- a/langtools/test/tools/javac/failover/FailOver07.java
+++ b/langtools/test/tools/javac/failover/FailOver07.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver07.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver07.java
+ * @compile/fail/ref=FailOver07.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver07.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver08.java b/langtools/test/tools/javac/failover/FailOver08.java
index 4c39f852204..e993f3dee09 100644
--- a/langtools/test/tools/javac/failover/FailOver08.java
+++ b/langtools/test/tools/javac/failover/FailOver08.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver08.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver08.java
+ * @compile/fail/ref=FailOver08.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver08.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver09.java b/langtools/test/tools/javac/failover/FailOver09.java
index 295cfa09aff..ca4976895fb 100644
--- a/langtools/test/tools/javac/failover/FailOver09.java
+++ b/langtools/test/tools/javac/failover/FailOver09.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver09.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver09.java
+ * @compile/fail/ref=FailOver09.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver09.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver10.java b/langtools/test/tools/javac/failover/FailOver10.java
index c59578a4286..2265de57442 100644
--- a/langtools/test/tools/javac/failover/FailOver10.java
+++ b/langtools/test/tools/javac/failover/FailOver10.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver10.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver10.java
+ * @compile/fail/ref=FailOver10.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver10.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver11.java b/langtools/test/tools/javac/failover/FailOver11.java
index 8d07ad1a196..aaad2800747 100644
--- a/langtools/test/tools/javac/failover/FailOver11.java
+++ b/langtools/test/tools/javac/failover/FailOver11.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver11.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver11.java
+ * @compile/fail/ref=FailOver11.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver11.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver12.java b/langtools/test/tools/javac/failover/FailOver12.java
index 4724999f1d8..da1e126ffeb 100644
--- a/langtools/test/tools/javac/failover/FailOver12.java
+++ b/langtools/test/tools/javac/failover/FailOver12.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver12.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver12.java
+ * @compile/fail/ref=FailOver12.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver12.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver13.java b/langtools/test/tools/javac/failover/FailOver13.java
index 8c3fdfc62a1..03cf4259011 100644
--- a/langtools/test/tools/javac/failover/FailOver13.java
+++ b/langtools/test/tools/javac/failover/FailOver13.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver13.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver13.java
+ * @compile/fail/ref=FailOver13.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver13.java
  */
 
 class Test extends Test {
diff --git a/langtools/test/tools/javac/failover/FailOver14.java b/langtools/test/tools/javac/failover/FailOver14.java
index a8e25b9157f..6f24ff3e558 100644
--- a/langtools/test/tools/javac/failover/FailOver14.java
+++ b/langtools/test/tools/javac/failover/FailOver14.java
@@ -4,7 +4,7 @@
  * @summary Flow.java should be more error-friendly
  * @author mcimadamore
  *
- * @compile/fail/ref=FailOver14.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver14.java
+ * @compile/fail/ref=FailOver14.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver14.java
  */
 
 class Test extends Test  {
diff --git a/langtools/test/tools/javac/failover/FailOver15.java b/langtools/test/tools/javac/failover/FailOver15.java
index e3c7e1ea3bf..6fe5e5ae485 100644
--- a/langtools/test/tools/javac/failover/FailOver15.java
+++ b/langtools/test/tools/javac/failover/FailOver15.java
@@ -3,7 +3,7 @@
  * @bug 6970584 7060926
  * @summary Attr.PostAttrAnalyzer misses a case
  *
- * @compile/fail/ref=FailOver15.out -XDrawDiagnostics -XDshouldStopPolicy=FLOW -XDdev FailOver15.java
+ * @compile/fail/ref=FailOver15.out -XDrawDiagnostics -Xshouldstop:at=FLOW -XDdev FailOver15.java
  */
 
 class Test {
diff --git a/langtools/test/tools/javac/lambda/MostSpecific09.java b/langtools/test/tools/javac/lambda/MostSpecific09.java
index d38370a6440..311af8d7b1a 100644
--- a/langtools/test/tools/javac/lambda/MostSpecific09.java
+++ b/langtools/test/tools/javac/lambda/MostSpecific09.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8029718
  * @summary Should always use lambda body structure to disambiguate overload resolution
- * @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics -XDshouldStopPolicy=ATTR -Xdebug:verboseResolution=applicable,success MostSpecific09.java
+ * @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics -Xshouldstop:at=ATTR -Xdebug:verboseResolution=applicable,success MostSpecific09.java
  */
 
 class MostSpecific09 {
diff --git a/langtools/test/tools/javac/lambda/MostSpecific09.out b/langtools/test/tools/javac/lambda/MostSpecific09.out
index 9876f67ffb5..75330535ba0 100644
--- a/langtools/test/tools/javac/lambda/MostSpecific09.out
+++ b/langtools/test/tools/javac/lambda/MostSpecific09.out
@@ -3,7 +3,7 @@ MostSpecific09.java:26:9: compiler.note.verbose.resolve.multi: foo, MostSpecific
 MostSpecific09.java:27:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.J), null)}
 MostSpecific09.java:27:32: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
 MostSpecific09.java:28:13: compiler.err.lambda.body.neither.value.nor.void.compatible
-MostSpecific09.java:28:9: compiler.err.cant.apply.symbols: kindname.method, foo, @685,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
+MostSpecific09.java:28:9: compiler.err.cant.apply.symbols: kindname.method, foo, @681,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
 MostSpecific09.java:28:43: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
 MostSpecific09.java:29:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(MostSpecific09.I), MostSpecific09, kindname.method, foo(MostSpecific09.J), MostSpecific09
 MostSpecific09.java:29:28: compiler.note.verbose.resolve.multi: , java.lang.RuntimeException, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, java.lang.RuntimeException(), null)}
@@ -11,7 +11,7 @@ MostSpecific09.java:30:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(
 MostSpecific09.java:32:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(MostSpecific09.I), MostSpecific09, kindname.method, foo(MostSpecific09.J), MostSpecific09
 MostSpecific09.java:33:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.I), null)}
 MostSpecific09.java:42:13: compiler.err.lambda.body.neither.value.nor.void.compatible
-MostSpecific09.java:42:9: compiler.err.cant.apply.symbols: kindname.method, foo, @1134,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
+MostSpecific09.java:42:9: compiler.err.cant.apply.symbols: kindname.method, foo, @1130,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
 MostSpecific09.java:46:23: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
 MostSpecific09.java:49:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.J), null)}
 MostSpecific09.java:56:25: compiler.note.verbose.resolve.multi: , Bar, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, Bar(), null)}
diff --git a/langtools/test/tools/javac/modules/AddLimitMods.java b/langtools/test/tools/javac/modules/AddLimitMods.java
index a7badd963a6..6cdd3ec9006 100644
--- a/langtools/test/tools/javac/modules/AddLimitMods.java
+++ b/langtools/test/tools/javac/modules/AddLimitMods.java
@@ -119,7 +119,7 @@ public class AddLimitMods extends ModuleTestBase {
         //real test
         new JavacTask(tb)
                 .options("-modulepath", modulePath.toString(),
-                         "-XDshouldStopPolicyIfNoError=FLOW",
+                         "-Xshouldstop:ifNoError=FLOW",
                          "-limitmods", "java.base")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
@@ -128,7 +128,7 @@ public class AddLimitMods extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("-modulepath", modulePath.toString(),
-                         "-XDshouldStopPolicyIfNoError=FLOW",
+                         "-Xshouldstop:ifNoError=FLOW",
                          "-limitmods", "java.base",
                          "-addmods", "m2")
                 .outdir(modulePath)
@@ -138,7 +138,7 @@ public class AddLimitMods extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("-modulepath", modulePath.toString(),
-                         "-XDshouldStopPolicyIfNoError=FLOW",
+                         "-Xshouldstop:ifNoError=FLOW",
                          "-limitmods", "java.base",
                          "-addmods", "m2,m3")
                 .outdir(modulePath)
@@ -148,7 +148,7 @@ public class AddLimitMods extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("-modulepath", modulePath.toString(),
-                         "-XDshouldStopPolicyIfNoError=FLOW",
+                         "-Xshouldstop:ifNoError=FLOW",
                          "-limitmods", "m2")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
@@ -157,7 +157,7 @@ public class AddLimitMods extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("-modulepath", modulePath.toString(),
-                         "-XDshouldStopPolicyIfNoError=FLOW",
+                         "-Xshouldstop:ifNoError=FLOW",
                          "-limitmods", "m3")
                 .outdir(modulePath)
                 .files(findJavaFiles(m1))
@@ -166,7 +166,7 @@ public class AddLimitMods extends ModuleTestBase {
 
         new JavacTask(tb)
                 .options("-modulepath", modulePath.toString(),
-                         "-XDshouldStopPolicyIfNoError=FLOW",
+                         "-Xshouldstop:ifNoError=FLOW",
                          "-limitmods", "m3",
                          "-addmods", "m2")
                 .outdir(modulePath)
@@ -473,7 +473,7 @@ public class AddLimitMods extends ModuleTestBase {
                                            auxOptions,
                                            "-modulepath", modulePath.toString(),
                                            "-classpath", classpathOut.toString(),
-                                           "-XDshouldStopPolicyIfNoError=FLOW"))
+                                           "-Xshouldstop:ifNoError=FLOW"))
                    .outdir(modulePath)
                    .files(findJavaFiles(m2))
                    .run(success ? Task.Expect.SUCCESS : Task.Expect.FAIL)
diff --git a/langtools/test/tools/javac/policy/test3/Test.java b/langtools/test/tools/javac/policy/test3/Test.java
index 9341843db7e..c3d1957d6b2 100644
--- a/langtools/test/tools/javac/policy/test3/Test.java
+++ b/langtools/test/tools/javac/policy/test3/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -30,7 +30,7 @@
 import java.io.*;
 import java.util.*;
 
-// Simple test of -XDshouldStopPolicy.
+// Simple test of -Xshouldstop:at.
 // For each of the permissable values, we compile a file with an error in it,
 // then using -XDverboseCompilePolicy we check that the compilation gets as
 // far as expected, but no further.
@@ -83,7 +83,7 @@ public class Test {
         args.add("-d");
         args.add(".");
         if (ssp.needOption)
-            args.add("-XDshouldStopPolicy=" + ssp);
+            args.add("-Xshouldstop:at=" + ssp);
         args.add(new File(System.getProperty("test.src", "."), "A.java").getPath());
 
         StringWriter sw = new StringWriter();
diff --git a/langtools/test/tools/javac/positions/TreeEndPosTest.java b/langtools/test/tools/javac/positions/TreeEndPosTest.java
index a33b813b508..e1a8be99452 100644
--- a/langtools/test/tools/javac/positions/TreeEndPosTest.java
+++ b/langtools/test/tools/javac/positions/TreeEndPosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -145,7 +145,7 @@ public class TreeEndPosTest {
             options.add(tempDir.getPath());
             options.add("-d");
             options.add(tempDir.getPath());
-            options.add("-XDshouldStopPolicy=GENERATE");
+            options.add("-Xshouldstop:at=GENERATE");
 
             List sources = new ArrayList<>();
             sources.add(src);
diff --git a/langtools/test/tools/javac/resolve/ResolveHarness.java b/langtools/test/tools/javac/resolve/ResolveHarness.java
index fab919b68f9..099fa4989ef 100644
--- a/langtools/test/tools/javac/resolve/ResolveHarness.java
+++ b/langtools/test/tools/javac/resolve/ResolveHarness.java
@@ -132,7 +132,7 @@ public class ResolveHarness implements javax.tools.DiagnosticListener
Date: Mon, 11 Jul 2016 17:18:59 -0700
Subject: [PATCH 098/111] 8160215:
 jdk/test/java/io/Reader/ReaderBulkReadContract.java should clean up better

Create temporary files in the test scratch directory instead of in the default temporary file directory.

Reviewed-by: lancea, alanb
---
 jdk/test/java/io/Reader/ReaderBulkReadContract.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/test/java/io/Reader/ReaderBulkReadContract.java b/jdk/test/java/io/Reader/ReaderBulkReadContract.java
index 98a2c767a88..88463dbd578 100644
--- a/jdk/test/java/io/Reader/ReaderBulkReadContract.java
+++ b/jdk/test/java/io/Reader/ReaderBulkReadContract.java
@@ -148,7 +148,8 @@ public class ReaderBulkReadContract {
 
     private static File createTempFileWithContents(String contents) {
         try {
-            File file = File.createTempFile("ReaderContract", "");
+            File testDir = new File(System.getProperty("test.dir", "."));
+            File file = File.createTempFile("ReaderContract", "", testDir);
             try (FileWriter w = new FileWriter(file)) {
                 w.write(contents);
             }

From 5d404c26b1721f180fcea030a755a0e5770c5558 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter 
Date: Tue, 12 Jul 2016 07:58:40 -0700
Subject: [PATCH 099/111] 8160221:
 jdk/test/java/nio/channels/FileChannel/Transfers.java leaving files behind

Create temporary files in the test scratch directory instead of in the default temporary file directory.

Reviewed-by: alanb
---
 .../nio/channels/FileChannel/Transfers.java   | 105 +++++++++---------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/jdk/test/java/nio/channels/FileChannel/Transfers.java b/jdk/test/java/nio/channels/FileChannel/Transfers.java
index 70591316077..a414b591cc5 100644
--- a/jdk/test/java/nio/channels/FileChannel/Transfers.java
+++ b/jdk/test/java/nio/channels/FileChannel/Transfers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, 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
@@ -489,69 +489,72 @@ public class Transfers {
                 debug = verbose = true;
         }
 
-        sourceFile = File.createTempFile("xfer.src.", "");
+        File testDir = new File(System.getProperty("test.dir", "."));
+
+        sourceFile = File.createTempFile("xfer.src.", "", testDir);
         sourceFile.deleteOnExit();
-        targetFile = File.createTempFile("xfer.tgt.", "");
+        targetFile = File.createTempFile("xfer.tgt.", "", testDir);
         targetFile.deleteOnExit();
 
-        File fn = File.createTempFile("xfer.fch.", "");
+        File fn = File.createTempFile("xfer.fch.", "", testDir);
         fn.deleteOnExit();
-        FileChannel fc = new RandomAccessFile(fn, "rw").getChannel();
 
         Random rnd = new Random();
         int failures = 0;
 
-        for (boolean to = false;; to = true) {
-            for (boolean user = false;; user = true) {
-                if (!verbose)
-                    out.print((to ? "To " : "From ") +
-                              (user ? "user channel" : "file channel")
-                              + ":");
-                IntGenerator offGen = new IntGenerator(MAX_XFER_SIZE + 2);
-                while (offGen.hasNext()) {
-                    int off = offGen.next();
-                    if (!verbose) out.print(" " + off);
-                    IntGenerator lenGen = new IntGenerator(MAX_XFER_SIZE + 2);
-                    while (lenGen.hasNext()) {
-                        int len = lenGen.next();
-                        long s = rnd.nextLong();
-                        String chName = null;
-                        try {
-                            if (to) {
-                                Target tgt;
-                                if (user)
-                                    tgt = new UserTarget(len, s);
-                                else
-                                    tgt = new FileTarget(len, s);
-                                chName = tgt.name();
-                                testTo(s, fc, off, len, tgt);
+        try (FileChannel fc = new RandomAccessFile(fn, "rw").getChannel()) {
+            for (boolean to = false;; to = true) {
+                for (boolean user = false;; user = true) {
+                    if (!verbose)
+                        out.print((to ? "To " : "From ") +
+                                  (user ? "user channel" : "file channel")
+                                  + ":");
+                    IntGenerator offGen = new IntGenerator(MAX_XFER_SIZE + 2);
+                    while (offGen.hasNext()) {
+                        int off = offGen.next();
+                        if (!verbose) out.print(" " + off);
+                        IntGenerator lenGen = new IntGenerator(MAX_XFER_SIZE + 2);
+                        while (lenGen.hasNext()) {
+                            int len = lenGen.next();
+                            long s = rnd.nextLong();
+                            String chName = null;
+                            try {
+                                if (to) {
+                                    Target tgt;
+                                    if (user)
+                                        tgt = new UserTarget(len, s);
+                                    else
+                                        tgt = new FileTarget(len, s);
+                                    chName = tgt.name();
+                                    testTo(s, fc, off, len, tgt);
+                                }
+                                else {
+                                    Source src;
+                                    if (user)
+                                        src = new UserSource(len, s);
+                                    else
+                                        src = new FileSource(len, s);
+                                    chName = src.name();
+                                    testFrom(s, src, fc, off, len);
+                                }
+                            } catch (Failure x) {
+                                out.println();
+                                out.println("FAILURE: " + chName
+                                            + ", offset " + off
+                                            + ", length " + len);
+                                x.printStackTrace(out);
+                                failures++;
                             }
-                            else {
-                                Source src;
-                                if (user)
-                                    src = new UserSource(len, s);
-                                else
-                                    src = new FileSource(len, s);
-                                chName = src.name();
-                                testFrom(s, src, fc, off, len);
-                            }
-                        } catch (Failure x) {
-                            out.println();
-                            out.println("FAILURE: " + chName
-                                        + ", offset " + off
-                                        + ", length " + len);
-                            x.printStackTrace(out);
-                            failures++;
                         }
                     }
+                    if (!verbose)
+                        out.println();
+                    if (user)
+                        break;
                 }
-                if (!verbose)
-                    out.println();
-                if (user)
+                if (to)
                     break;
             }
-            if (to)
-                break;
         }
 
         sourceFile.delete();
@@ -563,6 +566,6 @@ public class Transfers {
             throw new RuntimeException("Some tests failed");
         }
 
+        out.println("Test succeeded.");
     }
-
 }

From 47c84f9fe6d336d34717377a289e271b5f0d086f Mon Sep 17 00:00:00 2001
From: Xueming Shen 
Date: Wed, 13 Jul 2016 16:37:24 -0700
Subject: [PATCH 100/111] 7031075: GZIPInputStream's available() reports 1, but
 read() gives -1

Reviewed-by: bpb
---
 .../java/util/zip/InflaterInputStream.java    |  4 +
 .../InflaterInputStream/TestAvailable.java    | 94 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java

diff --git a/jdk/src/java.base/share/classes/java/util/zip/InflaterInputStream.java b/jdk/src/java.base/share/classes/java/util/zip/InflaterInputStream.java
index 163f619c101..57e38b341c8 100644
--- a/jdk/src/java.base/share/classes/java/util/zip/InflaterInputStream.java
+++ b/jdk/src/java.base/share/classes/java/util/zip/InflaterInputStream.java
@@ -179,6 +179,10 @@ class InflaterInputStream extends FilterInputStream {
         ensureOpen();
         if (reachEOF) {
             return 0;
+        } else if (inf.finished()) {
+            // the end of the compressed data stream has been reached
+            reachEOF = true;
+            return 0;
         } else {
             return 1;
         }
diff --git a/jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java b/jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java
new file mode 100644
index 00000000000..1ac4d4b1779
--- /dev/null
+++ b/jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @library /lib/testlibrary/
+ * @build jdk.testlibrary.*
+ * @run main TestAvailable
+ * @bug 7031075
+ * @summary Make sure that available() method behaves as expected.
+ * @key randomness
+ */
+
+import java.io.*;
+import java.util.Random;
+import java.util.zip.*;
+import jdk.testlibrary.RandomFactory;
+
+public class TestAvailable {
+
+    public static void main(String args[]) throws Throwable {
+        Random r = RandomFactory.getRandom();
+        for (int n = 0; n < 10; n++) {
+            byte[] src = new byte[r.nextInt(100)];
+            r.nextBytes(src);
+
+            // test InflaterInputStream
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try (DeflaterOutputStream dos = new DeflaterOutputStream(baos)) {
+                dos.write(src);
+            }
+            try (InflaterInputStream iis = new InflaterInputStream(
+                   new ByteArrayInputStream(baos.toByteArray()))) {
+                test(iis, src);
+            }
+
+            // test GZIPInputStream
+            baos = new ByteArrayOutputStream();
+            try (GZIPOutputStream dos = new GZIPOutputStream(baos)) {
+                dos.write(src);
+            }
+            try (GZIPInputStream gis = new GZIPInputStream(
+                   new ByteArrayInputStream(baos.toByteArray()))) {
+                test(gis, src);
+            }
+        }
+    }
+
+    private static void test(InputStream is, byte[] expected) throws IOException {
+        int cnt = 0;
+        do {
+            int available = is.available();
+            if (available > 0) {
+                int b = is.read();
+                if (b == -1) {
+                    throw new RuntimeException("available() > 0, read() == -1 : failed!");
+                }
+                if (expected[cnt++] != (byte)b) {
+                    throw new RuntimeException("read() : failed!");
+                }
+            } else if (available == 0) {
+                if (is.read() != -1) {
+                    throw new RuntimeException("available() == 0, read() != -1 : failed!");
+                }
+                break;
+            } else {
+                throw new RuntimeException("available() < 0 : failed!");
+            }
+        } while (true);
+        if (cnt != expected.length) {
+            throw new RuntimeException("read : failed!");
+        }
+    }
+
+}

From 1a75a21846837370573d52879227b8fcd8999e02 Mon Sep 17 00:00:00 2001
From: Rajan Halade 
Date: Wed, 13 Jul 2016 16:53:31 -0700
Subject: [PATCH 101/111] 8161011: Mark RMI tests DownloadActivationGroup,
 UseCustomSocketFactory, and RestartService as itnermittent

Reviewed-by: bpb
---
 .../activation/Activatable/restartService/RestartService.java | 3 ++-
 .../downloadActivationGroup/DownloadActivationGroup.java      | 3 ++-
 .../useSocketFactory/activatable/UseCustomSocketFactory.java  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java b/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java
index 221ae5b3401..2d1aa50e56e 100644
--- a/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java
+++ b/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -23,6 +23,7 @@
 
 /* @test
  * @bug 4095165 4321151
+ * @key intermittent
  * @summary synopsis: activator should restart daemon services
  * @author Ann Wollrath
  *
diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java
index 5906f991a40..8560b070c0c 100644
--- a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java
+++ b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, 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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4510355
+ * @key intermittent
  * @summary ActivationGroup implementations cannot be downloaded by default;
  * Creates a custom activation group without setting a security manager
  * in activation group's descriptor.  The custom activation group
diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java
index a9cb118ebea..86512a9d225 100644
--- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java
+++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -23,7 +23,7 @@
 
 /* @test
  * @bug 4115696
-
+ * @key intermittent
  * @summary synopsis: cannot use socket factories with Activatable objects
  * @author Ann Wollrath
  *

From 4e8a2de21a62d0065b6293e986a1665bae67467d Mon Sep 17 00:00:00 2001
From: Rachna Goel 
Date: Thu, 14 Jul 2016 10:30:23 +0900
Subject: [PATCH 102/111] 8154797: Localization data for "GMT"

Reviewed-by: naoto, okutsu
---
 .../tools/cldrconverter/CLDRConverter.java    |  2 +
 .../tools/cldrconverter/CopyrightHeaders.java |  6 +-
 .../tools/cldrconverter/LDMLParseHandler.java |  6 ++
 .../text/resources/JavaTimeSupplementary.java |  4 +
 .../ext/JavaTimeSupplementary_ar.java         |  2 +
 .../ext/JavaTimeSupplementary_be.java         |  2 +
 .../ext/JavaTimeSupplementary_bg.java         |  2 +
 .../ext/JavaTimeSupplementary_cs.java         |  2 +
 .../ext/JavaTimeSupplementary_da.java         |  2 +
 .../ext/JavaTimeSupplementary_et.java         |  2 +
 .../ext/JavaTimeSupplementary_fi.java         |  4 +
 .../ext/JavaTimeSupplementary_fr.java         |  4 +
 .../ext/JavaTimeSupplementary_ga.java         |  2 +
 .../ext/JavaTimeSupplementary_hr.java         |  2 +
 .../ext/JavaTimeSupplementary_in.java         |  2 +
 .../ext/JavaTimeSupplementary_iw.java         |  4 +
 .../ext/JavaTimeSupplementary_lt.java         |  2 +
 .../ext/JavaTimeSupplementary_no.java         |  2 +
 .../ext/JavaTimeSupplementary_sl.java         |  2 +
 .../ext/JavaTimeSupplementary_sq.java         |  2 +
 .../ext/JavaTimeSupplementary_sr.java         |  2 +
 .../ext/JavaTimeSupplementary_sv.java         |  2 +
 jdk/test/java/util/Locale/Bug8154797.java     | 99 +++++++++++++++++++
 .../resources/JavaTimeSupplementaryTest.java  |  3 +-
 24 files changed, 158 insertions(+), 4 deletions(-)
 create mode 100644 jdk/test/java/util/Locale/Bug8154797.java

diff --git a/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java b/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
index f1c1b7dfa64..59b1054a000 100644
--- a/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -693,6 +693,8 @@ public class CLDRConverter {
         "field.weekday",
         "field.dayperiod",
         "field.hour",
+        "timezone.hourFormat",
+        "timezone.gmtFormat",
         "field.minute",
         "field.second",
         "field.zone",
diff --git a/jdk/make/src/classes/build/tools/cldrconverter/CopyrightHeaders.java b/jdk/make/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
index 082dd429961..89c7e0f41aa 100644
--- a/jdk/make/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
+++ b/jdk/make/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -41,12 +41,12 @@ class CopyrightHeaders {
         " * Copyright (c) 2012, %d, Oracle and/or its affiliates. All rights reserved.\n" +
         " */\n";
 
-    // Last updated:  - 1/16/2015, 1:42:31 PM
+    // Last updated:  - 6/06/2016, 1:42:31 PM
     private static final String UNICODE =
         "/*\n" +
         " * COPYRIGHT AND PERMISSION NOTICE\n" +
         " *\n" +
-        " * Copyright (C) 1991-2015 Unicode, Inc. All rights reserved.\n" +
+        " * Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.\n" +
         " * Distributed under the Terms of Use in \n" +
         " * http://www.unicode.org/copyright.html.\n" +
         " *\n" +
diff --git a/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java b/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
index 720f5e3c088..8683f282581 100644
--- a/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
+++ b/jdk/make/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
@@ -417,6 +417,12 @@ class LDMLParseHandler extends AbstractLDMLHandler {
         case "timeZoneNames":
             pushContainer(qName, attributes);
             break;
+        case "hourFormat":
+            pushStringEntry(qName, attributes, "timezone.hourFormat");
+            break;
+        case "gmtFormat":
+            pushStringEntry(qName, attributes, "timezone.gmtFormat");
+            break;
         case "zone":
             {
                 String tzid = attributes.getValue("type"); // Olson tz id
diff --git a/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java b/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
index 2a7de9bde43..cd7f4df1305 100644
--- a/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
+++ b/jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary.java
@@ -343,6 +343,10 @@ public class JavaTimeSupplementary extends OpenListResourceBundle {
                 sharedShortEras },
             { "roc.short.Eras",
                 sharedShortEras },
+            { "timezone.gmtFormat",
+                "GMT{0}" },
+            { "timezone.hourFormat",
+                "+HH:mm;-HH:mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java
index 93df2b4f089..a46891f4270 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ar.java
@@ -371,6 +371,8 @@ public class JavaTimeSupplementary_ar extends OpenListResourceBundle {
                 sharedShortEras },
             { "roc.short.Eras",
                 sharedShortEras },
+            { "timezone.gmtFormat",
+                "\u062c\u0631\u064a\u0646\u062a\u0634{0}" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java
index 0ab0654ae06..2e530eb4dbc 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_be.java
@@ -308,6 +308,8 @@ public class JavaTimeSupplementary_be extends OpenListResourceBundle {
                 sharedAbbreviatedAmPmMarkers },
             { "roc.narrow.AmPmMarkers",
                 sharedNarrowAmPmMarkers },
+            { "timezone.hourFormat",
+                "+HH.mm;-HH.mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java
index 0d3c3d8f317..6615e82e845 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_bg.java
@@ -309,6 +309,8 @@ public class JavaTimeSupplementary_bg extends OpenListResourceBundle {
                 sharedAmPmMarkers },
             { "roc.narrow.AmPmMarkers",
                 sharedAmPmMarkers },
+            { "timezone.gmtFormat",
+                "\u0413\u0440\u0438\u043d\u0443\u0438\u0447{0}" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java
index 9467f3e7fdb..64d72dab0fa 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_cs.java
@@ -298,6 +298,8 @@ public class JavaTimeSupplementary_cs extends OpenListResourceBundle {
                 sharedEras },
             { "roc.short.Eras",
                 sharedEras },
+            { "timezone.hourFormat",
+                "+H:mm;-H:mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java
index 31eb458e419..1e5acf8832e 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_da.java
@@ -308,6 +308,8 @@ public class JavaTimeSupplementary_da extends OpenListResourceBundle {
                 sharedEras },
             { "roc.short.Eras",
                 sharedEras },
+            { "timezone.hourFormat",
+                "+HH.mm;-HH.mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java
index e8df6930c81..5dc9739f706 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_et.java
@@ -280,6 +280,8 @@ public class JavaTimeSupplementary_et extends OpenListResourceBundle {
                 sharedTimePatterns },
             { "roc.narrow.AmPmMarkers",
                 sharedNarrowAmPmMarkers },
+            { "timezone.hourFormat",
+                "+HH:mm;\u2212HH:mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java
index 8a935e09d6b..2456945df4b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fi.java
@@ -324,6 +324,10 @@ public class JavaTimeSupplementary_fi extends OpenListResourceBundle {
                 sharedEras },
             { "roc.short.Eras",
                 sharedEras },
+            { "timezone.gmtFormat",
+                "UTC{0}" },
+            { "timezone.hourFormat",
+                "+H.mm;-H.mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java
index 0e86ade889a..1bebe8ee829 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_fr.java
@@ -329,6 +329,10 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle {
                 sharedEras },
             { "roc.short.Eras",
                 sharedEras },
+            { "timezone.gmtFormat",
+                "UTC{0}" },
+            { "timezone.hourFormat",
+                "+HH:mm;\u2212HH:mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java
index 4d1debee254..33594de7548 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_ga.java
@@ -284,6 +284,8 @@ public class JavaTimeSupplementary_ga extends OpenListResourceBundle {
                 sharedAmPmMarkers },
             { "roc.narrow.AmPmMarkers",
                 sharedNarrowAmPmMarkers },
+            { "timezone.gmtFormat",
+                "MAG{0}" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java
index b8bb2b1ef08..e73d296ddc7 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_hr.java
@@ -335,6 +335,8 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
                 sharedEras },
             { "roc.short.Eras",
                 sharedEras },
+            { "timezone.hourFormat",
+                "+HH:mm; -HH:mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java
index dcb2c112372..4e62f071f15 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_in.java
@@ -347,6 +347,8 @@ public class JavaTimeSupplementary_in extends OpenListResourceBundle {
                 sharedEras },
             { "roc.short.Eras",
                 sharedEras },
+            { "timezone.hourFormat",
+                "+HH.mm;-HH.mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java
index 76e9c8ee1a2..3170efd769b 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_iw.java
@@ -324,6 +324,10 @@ public class JavaTimeSupplementary_iw extends OpenListResourceBundle {
                 sharedAmPmMarkers },
             { "roc.narrow.AmPmMarkers",
                 sharedAmPmMarkers },
+            { "timezone.gmtFormat",
+                "GMT{0}\u200e" },
+            { "timezone.hourFormat",
+                "\u200e+HH:mm;-HH:mm\u200e" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java
index 6158a2f8a8d..735200db979 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_lt.java
@@ -325,6 +325,8 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
                 sharedEras },
             { "roc.short.Eras",
                 sharedEras },
+            { "timezone.hourFormat",
+                "+HH:mm;\u2212HH:mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java
index 5bf80bd3523..f2b3b8ef1a3 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_no.java
@@ -389,6 +389,8 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
                 sharedEras },
             { "roc.short.Eras",
                 sharedEras },
+            { "timezone.hourFormat",
+                "+HH.mm;-HH.mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java
index 26149956100..7b6712baa11 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sl.java
@@ -286,6 +286,8 @@ public class JavaTimeSupplementary_sl extends OpenListResourceBundle {
                 sharedAmPmMarkers },
             { "roc.narrow.AmPmMarkers",
                 sharedNarrowAmPmMarkers },
+            { "timezone.hourFormat",
+                "+HH.mm;-HH.mm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java
index b4daea70146..e6b640764e0 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sq.java
@@ -294,6 +294,8 @@ public class JavaTimeSupplementary_sq extends OpenListResourceBundle {
                 sharedAmPmMarkers },
             { "roc.narrow.AmPmMarkers",
                 sharedAmPmMarkers },
+            { "timezone.gmtFormat",
+                "Ora e Grenui\u00e7it: {0}" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java
index 1aa88241665..5f127a00dcb 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sr.java
@@ -386,6 +386,8 @@ public class JavaTimeSupplementary_sr extends OpenListResourceBundle {
                 sharedShortEras },
             { "roc.short.Eras",
                 sharedShortEras },
+            { "timezone.hourFormat",
+                "+HHmm;-HHmm" },
         };
     }
 }
diff --git a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java
index 637f500918c..160cfec9f38 100644
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/JavaTimeSupplementary_sv.java
@@ -345,6 +345,8 @@ public class JavaTimeSupplementary_sv extends OpenListResourceBundle {
                 sharedEras },
             { "roc.short.Eras",
                 sharedEras },
+            { "timezone.hourFormat",
+                "+HH:mm;\u2212HH:mm" },
         };
     }
 }
diff --git a/jdk/test/java/util/Locale/Bug8154797.java b/jdk/test/java/util/Locale/Bug8154797.java
new file mode 100644
index 00000000000..95599f25df8
--- /dev/null
+++ b/jdk/test/java/util/Locale/Bug8154797.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8154797
+ * @modules java.base/sun.util.locale.provider
+ *          java.base/sun.util.resources
+ *          jdk.localedata
+ * @summary Test for checking HourFormat and GmtFormat resources are retrieved from
+ *  COMPAT and CLDR Providers.
+*/
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+import sun.util.locale.provider.LocaleProviderAdapter.Type;
+import sun.util.locale.provider.LocaleProviderAdapter;
+
+public class Bug8154797 {
+    static Map expectedResourcesMap = new HashMap<>();
+    static final String GMT_RESOURCE_KEY = "timezone.gmtFormat";
+    static final String HMT_RESOURCE_KEY = "timezone.hourFormat";
+    static final String GMT = "Gmt";
+    static final String HMT = "Hmt";
+
+    static void generateExpectedValues() {
+        expectedResourcesMap.put("FR" + GMT, "UTC{0}");
+        expectedResourcesMap.put("FR" + HMT, "+HH:mm;\u2212HH:mm");
+        expectedResourcesMap.put("FI" + HMT, "+H.mm;-H.mm");
+        expectedResourcesMap.put("FI" + GMT, "UTC{0}");
+        /* For  root locale, en_US, de_DE, hi_IN, ja_JP,Root locale resources
+        * should be returned.
+         */
+        expectedResourcesMap.put(GMT, "GMT{0}"); //Root locale resource
+        expectedResourcesMap.put(HMT, "+HH:mm;-HH:mm"); //Root locale resource
+    }
+
+    static void compareResources(Locale loc) {
+        String mapKeyHourFormat = HMT, mapKeyGmtFormat = GMT;
+        ResourceBundle compatBundle, cldrBundle;
+        compatBundle = LocaleProviderAdapter.forJRE().getLocaleResources(loc)
+                .getJavaTimeFormatData();
+        cldrBundle = LocaleProviderAdapter.forType(Type.CLDR)
+                .getLocaleResources(loc).getJavaTimeFormatData();
+        if (loc.getCountry() == "FR" || loc.getCountry() == "FI") {
+            mapKeyHourFormat = loc.getCountry() + HMT;
+            mapKeyGmtFormat = loc.getCountry() + GMT;
+        }
+
+        if (!(expectedResourcesMap.get(mapKeyGmtFormat)
+                .equals(compatBundle.getString(GMT_RESOURCE_KEY))
+                && expectedResourcesMap.get(mapKeyHourFormat)
+                .equals(compatBundle.getString(HMT_RESOURCE_KEY))
+                && expectedResourcesMap.get(mapKeyGmtFormat)
+                .equals(cldrBundle.getString(GMT_RESOURCE_KEY))
+                && expectedResourcesMap.get(mapKeyHourFormat)
+                .equals(cldrBundle.getString(HMT_RESOURCE_KEY)))) {
+
+            throw new RuntimeException("Retrieved resource does not match with "
+                    + "  expected string for Locale " + compatBundle.getLocale());
+
+        }
+
+    }
+
+    public static void main(String args[]) {
+        Bug8154797.generateExpectedValues();
+        Locale[] locArr = {new Locale("hi", "IN"), Locale.UK, new Locale("fi", "FI"),
+                           Locale.ROOT, Locale.GERMAN, Locale.JAPANESE,
+                           Locale.ENGLISH, Locale.FRANCE};
+        for (Locale loc : locArr) {
+            Bug8154797.compareResources(loc);
+        }
+    }
+
+}
+
diff --git a/jdk/test/sun/text/resources/JavaTimeSupplementaryTest.java b/jdk/test/sun/text/resources/JavaTimeSupplementaryTest.java
index 46a7bfc854f..8e727dcbd45 100644
--- a/jdk/test/sun/text/resources/JavaTimeSupplementaryTest.java
+++ b/jdk/test/sun/text/resources/JavaTimeSupplementaryTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8159943
+ * @bug 8159943 8154797
  * @modules java.base/sun.util.locale.provider
  *          java.base/sun.util.resources
  *          jdk.localedata
@@ -65,6 +65,7 @@ public class JavaTimeSupplementaryTest {
         "field.",
         "islamic.",
         "roc.",
+        "timezone."
     };
 
     // All available locales for the COMPAT FormatData resource bundles

From 3db1a80a5f83e6725862dc187c14d5d9c22f6103 Mon Sep 17 00:00:00 2001
From: Weijun Wang 
Date: Thu, 14 Jul 2016 10:37:36 +0800
Subject: [PATCH 103/111] 8161341: Garbage in ProblemList.txt

Reviewed-by: xuelei
---
 jdk/test/ProblemList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 2214bd66fc1..2e7da24b031 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -215,7 +215,7 @@ java/rmi/transport/dgcDeadLock/DGCDeadLock.java                 8029360 macosx-a
 
 sun/security/pkcs11/ec/TestKeyFactory.java                      7157786 generic-all
 
-sun/security/krb5/auto/Unreachable.java                         7164518 macosx-all no PortUnreachableException on Mac
+sun/security/krb5/auto/Unreachable.java                         7164518 macosx-all
 
 sun/security/tools/keytool/ListKeychainStore.sh                 8156889 macosx-all
 

From 0062a02e07a116e55ebe0c7f85b90a1a66911152 Mon Sep 17 00:00:00 2001
From: Steve Drach 
Date: Wed, 13 Jul 2016 11:43:45 -0700
Subject: [PATCH 104/111] 8150680: JarFile.Release enum needs reconsideration
 with respect to it's values

Reviewed-by: alanb, psandoz
---
 .../classes/java/lang/module/ModulePath.java  |   2 +-
 .../java/lang/module/ModuleReferences.java    |   2 +-
 .../share/classes/java/util/jar/JarFile.java  | 186 +++++++-----------
 .../jdk/internal/loader/URLClassPath.java     |   2 +-
 .../sun/net/www/protocol/jar/URLJarFile.java  |  14 +-
 .../jar/JarFile/mrjar/MultiReleaseJarAPI.java | 110 +++++------
 .../mrjar/MultiReleaseJarHttpProperties.java  |   6 -
 .../mrjar/MultiReleaseJarIterators.java       |  14 +-
 .../mrjar/MultiReleaseJarProperties.java      |  21 +-
 .../mrjar/MultiReleaseJarSecurity.java        |   2 +-
 .../jar/MultiReleaseJarURLConnection.java     |   4 +-
 jdk/test/tools/jar/multiRelease/Basic.java    |   2 +-
 12 files changed, 159 insertions(+), 206 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java b/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java
index 43d8e56974d..92c16bdfbc2 100644
--- a/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java
+++ b/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java
@@ -523,7 +523,7 @@ class ModulePath implements ConfigurableModuleFinder {
         try (JarFile jf = new JarFile(file.toFile(),
                                       true,               // verify
                                       ZipFile.OPEN_READ,
-                                      JarFile.Release.RUNTIME))
+                                      JarFile.runtimeVersion()))
         {
             ModuleDescriptor md;
             JarEntry entry = jf.getJarEntry(MODULE_INFO);
diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java b/jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java
index eccd0d493f4..18caa15d71c 100644
--- a/jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java
+++ b/jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java
@@ -201,7 +201,7 @@ class ModuleReferences {
                 return new JarFile(path.toFile(),
                                    true,               // verify
                                    ZipFile.OPEN_READ,
-                                   JarFile.Release.RUNTIME);
+                                   JarFile.runtimeVersion());
             } catch (IOException ioe) {
                 throw new UncheckedIOException(ioe);
             }
diff --git a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
index aab2474fd66..10abc4d9198 100644
--- a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
+++ b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java
@@ -64,8 +64,8 @@ import sun.security.util.SignatureFileVerifier;
  * file, and as such an entry name is associated with at most one base entry.
  * The {@code JarFile} may be configured to process a multi-release jar file by
  * creating the {@code JarFile} with the
- * {@link JarFile#JarFile(File, boolean, int, Release)} constructor.  The
- * {@code Release} object sets a maximum version used when searching for
+ * {@link JarFile#JarFile(File, boolean, int, Runtime.Version)} constructor.  The
+ * {@code Runtime.Version} object sets a maximum version used when searching for
  * versioned entries.  When so configured, an entry name
  * can correspond with at most one base entry and zero or more versioned
  * entries. A search is required to associate the entry name with the latest
@@ -74,8 +74,8 @@ import sun.security.util.SignatureFileVerifier;
  *
  * 
      Class loaders that utilize {@code JarFile} to load classes from the
  * contents of {@code JarFile} entries should construct the {@code JarFile}
- * by invoking the {@link JarFile#JarFile(File, boolean, int, Release)}
- * constructor with the value {@code Release.RUNTIME} assigned to the last
+ * by invoking the {@link JarFile#JarFile(File, boolean, int, Runtime.Version)}
+ * constructor with the value {@code Runtime.version()} assigned to the last
  * argument.  This assures that classes compatible with the major
  * version of the running JVM are loaded from multi-release jar files.
  *
@@ -99,12 +99,12 @@ import sun.security.util.SignatureFileVerifier;
  * 
    22. 
  * {@code jdk.util.jar.version} can be assigned a value that is the
  * {@code String} representation of a non-negative integer
- * {@code <= Version.current().major()}.  The value is used to set the effective
+ * {@code <= Runtime.version().major()}.  The value is used to set the effective
  * runtime version to something other than the default value obtained by
- * evaluating {@code Version.current().major()}. The effective runtime version
- * is the version that the {@link JarFile#JarFile(File, boolean, int, Release)}
+ * evaluating {@code Runtime.version().major()}. The effective runtime version
+ * is the version that the {@link JarFile#JarFile(File, boolean, int, Runtime.Version)}
  * constructor uses when the value of the last argument is
- * {@code Release.RUNTIME}.
+ * {@code JarFile.runtimeVersion()}.
  * 
      23. 
  * 
    23. 
  * {@code jdk.util.jar.enableMultiRelease} can be assigned one of the three
@@ -116,7 +116,7 @@ import sun.security.util.SignatureFileVerifier;
  * the method {@link JarFile#isMultiRelease()} returns false. The value
  * force causes the {@code JarFile} to be initialized to runtime
  * versioning after construction.  It effectively does the same as this code:
- * {@code (new JarFile(File, boolean, int, Release.RUNTIME)}.
+ * {@code (new JarFile(File, boolean, int, JarFile.runtimeVersion())}.
  * 
      24. 
  * 
  * 
@@ -129,8 +129,9 @@ import sun.security.util.SignatureFileVerifier;
  */
 public
 class JarFile extends ZipFile {
-    private final static int BASE_VERSION;
-    private final static int RUNTIME_VERSION;
+    private final static Runtime.Version BASE_VERSION;
+    private final static int BASE_VERSION_MAJOR;
+    private final static Runtime.Version RUNTIME_VERSION;
     private final static boolean MULTI_RELEASE_ENABLED;
     private final static boolean MULTI_RELEASE_FORCED;
     private SoftReference manRef;
@@ -138,10 +139,10 @@ class JarFile extends ZipFile {
     private JarVerifier jv;
     private boolean jvInitialized;
     private boolean verify;
-    private final int version;
-    private boolean notVersioned;
-    private final boolean runtimeVersioned;
-    private boolean isMultiRelease;    // is jar multi-release?
+    private final Runtime.Version version;  // current version
+    private final int versionMajor;         // version.major()
+    private boolean notVersioned;           // legacy constructor called
+    private boolean isMultiRelease;         // is jar multi-release?
 
     // indicates if Class-Path attribute present
     private boolean hasClassPathAttribute;
@@ -151,17 +152,18 @@ class JarFile extends ZipFile {
     static {
         // Set up JavaUtilJarAccess in SharedSecrets
         SharedSecrets.setJavaUtilJarAccess(new JavaUtilJarAccessImpl());
-
-        BASE_VERSION = 8;  // one less than lowest version for versioned entries
+        // multi-release jar file versions >= 9
+        BASE_VERSION = Runtime.Version.parse(Integer.toString(8));
+        BASE_VERSION_MAJOR = BASE_VERSION.major();
+        String jarVersion = GetPropertyAction.privilegedGetProperty("jdk.util.jar.version");
         int runtimeVersion = Runtime.version().major();
-        String jarVersion =
-                GetPropertyAction.privilegedGetProperty("jdk.util.jar.version");
         if (jarVersion != null) {
             int jarVer = Integer.parseInt(jarVersion);
             runtimeVersion = (jarVer > runtimeVersion)
-                    ? runtimeVersion : Math.max(jarVer, 0);
+                    ? runtimeVersion
+                    : Math.max(jarVer, BASE_VERSION_MAJOR);
         }
-        RUNTIME_VERSION = runtimeVersion;
+        RUNTIME_VERSION = Runtime.Version.parse(Integer.toString(runtimeVersion));
         String enableMultiRelease = GetPropertyAction
                 .privilegedGetProperty("jdk.util.jar.enableMultiRelease", "true");
         switch (enableMultiRelease) {
@@ -181,61 +183,6 @@ class JarFile extends ZipFile {
         }
     }
 
-    /**
-     * A set of constants that represent the entries in either the base directory
-     * or one of the versioned directories in a multi-release jar file.  It's
-     * possible for a multi-release jar file to contain versioned directories
-     * that are not represented by the constants of the {@code Release} enum.
-     * In those cases, the entries will not be located by this {@code JarFile}
-     * through the aliasing mechanism, but they can be directly accessed by
-     * specifying the full path name of the entry.
-     *
-     * @since 9
-     */
-    public enum Release {
-        /**
-         * Represents unversioned entries, or entries in "regular", as opposed
-         * to multi-release jar files.
-         */
-        BASE(BASE_VERSION),
-
-        /**
-         * Represents entries found in the META-INF/versions/9 directory of a
-         * multi-release jar file.
-         */
-        VERSION_9(9),
-
-        // fill in the "blanks" for future releases
-
-        /**
-         * Represents entries found in the META-INF/versions/{n} directory of a
-         * multi-release jar file, where {@code n} is the effective runtime
-         * version of the jar file.
-         *
-         * @implNote
-         * 
      
-         * The effective runtime version is determined
-         * by evaluating {@code Version.current().major()} or by using the value
-         * of the {@code jdk.util.jar.version} System property if it exists.
-         * 
      
-         */
-        RUNTIME(RUNTIME_VERSION);
-
-        Release(int version) {
-            this.version = version;
-        }
-
-        private static Release valueOf(int version) {
-            return version <= BASE.value() ? BASE : valueOf("VERSION_" + version);
-        }
-
-        private final int version;
-
-        private int value() {
-            return this.version;
-        }
-    }
-
     private static final String META_INF = "META-INF/";
 
     private static final String META_INF_VERSIONS = META_INF + "versions/";
@@ -245,6 +192,32 @@ class JarFile extends ZipFile {
      */
     public static final String MANIFEST_NAME = META_INF + "MANIFEST.MF";
 
+    /**
+     * The version that represents the unversioned configuration of a multi-release jar file.
+     *
+     * @return Runtime.Version that represents the unversioned configuration
+     *
+     * @since 9
+     */
+    public static Runtime.Version baseVersion() {
+        return BASE_VERSION;
+    }
+
+    /**
+     * The version that represents the effective runtime versioned configuration of a
+     * multi-release jar file.  In most cases, {@code runtimeVersion()} is equal to
+     * {@code Runtime.version()}.  However, if the {@code jdk.util.jar.version} property is set,
+     * {@code runtimeVersion()} is derived from that property and may not be equal to
+     * {@code Runtime.version()}.
+     *
+     * @return Runtime.Version that represents the runtime versioned configuration
+     *
+     * @since 9
+     */
+    public static Runtime.Version runtimeVersion() {
+        return RUNTIME_VERSION;
+    }
+
     /**
      * Creates a new {@code JarFile} to read from the specified
      * file {@code name}. The {@code JarFile} will be verified if
@@ -316,7 +289,7 @@ class JarFile extends ZipFile {
      * @since 1.3
      */
     public JarFile(File file, boolean verify, int mode) throws IOException {
-        this(file, verify, mode, Release.BASE);
+        this(file, verify, mode, BASE_VERSION);
         this.notVersioned = true;
     }
 
@@ -324,8 +297,13 @@ class JarFile extends ZipFile {
      * Creates a new {@code JarFile} to read from the specified
      * {@code File} object in the specified mode.  The mode argument
      * must be either {@code OPEN_READ} or {@code OPEN_READ | OPEN_DELETE}.
-     * The version argument configures the {@code JarFile} for processing
+     * The version argument, after being converted to a canonical form, is
+     * used to configure the {@code JarFile} for processing
      * multi-release jar files.
+     * 
      
+     * The canonical form derived from the version parameter is
+     * {@code Runtime.Version.parse(Integer.toString(n))} where {@code n} is
+     * {@code Math.max(version.major(), JarFile.baseVersion().major())}.
      *
      * @param file the jar file to be opened for reading
      * @param verify whether or not to verify the jar file if
@@ -340,47 +318,31 @@ class JarFile extends ZipFile {
      * @throws NullPointerException if {@code version} is {@code null}
      * @since 9
      */
-    public JarFile(File file, boolean verify, int mode, Release version) throws IOException {
+    public JarFile(File file, boolean verify, int mode, Runtime.Version version) throws IOException {
         super(file, mode);
-        Objects.requireNonNull(version);
         this.verify = verify;
-        // version applies to multi-release jar files, ignored for regular jar files
-        if (MULTI_RELEASE_FORCED) {
+        Objects.requireNonNull(version);
+        if (MULTI_RELEASE_FORCED || version.major() == RUNTIME_VERSION.major()) {
+            // This deals with the common case where the value from JarFile.runtimeVersion() is passed
             this.version = RUNTIME_VERSION;
-            version = Release.RUNTIME;
+        } else if (version.major() <= BASE_VERSION_MAJOR) {
+            // This also deals with the common case where the value from JarFile.baseVersion() is passed
+            this.version = BASE_VERSION;
         } else {
-            this.version = version.value();
-        }
-        this.runtimeVersioned = version == Release.RUNTIME;
-
-        assert runtimeVersionExists();
-    }
-
-    private boolean runtimeVersionExists() {
-        int version = Runtime.version().major();
-        try {
-            Release.valueOf(version);
-            return true;
-        } catch (IllegalArgumentException x) {
-            System.err.println("No JarFile.Release object for release " + version);
-            return false;
+            // Canonicalize
+            this.version = Runtime.Version.parse(Integer.toString(version.major()));
         }
+        this.versionMajor = this.version.major();
     }
 
     /**
      * Returns the maximum version used when searching for versioned entries.
      *
-     * @return the maximum version, or {@code Release.BASE} if this jar file is
-     *         processed as if it is an unversioned jar file or is not a
-     *         multi-release jar file
+     * @return the maximum version
      * @since 9
      */
-    public final Release getVersion() {
-        if (isMultiRelease()) {
-            return runtimeVersioned ? Release.RUNTIME : Release.valueOf(version);
-        } else {
-            return Release.BASE;
-        }
+    public final Runtime.Version getVersion() {
+        return isMultiRelease() ? this.version : BASE_VERSION;
     }
 
     /**
@@ -393,7 +355,7 @@ class JarFile extends ZipFile {
         if (isMultiRelease) {
             return true;
         }
-        if (MULTI_RELEASE_ENABLED && version != BASE_VERSION) {
+        if (MULTI_RELEASE_ENABLED && versionMajor != BASE_VERSION_MAJOR) {
             try {
                 checkForSpecialAttributes();
             } catch (IOException io) {
@@ -639,7 +601,7 @@ class JarFile extends ZipFile {
         ZipEntry vze = null;
         String sname = "/" + name;
         int i = version;
-        while (i > BASE_VERSION) {
+        while (i > BASE_VERSION_MAJOR) {
             vze = super.getEntry(META_INF_VERSIONS + i + sname);
             if (vze != null) break;
             i--;
@@ -649,10 +611,10 @@ class JarFile extends ZipFile {
 
     private ZipEntry getVersionedEntry(ZipEntry ze) {
         ZipEntry vze = null;
-        if (version > BASE_VERSION && !ze.isDirectory()) {
+        if (BASE_VERSION_MAJOR < versionMajor && !ze.isDirectory()) {
             String name = ze.getName();
             if (!name.startsWith(META_INF)) {
-                vze = searchForVersionedEntry(version, name);
+                vze = searchForVersionedEntry(versionMajor, name);
             }
         }
         return vze == null ? ze : vze;
@@ -1038,7 +1000,7 @@ class JarFile extends ZipFile {
                 hasClassPathAttribute = match(CLASSPATH_CHARS, b,
                         CLASSPATH_LASTOCC) != -1;
                 // is this a multi-release jar file
-                if (MULTI_RELEASE_ENABLED && version != BASE_VERSION) {
+                if (MULTI_RELEASE_ENABLED && versionMajor != BASE_VERSION_MAJOR) {
                     int i = match(MULTIRELEASE_CHARS, b, MULTIRELEASE_LASTOCC);
                     if (i != -1) {
                         i += MULTIRELEASE_CHARS.length;
diff --git a/jdk/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java b/jdk/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
index aa2722c5e63..695d8028068 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
@@ -695,7 +695,7 @@ public class URLClassPath {
                     throw new FileNotFoundException(p.getPath());
                 }
                 return checkJar(new JarFile(new File(p.getPath()), true, ZipFile.OPEN_READ,
-                        JarFile.Release.RUNTIME));
+                        JarFile.runtimeVersion()));
             }
             URLConnection uc = (new URL(getBaseURL(), "#runtime")).openConnection();
             uc.setRequestProperty(USER_AGENT_JAVA_VERSION, JAVA_VERSION);
diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java
index fe1a1f3c8f2..a320045ba75 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java
@@ -66,7 +66,9 @@ public class URLJarFile extends JarFile {
 
     static JarFile getJarFile(URL url, URLJarFileCloseController closeController) throws IOException {
         if (isFileURL(url)) {
-            Release version = "runtime".equals(url.getRef()) ? Release.RUNTIME : Release.BASE;
+            Runtime.Version version = "runtime".equals(url.getRef())
+                    ? JarFile.runtimeVersion()
+                    : JarFile.baseVersion();
             return new URLJarFile(url, closeController, version);
         } else {
             return retrieve(url, closeController);
@@ -90,12 +92,14 @@ public class URLJarFile extends JarFile {
         this.closeController = closeController;
     }
 
-    private URLJarFile(File file, URLJarFileCloseController closeController, Release version) throws IOException {
+    private URLJarFile(File file, URLJarFileCloseController closeController, Runtime.Version version)
+            throws IOException {
         super(file, true, ZipFile.OPEN_READ | ZipFile.OPEN_DELETE, version);
         this.closeController = closeController;
     }
 
-    private URLJarFile(URL url, URLJarFileCloseController closeController, Release version) throws IOException {
+    private URLJarFile(URL url, URLJarFileCloseController closeController, Runtime.Version version)
+            throws IOException {
         super(new File(ParseUtil.decode(url.getFile())), true, ZipFile.OPEN_READ, version);
         this.closeController = closeController;
     }
@@ -200,7 +204,9 @@ public class URLJarFile extends JarFile {
         {
 
             JarFile result = null;
-            Release version = "runtime".equals(url.getRef()) ? Release.RUNTIME : Release.BASE;
+            Runtime.Version version = "runtime".equals(url.getRef())
+                    ? JarFile.runtimeVersion()
+                    : JarFile.baseVersion();
 
             /* get the stream before asserting privileges */
             try (final InputStream in = url.openConnection().getInputStream()) {
diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
index 54b889f9427..bae8265be67 100644
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
@@ -40,25 +40,19 @@ import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static java.util.jar.JarFile.Release;
-
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-
 public class MultiReleaseJarAPI {
 
-    static final int MAJOR_VERSION = Runtime.version().major();
-
     String userdir = System.getProperty("user.dir",".");
     CreateMultiReleaseTestJars creator =  new CreateMultiReleaseTestJars();
     File unversioned = new File(userdir, "unversioned.jar");
     File multirelease = new File(userdir, "multi-release.jar");
     File signedmultirelease = new File(userdir, "signed-multi-release.jar");
-    Release[] values = JarFile.Release.values();
-
 
     @BeforeClass
     public void initialize() throws Exception {
@@ -81,7 +75,7 @@ public class MultiReleaseJarAPI {
             Assert.assertFalse(jf.isMultiRelease());
         }
 
-        try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Release.RUNTIME)) {
+        try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Runtime.version())) {
             Assert.assertFalse(jf.isMultiRelease());
         }
 
@@ -89,7 +83,7 @@ public class MultiReleaseJarAPI {
             Assert.assertFalse(jf.isMultiRelease());
         }
 
-        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Release.RUNTIME)) {
+        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Runtime.version())) {
             Assert.assertTrue(jf.isMultiRelease());
         }
 
@@ -110,68 +104,68 @@ public class MultiReleaseJarAPI {
     private void testCustomMultiReleaseValue(String value, boolean expected) throws Exception {
         creator.buildCustomMultiReleaseJar("custom-mr.jar", value);
         File custom = new File(userdir, "custom-mr.jar");
-        try (JarFile jf = new JarFile(custom, true, ZipFile.OPEN_READ, Release.RUNTIME)) {
+        try (JarFile jf = new JarFile(custom, true, ZipFile.OPEN_READ, Runtime.version())) {
             Assert.assertEquals(jf.isMultiRelease(), expected);
         }
         Files.delete(custom.toPath());
     }
 
-    @Test
-    public void testVersioning() throws Exception {
-        // multi-release jar
-        JarFile jar = new JarFile(multirelease);
-        Assert.assertEquals(Release.BASE, jar.getVersion());
-        jar.close();
+    @DataProvider(name = "versions")
+    public Object[][] createVersionData() throws Exception {
+        return new Object[][]{
+                {JarFile.baseVersion(), 8},
+                {JarFile.runtimeVersion(), Runtime.version().major()},
+                {Runtime.version(), Runtime.version().major()},
+                {Runtime.Version.parse("7.1"), JarFile.baseVersion().major()},
+                {Runtime.Version.parse("9"), 9},
+                {Runtime.Version.parse("9.1.5-ea+200"), 9}
+        };
+    }
 
-        for (Release value : values) {
-            System.err.println("test versioning for Release " + value);
-            try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, value)) {
-                Assert.assertEquals(value, jf.getVersion());
-            }
+    @Test(dataProvider="versions")
+    public void testVersioning(Runtime.Version value, int xpected) throws Exception {
+        Runtime.Version expected = Runtime.Version.parse(String.valueOf(xpected));
+        Runtime.Version base = JarFile.baseVersion();
+
+        // multi-release jar, opened as unversioned
+        try (JarFile jar = new JarFile(multirelease)) {
+            Assert.assertEquals(jar.getVersion(), base);
+        }
+
+        System.err.println("test versioning for Release " + value);
+        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, value)) {
+            Assert.assertEquals(jf.getVersion(), expected);
         }
 
         // regular, unversioned, jar
-        for (Release value : values) {
-            try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, value)) {
-                Assert.assertEquals(Release.BASE, jf.getVersion());
-            }
-        }
-
-        // assure that we have a Release object corresponding to the actual runtime version
-        String version = "VERSION_" + MAJOR_VERSION;
-        boolean runtimeVersionExists = false;
-        for (Release value : values) {
-            if (version.equals(value.name())) runtimeVersionExists = true;
-        }
-        Assert.assertTrue(runtimeVersionExists);
-    }
-
-    @Test
-    public void testAliasing() throws Exception {
-        for (Release value : values) {
-            System.err.println("test aliasing for Release " + value);
-            String name = value.name();
-            String prefix;
-            if (name.equals("BASE")) {
-                prefix = "";
-            } else if (name.equals("RUNTIME")) {
-                prefix = "META-INF/versions/" + MAJOR_VERSION + "/";
-            } else {
-                prefix = "META-INF/versions/" + name.substring(8) + "/";
-            }
-            // test both multi-release jars
-            readAndCompare(multirelease, value, "README", prefix + "README");
-            readAndCompare(multirelease, value, "version/Version.class", prefix + "version/Version.class");
-            // and signed multi-release jars
-            readAndCompare(signedmultirelease, value, "README", prefix + "README");
-            readAndCompare(signedmultirelease, value, "version/Version.class", prefix + "version/Version.class");
+        try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, value)) {
+            Assert.assertEquals(jf.getVersion(), base);
         }
     }
 
-    private void readAndCompare(File jar, Release version, String name, String realName) throws Exception {
+    @Test(dataProvider="versions")
+    public void testAliasing(Runtime.Version version, int xpected) throws Exception {
+        int n = Math.max(version.major(), JarFile.baseVersion().major());
+        Runtime.Version value = Runtime.Version.parse(String.valueOf(n));
+        System.err.println("test aliasing for Release " + version);
+        String prefix;
+        if (JarFile.baseVersion().equals(value)) {
+            prefix = "";
+        } else {
+            prefix = "META-INF/versions/" + value.major() + "/";
+        }
+        // test both multi-release jars
+        readAndCompare(multirelease, value, "README", prefix + "README");
+        readAndCompare(multirelease, value, "version/Version.class", prefix + "version/Version.class");
+        // and signed multi-release jars
+        readAndCompare(signedmultirelease, value, "README", prefix + "README");
+        readAndCompare(signedmultirelease, value, "version/Version.class", prefix + "version/Version.class");
+    }
+
+    private void readAndCompare(File jar, Runtime.Version version, String name, String realName) throws Exception {
         byte[] baseBytes;
         byte[] versionedBytes;
-        try (JarFile jf = new JarFile(jar, true, ZipFile.OPEN_READ, Release.BASE)) {
+        try (JarFile jf = new JarFile(jar, true, ZipFile.OPEN_READ, JarFile.baseVersion())) {
             ZipEntry ze = jf.getEntry(realName);
             try (InputStream is = jf.getInputStream(ze)) {
                 baseBytes = is.readAllBytes();
@@ -200,7 +194,7 @@ public class MultiReleaseJarAPI {
             ze1 = jf.getEntry(vname);
         }
         Assert.assertEquals(ze1.getName(), vname);
-        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Release.VERSION_9)) {
+        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Runtime.Version.parse("9"))) {
             ze2 = jf.getEntry(rname);
         }
         Assert.assertEquals(ze2.getName(), rname);
diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java
index 9cff19fcfb3..ee48fbed30d 100644
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java
@@ -47,14 +47,8 @@
  */
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarIterators.java b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarIterators.java
index 60d5063ba71..f51f012f256 100644
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarIterators.java
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarIterators.java
@@ -43,8 +43,6 @@ import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 import java.util.zip.ZipFile;
 
-import static java.util.jar.JarFile.Release;
-
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -111,17 +109,17 @@ public class MultiReleaseJarIterators {
             testStream(jf, mrEntries);
         }
 
-        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Release.BASE)) {
+        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, JarFile.baseVersion())) {
             testEnumeration(jf, baseEntries);
             testStream(jf, baseEntries);
         }
 
-        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Release.VERSION_9)) {
+        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Runtime.Version.parse("9"))) {
             testEnumeration(jf, v9Entries);
             testStream(jf, v9Entries);
         }
 
-        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Release.RUNTIME)) {
+        try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Runtime.version())) {
             Map expectedEntries;
             switch (MAJOR_VERSION) {
                 case 9:
@@ -147,17 +145,17 @@ public class MultiReleaseJarIterators {
             testStream(jf, uvEntries);
         }
 
-        try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Release.BASE)) {
+        try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, JarFile.baseVersion())) {
             testEnumeration(jf, uvEntries);
             testStream(jf, uvEntries);
         }
 
-        try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Release.VERSION_9)) {
+        try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Runtime.Version.parse("9"))) {
             testEnumeration(jf, uvEntries);
             testStream(jf, uvEntries);
         }
 
-        try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Release.RUNTIME)) {
+        try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Runtime.version())) {
             testEnumeration(jf, uvEntries);
             testStream(jf, uvEntries);
         }
diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java
index d729c438a66..86b8b907c76 100644
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java
@@ -60,11 +60,10 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+
 public class MultiReleaseJarProperties {
+    final static int BASE_VERSION = JarFile.baseVersion().major();
 
-    static final int MAJOR_VERSION = Runtime.version().major();
-
-    final static int ROOTVERSION = 8; // magic number from knowledge of internals
     final static String userdir = System.getProperty("user.dir", ".");
     final static File multirelease = new File(userdir, "multi-release.jar");
     protected int rtVersion;
@@ -77,15 +76,15 @@ public class MultiReleaseJarProperties {
         CreateMultiReleaseTestJars creator =  new CreateMultiReleaseTestJars();
         creator.compileEntries();
         creator.buildMultiReleaseJar();
-
-        rtVersion = Integer.getInteger("jdk.util.jar.version", MAJOR_VERSION);
+        int RUNTIME_VERSION = Runtime.version().major();
+        rtVersion = Integer.getInteger("jdk.util.jar.version", RUNTIME_VERSION);
         String mrprop = System.getProperty("jdk.util.jar.enableMultiRelease", "");
         if (mrprop.equals("false")) {
-            rtVersion = ROOTVERSION;
-        } else if (rtVersion < ROOTVERSION) {
-            rtVersion = ROOTVERSION;
-        } else if (rtVersion > MAJOR_VERSION) {
-            rtVersion = MAJOR_VERSION;
+            rtVersion = BASE_VERSION;
+        } else if (rtVersion < BASE_VERSION) {
+            rtVersion = BASE_VERSION;
+        } else if (rtVersion > RUNTIME_VERSION) {
+            rtVersion = RUNTIME_VERSION;
         }
         force = mrprop.equals("force");
 
@@ -135,7 +134,7 @@ public class MultiReleaseJarProperties {
                     if (force) throw x;
                 }
             }
-            invokeMethod(vcls, force ? rtVersion : ROOTVERSION);
+            invokeMethod(vcls, force ? rtVersion : BASE_VERSION);
         }
     }
 
diff --git a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java
index 538742ce192..39319aac062 100644
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java
@@ -70,7 +70,7 @@ public class MultiReleaseJarSecurity {
 
     @Test
     public void testCertsAndSigners() throws IOException {
-        try (JarFile jf = new JarFile(signedmultirelease, true, ZipFile.OPEN_READ, JarFile.Release.RUNTIME)) {
+        try (JarFile jf = new JarFile(signedmultirelease, true, ZipFile.OPEN_READ, Runtime.version())) {
             CertsAndSigners vcas = new CertsAndSigners(jf, jf.getJarEntry("version/Version.class"));
             CertsAndSigners rcas = new CertsAndSigners(jf, jf.getJarEntry("META-INF/versions/" + MAJOR_VERSION + "/version/Version.class"));
             Assert.assertTrue(Arrays.equals(rcas.getCertificates(), vcas.getCertificates()));
diff --git a/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java b/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java
index fe9ce71de78..d3660e45c2e 100644
--- a/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java
+++ b/jdk/test/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java
@@ -132,12 +132,12 @@ public class MultiReleaseJarURLConnection {
         URL rootUrl = new URL(urlFile);
         JarURLConnection juc = (JarURLConnection)rootUrl.openConnection();
         JarFile rootJar = juc.getJarFile();
-        JarFile.Release root = rootJar.getVersion();
+        Runtime.Version root = rootJar.getVersion();
 
         URL runtimeUrl = new URL(urlFile + "#runtime");
         juc = (JarURLConnection)runtimeUrl.openConnection();
         JarFile runtimeJar = juc.getJarFile();
-        JarFile.Release runtime = runtimeJar.getVersion();
+        Runtime.Version runtime = runtimeJar.getVersion();
         if (style.equals("unversioned")) {
             Assert.assertEquals(root, runtime);
         } else {
diff --git a/jdk/test/tools/jar/multiRelease/Basic.java b/jdk/test/tools/jar/multiRelease/Basic.java
index a1b595338e0..cd5c195a169 100644
--- a/jdk/test/tools/jar/multiRelease/Basic.java
+++ b/jdk/test/tools/jar/multiRelease/Basic.java
@@ -220,7 +220,7 @@ public class Basic {
 
     private void checkMultiRelease(String jarFile, boolean expected) throws IOException {
         try (JarFile jf = new JarFile(new File(jarFile), true, ZipFile.OPEN_READ,
-                JarFile.Release.RUNTIME)) {
+                JarFile.runtimeVersion())) {
             assertEquals(jf.isMultiRelease(), expected);
         }
     }

From e883900ac7175e7b15d3e79927d0f5af9197b367 Mon Sep 17 00:00:00 2001
From: Weijun Wang 
Date: Thu, 14 Jul 2016 19:31:43 +0800
Subject: [PATCH 105/111] 8161354: policytool fails if it needs to show an
 error dialog before the main window appears

Reviewed-by: mullan
---
 .../classes/sun/security/tools/policytool/PolicyTool.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java
index f8083997c09..b560e053d97 100644
--- a/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java
+++ b/jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool/PolicyTool.java
@@ -1376,10 +1376,6 @@ class ToolWindow extends JFrame {
         ToolDialog ed = new ToolDialog
                 (PolicyTool.getMessage("Error"), tool, this, true);
 
-        // find where the PolicyTool gui is
-        Point location = ((w == null) ?
-                getLocationOnScreen() : w.getLocationOnScreen());
-        //ed.setBounds(location.x + 50, location.y + 50, 600, 100);
         ed.setLayout(new GridBagLayout());
 
         JLabel label = new JLabel(error);

From d09561f8c678960fd2f74c631d46367973a0f63a Mon Sep 17 00:00:00 2001
From: Volker Simonis 
Date: Thu, 14 Jul 2016 16:49:30 +0200
Subject: [PATCH 106/111] 8160564: TEST: Add a test to check the implementation
 of VersionProps.versionNumbers()

Reviewed-by: mchung, redestad
---
 .../java/lang/VersionProps.java.template      |  34 ++++--
 .../lang/Runtime/Version/VersionProps.java    | 102 ++++++++++++++++++
 2 files changed, 127 insertions(+), 9 deletions(-)
 create mode 100644 jdk/test/java/lang/Runtime/Version/VersionProps.java

diff --git a/jdk/src/java.base/share/classes/java/lang/VersionProps.java.template b/jdk/src/java.base/share/classes/java/lang/VersionProps.java.template
index a9f12e708ff..a51702fa093 100644
--- a/jdk/src/java.base/share/classes/java/lang/VersionProps.java.template
+++ b/jdk/src/java.base/share/classes/java/lang/VersionProps.java.template
@@ -67,19 +67,35 @@ class VersionProps {
         System.setProperty("java.runtime.name", java_runtime_name);
     }
 
-    static List versionNumbers() {
-        List versionNumbers = new ArrayList<>(4);
+    private static int parseVersionNumber(String version, int prevIndex, int index) {
+        if (index - prevIndex > 1 &&
+            Character.digit(version.charAt(prevIndex), 10) <= 0)
+            throw new IllegalArgumentException("Leading zeros not supported (" +
+                    version.substring(prevIndex, index) + ")");
+        return Integer.parseInt(version, prevIndex, index, 10);
+    }
+
+    // This method is reflectively used by regression tests.
+    static List parseVersionNumbers(String version) {
+        List verNumbers = new ArrayList<>(4);
         int prevIndex = 0;
-        int index = VERSION_NUMBER.indexOf('.');
+        int index = version.indexOf('.');
         while (index > 0) {
-            versionNumbers.add(
-                    Integer.parseInt(VERSION_NUMBER, prevIndex, index, 10));
+            verNumbers.add(parseVersionNumber(version, prevIndex, index));
             prevIndex = index + 1; // Skip the period
-            index = VERSION_NUMBER.indexOf('.', prevIndex);
+            index = version.indexOf('.', prevIndex);
         }
-        versionNumbers.add(Integer.parseInt(VERSION_NUMBER,
-                prevIndex, VERSION_NUMBER.length(), 10));
-        return versionNumbers;
+        verNumbers.add(parseVersionNumber(version, prevIndex, version.length()));
+
+        if (verNumbers.get(0) == 0 || verNumbers.get(verNumbers.size() - 1) == 0)
+            throw new IllegalArgumentException("Leading/trailing zeros not supported (" +
+                    verNumbers + ")");
+
+        return verNumbers;
+    }
+
+    static List versionNumbers() {
+        return parseVersionNumbers(VERSION_NUMBER);
     }
 
     static Optional pre() {
diff --git a/jdk/test/java/lang/Runtime/Version/VersionProps.java b/jdk/test/java/lang/Runtime/Version/VersionProps.java
new file mode 100644
index 00000000000..ddbaa081d4f
--- /dev/null
+++ b/jdk/test/java/lang/Runtime/Version/VersionProps.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2016 SAP SE. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8160564
+ * @summary check the implementation of VersionProps.versionNumbers()
+ * @run main VersionProps
+ * @author Volker Simonis
+ */
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+
+public class VersionProps {
+
+    final static String[] validVersions = {
+        "1", "1.2", "1.2.3", "1.2.3.4", "1.0.0.1",
+        "1.10000.1", "1.0.2.0.0.3.0.0.0.4.5.0.0.6",
+        "1000001", "1.2.3.4.5.6.7.8.9.0.9.8.7.6.5.4.3.2.1" };
+
+    @SuppressWarnings("rawtypes")
+    final static List[] validLists = {
+        Arrays.asList(1),
+        Arrays.asList(1, 2),
+        Arrays.asList(1, 2, 3),
+        Arrays.asList(1, 2, 3, 4),
+        Arrays.asList(1, 0, 0, 1),
+        Arrays.asList(1, 10000, 1),
+        Arrays.asList(1, 0, 2, 0, 0, 3, 0, 0, 0, 4, 5, 0, 0, 6),
+        Arrays.asList(1000001),
+        Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 9, 8, 7, 6, 5, 4, 3, 2, 1) };
+
+    final static String[] invalidVersions = {
+        "01", "0.1.2", "1.02.3", "1.2.03.4", "1.0.0.1.0",
+        "1.0.1.0.0", "1.00.1", "1.0.1.00", "1.10000." };
+
+    public static void main(String[] args) throws Exception {
+        Class versionProps = Class.forName("java.lang.VersionProps");
+        Method parseVersionNumbers =
+            versionProps.getDeclaredMethod("parseVersionNumbers", String.class);
+        parseVersionNumbers.setAccessible(true);
+
+        for (int i = 0; i < validVersions.length; i++) {
+            @SuppressWarnings("unchecked")
+            List li =
+                (List)parseVersionNumbers.invoke(null, validVersions[i]);
+            System.out.println(li);
+            if (!validLists[i].equals(li))
+                throw new Exception(li + " != " + validLists[i]);
+            li = Runtime.Version.parse(validVersions[i]).version();
+            if (!validLists[i].equals(li))
+                throw new Exception(li + " != " + validLists[i]);
+        }
+
+        for (int i = 0; i < invalidVersions.length; i++) {
+            try {
+                List li =
+                        (List)parseVersionNumbers.invoke(null, invalidVersions[i]);
+                throw new Exception(invalidVersions[i] +
+                        " not recognized as invalid by VersionProps.parseVersionNumbers()");
+            } catch (InvocationTargetException ex) {
+                if (ex.getCause() instanceof IllegalArgumentException) {
+                    System.out.println("OK - caught bad version string " +
+                            invalidVersions[i]);
+                } else {
+                    throw ex;
+                }
+            }
+
+            try {
+                List li = Runtime.Version.parse(invalidVersions[i]).version();
+                throw new Exception(invalidVersions[i] +
+                        " not recognized as invalid by Runtime.Version.parse()");
+            } catch (IllegalArgumentException ex) {
+                continue;
+            }
+        }
+    }
+}

From 1b2daf8d675c985b10c60a1565c9a7ab5bc8932c Mon Sep 17 00:00:00 2001
From: "J. Duke" 
Date: Wed, 5 Jul 2017 21:55:12 +0200
Subject: [PATCH 107/111] Added tag jdk-9+126 for changeset 03e7b2c5ae34

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 17673fdda8d..a2481e251c9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -368,3 +368,4 @@ caf97b37ebec84288c112d21d3a60cb628cba1e8 jdk-9+119
 d53037a90c441cb528dc41c30827985de0e67c62 jdk-9+123
 2a5697a98620c4f40e4a1a71478464399b8878de jdk-9+124
 3aa52182b3ad7c5b3a61cf05a59dd07e4c5884e5 jdk-9+125
+03e7b2c5ae345be3caf981d76ceb3efe5ff447f8 jdk-9+126

From 58b0b8efb5df8e62ecaef8bd672e61dc3521ad4f Mon Sep 17 00:00:00 2001
From: Alejandro Murillo 
Date: Thu, 14 Jul 2016 15:47:46 +0000
Subject: [PATCH 108/111] Added tag jdk-9+127 for changeset a5744c1725a0

---
 jdk/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/.hgtags b/jdk/.hgtags
index 5a0ef0ed7ad..f2f2ce61f7e 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -369,3 +369,4 @@ c40c8739bcdc88892ff58ebee3fd8a3f287be94d jdk-9+123
 7ff61c55b5c6c124592f09b18953222009a204a6 jdk-9+124
 073ab1d4edf5590cf1af7b6d819350c14e425c1a jdk-9+125
 6fda66a5bdf2da8994032b9da2078a4137f4d954 jdk-9+126
+7a97b89ba83077ca62e4aa5a05437adc8f315343 jdk-9+127

From ac12555ea3985946b1d30df380eb7c14ec6b9d94 Mon Sep 17 00:00:00 2001
From: Xueming Shen 
Date: Thu, 14 Jul 2016 16:04:38 -0700
Subject: [PATCH 109/111] 8161426: Test
 java/util/zip/InflaterInputStream/TestAvailable.java fails on open-only linux

Reviewed-by: bpb
---
 .../java/util/zip/InflaterInputStream/TestAvailable.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java b/jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java
index 1ac4d4b1779..1a8f3ba71e2 100644
--- a/jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java
+++ b/jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java
@@ -25,7 +25,7 @@
  * @library /lib/testlibrary/
  * @build jdk.testlibrary.*
  * @run main TestAvailable
- * @bug 7031075
+ * @bug 7031075 8161426
  * @summary Make sure that available() method behaves as expected.
  * @key randomness
  */
@@ -40,9 +40,8 @@ public class TestAvailable {
     public static void main(String args[]) throws Throwable {
         Random r = RandomFactory.getRandom();
         for (int n = 0; n < 10; n++) {
-            byte[] src = new byte[r.nextInt(100)];
+            byte[] src = new byte[r.nextInt(100) + 1];
             r.nextBytes(src);
-
             // test InflaterInputStream
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             try (DeflaterOutputStream dos = new DeflaterOutputStream(baos)) {

From 99cea12e9087841db179a0d7b3c6a8d579a22b66 Mon Sep 17 00:00:00 2001
From: Valerie Peng 
Date: Fri, 15 Jul 2016 01:24:22 +0000
Subject: [PATCH 110/111] 8136459: MessageDigest.isEqual is not a "simple byte
 compare"

Update the corresponding javadoc with @implNote and clarification.

Reviewed-by: mullan, darcy
---
 .../share/classes/java/security/MessageDigest.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jdk/src/java.base/share/classes/java/security/MessageDigest.java b/jdk/src/java.base/share/classes/java/security/MessageDigest.java
index a226bfd3da2..3c08a64fbf8 100644
--- a/jdk/src/java.base/share/classes/java/security/MessageDigest.java
+++ b/jdk/src/java.base/share/classes/java/security/MessageDigest.java
@@ -439,7 +439,12 @@ public abstract class MessageDigest extends MessageDigestSpi {
     }
 
     /**
-     * Compares two digests for equality. Does a simple byte compare.
+     * Compares two digests for equality. Two digests are equal if they have
+     * the same length and all bytes at corresponding positions are equal.
+     *
+     * @implNote
+     * If the digests are the same length, all bytes are examined to
+     * determine equality.
      *
      * @param digesta one of the digests to compare.
      *

From 0475827ed55191a4bdb06e18a37bb2e07c51bfa9 Mon Sep 17 00:00:00 2001
From: John Jiang 
Date: Thu, 14 Jul 2016 19:42:16 -0700
Subject: [PATCH 111/111] 8154821: Update issue number for
 sun/security/pkcs11/ec/TestKeyFactory.java in ProblemList

Sun/security/pkcs11/ec/TestKeyFactory.java is tracked by 8026976 instead of 7157786

Reviewed-by: xuelei
---
 jdk/test/ProblemList.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 2e7da24b031..760c10816e1 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -213,7 +213,7 @@ java/rmi/transport/dgcDeadLock/DGCDeadLock.java                 8029360 macosx-a
 
 # jdk_security
 
-sun/security/pkcs11/ec/TestKeyFactory.java                      7157786 generic-all
+sun/security/pkcs11/ec/TestKeyFactory.java                      8026976 generic-all
 
 sun/security/krb5/auto/Unreachable.java                         7164518 macosx-all
 

    • Packages 
    PackageDescription