make/windows/makefiles/sa.make

Tue, 17 Feb 2015 19:59:05 -0800

author
poonam
date
Tue, 17 Feb 2015 19:59:05 -0800
changeset 7589
f9d003ea9023
parent 7355
89266fdfa9e6
child 7994
04ff2f6cd0eb
child 8337
01745e531a0a
permissions
-rw-r--r--

8046282: SA update
8049881: jstack not working on core files
Summary: These changes add some definitions on the SA side and the supporting code on the hotspot side.
Reviewed-by: sla, dsamersoff, mgronlun

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

mercurial