--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java	Sat Dec 26 16:59:26 2015 +0100
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java	Mon Dec 28 10:10:37 2015 -1000
@@ -175,11 +175,9 @@
     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() {