Mercurial > hg > truffle

comparison make/windows/makefiles/launcher.make @ 2308:99bd05619fa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7017110: Add /SAFESEH to links on windows 32bit to verify safe exceptions Summary: Ensure safe exception handler table is generated on Win32 binaries when compile with VS2010 Reviewed-by: acorn, coleenp, dcubed, sla, ohair
author zgu
date Wed, 02 Mar 2011 09:16:18 -0500
parents aa6e219afbf1
children 1d1603768966
comparison
equal deleted inserted replaced
2306:5584e20db481 2308:99bd05619fa4
47 # externals at link time. Even with /GS-, you need bufferoverflowU.lib. 47 # externals at link time. Even with /GS-, you need bufferoverflowU.lib.
48 BUFFEROVERFLOWLIB = bufferoverflowU.lib 48 BUFFEROVERFLOWLIB = bufferoverflowU.lib
49 LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB) 49 LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB)
50 !endif 50 !endif
51 51
52 !if "$(COMPILER_NAME)" == "VS2010" && "$(BUILDARCH)" == "i486"
53 LINK_FLAGS = /SAFESEH $(LINK_FLAGS)
54 !endif
55
52 LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher 56 LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher
53 LAUNCHERDIR_SHARE = $(WorkSpace)/src/share/tools/launcher 57 LAUNCHERDIR_SHARE = $(WorkSpace)/src/share/tools/launcher
54 58
55 OUTDIR = launcher 59 OUTDIR = launcher
56 60
65 $(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h 69 $(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h
66 70
67 launcher: $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj 71 launcher: $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj
68 echo $(JAVA_HOME) > jdkpath.txt 72 echo $(JAVA_HOME) > jdkpath.txt
69 $(LINK) $(LINK_FLAGS) /out:hotspot.exe $** 73 $(LINK) $(LINK_FLAGS) /out:hotspot.exe $**
70
71