# HG changeset patch
# User amurillo
# Date 1404418928 25200
# Node ID 3ced629c82b799fcaecd9db97c4a729b3ece3e99
# Parent  8a604411f552c85d38d365927176c8458cbce24c# Parent  7ea4fdc536b6487c02b568eac163dc41427ecca7
Merge

diff -r 8a604411f552 -r 3ced629c82b7 common/autoconf/hotspot-spec.gmk.in
--- a/common/autoconf/hotspot-spec.gmk.in	Tue Jul 01 14:26:31 2014 -0700
+++ b/common/autoconf/hotspot-spec.gmk.in	Thu Jul 03 13:22:08 2014 -0700
@@ -69,8 +69,8 @@
 # Yet another name for arch used for an extra subdir below the jvm lib.
 # Uses i386 and amd64, instead of x86 and x86_64.
 LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB)
-# Old name for OPENJDK_TARGET_CPU, uses i586 and amd64, instead of x86 and x86_64.
-ARCH=$(OPENJDK_TARGET_CPU_LEGACY)
+# Set the cpu architecture
+ARCH=$(OPENJDK_TARGET_CPU_ARCH)
 # Legacy setting for building for a 64 bit machine.
 # If yes then this expands to _LP64:=1
 @LP64@