--- hotspot/make/bsd/makefiles/universal.gmk.orig	2012-04-23 13:57:39.000000000 +0200
+++ hotspot/make/bsd/makefiles/universal.gmk	2012-04-23 13:57:52.000000000 +0200
@@ -33,15 +33,15 @@

 # Universal builds include 1 or more architectures in a single binary
 all_product_universal:
-#	$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_PRODUCT_TARGETS)
+	$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_PRODUCT_TARGETS)
 	$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_PRODUCT_TARGETS)
 	$(QUIETLY) $(MAKE) EXPORT_SUBDIR= universalize
 all_fastdebug_universal:
-#	$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_FASTDEBUG_TARGETS)
+	$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_FASTDEBUG_TARGETS)
 	$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_FASTDEBUG_TARGETS)
 	$(QUIETLY) $(MAKE) EXPORT_SUBDIR=/fastdebug universalize
 all_debug_universal:
-#	$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_DEBUG_TARGETS)
+	$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_DEBUG_TARGETS)
 	$(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_DEBUG_TARGETS)
 	$(QUIETLY) $(MAKE) EXPORT_SUBDIR=/debug universalize

--- jdk/src/macosx/bin/universal/jvm.cfg.orig	2012-04-23 15:57:50.000000000 +0200
+++ jdk/src/macosx/bin/universal/jvm.cfg	2012-04-23 15:58:01.000000000 +0200
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2012, 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
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# List of JVMs that can be used as an option to java, javac, etc.
+# Order is important -- first in this list is the default JVM.
+# NOTE that this both this file and its format are UNSUPPORTED and
+# WILL GO AWAY in a future release.
+#
+# You may also select a JVM in an arbitrary location with the
+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
+# and may not be available in a future release.
+#
+-server KNOWN
+-client KNOWN
+-hotspot ERROR
+-classic WARN
+-native ERROR
+-green ERROR
--- jdk/make/common/shared/Platform.gmk.org	2012-04-23 16:46:44.000000000 +0200
+++ jdk/make/common/shared/Platform.gmk	2012-04-23 16:47:17.000000000 +0200
@@ -242,8 +242,8 @@
   ifeq ($(origin ARCH), undefined)
    ifeq ($(PLATFORM), macosx)
 # MMM: revisit when hotspot producinging universal libs
-#   mach := universal
-    mach := x86_64
+   mach := universal
+#    mach := x86_64
    else
     mach := $(shell uname -m)
    endif
--- jdk/src/macosx/bin/java_md_macosx.c.orig	2012-04-23 17:10:11.000000000 +0200
+++ jdk/src/macosx/bin/java_md_macosx.c	2012-04-23 17:10:47.000000000 +0200
@@ -54,6 +54,8 @@
     char **argv;
 };

+#define DUAL_MODE
+
 #define JVM_DLL "libjvm.dylib"
 #define JAVA_DLL "libjava.dylib"
 /* FALLBACK avoids naming conflicts with system libraries