--- a/common/autoconf/generated-configure.sh	Tue Dec 20 13:33:57 2016 +0300
+++ b/common/autoconf/generated-configure.sh	Tue Dec 20 15:49:44 2016 -0500
@@ -5142,7 +5142,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1481496095
+DATE_WHEN_GENERATED=1482266922
 
 ###############################################################################
 #
@@ -52829,7 +52829,7 @@
 $as_echo "no, forced" >&6; }
     BUILD_GTEST="false"
   elif test "x$enable_hotspot_gtest" = "x"; then
-    if test "x$GTEST_DIR_EXISTS" = "xtrue" && test "x$OPENJDK_TARGET_OS" != "xaix"; then
+    if test "x$GTEST_DIR_EXISTS" = "xtrue"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
       BUILD_GTEST="true"

--- a/common/autoconf/hotspot.m4	Tue Dec 20 13:33:57 2016 +0300
+++ b/common/autoconf/hotspot.m4	Tue Dec 20 15:49:44 2016 -0500
@@ -433,7 +433,7 @@
     AC_MSG_RESULT([no, forced])
     BUILD_GTEST="false"
   elif test "x$enable_hotspot_gtest" = "x"; then
-    if test "x$GTEST_DIR_EXISTS" = "xtrue" && test "x$OPENJDK_TARGET_OS" != "xaix"; then
+    if test "x$GTEST_DIR_EXISTS" = "xtrue"; then
       AC_MSG_RESULT([yes])
       BUILD_GTEST="true"
     else