Mercurial > hg > truffle

comparison make/windows/makefiles/sa.make @ 6603:0d8e265ba727

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7181175: Enable builds on Windows with MinGW/MSYS Summary: This fix is the minimum number of Makefile changes to enable building HotSpot with MinGW/MSYS Reviewed-by: jcoomes, dcubed, tbell, ohair Contributed-by: volker.simonis@gmail.com
author dcubed
date Fri, 03 Aug 2012 18:34:28 -0700
parents d652a62d6e03
children 5a98bf7d847b
comparison
equal deleted inserted replaced
6602:282abd0fd878 6603:0d8e265ba727
34 34
35 # This first part is used to build sa-jdi.jar 35 # This first part is used to build sa-jdi.jar
36 !include $(WorkSpace)/make/windows/makefiles/rules.make 36 !include $(WorkSpace)/make/windows/makefiles/rules.make
37 !include $(WorkSpace)/make/sa.files 37 !include $(WorkSpace)/make/sa.files
38 38
39 GENERATED = ..\generated 39 GENERATED = ../generated
40 40
41 # tools.jar is needed by the JDI - SA binding 41 # tools.jar is needed by the JDI - SA binding
42 SA_CLASSPATH = $(BOOT_JAVA_HOME)\lib\tools.jar 42 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
43 43
44 SA_CLASSDIR = $(GENERATED)\saclasses 44 SA_CLASSDIR = $(GENERATED)/saclasses
45 45
46 SA_BUILD_VERSION_PROP = sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION) 46 SA_BUILD_VERSION_PROP = sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)
47 47
48 SA_PROPERTIES = $(SA_CLASSDIR)\sa.properties 48 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
49 49
50 default:: $(GENERATED)\sa-jdi.jar 50 default:: $(GENERATED)/sa-jdi.jar
51 51
52 # Remove the space between $(SA_BUILD_VERSION_PROP) and > below as it adds a white space 52 # Remove the space between $(SA_BUILD_VERSION_PROP) and > below as it adds a white space
53 # at the end of SA version string and causes a version mismatch with the target VM version. 53 # at the end of SA version string and causes a version mismatch with the target VM version.
54 54
55 $(GENERATED)\sa-jdi.jar: $(AGENT_FILES:/=\) 55 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
56 @if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR) 56 $(QUIETLY) mkdir -p $(SA_CLASSDIR)
57 @echo ...Building sa-jdi.jar 57 @echo ...Building sa-jdi.jar into $(SA_CLASSDIR)
58 @echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) .... 58 @echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) ....
59 @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES:/=\) 59 @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES)
60 $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer 60 $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
61 $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES) 61 $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES)
62 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js 62 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
63 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql 63 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
64 $(QUIETLY) rm -rf $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources 64 $(QUIETLY) rm -rf $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
65 $(QUIETLY) mkdir $(SA_CLASSDIR)\sun\jvm\hotspot\ui\resources 65 $(QUIETLY) mkdir $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
66 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources 66 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
67 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR) 67 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)
68 $(RUN_JAR) cf $@ -C $(SA_CLASSDIR) . 68 $(RUN_JAR) cf $@ -C $(SA_CLASSDIR) .
69 $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector 69 $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
70 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal 70 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal
71 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext 71 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext
72 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext 72 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext
73 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext 73 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
74 74
83 83
84 # These do not need to be optimized (don't run a lot of code) and it 84 # These do not need to be optimized (don't run a lot of code) and it
85 # will be useful to have the assertion checks in place 85 # will be useful to have the assertion checks in place
86 86
87 !if "$(BUILDARCH)" == "ia64" 87 !if "$(BUILDARCH)" == "ia64"
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 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 !elseif "$(BUILDARCH)" == "amd64" 89 !elseif "$(BUILDARCH)" == "amd64"
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 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 !if "$(COMPILER_NAME)" == "VS2005" 91 !if "$(COMPILER_NAME)" == "VS2005"
92 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, 92 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line,
93 # otherwise we get missing __security_check_cookie externals at link time. 93 # otherwise we get missing __security_check_cookie externals at link time.
94 SA_LD_FLAGS = bufferoverflowU.lib 94 SA_LD_FLAGS = bufferoverflowU.lib
95 !endif 95 !endif
96 !else 96 !else
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 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 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" 98 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
99 SA_CFLAGS = $(SA_CFLAGS) /ZI 99 SA_CFLAGS = $(SA_CFLAGS) -ZI
100 !endif 100 !endif
101 !endif 101 !endif
102 !if "$(MT)" != "" 102 !if "$(MT)" != ""
103 SA_LD_FLAGS = /manifest $(SA_LD_FLAGS) 103 SA_LD_FLAGS = -manifest $(SA_LD_FLAGS)
104 !endif 104 !endif
105 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp 105 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp
106 SA_LFLAGS = $(SA_LD_FLAGS) /nologo /subsystem:console /machine:$(MACHINE) 106 SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE)
107 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" 107 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
108 SA_LFLAGS = $(SA_LFLAGS) /map /debug 108 SA_LFLAGS = $(SA_LFLAGS) -map -debug
109 !endif 109 !endif
110 110
111 # Note that we do not keep sawindbj.obj around as it would then 111 # Note that we do not keep sawindbj.obj around as it would then
112 # get included in the dumpbin command in build_vm_def.sh 112 # get included in the dumpbin command in build_vm_def.sh
113 113
115 # to insert into the linked artifact so we do not need to track it separately. 115 # to insert into the linked artifact so we do not need to track it separately.
116 # Use ";#2" for .dll and ";#1" for .exe in the MT command below: 116 # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
117 $(SAWINDBG): $(SASRCFILE) 117 $(SAWINDBG): $(SASRCFILE)
118 set INCLUDE=$(SA_INCLUDE)$(INCLUDE) 118 set INCLUDE=$(SA_INCLUDE)$(INCLUDE)
119 $(CXX) @<< 119 $(CXX) @<<
120 /I"$(BootStrapDir)/include" /I"$(BootStrapDir)/include/win32" 120 -I"$(BootStrapDir)/include" -I"$(BootStrapDir)/include/win32"
121 /I"$(GENERATED)" $(SA_CFLAGS) 121 -I"$(GENERATED)" $(SA_CFLAGS)
122 $(SASRCFILE) 122 $(SASRCFILE)
123 /out:$*.obj 123 -out:$*.obj
124 << 124 <<
125 set LIB=$(SA_LIB)$(LIB) 125 set LIB=$(SA_LIB)$(LIB)
126 $(LD) /out:$@ /DLL $*.obj dbgeng.lib $(SA_LFLAGS) 126 $(LD) -out:$@ -DLL $*.obj dbgeng.lib $(SA_LFLAGS)
127 !if "$(MT)" != "" 127 !if "$(MT)" != ""
128 $(MT) /manifest $(@F).manifest /outputresource:$(@F);#2 128 $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2
129 !endif 129 !endif
130 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" 130 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
131 !if "$(ZIP_DEBUGINFO_FILES)" == "1" 131 !if "$(ZIP_DEBUGINFO_FILES)" == "1"
132 $(ZIPEXE) -q $*.diz $*.map $*.pdb 132 $(ZIPEXE) -q $*.diz $*.map $*.pdb
133 $(RM) $*.map $*.pdb 133 $(RM) $*.map $*.pdb
134 !endif 134 !endif
135 !endif 135 !endif
136 -@rm -f $*.obj 136 -@rm -f $*.obj
137 137
138 cleanall : 138 cleanall :
139 rm -rf $(GENERATED:\=/)/saclasses 139 rm -rf $(GENERATED)/saclasses
140 rm -rf $(GENERATED:\=/)/sa-jdi.jar 140 rm -rf $(GENERATED)/sa-jdi.jar
141 !endif 141 !endif