diff --git a/make/jprt.config b/make/jprt.config
--- a/make/jprt.config
+++ b/make/jprt.config
@@ -176,7 +176,12 @@
     if [ "${osarch}" = i686 ] ; then
 	linux_arch=i586
     elif [ "${osarch}" = x86_64 ] ; then
-	linux_arch=amd64
+        # LOCALPATCH
+        if [ "${ARCH_DATA_MODEL}" = 64 ] ; then
+          linux_arch=amd64
+        else
+          linux_arch=i586
+        fi
     fi
 
     # Get the compilers into path (make sure it matches ALT setting)
diff --git a/corba/make/common/shared/Platform.gmk b/corba/make/common/shared/Platform.gmk
--- a/corba/make/common/shared/Platform.gmk
+++ b/corba/make/common/shared/Platform.gmk
@@ -214,13 +214,20 @@
       ARCH=sparcv9
     endif
   else
-    # i586 is 32-bit, amd64 is 64-bit
+    # LOCALPATCH
+    # i586 is 32-bit, amd64 is 64-bit, unless ARCH_DATA_MODEL is explicitly set
+    # as 32 and ARCH will be demoted to i586
     ifndef ARCH_DATA_MODEL
       ifeq ($(ARCH), i586)
         ARCH_DATA_MODEL=32
       else
         ARCH_DATA_MODEL=64
       endif
+    else
+      ifeq ($(ARCH_DATA_MODEL), 32)
+      ARCH=i586
+      ARCH_FAMILY := $(ARCH)
+      endif
     endif
   endif
 
diff --git a/jdk/make/common/shared/Platform.gmk b/jdk/make/common/shared/Platform.gmk
--- a/jdk/make/common/shared/Platform.gmk
+++ b/jdk/make/common/shared/Platform.gmk
@@ -220,13 +220,20 @@
       ARCH=sparcv9
     endif
   else
-    # i586 is 32-bit, amd64 is 64-bit
+    # LOCALPATCH
+    # i586 is 32-bit, amd64 is 64-bit, unless ARCH_DATA_MODEL is explicitly set
+    # as 32 and ARCH will be demoted to i586
     ifndef ARCH_DATA_MODEL
       ifeq ($(ARCH), i586)
         ARCH_DATA_MODEL=32
       else
         ARCH_DATA_MODEL=64
       endif
+    else
+      ifeq ($(ARCH_DATA_MODEL), 32)
+      ARCH=i586
+      ARCH_FAMILY := $(ARCH)
+      endif
     endif
   endif