stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8015614: Update build settings

Browse Source 
Reviewed-by: tbell, dholmes, ahgross
This commit is contained in:
Erik Joelsson 2013-08-19 17:47:21 +02:00
parent 972c8c9fb0
commit 1b5eaa621e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hotspot/make/windows/makefiles/compile.make
View File

@ -180,6 +180,7 @@ DEBUG_OPT_OPTION = /Od
PRODUCT_OPT_OPTION = /O2 /Oy- PRODUCT_OPT_OPTION = /O2 /Oy-
FASTDEBUG_OPT_OPTION = /O2 /Oy- FASTDEBUG_OPT_OPTION = /O2 /Oy-
DEBUG_OPT_OPTION = /Od DEBUG_OPT_OPTION = /Od
SAFESEH_FLAG = /SAFESEH
!endif !endif
!if "$(COMPILER_NAME)" == "VS2005" !if "$(COMPILER_NAME)" == "VS2005"
@ -198,6 +199,7 @@ LD_FLAGS = /manifest $(LD_FLAGS) $(BUFFEROVERFLOWLIB)
!if "x$(MT)" == "x" !if "x$(MT)" == "x"
MT=mt.exe MT=mt.exe
!endif !endif
SAFESEH_FLAG = /SAFESEH
!endif !endif
!if "$(COMPILER_NAME)" == "VS2008" !if "$(COMPILER_NAME)" == "VS2008"
@ -211,6 +213,7 @@ LD_FLAGS = /manifest $(LD_FLAGS)
!if "x$(MT)" == "x" !if "x$(MT)" == "x"
MT=mt.exe MT=mt.exe
!endif !endif
SAFESEH_FLAG = /SAFESEH
!endif !endif
!if "$(COMPILER_NAME)" == "VS2010" !if "$(COMPILER_NAME)" == "VS2010"
@ -240,9 +243,11 @@ LD_FLAGS = /manifest $(LD_FLAGS)
!if "x$(MT)" == "x" !if "x$(MT)" == "x"
MT=mt.exe MT=mt.exe
!endif !endif
!if "$(BUILDARCH)" == "i486" SAFESEH_FLAG = /SAFESEH
LD_FLAGS = /SAFESEH $(LD_FLAGS)
!endif !endif
!if "$(BUILDARCH)" == "i486"
LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
!endif !endif
# If NO_OPTIMIZATIONS is defined in the environment, turn everything off # If NO_OPTIMIZATIONS is defined in the environment, turn everything off

3
hotspot/make/windows/makefiles/sa.make
View File

@ -107,6 +107,9 @@ SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE)
!if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
SA_LFLAGS = $(SA_LFLAGS) -map -debug SA_LFLAGS = $(SA_LFLAGS) -map -debug
!endif !endif
!if "$(BUILDARCH)" == "i486"
SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
!endif
# Note that we do not keep sawindbj.obj around as it would then # Note that we do not keep sawindbj.obj around as it would then
# get included in the dumpbin command in build_vm_def.sh # get included in the dumpbin command in build_vm_def.sh