--- a/make/autoconf/flags-other.m4	Mon Feb 26 14:38:46 2018 +0100
+++ b/make/autoconf/flags-other.m4	Mon Feb 26 14:43:22 2018 +0100
@@ -120,9 +120,11 @@
 [
   # NOTE: This test should be generalized, but for now keep old behavior.
   if test "x$1" = "xTARGET"; then
-    $2JVM_ASFLAGS="${$2JVM_ASFLAGS} $MACHINE_FLAG"
+    $1_JVM_ASFLAGS_CPU="$MACHINE_FLAG"
   fi
 
+  $2JVM_ASFLAGS="$JVM_ASFLAGS ${$1_JVM_ASFLAGS_CPU}"
+
   AC_SUBST($2JVM_ASFLAGS)
 ])