--- a/common/autoconf/flags.m4	Thu Nov 05 15:14:39 2015 +0100
+++ b/common/autoconf/flags.m4	Thu Nov 05 17:32:57 2015 +0100
@@ -942,7 +942,16 @@
   else
     AC_MSG_ERROR([--enable-warnings-as-errors accepts no argument])
   fi
+
+  if test "x$WARNINGS_AS_ERRORS" = "xfalse"; then
+    # Set legacy hotspot variable
+    HOTSPOT_SET_WARNINGS_AS_ERRORS=WARNINGS_ARE_ERRORS=
+  else
+    HOTSPOT_SET_WARNINGS_AS_ERRORS=
+  fi
+
   AC_SUBST(WARNINGS_AS_ERRORS)
+  AC_SUBST(HOTSPOT_SET_WARNINGS_AS_ERRORS)
 
   case "${TOOLCHAIN_TYPE}" in
     microsoft)

--- a/common/autoconf/generated-configure.sh	Thu Nov 05 15:14:39 2015 +0100
+++ b/common/autoconf/generated-configure.sh	Thu Nov 05 17:32:57 2015 +0100
@@ -685,6 +685,7 @@
 ENABLE_DEBUG_SYMBOLS
 CFLAGS_WARNINGS_ARE_ERRORS
 DISABLE_WARNING_PREFIX
+HOTSPOT_SET_WARNINGS_AS_ERRORS
 WARNINGS_AS_ERRORS
 COMPILER_SUPPORTS_TARGET_BITS_FLAG
 ZERO_ARCHFLAG
@@ -4597,7 +4598,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1446732848
+DATE_WHEN_GENERATED=1446741156
 
 ###############################################################################
 #
@@ -45137,6 +45138,15 @@
     as_fn_error $? "--enable-warnings-as-errors accepts no argument" "$LINENO" 5
   fi
 
+  if test "x$WARNINGS_AS_ERRORS" = "xfalse"; then
+    # Set legacy hotspot variable
+    HOTSPOT_SET_WARNINGS_AS_ERRORS=WARNINGS_ARE_ERRORS=
+  else
+    HOTSPOT_SET_WARNINGS_AS_ERRORS=
+  fi
+
+
+
 
   case "${TOOLCHAIN_TYPE}" in
     microsoft)

--- a/common/autoconf/hotspot-spec.gmk.in	Thu Nov 05 15:14:39 2015 +0100
+++ b/common/autoconf/hotspot-spec.gmk.in	Thu Nov 05 17:32:57 2015 +0100
@@ -33,6 +33,7 @@
 # Additional legacy variables defined for Hotspot
 
 @SET_OPENJDK@
+@HOTSPOT_SET_WARNINGS_AS_ERRORS@
 
 # Legacy defines controlled by the SUPPORT_HEADLESS and SUPPORT_HEADFUL options.
 @BUILD_HEADLESS@