--- old/common/autoconf/hotspot.m4	2016-01-29 10:22:47.000000000 -0600
+++ new/common/autoconf/hotspot.m4	2016-01-29 10:22:47.000000000 -0600
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -129,11 +129,6 @@
   fi
   AC_SUBST(INCLUDE_SA)
 
-  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
-    MACOSX_UNIVERSAL="true"
-  fi
-
-  AC_SUBST(MACOSX_UNIVERSAL)
 ])
 
 
@@ -230,12 +225,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
 
   #####