Mercurial > hg > graal-jvmci-8
comparison make/solaris/makefiles/vm.make @ 6077:7d4e6dabc6bf
7165060: dtrace tests fail with FDS debug info files
Summary: Work around 'gobjcopy --add-gnu-debuglink' failure by adding a temporary tool that adds the '.gnu_debuglink' section and nothing more.
Reviewed-by: sspitsyn, acorn
author | dcubed |
---|---|
date | Tue, 15 May 2012 10:52:24 -0700 |
parents | d652a62d6e03 |
children | 80b9cc90b643 9c1709c4c80c |
comparison
equal
deleted
inserted
replaced
6021:744728c16316 | 6077:7d4e6dabc6bf |
---|---|
141 JDK_LIBDIR = $(JAVA_HOME)/jre/lib/$(LIBARCH) | 141 JDK_LIBDIR = $(JAVA_HOME)/jre/lib/$(LIBARCH) |
142 | 142 |
143 #---------------------------------------------------------------------- | 143 #---------------------------------------------------------------------- |
144 # jvm_db & dtrace | 144 # jvm_db & dtrace |
145 include $(MAKEFILES_DIR)/dtrace.make | 145 include $(MAKEFILES_DIR)/dtrace.make |
146 | |
147 #---------------------------------------------------------------------- | |
148 # add_gnu_debuglink tool | |
149 include $(MAKEFILES_DIR)/add_gnu_debuglink.make | |
146 | 150 |
147 #---------------------------------------------------------------------- | 151 #---------------------------------------------------------------------- |
148 # JVM | 152 # JVM |
149 | 153 |
150 JVM = jvm | 154 JVM = jvm |
274 LINK_VM = $(LINK_LIB.CC) | 278 LINK_VM = $(LINK_LIB.CC) |
275 else | 279 else |
276 LINK_VM = $(LINK_LIB.CXX) | 280 LINK_VM = $(LINK_LIB.CXX) |
277 endif | 281 endif |
278 # making the library: | 282 # making the library: |
279 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) | 283 $(LIBJVM): $(ADD_GNU_DEBUGLINK) $(LIBJVM.o) $(LIBJVM_MAPFILE) |
280 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) | 284 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) |
281 @echo Linking vm... | 285 @echo Linking vm... |
282 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK) | 286 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK) |
283 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) | 287 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) |
284 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) | 288 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) |
285 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 | 289 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 |
286 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) | 290 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) |
287 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 | 291 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 |
288 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) | 292 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
289 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) | 293 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) |
290 $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ | 294 # $(OBJCOPY) --add-gnu-debuglink=... corrupts the SUNW_dof section |
295 # in libjvm.so. Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) | |
296 # is available. | |
297 # $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ | |
298 $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DEBUGINFO) $@ | |
291 ifeq ($(STRIP_POLICY),all_strip) | 299 ifeq ($(STRIP_POLICY),all_strip) |
292 $(QUIETLY) $(STRIP) $@ | 300 $(QUIETLY) $(STRIP) $@ |
293 else | 301 else |
294 ifeq ($(STRIP_POLICY),min_strip) | 302 ifeq ($(STRIP_POLICY),min_strip) |
295 $(QUIETLY) $(STRIP) -x $@ | 303 $(QUIETLY) $(STRIP) -x $@ |