LIBARCH replacement?

[David Holmes]

I now see this set of definitions in spec.gmk for a 32-bit x86 build:

OPENJDK_TARGET_CPU:=x86
OPENJDK_TARGET_CPU_ARCH:=x86
OPENJDK_TARGET_CPU_BITS:=32
OPENJDK_TARGET_CPU_ENDIAN:=little
OPENJDK_TARGET_CPU_ISADIR:=
OPENJDK_TARGET_CPU_LIBDIR:=/i386
OPENJDK_TARGET_CPU_LEGACY:=i586
OPENJDK_TARGET_CPU_LEGACY_LIB:=i386
OPENJDK_TARGET_CPU_OSARCH:=i386
OPENJDK_TARGET_CPU_JLI_CFLAGS:=-DLIBARCHNAME='"i386"'

and it is far from clear which variable is meant to represent which kind 
of "arch" usage. In particular LIBARCH very clearly meant "the <arch> 
directory found in the lib directory". But which of the above should be 
used to replace LIBARCH? The candidates (based on the fact they have the 
right value) are:

OPENJDK_TARGET_CPU_LIBDIR:=/i386
OPENJDK_TARGET_CPU_LEGACY_LIB:=i386
OPENJDK_TARGET_CPU_OSARCH:=i386

I suspect the first one was the intended replacement - right? But the 
leading slash is problematic for my usage (hence I've used the second 
one). I don't think slashes belong in simple variables.

David