From 0d536f5e7da0ee2813efd2955a31b5305d5cc57c Mon Sep 17 00:00:00 2001
From: OpenJDK Team <openjdk@lists.launchpad.net>
Date: Thu, 19 Nov 2015 00:27:25 +0000
Subject: [PATCH] it-x32-zero

Gbp-Pq: Name it-x32-zero.diff
---
 acinclude.m4 | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 1964f69..cc7b92b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,10 +2,18 @@ AC_DEFUN([IT_SET_ARCH_SETTINGS],
 [
   case "${host_cpu}" in
     x86_64)
-      BUILD_ARCH_DIR=amd64
-      INSTALL_ARCH_DIR=amd64
-      JRE_ARCH_DIR=amd64
-      ARCHFLAG="-m64"
+      case "${host}" in
+        *x32)
+          BUILD_ARCH_DIR=x32
+          INSTALL_ARCH_DIR=x32
+          JRE_ARCH_DIR=x32
+          ;;
+        *)
+          BUILD_ARCH_DIR=amd64
+          INSTALL_ARCH_DIR=amd64
+          JRE_ARCH_DIR=amd64
+          ARCHFLAG="-m64"
+      esac
       ;;
     i?86)
       BUILD_ARCH_DIR=i586
@@ -720,7 +728,7 @@ AC_DEFUN_ONCE([IT_ENABLE_ZERO_BUILD],
   ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
   dnl can't use AC_CHECK_SIZEOF on multilib
   case "${ZERO_LIBARCH}" in
-    arm|i386|ppc|s390|sh|sparc)
+    arm|i386|ppc|s390|sh|sparc|x32)
       ZERO_BITSPERWORD=32
       ;;
     aarch64|alpha|amd64|ia64|ppc64|ppc64le|s390x|sparcv9)
-- 
2.30.2