Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/windows/build_vm_def.sh	Thu Aug 22 14:56:10 2013 -0400
     1.2 +++ b/make/windows/build_vm_def.sh	Thu Aug 22 13:53:13 2013 -0700
     1.3 @@ -42,8 +42,6 @@
     1.4   MKS_HOME=`dirname "$SH"`
     1.5  fi
     1.6  
     1.7 -echo "EXPORTS" > vm1.def
     1.8 -
     1.9  AWK="$MKS_HOME/awk.exe"
    1.10  if [ ! -e $AWK ]; then
    1.11      AWK="$MKS_HOME/gawk.exe"
    1.12 @@ -55,6 +53,22 @@
    1.13  RM="$MKS_HOME/rm.exe"
    1.14  DUMPBIN="link.exe /dump"
    1.15  
    1.16 +if [ "$1" = "-nosa" ]; then
    1.17 +    echo EXPORTS > vm.def
    1.18 +    echo ""
    1.19 +    echo "***"
    1.20 +    echo "*** Not building SA: BUILD_WIN_SA != 1"
    1.21 +    echo "*** C++ Vtables NOT included in vm.def"
    1.22 +    echo "*** This jvm.dll will NOT work properly with SA."
    1.23 +    echo "***"
    1.24 +    echo "*** When in doubt, set BUILD_WIN_SA=1, clean and rebuild."
    1.25 +    echo "***"
    1.26 +    echo ""
    1.27 +    exit
    1.28 +fi
    1.29 +
    1.30 +echo "EXPORTS" > vm1.def
    1.31 +
    1.32  # When called from IDE the first param should contain the link version, otherwise may be nill
    1.33  if [ "x$1" != "x" ]; then
    1.34  LD_VER="$1"

     2.1 --- a/make/windows/makefiles/debug.make	Thu Aug 22 14:56:10 2013 -0400
     2.2 +++ b/make/windows/makefiles/debug.make	Thu Aug 22 13:53:13 2013 -0700
     2.3 @@ -49,9 +49,6 @@
     2.4  # Force resources to be rebuilt every time
     2.5  $(Res_Files): FORCE
     2.6  
     2.7 -vm.def: $(Obj_Files)
     2.8 -	sh $(WorkSpace)/make/windows/build_vm_def.sh
     2.9 -
    2.10  $(AOUT): $(Res_Files) $(Obj_Files) vm.def
    2.11  	$(LD) @<<
    2.12    $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)

     3.1 --- a/make/windows/makefiles/fastdebug.make	Thu Aug 22 14:56:10 2013 -0400
     3.2 +++ b/make/windows/makefiles/fastdebug.make	Thu Aug 22 13:53:13 2013 -0700
     3.3 @@ -48,9 +48,6 @@
     3.4  # Force resources to be rebuilt every time
     3.5  $(Res_Files): FORCE
     3.6  
     3.7 -vm.def: $(Obj_Files)
     3.8 -	sh $(WorkSpace)/make/windows/build_vm_def.sh
     3.9 -
    3.10  $(AOUT): $(Res_Files) $(Obj_Files) vm.def
    3.11  	$(LD) @<<
    3.12    $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)

     4.1 --- a/make/windows/makefiles/product.make	Thu Aug 22 14:56:10 2013 -0400
     4.2 +++ b/make/windows/makefiles/product.make	Thu Aug 22 13:53:13 2013 -0700
     4.3 @@ -51,9 +51,6 @@
     4.4  # Force resources to be rebuilt every time
     4.5  $(Res_Files): FORCE
     4.6  
     4.7 -vm.def: $(Obj_Files)
     4.8 -	sh $(WorkSpace)/make/windows/build_vm_def.sh
     4.9 -
    4.10  $(AOUT): $(Res_Files) $(Obj_Files) vm.def
    4.11  	$(LD) @<<
    4.12    $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)

     5.1 --- a/make/windows/makefiles/projectcreator.make	Thu Aug 22 14:56:10 2013 -0400
     5.2 +++ b/make/windows/makefiles/projectcreator.make	Thu Aug 22 13:53:13 2013 -0700
     5.3 @@ -92,6 +92,10 @@
     5.4          -disablePch        getThread_windows_$(Platform_arch).cpp \
     5.5          -disablePch_compiler2     opcodes.cpp
     5.6  
     5.7 +!if "$(BUILD_WIN_SA)" != "1"
     5.8 +BUILD_VM_DEF_FLAG=-nosa
     5.9 +!endif
    5.10 +
    5.11  # Common options for the IDE builds for c1, and c2
    5.12  ProjectCreatorIDEOptions=\
    5.13          $(ProjectCreatorIDEOptions) \
    5.14 @@ -104,7 +108,7 @@
    5.15          -jdkTargetRoot $(HOTSPOTJDKDIST) \
    5.16          -define ALIGN_STACK_FRAMES \
    5.17          -define VM_LITTLE_ENDIAN \
    5.18 -        -prelink  "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b	set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME)	set JAVA_HOME=$(HOTSPOTJDKDIST)	$(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \
    5.19 +        -prelink  "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b	set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME)	set JAVA_HOME=$(HOTSPOTJDKDIST)	$(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(BUILD_VM_DEF_FLAG) $(LD_VER)" \
    5.20          -ignoreFile jsig.c \
    5.21          -ignoreFile jvmtiEnvRecommended.cpp \
    5.22          -ignoreFile jvmtiEnvStub.cpp \

     6.1 --- a/make/windows/makefiles/vm.make	Thu Aug 22 14:56:10 2013 -0400
     6.2 +++ b/make/windows/makefiles/vm.make	Thu Aug 22 13:53:13 2013 -0700
     6.3 @@ -393,3 +393,11 @@
     6.4  _build_pch_file.obj:
     6.5          @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp
     6.6          $(CXX) $(CXX_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp
     6.7 +
     6.8 +!if "$(BUILD_WIN_SA)" != "1"
     6.9 +BUILD_VM_DEF_FLAG=-nosa
    6.10 +!endif
    6.11 +
    6.12 +vm.def: $(Obj_Files)
    6.13 +	sh $(WorkSpace)/make/windows/build_vm_def.sh $(BUILD_VM_DEF_FLAG)
    6.14 +