--- a/common/autoconf/hotspot.m4	Wed Jul 05 22:55:08 2017 +0200
+++ b/common/autoconf/hotspot.m4	Fri Feb 24 12:31:56 2017 -0500
@@ -212,8 +212,8 @@
   fi
 
   if test "x$ENABLE_AOT" = "xtrue"; then
-    # Only enable AOT on linux-X64.
-    if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
+    # Only enable AOT on X64 platforms.
+    if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
       if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
         if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then
           ENABLE_AOT="true"