--- a/.hgtags-top-repo Tue Jun 09 23:47:38 2009 -0700
+++ b/.hgtags-top-repo Wed Jul 05 16:53:40 2017 +0200
@@ -33,3 +33,4 @@
ba12117a5e6c918578d6b2a8c693232a33289024 jdk7-b56
ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
+030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
--- a/hotspot/.hgtags Tue Jun 09 23:47:38 2009 -0700
+++ b/hotspot/.hgtags Wed Jul 05 16:53:40 2017 +0200
@@ -33,3 +33,4 @@
a3fd9e40ff2e854f6169eb6d09d491a28634d04f jdk7-b56
f4cbf78110c726919f46b59a3b054c54c7e889b4 jdk7-b57
53d9bf689e80fcc76b221bbe6c5d58e08b80cbc6 jdk7-b58
+c55be0c7bd32c016c52218eb4c8b5da8a75450b5 jdk7-b59
--- a/hotspot/make/README Tue Jun 09 23:47:38 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-README:
- This file should be located at the top of the hotspot Mercurial repository.
-
- See http://openjdk.java.net/ for more information about the OpenJDK.
-
- See ../README-builds.html for complete details on build machine requirements.
-
-Simple Build Instructions:
-
- cd make && gnumake
-
- The files that will be imported into the jdk build will be in the "build"
- directory.
-
--- a/hotspot/make/linux/makefiles/gcc.make Tue Jun 09 23:47:38 2009 -0700
+++ b/hotspot/make/linux/makefiles/gcc.make Wed Jul 05 16:53:40 2017 +0200
@@ -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/hotspot/make/linux/makefiles/jsig.make Tue Jun 09 23:47:38 2009 -0700
+++ b/hotspot/make/linux/makefiles/jsig.make Wed Jul 05 16:53:40 2017 +0200
@@ -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/hotspot/make/linux/makefiles/saproc.make Tue Jun 09 23:47:38 2009 -0700
+++ b/hotspot/make/linux/makefiles/saproc.make Wed Jul 05 16:53:40 2017 +0200
@@ -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/hotspot/src/share/vm/adlc/filebuff.hpp Tue Jun 09 23:47:38 2009 -0700
+++ b/hotspot/src/share/vm/adlc/filebuff.hpp Wed Jul 05 16:53:40 2017 +0200
@@ -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---------------------------------
--- a/make/sanity-rules.gmk Tue Jun 09 23:47:38 2009 -0700
+++ b/make/sanity-rules.gmk Wed Jul 05 16:53:40 2017 +0200
@@ -348,6 +348,8 @@
ifeq ($(SPONSORS_SRC_AVAILABLE), true)
@$(ECHO) " BUILD_SPONSORS = $(BUILD_SPONSORS) " >> $(MESSAGE_FILE)
endif
+ @$(ECHO) " DEBUG_CLASSFILES = $(DEBUG_CLASSFILES) " >> $(MESSAGE_FILE)
+ @$(ECHO) " DEBUG_BINARIES = $(DEBUG_BINARIES) " >> $(MESSAGE_FILE)
@$(ECHO) "" >> $(MESSAGE_FILE)
.PHONY: sanity settings pre-sanity insane \