From 75c7f3063c6246d2b5178af4395c8422e92e674e Mon Sep 17 00:00:00 2001
From: aph <unknown>
Date: Tue, 23 Jun 2015 22:14:58 -0400
Subject: [PATCH] 8080600: AARCH64: testlibrary does not support AArch64
 Summary: Partial backport of 8080600 to make AArch64 a known platform
 Reviewed-by: dholmes, coleenp

---
 test/testlibrary/com/oracle/java/testlibrary/Platform.java    | 4 ++++
 .../TestMutuallyExclusivePlatformPredicates.java              | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/testlibrary/com/oracle/java/testlibrary/Platform.java b/test/testlibrary/com/oracle/java/testlibrary/Platform.java
index d608cd810..93841bf59 100644
--- a/test/testlibrary/com/oracle/java/testlibrary/Platform.java
+++ b/test/testlibrary/com/oracle/java/testlibrary/Platform.java
@@ -122,6 +122,10 @@ public class Platform {
         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)
diff --git a/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java b/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
index fa6e12002..7d56a4a3b 100644
--- a/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
+++ b/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -43,7 +43,7 @@ import java.util.Set;
  */
 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", "isSolaris", "isWindows", "isOSX"),
         VM_TYPE("isClient", "isServer", "isGraal", "isMinimal"),
-- 
GitLab