*** old/common/autoconf/hotspot.m4	Wed Feb  8 13:32:36 2017
--- new/common/autoconf/hotspot.m4	Wed Feb  8 13:32:34 2017

*** 1,7 ****
--- 1,7 ----
  #
! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 2011, 2017, Oracle and/or its affiliates. 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this

*** 211,222 ****
--- 211,223 ----
    else
      AC_MSG_ERROR([Invalid value for --enable-aot: $enable_aot])
    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" || 
+        test "x$OPENJDK_TARGET_CPU" = "xamd64"; then
        if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
          if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then
            ENABLE_AOT="true"
          else
            ENABLE_AOT="false"