Streamline x86 configurations, ia32 => 32bit x86_64 => 64bit.

build/hosts/ia32-linux.properties

@@ -10,15 +10,22 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-bison.exe=/usr/bin/bison
-c++.exe=/usr/bin/g++
-c++.args=-w -pipe -ggdb3 -O -fPIC
 c.exe=/usr/bin/gcc
-c.args=${c++.args}
-shld.args=${c++.args} -shared
+c.args=-w -g -mfpmath=sse -O3 -m32
+shld.args=${c.args} -shared
+ld.exe=/usr/bin/ld
+bison.exe=/usr/bin/bison
 perl.exe=/usr/bin/perl
 bash.exe=/bin/bash
 
+# optional flags used in building Harmony
+harmony.arch=x86
+harmony.cflags=-m32
+harmony.cxxflags=-m32
+harmony.ldflags=-m32
+harmony.asflags=--32
+ant.exe=/usr/bin/ant
+
 # optional unless downloading and installing classpath or gcspy
 make.exe=/usr/bin/make
 

build/hosts/x86_64-linux.properties

@@ -10,21 +10,18 @@
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
 #
-c.exe=/usr/bin/gcc
-c.args=-w -g -mfpmath=sse -O3 -m32
-ld.exe=/usr/bin/ld
 bison.exe=/usr/bin/bison
+c.args=-w -pipe -ggdb3 -O -fPIC -m64
+c.exe=/usr/bin/gcc
+shld.args=${c.args} -shared
+harmony.arch=x86_64
+harmony.cflags=-m64
+harmony.cxxflags=-m64
+harmony.ldflags=-m64
+harmony.asflags=--64
 perl.exe=/usr/bin/perl
 bash.exe=/bin/bash
 
-# optional flags used in building Harmony
-harmony.arch=x86
-harmony.cflags=-m32
-harmony.cxxflags=-m32
-harmony.ldflags=-m32
-harmony.asflags=--32
-ant.exe=/usr/bin/ant
-
 # optional unless downloading and installing classpath or gcspy
 make.exe=/usr/bin/make
 

build/targets/ia32-linux.properties

@@ -12,15 +12,17 @@
 #
 target.arch=ia32
 target.os=Linux
-target.bootimage.code.address=0x5B000000
-target.bootimage.data.address=0x57000000
-target.bootimage.rmap.address=0x5E000000
-target.max-mappable.address=0xa0000000
+target.bootimage.code.address=0x64000000
+target.bootimage.data.address=0x60000000
+target.bootimage.rmap.address=0x67000000
+target.max-mappable.address=0xb0000000
 target.address.size=32
-target.obj-ext=.o
-target.obj-prefix=
 target.dll-ext=.so
 target.dll-prefix=lib
+target.lib-ext=
+target.lib-prefix=
+target.obj-ext=.o
+target.obj-prefix=
 target.jni-suffix=${target.dll-ext}
 target.debug-suffix=${target.dll-ext}
 target.exe-ext=

build/targets/x86_64-linux.properties

@@ -15,8 +15,8 @@ target.os=Linux
 target.bootimage.code.address=0x64000000
 target.bootimage.data.address=0x60000000
 target.bootimage.rmap.address=0x67000000
-target.max-mappable.address=0xb0000000
-target.address.size=32
+target.max-mappable.address=0xF0000000L
+target.address.size=64
 target.dll-ext=.so
 target.dll-prefix=lib
 target.lib-ext=