--- old/src/hotspot/share/c1/c1_LIR.cpp	2018-09-25 19:23:32.000000000 +0300
+++ new/src/hotspot/share/c1/c1_LIR.cpp	2018-09-25 19:23:32.000000000 +0300
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2018, Azul Systems, Inc. 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,6 +146,7 @@
     case T_FLOAT:
       // FP return values can be also in CPU registers on ARM and PPC32 (softfp ABI)
       assert((kindfield == fpu_register || kindfield == stack_value
+             AARCH32_ONLY(|| kindfield == cpu_register)
              ARM_ONLY(|| kindfield == cpu_register)
              PPC32_ONLY(|| kindfield == cpu_register) ) &&
              size_field() == single_size, "must match");
@@ -1492,7 +1494,7 @@
     out->print("fpu%d", fpu_regnr());
   } else if (is_double_fpu()) {
     out->print("fpu%d", fpu_regnrLo());
-#elif defined(ARM)
+#elif defined(ARM) || defined(AARCH32)
   } else if (is_single_fpu()) {
     out->print("s%d", fpu_regnr());
   } else if (is_double_fpu()) {