--- old/common/autoconf/generated-configure.sh	2016-01-29 10:22:45.000000000 -0600
+++ new/common/autoconf/generated-configure.sh	2016-01-29 10:22:44.000000000 -0600
@@ -909,7 +909,6 @@
 FASTDEBUG
 VARIANT
 DEBUG_LEVEL
-MACOSX_UNIVERSAL
 INCLUDE_SA
 JVM_VARIANT_CORE
 JVM_VARIANT_ZEROSHARK
@@ -4839,7 +4838,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1452780299
+DATE_WHEN_GENERATED=1453564616
 
 ###############################################################################
 #
@@ -15839,11 +15838,6 @@
   fi
 
 
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    MACOSX_UNIVERSAL="true"
-  fi
-
-
 
 
   DEBUG_LEVEL="release"
@@ -15965,12 +15959,11 @@
 
   HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
 
-  # On Macosx universal binaries are produced, but they only contain
-  # 64 bit intel. This invalidates control of which jvms are built
+  # This invalidates control of which jvms are built
   # from configure, but only server is valid anyway. Fix this
   # when hotspot makefiles are rewritten.
-  if test "x$MACOSX_UNIVERSAL" = xtrue; then
-    HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
+  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+    HOTSPOT_TARGET=macosx_${HOTSPOT_EXPORT}
   fi
 
   #####