/hg/icedtea6: 3 new changesets
aph at icedtea.classpath.org
aph at icedtea.classpath.org
Tue Jan 31 04:29:11 PST 2012
changeset 845a28acf5c9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=845a28acf5c9
author: aph
date: Tue Jan 31 07:17:17 2012 -0500
2012-01-27 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis):
Set decode_instructions = NULL.
changeset e9550af57b57 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e9550af57b57
author: aph
date: Tue Jan 31 07:19:24 2012 -0500
DECACHE_JPC in return_check_monitors 2012-01-31 Andrew Haley
<aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(return_check_monitors): DECACHE_JPC so that the saved bytecode
pointer is correct for the GC.
changeset efaffd693af8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=efaffd693af8
author: aph
date: Tue Jan 31 12:21:44 2012 +0000
merge
diffstat:
ChangeLog | 20 +
Makefile.am | 4 +-
NEWS | 1 +
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 1 +
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 2 +
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 11 +
patches/openjdk/remove-mimpure-option-to-gcc.patch | 150 ++++++++++
7 files changed, 188 insertions(+), 1 deletions(-)
diffs (257 lines):
diff -r 80c34531aba3 -r efaffd693af8 ChangeLog
--- a/ChangeLog Thu Jan 26 07:27:15 2012 -0500
+++ b/ChangeLog Tue Jan 31 12:21:44 2012 +0000
@@ -1,3 +1,23 @@
+2012-01-31 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (return_check_monitors): DECACHE_JPC so that the saved bytecode
+ pointer is correct for the GC.
+
+2012-01-30 Deepak Bhole <dbhole at redhat.com>
+
+ Added patches to fix building with GCC 4.7
+ * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch:
+ New patch. Makes methods return NULL instead of boolean when they return a
+ pointer.
+ * patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. Removes
+ the invalid -mimpure-text option to GCC.
+
+2012-01-27 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (class Hsdis): Set
+ decode_instructions = NULL.
+
2012-01-25 Andrew Haley <aph at redhat.com>
* openjdk-ecj/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_Branch):
diff -r 80c34531aba3 -r efaffd693af8 Makefile.am
--- a/Makefile.am Thu Jan 26 07:27:15 2012 -0500
+++ b/Makefile.am Tue Jan 31 12:21:44 2012 +0000
@@ -407,7 +407,9 @@
patches/openjdk/7103725-ssl_beast_regression.patch \
patches/openjdk/6706974-krb5_test_infrastructure.patch \
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
- patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch
+ patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
+ patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
+ patches/openjdk/remove-mimpure-option-to-gcc.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 80c34531aba3 -r efaffd693af8 NEWS
--- a/NEWS Thu Jan 26 07:27:15 2012 -0500
+++ b/NEWS Tue Jan 31 12:21:44 2012 +0000
@@ -23,6 +23,7 @@
* ARM assembly language port reinstated and updated; details below.
* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
* Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x.
+* Fixed build with GCC 4.7
* Bug fixes
- PR637: make check should exit with an error code if any regression test failed.
- PR752: ImageFormatException extends Exception not RuntimeException
diff -r 80c34531aba3 -r efaffd693af8 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Jan 26 07:27:15 2012 -0500
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Tue Jan 31 12:21:44 2012 +0000
@@ -3576,6 +3576,7 @@
return_check_monitors:
stmdb arm_sp!, {r4, lr}
+ DECACHE_JPC
ldr r2, [istate, #ISTATE_METHOD]
ldr r4, [r2, #METHOD_ACCESSFLAGS]
tst r4, #1<<5
diff -r 80c34531aba3 -r efaffd693af8 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Jan 26 07:27:15 2012 -0500
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Tue Jan 31 12:21:44 2012 +0000
@@ -736,6 +736,8 @@
// Load hsdis-arm.so lazily.
Hsdis()
{
+ decode_instructions = NULL;
+
if (PrintAssembly) {
if (lib = dlopen("hsdis-arm.so", RTLD_NOW)) {
decode_instructions
diff -r 80c34531aba3 -r efaffd693af8 patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch Tue Jan 31 12:21:44 2012 +0000
@@ -0,0 +1,12 @@
+diff -ur openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp openjdk/hotspot/src/share/vm/opto/loopnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp 2011-11-14 17:07:36.000000000 -0500
++++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2012-01-30 11:25:10.648080484 -0500
+@@ -546,7 +546,7 @@
+ Node* CountedLoopNode::match_incr_with_optional_truncation(
+ Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) {
+ // Quick cutouts:
+- if (expr == NULL || expr->req() != 3) return false;
++ if (expr == NULL || expr->req() != 3) return NULL;
+
+ Node *t1 = NULL;
+ Node *t2 = NULL;
diff -r 80c34531aba3 -r efaffd693af8 patches/openjdk/remove-mimpure-option-to-gcc.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/remove-mimpure-option-to-gcc.patch Tue Jan 31 12:21:44 2012 +0000
@@ -0,0 +1,162 @@
+diff -ur openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-11-14 17:11:39.000000000 -0500
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-01-30 11:27:47.181487274 -0500
+@@ -94,7 +94,7 @@
+ endif
+ endif
+ # Option used to create a shared library
+- SHARED_LIBRARY_FLAG = -shared -mimpure-text
++ SHARED_LIBRARY_FLAG = -shared
+ SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
+
+ endif
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2012-01-30 11:27:47.186487189 -0500
+@@ -90,7 +90,7 @@
+ OBJECTS=$(SOURCES:%.c=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES=-lc
+ # Building a shared library
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500
+@@ -90,7 +90,7 @@
+ OBJECTS=$(SOURCES:%.c=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES=-lc
+ # Building a shared library
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2012-01-30 11:27:47.186487189 -0500
+@@ -94,7 +94,7 @@
+ OBJECTS=$(SOURCES:%.c=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
+ # Building a shared library
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2012-01-30 11:27:47.184487223 -0500
+@@ -90,7 +90,7 @@
+ OBJECTS=$(SOURCES:%.c=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES=-lc
+ # Building a shared library
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2012-01-30 11:27:47.189487139 -0500
+@@ -130,7 +130,7 @@
+ OBJECTS=$(SOURCES:%.c=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES= -lnsl -ldl -lc
+ # Building a shared library
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/index.html openjdk/jdk/src/share/demo/jvmti/index.html
+--- openjdk.orig/jdk/src/share/demo/jvmti/index.html 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/index.html 2012-01-30 11:27:47.183487240 -0500
+@@ -308,7 +308,7 @@
+ <code><ul>
+ gcc -O2 -fPIC -pthread -DLINUX -c <i>*.c</i>
+ <br>
+-gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
++gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
+ </code></ul>
+ <br>
+ For AMD64:
+@@ -316,7 +316,7 @@
+ <code><ul>
+ gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c <i>*.c</i>
+ <br>
+-gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
++gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
+ </code></ul>
+ <br>
+ </li>
+@@ -339,7 +339,7 @@
+ </li>
+
+ <li>
+-Library: Use -static-libgcc -mimpure-text.
++Library: Use -static-libgcc.
+ <br>
+ When building the shared library (-shared option), this option
+ allows for maximum portability of the library between different
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500
+@@ -90,7 +90,7 @@
+ OBJECTS=$(SOURCES:%.c=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES=-lc
+ # Building a shared library
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2012-01-30 11:27:47.187487172 -0500
+@@ -94,7 +94,7 @@
+ OBJECTS=$(SOURCES:%.c=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
+ # Building a shared library
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2012-01-30 11:27:47.188487155 -0500
+@@ -94,7 +94,7 @@
+ OBJECTS=$(SOURCES:%.c=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
+ # Building a shared library
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2012-01-30 11:27:47.185487206 -0500
+@@ -90,7 +90,7 @@
+ OBJECTS=$(SOURCES:%.c=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES=-lc
+ # Building a shared library
+diff -ur openjdk.orig/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt
+--- openjdk.orig/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2011-11-14 17:12:10.000000000 -0500
++++ openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2012-01-30 11:27:47.188487155 -0500
+@@ -91,7 +91,7 @@
+ OBJECTS=$(SOURCES:%.cpp=%.o)
+ # Library name and options needed to build it
+ LIBRARY=lib$(LIBNAME).so
+- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
+ # Libraries we are dependent on
+ LIBRARIES=
+ # Building a shared library
More information about the distro-pkg-dev
mailing list