Mercurial > hg > truffle
annotate make/windows/build_vm_def.sh @ 17716:cdb71841f4bc
6498581: ThreadInterruptTest3 produces wrong output on Windows
Summary: There is race condition between os::interrupt and os::is_interrupted on Windows. In JVM_Sleep(Thread.sleep), check if thread gets interrupted, it may see interrupted but not really interrupted so cause spurious waking up (early return from sleep). Fix by checking if interrupt event really gets set thus prevent false return. For intrinsic of _isInterrupted, on Windows, go fastpath only on bit not set.
Reviewed-by: acorn, kvn
Contributed-by: david.holmes@oracle.com, yumin.qi@oracle.com
| author | minqi |
|---|---|
| date | Wed, 26 Feb 2014 15:20:41 -0800 |
| parents | 55fb97c4c58d |
| children | d8041d695d19 |
| rev | line source |
|---|---|
| 0 | 1 # |
|
17467
55fb97c4c58d
8029233: Update copyright year to match last edit in jdk8 hotspot repository for 2013
mikael
parents:
12099
diff
changeset
|
2 # Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 # | |
| 5 # This code is free software; you can redistribute it and/or modify it | |
| 6 # under the terms of the GNU General Public License version 2 only, as | |
| 7 # published by the Free Software Foundation. | |
| 8 # | |
| 9 # This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 # version 2 for more details (a copy is included in the LICENSE file that | |
| 13 # accompanied this code). | |
| 14 # | |
| 15 # You should have received a copy of the GNU General Public License version | |
| 16 # 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 # | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1485
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1485
diff
changeset
|
20 # or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1485
diff
changeset
|
21 # questions. |
| 0 | 22 # |
| 23 # | |
| 24 | |
| 25 # This shell script builds a vm.def file for the current VM variant. | |
| 26 # The .def file exports vtbl symbols which allow the Serviceability | |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
27 # Agent to run on Windows. See make/windows/projectfiles/*/vm.def |
| 0 | 28 # for more information. |
| 29 # | |
| 30 # The script expects to be executed in the directory containing all of | |
| 31 # the object files. | |
| 32 | |
| 33 # Note that we currently do not have a way to set HotSpotMksHome in | |
| 34 # the batch build, but so far this has not seemed to be a problem. The | |
| 35 # reason this environment variable is necessary is that it seems that | |
| 36 # Windows truncates very long PATHs when executing shells like MKS's | |
| 37 # sh, and it has been found that sometimes `which sh` fails. | |
| 38 if [ "x$HOTSPOTMKSHOME" != "x" ]; then | |
| 39 MKS_HOME="$HOTSPOTMKSHOME" | |
| 40 else | |
| 41 SH=`which sh` | |
| 42 MKS_HOME=`dirname "$SH"` | |
| 43 fi | |
| 44 | |
| 45 AWK="$MKS_HOME/awk.exe" | |
|
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1552
diff
changeset
|
46 if [ ! -e $AWK ]; then |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1552
diff
changeset
|
47 AWK="$MKS_HOME/gawk.exe" |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1552
diff
changeset
|
48 fi |
| 0 | 49 GREP="$MKS_HOME/grep.exe" |
| 50 SORT="$MKS_HOME/sort.exe" | |
| 51 UNIQ="$MKS_HOME/uniq.exe" | |
| 52 CAT="$MKS_HOME/cat.exe" | |
| 53 RM="$MKS_HOME/rm.exe" | |
| 54 DUMPBIN="link.exe /dump" | |
| 55 | |
|
12099
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
56 if [ "$1" = "-nosa" ]; then |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
57 echo EXPORTS > vm.def |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
58 echo "" |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
59 echo "***" |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
60 echo "*** Not building SA: BUILD_WIN_SA != 1" |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
61 echo "*** C++ Vtables NOT included in vm.def" |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
62 echo "*** This jvm.dll will NOT work properly with SA." |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
63 echo "***" |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
64 echo "*** When in doubt, set BUILD_WIN_SA=1, clean and rebuild." |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
65 echo "***" |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
66 echo "" |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
67 exit |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
68 fi |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
69 |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
70 echo "EXPORTS" > vm1.def |
|
c062a6e1fa33
8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
iklam
parents:
6842
diff
changeset
|
71 |
|
659
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
72 # When called from IDE the first param should contain the link version, otherwise may be nill |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
73 if [ "x$1" != "x" ]; then |
|
4891
719f7007c8e8
7141242: build-infra merge: Rename CPP->CXX and LINK->LD
erikj
parents:
2027
diff
changeset
|
74 LD_VER="$1" |
|
659
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
75 fi |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
76 |
|
4891
719f7007c8e8
7141242: build-infra merge: Rename CPP->CXX and LINK->LD
erikj
parents:
2027
diff
changeset
|
77 if [ "x$LD_VER" != "x800" -a "x$LD_VER" != "x900" -a "x$LD_VER" != "x1000" ]; then |
|
1485
fb57d4cf76c2
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
844
diff
changeset
|
78 $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def |
|
659
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
79 else |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
80 # Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
81 $DUMPBIN /OUT:vm3.def /symbols *.obj |
|
1485
fb57d4cf76c2
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
844
diff
changeset
|
82 "$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def |
|
659
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
83 "$RM" -f vm3.def |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
84 fi |
|
520d43965b1f
6812297: update project creation for Visual Studio 2005-2008
ikrylov
parents:
196
diff
changeset
|
85 |
| 0 | 86 "$CAT" vm1.def vm2.def > vm.def |
| 87 "$RM" -f vm1.def vm2.def |