From 41db47bfe830dd778f30fee633d961bfd290d636 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 6 May 2010 09:24:57 -0700 Subject: [PATCH] Streamline x86 configurations, ia32 => 32bit x86_64 => 64bit. --- build/hosts/ia32-linux.properties | 17 ++++++++---- build/hosts/x86_64-linux.properties | 19 ++++++------- build/hosts/x86_64_m64-linux.properties | 33 ----------------------- build/targets/ia32-linux.properties | 14 +++++----- build/targets/x86_64-linux.properties | 4 +-- build/targets/x86_64_m64-linux.properties | 30 --------------------- 6 files changed, 30 insertions(+), 87 deletions(-) delete mode 100644 build/hosts/x86_64_m64-linux.properties delete mode 100644 build/targets/x86_64_m64-linux.properties diff --git a/build/hosts/ia32-linux.properties b/build/hosts/ia32-linux.properties index c6178a710..18f9f0dc7 100644 --- a/build/hosts/ia32-linux.properties +++ b/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 diff --git a/build/hosts/x86_64-linux.properties b/build/hosts/x86_64-linux.properties index 591f30a8d..ced167676 100644 --- a/build/hosts/x86_64-linux.properties +++ b/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 diff --git a/build/hosts/x86_64_m64-linux.properties b/build/hosts/x86_64_m64-linux.properties deleted file mode 100644 index b2b7da3ae..000000000 --- a/build/hosts/x86_64_m64-linux.properties +++ /dev/null @@ -1,33 +0,0 @@ -# -# This file is part of the Jikes RVM project (http://jikesrvm.org). -# -# This file is licensed to You under the Eclipse Public License (EPL); -# You may not use this file except in compliance with the License. You -# may obtain a copy of the License at -# -# http://www.opensource.org/licenses/eclipse-1.0.php -# -# 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 -m64 -c.exe=/usr/bin/gcc -c.args=${c++.args} -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 unless downloading and installing classpath or gcspy -make.exe=/usr/bin/make - -# optional unless downloading and installing classpath -tar.exe=/bin/tar -cvs.exe=/usr/bin/cvs -autoconf.exe=/usr/bin/autoconf diff --git a/build/targets/ia32-linux.properties b/build/targets/ia32-linux.properties index 23fb29094..5854df4d7 100755 --- a/build/targets/ia32-linux.properties +++ b/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= diff --git a/build/targets/x86_64-linux.properties b/build/targets/x86_64-linux.properties index 5854df4d7..e9b919bed 100755 --- a/build/targets/x86_64-linux.properties +++ b/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= diff --git a/build/targets/x86_64_m64-linux.properties b/build/targets/x86_64_m64-linux.properties deleted file mode 100644 index e9b919bed..000000000 --- a/build/targets/x86_64_m64-linux.properties +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is part of the Jikes RVM project (http://jikesrvm.org). -# -# This file is licensed to You under the Eclipse Public License (EPL); -# You may not use this file except in compliance with the License. You -# may obtain a copy of the License at -# -# http://www.opensource.org/licenses/eclipse-1.0.php -# -# See the COPYRIGHT.txt file distributed with this work for information -# regarding copyright ownership. -# -target.arch=ia32 -target.os=Linux -target.bootimage.code.address=0x64000000 -target.bootimage.data.address=0x60000000 -target.bootimage.rmap.address=0x67000000 -target.max-mappable.address=0xF0000000L -target.address.size=64 -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= -target.arch.sse2=full -target.arch.hw_fsqrt=true