Print this page
rev 6897 : 8059131: sawindbg.dll is not compiled with /SAFESEH
Summary: Make variable SAFESEH_FLAG replaced with /SAFESEH link option.
Reviewed-by: mgronlun, sla
| Split |
Split |
Close |
| Expand all |
| Collapse all |
--- old/hotspot/make/windows/makefiles/sa.make
+++ new/hotspot/make/windows/makefiles/sa.make
1 1 #
2 2 # Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 #
5 5 # This code is free software; you can redistribute it and/or modify it
6 6 # under the terms of the GNU General Public License version 2 only, as
7 7 # published by the Free Software Foundation.
8 8 #
9 9 # This code is distributed in the hope that it will be useful, but WITHOUT
10 10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 # version 2 for more details (a copy is included in the LICENSE file that
13 13 # accompanied this code).
14 14 #
15 15 # You should have received a copy of the GNU General Public License version
16 16 # 2 along with this work; if not, write to the Free Software Foundation,
17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 #
19 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 # or visit www.oracle.com if you need additional information or have any
21 21 # questions.
22 22 #
23 23 #
24 24
25 25 # This makefile is used to build Serviceability Agent code
26 26 # and generate JNI header file for native methods.
27 27
28 28 AGENT_DIR = $(WorkSpace)/agent
29 29 checkAndBuildSA::
30 30
31 31 !if "$(BUILD_WIN_SA)" != "1"
32 32 # Already warned about this in build.make
33 33 !else
34 34
35 35 # This first part is used to build sa-jdi.jar
36 36 !include $(WorkSpace)/make/windows/makefiles/rules.make
37 37 !include $(WorkSpace)/make/sa.files
38 38
39 39 GENERATED = ../generated
40 40
41 41 # tools.jar is needed by the JDI - SA binding
42 42 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
43 43
44 44 SA_CLASSDIR = $(GENERATED)/saclasses
45 45
46 46 SA_BUILD_VERSION_PROP = sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)
47 47
48 48 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
49 49
50 50 default:: $(GENERATED)/sa-jdi.jar
51 51
52 52 # Remove the space between $(SA_BUILD_VERSION_PROP) and > below as it adds a white space
53 53 # at the end of SA version string and causes a version mismatch with the target VM version.
54 54
55 55 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
56 56 $(QUIETLY) mkdir -p $(SA_CLASSDIR)
57 57 @echo ...Building sa-jdi.jar into $(SA_CLASSDIR)
58 58 @echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) ....
59 59 @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES)
60 60 $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
61 61 $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES)
62 62 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
63 63 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
64 64 $(QUIETLY) rm -rf $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
65 65 $(QUIETLY) mkdir $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
66 66 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
67 67 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)
68 68 $(RUN_JAR) cf $@ -C $(SA_CLASSDIR) .
69 69 $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
70 70 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal
71 71 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext
72 72 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
73 73 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.asm.Disassembler
74 74
75 75
76 76
77 77 # This second part is used to build sawindbg.dll
78 78 # We currently build it the same way for product, debug, and fastdebug.
79 79
80 80 SAWINDBG=sawindbg.dll
81 81
82 82 checkAndBuildSA:: $(SAWINDBG)
83 83
84 84 # These do not need to be optimized (don't run a lot of code) and it
85 85 # will be useful to have the assertion checks in place
86 86
87 87 !if "$(BUILDARCH)" == "ia64"
88 88 SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "WIN64" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -c
89 89 !elseif "$(BUILDARCH)" == "amd64"
90 90 SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "WIN64" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -c
91 91 !if "$(COMPILER_NAME)" == "VS2005"
92 92 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line,
93 93 # otherwise we get missing __security_check_cookie externals at link time.
94 94 SA_LD_FLAGS = bufferoverflowU.lib
95 95 !endif
96 96 !else
97 97 SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -Od -D "WIN32" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c
98 98 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
99 99 SA_CFLAGS = $(SA_CFLAGS) -ZI
100 100 !endif
101 101 !endif
102 102 !if "$(MT)" != ""
103 103 SA_LD_FLAGS = -manifest $(SA_LD_FLAGS)
|
↓ open down ↓ |
103 lines elided |
↑ open up ↑ |
104 104 !endif
105 105
106 106 SASRCFILES = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp \
107 107 $(AGENT_DIR)/src/share/native/sadis.c
108 108
109 109 SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE)
110 110 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
111 111 SA_LFLAGS = $(SA_LFLAGS) -map -debug
112 112 !endif
113 113 !if "$(BUILDARCH)" == "i486"
114 -SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS)
114 +SA_LFLAGS = /SAFESEH $(SA_LFLAGS)
115 115 !endif
116 116
117 117 SA_CFLAGS = $(SA_CFLAGS) $(MP_FLAG)
118 118
119 119 # Note that we do not keep sawindbj.obj around as it would then
120 120 # get included in the dumpbin command in build_vm_def.sh
121 121
122 122 # In VS2005 or VS2008 the link command creates a .manifest file that we want
123 123 # to insert into the linked artifact so we do not need to track it separately.
124 124 # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
125 125 $(SAWINDBG): $(SASRCFILES)
126 126 set INCLUDE=$(SA_INCLUDE)$(INCLUDE)
127 127 $(CXX) @<<
128 128 -I"$(BootStrapDir)/include" -I"$(BootStrapDir)/include/win32"
129 129 -I"$(GENERATED)" $(SA_CFLAGS)
130 130 $(SASRCFILES)
131 131 -out:$*.obj
132 132 <<
133 133 set LIB=$(SA_LIB)$(LIB)
134 134 $(LD) -out:$@ -DLL sawindbg.obj sadis.obj dbgeng.lib $(SA_LFLAGS)
135 135 !if "$(MT)" != ""
136 136 $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2
137 137 !endif
138 138 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
139 139 !if "$(ZIP_DEBUGINFO_FILES)" == "1"
140 140 $(ZIPEXE) -q $*.diz $*.map $*.pdb
141 141 $(RM) $*.map $*.pdb
142 142 !endif
143 143 !endif
144 144 -@rm -f $*.obj
145 145
146 146 cleanall :
147 147 rm -rf $(GENERATED)/saclasses
148 148 rm -rf $(GENERATED)/sa-jdi.jar
149 149 !endif
|
↓ open down ↓ |
25 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX