comparison make/windows/build_vm_def.sh @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 5d801e6b9a80 719f7007c8e8
children e522a00b91aa
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
56 DUMPBIN="link.exe /dump" 56 DUMPBIN="link.exe /dump"
57 export VS_UNICODE_OUTPUT= 57 export VS_UNICODE_OUTPUT=
58 58
59 # When called from IDE the first param should contain the link version, otherwise may be nill 59 # When called from IDE the first param should contain the link version, otherwise may be nill
60 if [ "x$1" != "x" ]; then 60 if [ "x$1" != "x" ]; then
61 LINK_VER="$1" 61 LD_VER="$1"
62 fi 62 fi
63 63
64 if [ "x$LINK_VER" != "x800" -a "x$LINK_VER" != "x900" -a "x$LINK_VER" != "x1000" ]; then 64 if [ "x$LD_VER" != "x800" -a "x$LD_VER" != "x900" -a "x$LD_VER" != "x1000" ]; then
65 $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def 65 $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
66 else 66 else
67 # Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def 67 # Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def
68 $DUMPBIN /OUT:vm3.def /symbols *.obj 68 $DUMPBIN /OUT:vm3.def /symbols *.obj
69 "$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def 69 "$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def