changeset 8411:02985f5bf56a

Merge
author roland
date Wed, 20 May 2015 17:06:44 +0200
parents 468d10ade318 3f334f56441e
children 7fb118c7ff45 ed9cc6871da2
files
diffstat 3 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java	Wed May 20 09:07:36 2015 -0400
+++ b/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java	Wed May 20 17:06:44 2015 +0200
@@ -129,7 +129,8 @@
 
         @Override
         protected boolean isIntrinsicSupported() {
-            return isServerVM() && Boolean.valueOf(useMathExactIntrinsics) && (Platform.isX86() || Platform.isX64());
+            return isServerVM() && Boolean.valueOf(useMathExactIntrinsics)
+                && (Platform.isX86() || Platform.isX64() || Platform.isAArch64());
         }
 
         @Override
@@ -146,7 +147,7 @@
         @Override
         protected boolean isIntrinsicSupported() {
             return isServerVM() && Boolean.valueOf(useMathExactIntrinsics) &&
-                (Platform.isX64() || Platform.isPPC());
+                (Platform.isX64() || Platform.isPPC() || Platform.isAArch64());
         }
 
         @Override
--- a/test/testlibrary/jdk/test/lib/Platform.java	Wed May 20 09:07:36 2015 -0400
+++ b/test/testlibrary/jdk/test/lib/Platform.java	Wed May 20 17:06:44 2015 +0200
@@ -132,6 +132,10 @@
         return isArch("(amd64)|(x86_64)");
     }
 
+    public static boolean isAArch64() {
+        return isArch("aarch64");
+    }
+
     private static boolean isArch(String archnameRE) {
         return Pattern.compile(archnameRE, Pattern.CASE_INSENSITIVE)
                 .matcher(osArch)
--- a/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java	Wed May 20 09:07:36 2015 -0400
+++ b/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java	Wed May 20 17:06:44 2015 +0200
@@ -45,7 +45,7 @@
  */
 public class TestMutuallyExclusivePlatformPredicates {
     private static enum MethodGroup {
-        ARCH("isARM", "isPPC", "isSparc", "isX86", "isX64"),
+        ARCH("isARM", "isPPC", "isSparc", "isX86", "isX64", "isAArch64"),
         BITNESS("is32bit", "is64bit"),
         OS("isAix", "isLinux", "isOSX", "isSolaris", "isWindows"),
         VM_TYPE("isClient", "isServer", "isGraal", "isMinimal", "isZero"),