Merge

Fri, 15 May 2009 18:14:44 -0700

author
ohair
date
Fri, 15 May 2009 18:14:44 -0700
changeset 1221
27d660246893
parent 1220
2056494941db
parent 1204
116b019a3961
child 1222
aabd393cf1ee

Merge

make/linux/makefiles/gcc.make file | annotate | diff | comparison | revisions
make/linux/makefiles/jsig.make file | annotate | diff | comparison | revisions
make/linux/makefiles/saproc.make file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed May 13 00:45:22 2009 -0700
     1.2 +++ b/.hgtags	Fri May 15 18:14:44 2009 -0700
     1.3 @@ -31,3 +31,4 @@
     1.4  fafab5d5349c7c066d677538db67a1ee0fb33bd2 jdk7-b54
     1.5  f8e839c086152da70d6ec5913ba6f9f509282e8d jdk7-b55
     1.6  a3fd9e40ff2e854f6169eb6d09d491a28634d04f jdk7-b56
     1.7 +f4cbf78110c726919f46b59a3b054c54c7e889b4 jdk7-b57
     2.1 --- a/make/linux/makefiles/gcc.make	Wed May 13 00:45:22 2009 -0700
     2.2 +++ b/make/linux/makefiles/gcc.make	Fri May 15 18:14:44 2009 -0700
     2.3 @@ -171,3 +171,9 @@
     2.4  ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
     2.5  DEBUG_CFLAGS += -gstabs
     2.6  endif
     2.7 +
     2.8 +# DEBUG_BINARIES overrides everything, use full -g debug information
     2.9 +ifeq ($(DEBUG_BINARIES), true)
    2.10 +  DEBUG_CFLAGS = -g
    2.11 +  CFLAGS += $(DEBUG_CFLAGS)
    2.12 +endif
     3.1 --- a/make/linux/makefiles/jsig.make	Wed May 13 00:45:22 2009 -0700
     3.2 +++ b/make/linux/makefiles/jsig.make	Fri May 15 18:14:44 2009 -0700
     3.3 @@ -41,10 +41,15 @@
     3.4  
     3.5  LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
     3.6  
     3.7 +# DEBUG_BINARIES overrides everything, use full -g debug information
     3.8 +ifeq ($(DEBUG_BINARIES), true)
     3.9 +  JSIG_DEBUG_CFLAGS = -g
    3.10 +endif
    3.11 +
    3.12  $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
    3.13  	@echo Making signal interposition lib...
    3.14  	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
    3.15 -                         $(LFLAGS_JSIG) -o $@ $< -ldl
    3.16 +                         $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
    3.17  
    3.18  install_jsig: $(LIBJSIG)
    3.19  	@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
     4.1 --- a/make/linux/makefiles/saproc.make	Wed May 13 00:45:22 2009 -0700
     4.2 +++ b/make/linux/makefiles/saproc.make	Fri May 15 18:14:44 2009 -0700
     4.3 @@ -43,6 +43,11 @@
     4.4  
     4.5  DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
     4.6  
     4.7 +# DEBUG_BINARIES overrides everything, use full -g debug information
     4.8 +ifeq ($(DEBUG_BINARIES), true)
     4.9 +  SA_DEBUG_CFLAGS = -g
    4.10 +endif
    4.11 +
    4.12  # if $(AGENT_DIR) does not exist, we don't build SA
    4.13  # also, we don't build SA on Itanium.
    4.14  
    4.15 @@ -67,6 +72,7 @@
    4.16  	           -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family)    \
    4.17  	           $(SASRCFILES)                                        \
    4.18  	           $(SA_LFLAGS)                                         \
    4.19 +	           $(SA_DEBUG_CFLAGS)                                   \
    4.20  	           -o $@                                                \
    4.21  	           -lthread_db
    4.22  
     5.1 --- a/src/share/vm/adlc/filebuff.hpp	Wed May 13 00:45:22 2009 -0700
     5.2 +++ b/src/share/vm/adlc/filebuff.hpp	Fri May 15 18:14:44 2009 -0700
     5.3 @@ -73,7 +73,7 @@
     5.4  
     5.5    // This converts a pointer into the buffer to a file offset.  It only works
     5.6    // when the pointer is valid (i.e. just obtained from getline()).
     5.7 -  long getoff(const char* s) { return _bufoff + (s - _buf); }
     5.8 +  long getoff(const char* s) { return _bufoff + (long)(s - _buf); }
     5.9  };
    5.10  
    5.11  //------------------------------FileBuffRegion---------------------------------

mercurial