/hg/release/icedtea7-2.1: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 12 11:36:16 PDT 2013
changeset 1bcc6dd061fa in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=1bcc6dd061fa
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 11 16:24:59 2013 +0000
Don't strip binaries during OpenJDK build. Leave this to the end user.
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add patch.
(ICEDTEA_ENV): Add ALT_STRIP_POLICY=no_strip.
* patches/no_stripping.patch:
Don't create debuginfo files when no_strip is set.
* NEWS: Updated with this fix and previous set.
changeset ac2e6d3acc00 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=ac2e6d3acc00
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 11 16:30:36 2013 +0000
PR1340: Simplify the rhino class rewriter to avoid use of concurrency
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1340: Simplify the rewriter, avoiding concurrency.
* NEWS: Mention fix.
* rewriter/com/redhat/rewriter/ClassRewriter.java:
Always use the single threaded executor.
changeset 3b31da62583f in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=3b31da62583f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 11 20:19:08 2013 +0000
Revert 7017193 and add the missing free call on a -1 return, until a better fix is ready.
http://mail.openjdk.java.net/pipermail/hotspot-dev/2013-February/008695.html
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* patches/revert-7017193.patch:
Revert 7017193 due to performance issues,
adding a free call on error, until a better
fix is produced.
* NEWS: Updated.
changeset 04dbdea00c85 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=04dbdea00c85
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 11 20:19:49 2013 +0000
Prepare for 2.1.7 release.
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* configure.ac: Bump to 2.1.7 proper.
* NEWS: Set release date for 2.1.7.
changeset 576696c715ca in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=576696c715ca
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 12 18:35:56 2013 +0000
Added tag icedtea-2.1.7 for changeset 04dbdea00c85
diffstat:
.hgtags | 1 +
ChangeLog | 31 ++++
Makefile.am | 7 +-
NEWS | 12 +-
configure.ac | 2 +-
patches/no_stripping.patch | 180 ++++++++++++++++++++++++
patches/revert-7017193.patch | 136 ++++++++++++++++++
rewriter/com/redhat/rewriter/ClassRewriter.java | 6 +-
8 files changed, 368 insertions(+), 7 deletions(-)
diffs (450 lines):
diff -r cf4897fbb9f5 -r 576696c715ca .hgtags
--- a/.hgtags Mon Mar 11 15:11:10 2013 +0000
+++ b/.hgtags Tue Mar 12 18:35:56 2013 +0000
@@ -43,3 +43,4 @@
a25c80a05735543475e3c704a4162c0d1c02a441 icedtea-2.1.4
763c13001988cc50ffd1d195a110c1650b2d7fe1 icedtea-2.1.5
05bc6e6f7d9cbed6d4760813236856c9782c5277 icedtea-2.1.6
+04dbdea00c8531667d0273ed9ee76fa7db645f94 icedtea-2.1.7
diff -r cf4897fbb9f5 -r 576696c715ca ChangeLog
--- a/ChangeLog Mon Mar 11 15:11:10 2013 +0000
+++ b/ChangeLog Tue Mar 12 18:35:56 2013 +0000
@@ -1,3 +1,34 @@
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * configure.ac: Bump to 2.1.7 proper.
+ * NEWS: Set release date for 2.1.7.
+
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * patches/revert-7017193.patch:
+ Revert 7017193 due to performance issues,
+ adding a free call on error, until a better
+ fix is produced.
+ * NEWS: Updated.
+
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1340: Simplify the rewriter, avoiding concurrency.
+ * NEWS: Mention fix.
+ * rewriter/com/redhat/rewriter/ClassRewriter.java:
+ Always use the single threaded executor.
+
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patch.
+ (ICEDTEA_ENV): Add ALT_STRIP_POLICY=no_strip.
+ * patches/no_stripping.patch:
+ Don't create debuginfo files when no_strip is set.
+ * NEWS: Updated with this fix and previous set.
+
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r cf4897fbb9f5 -r 576696c715ca Makefile.am
--- a/Makefile.am Mon Mar 11 15:11:10 2013 +0000
+++ b/Makefile.am Tue Mar 12 18:35:56 2013 +0000
@@ -240,7 +240,9 @@
patches/8004344-toolkiterrorhandler.patch \
patches/8006179-lookup_using_findvirtual.patch \
patches/8006882-sun.proxy.patch \
- patches/pr1303-ifdef_fix.patch
+ patches/pr1303-ifdef_fix.patch \
+ patches/no_stripping.patch \
+ patches/revert-7017193.patch
# Conditional patches
@@ -436,7 +438,8 @@
BUILD_CPP="$(CXX)" \
USE_SYSTEM_CUPS="true" \
CUPS_LIBS="${CUPS_LIBS}" \
- CUPS_CFLAGS="${CUPS_CFLAGS}"
+ CUPS_CFLAGS="${CUPS_CFLAGS}" \
+ ALT_STRIP_POLICY=no_strip
if ENABLE_CACAO
ICEDTEA_ENV += \
diff -r cf4897fbb9f5 -r 576696c715ca NEWS
--- a/NEWS Mon Mar 11 15:11:10 2013 +0000
+++ b/NEWS Tue Mar 12 18:35:56 2013 +0000
@@ -10,11 +10,21 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.1.7 (2013-04-XX):
+New in release 2.1.7 (2013-04-11):
* Security fixes
- S8007014, CVE-2013-0809: Improve image handling
- S8007675, CVE-2013-1493: Improve color conversion
+* Backports
+ - S8002344: Krb5LoginModule config class does not return proper KDC list from DNS
+ - S8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c
+ - S8006179: JSR292 MethodHandles lookup with interface using findVirtual()
+ - S8006882: Proxy generated classes in sun.proxy package breaks JMockit
+* Bug fixes
+ - PR1303: Correct #ifdef to #if
+ - Stop libraries being stripped in the OpenJDK build.
+ - PR1340: Simplify the rhino class rewriter to avoid use of concurrency
+ - Revert 7017193 and add the missing free call, until a better fix is ready.
New in release 2.1.6 (2013-02-20):
diff -r cf4897fbb9f5 -r 576696c715ca configure.ac
--- a/configure.ac Mon Mar 11 15:11:10 2013 +0000
+++ b/configure.ac Tue Mar 12 18:35:56 2013 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.1.7pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.1.7], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r cf4897fbb9f5 -r 576696c715ca patches/no_stripping.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/no_stripping.patch Tue Mar 12 18:35:56 2013 +0000
@@ -0,0 +1,180 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/defs.make 2013-03-11 15:29:11.691786343 +0000
+@@ -186,7 +186,9 @@
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
+ ifneq ($(ZERO_BUILD), true)
+ ifneq ($(OBJCOPY),)
+- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
++ ifneq ($(STRIP_POLICY),no_strip)
++ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
++ endif
+ endif
+ endif
+
+@@ -198,7 +200,9 @@
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+ ifneq ($(ZERO_BUILD), true)
+ ifneq ($(OBJCOPY),)
+- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
++ ifneq ($(STRIP_POLICY),no_strip)
++ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
++ endif
+ endif
+ endif
+ endif
+@@ -208,7 +212,9 @@
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
+ ifneq ($(OBJCOPY),)
+- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
++ ifneq ($(STRIP_POLICY),no_strip)
++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
++ endif
+ endif
+ endif
+ endif
+@@ -221,8 +227,10 @@
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+ ifneq ($(ZERO_BUILD), true)
+ ifneq ($(OBJCOPY),)
+- ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+- ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++ ifneq ($(STRIP_POLICY),no_strip)
++ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
++ endif
+ endif
+ endif
+ ADD_SA_BINARIES/ppc =
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/jsig.make 2013-03-11 15:27:13.065876291 +0000
+@@ -59,8 +59,10 @@
+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
+ $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/saproc.make 2013-03-11 15:27:13.065876291 +0000
+@@ -87,8 +87,10 @@
+ -lthread_db
+ $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/vm.make 2013-03-11 15:27:13.065876291 +0000
+@@ -328,8 +328,10 @@
+ }
+ ifeq ($(CROSS_COMPILE_ARCH),)
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/dtrace.make openjdk/hotspot/make/solaris/makefiles/dtrace.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/dtrace.make 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/dtrace.make 2013-03-11 15:27:13.065876291 +0000
+@@ -107,8 +107,10 @@
+ $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
+ [ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); }
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DB_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+@@ -127,8 +129,10 @@
+ $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
+ [ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); }
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DTRACE_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+@@ -186,8 +190,10 @@
+ $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
+ [ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); }
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+@@ -205,8 +211,10 @@
+ $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
+ [ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); }
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/jsig.make openjdk/hotspot/make/solaris/makefiles/jsig.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/jsig.make 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/jsig.make 2013-03-11 15:27:13.065876291 +0000
+@@ -55,8 +55,10 @@
+ $(LFLAGS_JSIG) -o $@ $< -ldl
+ [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/saproc.make openjdk/hotspot/make/solaris/makefiles/saproc.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/saproc.make 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/saproc.make 2013-03-11 15:27:13.065876291 +0000
+@@ -106,8 +106,10 @@
+ -ldl -ldemangle -lthread -lc
+ [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/vm.make openjdk/hotspot/make/solaris/makefiles/vm.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/vm.make 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/vm.make 2013-03-11 15:27:13.065876291 +0000
+@@ -284,8 +284,10 @@
+ $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
+ $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
+ ifneq ($(OBJCOPY),)
++ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
diff -r cf4897fbb9f5 -r 576696c715ca patches/revert-7017193.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/revert-7017193.patch Tue Mar 12 18:35:56 2013 +0000
@@ -0,0 +1,136 @@
+diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-03-11 20:15:01.080257099 +0000
+@@ -2788,39 +2788,47 @@
+ // writing thread stacks don't use growable mappings (i.e. those
+ // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this
+ // only applies to the main thread.
+-
+-static
+-bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) {
+-
+- char buf[128];
+- int fd, sz;
+-
+- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) {
++static bool
++get_stack_bounds(uintptr_t *bottom, uintptr_t *top)
++{
++ FILE *f = fopen("/proc/self/maps", "r");
++ if (f == NULL)
+ return false;
+- }
+
+- const char kw[] = "[stack]";
+- const int kwlen = sizeof(kw)-1;
+-
+- // Address part of /proc/self/maps couldn't be more than 128 bytes
+- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) {
+- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) {
+- // Extract addresses
+- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
+- uintptr_t sp = (uintptr_t) __builtin_frame_address(0);
+- if (sp >= *bottom && sp <= *top) {
+- ::close(fd);
+- return true;
+- }
++ while (!feof(f)) {
++ size_t dummy;
++ char *str = NULL;
++ ssize_t len = getline(&str, &dummy, f);
++ if (len == -1) {
++ fclose(f);
++ if (str != NULL)
++ free(str);
++ return false;
++ }
++
++ if (len > 0 && str[len-1] == '\n') {
++ str[len-1] = 0;
++ len--;
++ }
++
++ static const char *stack_str = "[stack]";
++ if (len > (ssize_t)strlen(stack_str)
++ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) {
++ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
++ uintptr_t sp = (uintptr_t)__builtin_frame_address(0);
++ if (sp >= *bottom && sp <= *top) {
++ free(str);
++ fclose(f);
++ return true;
+ }
+- }
++ }
++ }
++ free(str);
+ }
+-
+- ::close(fd);
++ fclose(f);
+ return false;
+ }
+
+-
+ // If the (growable) stack mapping already extends beyond the point
+ // where we're going to put our guard pages, truncate the mapping at
+ // that point by munmap()ping it. This ensures that when we later
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2013-03-11 20:15:01.080257099 +0000
+@@ -1306,41 +1306,3 @@
+ }
+ return result;
+ }
+-
+-// Read file line by line, if line is longer than bsize,
+-// skip rest of line.
+-int os::get_line_chars(int fd, char* buf, const size_t bsize){
+- size_t sz, i = 0;
+-
+- // read until EOF, EOL or buf is full
+- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') {
+- ++i;
+- }
+-
+- if (buf[i] == '\n') {
+- // EOL reached so ignore EOL character and return
+-
+- buf[i] = 0;
+- return (int) i;
+- }
+-
+- buf[i+1] = 0;
+-
+- if (sz != 1) {
+- // EOF reached. if we read chars before EOF return them and
+- // return EOF on next call otherwise return EOF
+-
+- return (i == 0) ? -1 : (int) i;
+- }
+-
+- // line is longer than size of buf, skip to EOL
+- char ch;
+- while (read(fd, &ch, 1) == 1 && ch != '\n') {
+- // Do nothing
+- }
+-
+- // return initial part of line that fits in buf.
+- // If we reached EOF, it will be returned on next call.
+-
+- return (int) i;
+-}
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.hpp openjdk/hotspot/src/share/vm/runtime/os.hpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/os.hpp 2013-02-15 00:04:42.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/os.hpp 2013-03-11 20:15:16.008497745 +0000
+@@ -661,10 +661,6 @@
+ // Hook for os specific jvm options that we don't want to abort on seeing
+ static bool obsolete_option(const JavaVMOption *option);
+
+- // Read file line by line. If line is longer than bsize,
+- // rest of line is skipped. Returns number of bytes read or -1 on EOF
+- static int get_line_chars(int fd, char *buf, const size_t bsize);
+-
+ // Platform dependent stuff
+ #ifdef TARGET_OS_FAMILY_linux
+ # include "os_linux.hpp"
diff -r cf4897fbb9f5 -r 576696c715ca rewriter/com/redhat/rewriter/ClassRewriter.java
--- a/rewriter/com/redhat/rewriter/ClassRewriter.java Mon Mar 11 15:11:10 2013 +0000
+++ b/rewriter/com/redhat/rewriter/ClassRewriter.java Tue Mar 12 18:35:56 2013 +0000
@@ -60,8 +60,8 @@
/**
* The executor for submitting rewriting jobs.
*/
- private static final ExecutorService executor = DEBUG ?
- Executors.newSingleThreadExecutor() : Executors.newCachedThreadPool();
+ private static final ExecutorService executor =
+ Executors.newSingleThreadExecutor();
/**
* The source directory, set once by main.
@@ -290,4 +290,4 @@
return null;
}
-}
\ No newline at end of file
+}
More information about the distro-pkg-dev
mailing list