From fb318fc787a3bf941bfe4182c1f1af6a41971d05 Mon Sep 17 00:00:00 2001
From: Christian Thalinger <twisti@openjdk.org>
Date: Mon, 28 Dec 2015 10:10:37 -1000
Subject: [PATCH] 8146245: compiler/jvmci/ tests fail:
 java.lang.AssertionError: minimum config for aarch64

Reviewed-by: kvn
---
 .../jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 af6f7e892af..0038c161b1b 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
@@ -175,11 +175,9 @@ public class AArch64 extends Architecture {
     private final EnumSet<Flag> flags;
 
     public AArch64(EnumSet<CPUFeature> features, EnumSet<Flag> flags) {
-        super("aarch64", AArch64Kind.QWORD, ByteOrder.LITTLE_ENDIAN, /* unalignedMemoryAccess */true, allRegisters, /* implicitMemoryBarriers */0, /* nativeCallDisplacementOffset */0,
-                        /* returnAddressSize */0);
+        super("aarch64", AArch64Kind.QWORD, ByteOrder.LITTLE_ENDIAN, true, allRegisters, 0, 0, 0);
         this.features = features;
         this.flags = flags;
-        assert features.contains(CPUFeature.FP) : "minimum config for aarch64";
     }
 
     public EnumSet<CPUFeature> getFeatures() {