annotate domake @ 3237:399aa66d375e

Fixed a bug in which the valueEquals method was misused. The method does only check the equality of the node data and not full GVN equality by taking inputs and successors into account.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 27 Jul 2011 14:16:38 -0700
parents c4922e69711e
children 44da449fc29c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1421
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
diff changeset
1 #!/bin/bash
1439
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
2
1476
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
3 test -n "$JDK7" || { echo "Need to set JDK7 environment variable to the base of a JDK 1.7"; exit 1; }
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
4 test -n "$JDK7G" || { echo "Need to set JDK7G environment variable to the base of a JDK 1.7"; exit 1; }
1439
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
5
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
6 # Resolve location of this script
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
7 me="${BASH_SOURCE[0]}"
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
8 while [ -h "$me" ]; do
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
9 me=`readlink -e "$me"`
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
10 done
1467
c0de7306803c Renaming: hsx -> graal.
Doug Simon <doug.simon@oracle.com>
parents: 1446
diff changeset
11 graal_home=$(cd `dirname $me`; pwd)
1439
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
12
1476
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
13 grep '-client KNOWN' $JDK7/jre/lib/amd64/jvm.cfg >/dev/null
1439
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
14 if [ $? -ne 0 ] ; then
1476
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
15 echo "The setting for -client in $JDK7/jre/lib/amd64/jvm.cfg must be:"
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
16 echo
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
17 echo " -client KNOWN"
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
18 echo
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
19 exit 1
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
20 fi
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
21
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
22 grep '-client KNOWN' $JDK7G/jre/lib/amd64/jvm.cfg >/dev/null
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
23 if [ $? -ne 0 ] ; then
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
24 echo "The setting for -client in $JDK7G/jre/lib/amd64/jvm.cfg must be:"
1439
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
25 echo
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
26 echo " -client KNOWN"
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
27 echo
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
28 exit 1
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
29 fi
d0c8d3a2a7e8 Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Doug Simon <doug.simon@oracle.com>
parents: 1435
diff changeset
30
2667
c4922e69711e fixed link in domake script
Lukas Stadler <lukas.stadler@jku.at>
parents: 2287
diff changeset
31 java_link="$graal_home/graal/hotspot/java"
1446
5f1100e1cb12 Removed 'java' indirection script and modified domake to create the replacement symlink to /usr/lib/jvm/jre1.7.0/bin/java
Doug Simon <doug.simon@oracle.com>
parents: 1441
diff changeset
32 if [ ! -e $java_link ]; then
1476
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
33 echo "Creating link: $java_link -> $JDK7/jre/bin/java"
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
34 ln -s $JDK7/jre/bin/java $java_link
1446
5f1100e1cb12 Removed 'java' indirection script and modified domake to create the replacement symlink to /usr/lib/jvm/jre1.7.0/bin/java
Doug Simon <doug.simon@oracle.com>
parents: 1441
diff changeset
35 fi
5f1100e1cb12 Removed 'java' indirection script and modified domake to create the replacement symlink to /usr/lib/jvm/jre1.7.0/bin/java
Doug Simon <doug.simon@oracle.com>
parents: 1441
diff changeset
36
2279
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
37 client_dir=$JDK7/jre/lib/amd64/client
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
38 if [ ! -e $client_dir ]; then
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
39 echo "Creating client compiler dir: $client_dir"
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
40 mkdir $client_dir
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
41 fi
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
42
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
43 client_dir=$JDK7G/jre/lib/amd64/client
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
44 if [ ! -e $client_dir ]; then
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
45 echo "Creating debug client compiler dir: $client_dir"
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
46 mkdir $client_dir
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
47 fi
9aad24bf09ed domake script creates client dirs
Lukas Stadler <lukas.stadler@jku.at>
parents: 1476
diff changeset
48
1467
c0de7306803c Renaming: hsx -> graal.
Doug Simon <doug.simon@oracle.com>
parents: 1446
diff changeset
49 pushd $graal_home/make
1476
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
50
2287
66ffa0e99cef suppress Xusage.txt build errors, fix INSTALL (yes/no option, uses ALT_BOOTDIR)
Lukas Stadler <lukas.stadler@jku.at>
parents: 2279
diff changeset
51 # the piping magic runs stderr through grep and removes the complaints about Xusage.txt files
66ffa0e99cef suppress Xusage.txt build errors, fix INSTALL (yes/no option, uses ALT_BOOTDIR)
Lukas Stadler <lukas.stadler@jku.at>
parents: 2279
diff changeset
52 ARCH_DATA_MODEL=64 LANG=C HOTSPOT_BUILD_JOBS=4 ALT_BOOTDIR=$JDK7G INSTALL=y make jvmg1 3>&1 1>&2 2>&3 | grep -v Xusage[.]txt
66ffa0e99cef suppress Xusage.txt build errors, fix INSTALL (yes/no option, uses ALT_BOOTDIR)
Lukas Stadler <lukas.stadler@jku.at>
parents: 2279
diff changeset
53 ARCH_DATA_MODEL=64 LANG=C HOTSPOT_BUILD_JOBS=4 ALT_BOOTDIR=$JDK7 INSTALL=y make product1 3>&1 1>&2 2>&3 | grep -v Xusage[.]txt
1476
1f81c0d18c75 Build also release version of VM. Fix towards making SpecJVM2008 run.
Thomas Wuerthinger <wuerthinger@ssw.jku.at>
parents: 1467
diff changeset
54
1421
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
diff changeset
55 popd
6223633ce7dd changed VMExit/VMEntries to non-static, added eclipse c++ project, CIR interface changes
Lukas Stadler <lukas.stadler@oracle.com>
parents:
diff changeset
56