Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/windows/build.make	Fri Jan 24 09:41:30 2020 +0800
     1.2 +++ b/make/windows/build.make	Sat Jan 25 06:34:42 2020 +0000
     1.3 @@ -280,7 +280,7 @@
     1.4  	@ echo HS_COMPANY=$(COMPANY_NAME)			>> $@
     1.5  	@ echo HS_FILEDESC=$(HS_FILEDESC)			>> $@
     1.6  	@ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)		>> $@
     1.7 -	@ echo VENDOR=$(VENDOR)					>> $@
     1.8 +	@ echo VENDOR=$(COMPANY_NAME)				>> $@
     1.9  	@ echo VENDOR_URL=$(VENDOR_URL)				>> $@
    1.10  	@ echo VENDOR_URL_BUG=$(VENDOR_URL_BUG)			>> $@
    1.11  	@ echo VENDOR_URL_VM_BUG=$(VENDOR_URL_VM_BUG)		>> $@

     2.1 --- a/make/windows/makefiles/compile.make	Fri Jan 24 09:41:30 2020 +0800
     2.2 +++ b/make/windows/makefiles/compile.make	Sat Jan 25 06:34:42 2020 +0000
     2.3 @@ -346,7 +346,7 @@
     2.4  	 /D "HS_BUILD_ID=$(HS_BUILD_ID)" \
     2.5  	 /D "JDK_VER=$(JDK_VER)" \
     2.6  	 /D "JDK_DOTVER=$(JDK_DOTVER)" \
     2.7 -	 /D "HS_COMPANY=$(HS_COMPANY)" \
     2.8 +	 /D "HS_COMPANY=$(COMPANY_NAME)" \
     2.9  	 /D "HS_FILEDESC=$(HS_FILEDESC)" \
    2.10  	 /D "HS_COPYRIGHT=$(HS_COPYRIGHT)" \
    2.11  	 /D "HS_FNAME=$(HS_FNAME)" \

     3.1 --- a/make/windows/makefiles/defs.make	Fri Jan 24 09:41:30 2020 +0800
     3.2 +++ b/make/windows/makefiles/defs.make	Sat Jan 25 06:34:42 2020 +0000
     3.3 @@ -157,6 +157,15 @@
     3.4  MAKE_ARGS += RM="$(RM)"
     3.5  MAKE_ARGS += ZIPEXE=$(ZIPEXE)
     3.6  
     3.7 +MAKE_ARGS += COMPANY_NAME="$(COMPANY_NAME)"
     3.8 +MAKE_ARGS += VENDOR_URL=$(VENDOR_URL)
     3.9 +MAKE_ARGS += VENDOR_URL_BUG=$(VENDOR_URL_BUG)
    3.10 +MAKE_ARGS += VENDOR_URL_VM_BUG=$(VENDOR_URL_VM_BUG)
    3.11 +ifneq ($(VERSION_CFLAGS),)
    3.12 +  # transform syntax from -DProp='"Value"' to /D "Prop=\"Value\"" for Windows build
    3.13 +  MAKE_ARGS += VERSION_CFLAGS="$(subst -D,/D \",$(subst ',,$(subst '$() $(),\"$() $(),$(subst ",\\\",$(VERSION_CFLAGS)))))\""
    3.14 +endif
    3.15 +
    3.16  # On 32 bit windows we build server and client, on 64 bit just server.
    3.17  ifeq ($(JVM_VARIANTS),)
    3.18    ifeq ($(ARCH_DATA_MODEL), 32)

     4.1 --- a/make/windows/makefiles/vm.make	Fri Jan 24 09:41:30 2020 +0800
     4.2 +++ b/make/windows/makefiles/vm.make	Sat Jan 25 06:34:42 2020 +0000
     4.3 @@ -62,10 +62,6 @@
     4.4  CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
     4.5  CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
     4.6  CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
     4.7 -CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR=\"$(COMPANY_NAME)\""
     4.8 -CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL=\"$(VENDOR_URL)\""
     4.9 -CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_BUG=\"$(VENDOR_URL_BUG)\""
    4.10 -CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_VM_BUG=\"$(VENDOR_URL_VM_BUG)\""
    4.11  
    4.12  CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS)
    4.13  
    4.14 @@ -209,6 +205,14 @@
    4.15  bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
    4.16          $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
    4.17  
    4.18 +#files compiled with version flags
    4.19 +
    4.20 +vm_version.obj: $(WorkSpace)\src\share\vm\runtime\vm_version.cpp
    4.21 +        $(CXX) $(CXX_FLAGS) $(VERSION_CFLAGS) $(CXX_USE_PCH) /c $(WorkSpace)\src\share\vm\runtime\vm_version.cpp
    4.22 +
    4.23 +arguments.obj: $(WorkSpace)\src\share\vm\runtime\arguments.cpp
    4.24 +        $(CXX) $(CXX_FLAGS) $(VERSION_CFLAGS) $(CXX_USE_PCH) /c $(WorkSpace)\src\share\vm\runtime\arguments.cpp
    4.25 +
    4.26  # Default rules for the Virtual Machine
    4.27  {$(COMMONSRC)\share\vm\c1}.cpp.obj::
    4.28          $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<