Mercurial > hg > openjdk > jdk6 > hotspot

changeset 4047:c2e524f26e19 jdk6-b29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OPENJDK6-23: Resolve merge issues in 8015614. Reviewed-by: omajid
author andrew
date Tue, 03 Dec 2013 07:15:34 +0000
parents e8d1979fe077
children d835d67bfb88
files make/windows/makefiles/compile.make
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/windows/makefiles/compile.make	Mon Sep 16 13:49:10 2013 -0700
+++ b/make/windows/makefiles/compile.make	Tue Dec 03 07:15:34 2013 +0000
@@ -140,7 +140,6 @@
 !if "$(MSC_VER)" == "1600"
 COMPILER_NAME=VS2010
 !endif
-SAFESEH_FLAG = /SAFESEH
 !endif
 
 # By default, we do not want to use the debug version of the msvcrt.dll file
@@ -200,6 +199,7 @@
 # Manifest Tool - used in VS2005 and later to adjust manifests stored
 # as resources inside build artifacts.
 MT=mt.exe
+SAFESEH_FLAG = /SAFESEH
 !endif
 
 !if "$(COMPILER_NAME)" == "VS2010"
@@ -211,8 +211,6 @@
 # Manifest Tool - used in VS2005 and later to adjust manifests stored
 # as resources inside build artifacts.
 MT=mt.exe
-!if "$(BUILDARCH)" == "i486"
-LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
 SAFESEH_FLAG = /SAFESEH
 !endif
 
@@ -238,6 +236,9 @@
 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
 LD_FLAGS= $(LD_FLAGS) /map /debug
 !endif
+!if "$(BUILDARCH)" == "i486"
+LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS)
+!endif
 
 
 !if $(MSC_VER) >= 1600