comparison make/solaris/makefiles/saproc.make @ 7066:7d815d842ee0

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 23 Nov 2012 11:50:27 +0100
parents 5a98bf7d847b
children 892acf0431ef
comparison
equal deleted inserted replaced
7065:cfacf5d5bade 7066:7d815d842ee0
25 # Rules to build serviceability agent library, used by vm.make 25 # Rules to build serviceability agent library, used by vm.make
26 26
27 # libsaproc[_g].so: serviceability agent 27 # libsaproc[_g].so: serviceability agent
28 28
29 SAPROC = saproc 29 SAPROC = saproc
30 SADIS = sadis
30 LIBSAPROC = lib$(SAPROC).so 31 LIBSAPROC = lib$(SAPROC).so
32 SADISOBJ = $(SADIS).o
31 33
32 SAPROC_G = $(SAPROC)$(G_SUFFIX) 34 SAPROC_G = $(SAPROC)$(G_SUFFIX)
33 LIBSAPROC_G = lib$(SAPROC_G).so 35 LIBSAPROC_G = lib$(SAPROC_G).so
34 36
35 LIBSAPROC_DEBUGINFO = lib$(SAPROC).debuginfo 37 LIBSAPROC_DEBUGINFO = lib$(SAPROC).debuginfo
40 AGENT_DIR = $(GAMMADIR)/agent 42 AGENT_DIR = $(GAMMADIR)/agent
41 43
42 SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)/proc 44 SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)/proc
43 45
44 SASRCFILES = $(SASRCDIR)/saproc.cpp 46 SASRCFILES = $(SASRCDIR)/saproc.cpp
47
48 SADISSRCFILES = $(AGENT_DIR)/src/share/native/sadis.c
45 49
46 SAMAPFILE = $(SASRCDIR)/mapfile 50 SAMAPFILE = $(SASRCDIR)/mapfile
47 51
48 DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC) 52 DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
49 DEST_SAPROC_DEBUGINFO = $(JDK_LIBDIR)/$(LIBSAPROC_DEBUGINFO) 53 DEST_SAPROC_DEBUGINFO = $(JDK_LIBDIR)/$(LIBSAPROC_DEBUGINFO)
88 92
89 # Uncomment the following to simulate building on Nevada-B159 or later 93 # Uncomment the following to simulate building on Nevada-B159 or later
90 # when actually building on Nevada-B158 or earlier: 94 # when actually building on Nevada-B158 or earlier:
91 #SOLARIS_11_B159_OR_LATER=-DSOLARIS_11_B159_OR_LATER 95 #SOLARIS_11_B159_OR_LATER=-DSOLARIS_11_B159_OR_LATER
92 96
93 $(LIBSAPROC): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(SASRCFILES) $(SAMAPFILE) 97
98 $(LIBSAPROC): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(SASRCFILES) $(SADISOBJ) $(SAMAPFILE)
94 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 99 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
95 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 100 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
96 exit 1; \ 101 exit 1; \
97 fi 102 fi
98 @echo Making SA debugger back-end... 103 @echo Making SA debugger back-end...
99 $(QUIETLY) $(CXX) \ 104 $(QUIETLY) $(CXX) \
100 $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ 105 $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
101 -I$(SASRCDIR) \ 106 -I$(SASRCDIR) \
102 -I$(GENERATED) \ 107 -I$(GENERATED) \
103 -I$(BOOT_JAVA_HOME)/include \ 108 -I$(BOOT_JAVA_HOME)/include \
104 -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \ 109 -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \
105 $(SOLARIS_11_B159_OR_LATER) \ 110 $(SOLARIS_11_B159_OR_LATER) \
106 $(SASRCFILES) \ 111 $(SASRCFILES) \
112 $(SADISOBJ) \
107 $(SA_LFLAGS) \ 113 $(SA_LFLAGS) \
108 -o $@ \ 114 -o $@ \
109 -ldl -ldemangle -lthread -lc 115 -ldl -ldemangle -lthread -lc
110 [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } 116 [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
117
118 $(SADISOBJ): $(SADISSRCFILES)
119 $(QUIETLY) $(CC) \
120 $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
121 -I$(SASRCDIR) \
122 -I$(GENERATED) \
123 -I$(BOOT_JAVA_HOME)/include \
124 -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \
125 $(SOLARIS_11_B159_OR_LATER) \
126 $(SADISSRCFILES) \
127 -c -o $(SADISOBJ)
128
111 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 129 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
112 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 130 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
113 # Clear the SHF_ALLOC flag (if set) from empty section headers. 131 # Clear the SHF_ALLOC flag (if set) from empty section headers.
114 # An empty section header has sh_addr == 0 and sh_size == 0. 132 # An empty section header has sh_addr == 0 and sh_size == 0.
115 # This problem has only been seen on Solaris X64, but we call this tool 133 # This problem has only been seen on Solaris X64, but we call this tool