Mercurial > hg > truffle
changeset 786:27d660246893
Merge
author | ohair |
---|---|
date | Fri, 15 May 2009 18:14:44 -0700 |
parents | 2056494941db (current diff) 116b019a3961 (diff) |
children | aabd393cf1ee |
files | make/linux/makefiles/gcc.make make/linux/makefiles/jsig.make make/linux/makefiles/saproc.make |
diffstat | 5 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed May 13 00:45:22 2009 -0700 +++ b/.hgtags Fri May 15 18:14:44 2009 -0700 @@ -31,3 +31,4 @@ fafab5d5349c7c066d677538db67a1ee0fb33bd2 jdk7-b54 f8e839c086152da70d6ec5913ba6f9f509282e8d jdk7-b55 a3fd9e40ff2e854f6169eb6d09d491a28634d04f jdk7-b56 +f4cbf78110c726919f46b59a3b054c54c7e889b4 jdk7-b57
--- a/make/linux/makefiles/gcc.make Wed May 13 00:45:22 2009 -0700 +++ b/make/linux/makefiles/gcc.make Fri May 15 18:14:44 2009 -0700 @@ -171,3 +171,9 @@ ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) DEBUG_CFLAGS += -gstabs endif + +# DEBUG_BINARIES overrides everything, use full -g debug information +ifeq ($(DEBUG_BINARIES), true) + DEBUG_CFLAGS = -g + CFLAGS += $(DEBUG_CFLAGS) +endif
--- a/make/linux/makefiles/jsig.make Wed May 13 00:45:22 2009 -0700 +++ b/make/linux/makefiles/jsig.make Fri May 15 18:14:44 2009 -0700 @@ -41,10 +41,15 @@ LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) +# DEBUG_BINARIES overrides everything, use full -g debug information +ifeq ($(DEBUG_BINARIES), true) + JSIG_DEBUG_CFLAGS = -g +endif + $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) @echo Making signal interposition lib... $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ - $(LFLAGS_JSIG) -o $@ $< -ldl + $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl install_jsig: $(LIBJSIG) @echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
--- a/make/linux/makefiles/saproc.make Wed May 13 00:45:22 2009 -0700 +++ b/make/linux/makefiles/saproc.make Fri May 15 18:14:44 2009 -0700 @@ -43,6 +43,11 @@ DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC) +# DEBUG_BINARIES overrides everything, use full -g debug information +ifeq ($(DEBUG_BINARIES), true) + SA_DEBUG_CFLAGS = -g +endif + # if $(AGENT_DIR) does not exist, we don't build SA # also, we don't build SA on Itanium. @@ -67,6 +72,7 @@ -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \ $(SASRCFILES) \ $(SA_LFLAGS) \ + $(SA_DEBUG_CFLAGS) \ -o $@ \ -lthread_db
--- a/src/share/vm/adlc/filebuff.hpp Wed May 13 00:45:22 2009 -0700 +++ b/src/share/vm/adlc/filebuff.hpp Fri May 15 18:14:44 2009 -0700 @@ -73,7 +73,7 @@ // This converts a pointer into the buffer to a file offset. It only works // when the pointer is valid (i.e. just obtained from getline()). - long getoff(const char* s) { return _bufoff + (s - _buf); } + long getoff(const char* s) { return _bufoff + (long)(s - _buf); } }; //------------------------------FileBuffRegion---------------------------------