-@@ -451,7 +458,13 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
- ppc64) ZERO_ARCHDEF=PPC64 ;;
+ VAR_CPU_ARCH=x86
+@@ -168,7 +174,14 @@
+
+ # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
+ PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
+- PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
++ case "$build" in
++ *x32)
++ PLATFORM_EXTRACT_VARS_FROM_CPU(x32)
++ ;;
++ *)
++ PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
++ ;;
++ esac
+ # ..and setup our own variables. (Do this explicitely to facilitate searching)
+ OPENJDK_BUILD_OS="$VAR_OS"
+ OPENJDK_BUILD_OS_API="$VAR_OS_API"
+@@ -190,7 +203,14 @@
+
+ # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
+ PLATFORM_EXTRACT_VARS_FROM_OS($host_os)
+- PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
++ case "$host" in
++ *x32)
++ PLATFORM_EXTRACT_VARS_FROM_CPU(x32)
++ ;;
++ *)
++ PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
++ ;;
++ esac
+ # ... and setup our own variables. (Do this explicitely to facilitate searching)
+ OPENJDK_TARGET_OS="$VAR_OS"
+ OPENJDK_TARGET_OS_API="$VAR_OS_API"
+@@ -380,6 +400,7 @@