--- old/make/linux/makefiles/buildtree.make	2013-02-20 22:24:39.238638924 +0100
+++ new/make/linux/makefiles/buildtree.make	2013-02-20 22:24:39.162639026 +0100
@@ -398,7 +398,7 @@
 DATA_MODE/sparcv9 = 64
 DATA_MODE/amd64   = 64
 DATA_MODE/ia64    = 64
-DATA_MODE/zero    = $(ARCH_DATA_MODEL)
+DATA_MODE/zero    = $(OPENJDK_TARGET_CPU_BITS)
 
 JAVA_FLAG/32 = -d32
 JAVA_FLAG/64 = -d64