--- jdk/make/common/shared/Platform.gmk.orig  2010-11-20 19:33:19.000000000 +0100
+++ jdk/make/common/shared/Platform.gmk 2010-11-21 00:39:18.000000000 +0100
@@ -272,6 +272,12 @@

   # Darwin builds may be 32-bit or 64-bit data model.
   ifeq ($(SYSTEM_UNAME), Darwin)
+    ifeq ($(ARCH), amd64)
+      # force i586 if 32bits VM asked
+      ifeq ($(ARCH_DATA_MODEL), 32)
+        ARCH=i586
+      endif
+    endif
     ifeq ($(ARCH), i586)
       ifeq ($(ARCH_DATA_MODEL), 64)
         ARCH=amd64