Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/windows/makefiles/compile.make	Thu Aug 15 21:33:37 2013 +0100
     1.2 +++ b/make/windows/makefiles/compile.make	Mon Aug 19 17:47:21 2013 +0200
     1.3 @@ -180,6 +180,7 @@
     1.4  PRODUCT_OPT_OPTION   = /O2 /Oy-
     1.5  FASTDEBUG_OPT_OPTION = /O2 /Oy-
     1.6  DEBUG_OPT_OPTION     = /Od
     1.7 +SAFESEH_FLAG = /SAFESEH
     1.8  !endif
     1.9  
    1.10  !if "$(COMPILER_NAME)" == "VS2005"
    1.11 @@ -198,6 +199,7 @@
    1.12  !if "x$(MT)" == "x"
    1.13  MT=mt.exe
    1.14  !endif
    1.15 +SAFESEH_FLAG = /SAFESEH
    1.16  !endif
    1.17  
    1.18  !if "$(COMPILER_NAME)" == "VS2008"
    1.19 @@ -211,6 +213,7 @@
    1.20  !if "x$(MT)" == "x"
    1.21  MT=mt.exe
    1.22  !endif
    1.23 +SAFESEH_FLAG = /SAFESEH
    1.24  !endif
    1.25  
    1.26  !if "$(COMPILER_NAME)" == "VS2010"
    1.27 @@ -240,9 +243,11 @@
    1.28  !if "x$(MT)" == "x"
    1.29  MT=mt.exe
    1.30  !endif
    1.31 +SAFESEH_FLAG = /SAFESEH
    1.32 +!endif
    1.33 +
    1.34  !if "$(BUILDARCH)" == "i486"
    1.35 -LD_FLAGS = /SAFESEH $(LD_FLAGS)
    1.36 -!endif
    1.37 +LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
    1.38  !endif
    1.39  
    1.40  # If NO_OPTIMIZATIONS is defined in the environment, turn everything off

     2.1 --- a/make/windows/makefiles/sa.make	Thu Aug 15 21:33:37 2013 +0100
     2.2 +++ b/make/windows/makefiles/sa.make	Mon Aug 19 17:47:21 2013 +0200
     2.3 @@ -107,6 +107,9 @@
     2.4  !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
     2.5  SA_LFLAGS = $(SA_LFLAGS) -map -debug
     2.6  !endif
     2.7 +!if "$(BUILDARCH)" == "i486"
     2.8 +SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
     2.9 +!endif
    2.10  
    2.11  # Note that we do not keep sawindbj.obj around as it would then
    2.12  # get included in the dumpbin command in build_vm_def.sh