summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2013-04-22 22:10:54 +0200
committer Eric Hameleers <alien@slackware.com>2013-04-22 22:10:54 +0200
commit3874c095858ad1b82350df4eedbf341a5a9de0d4 (patch)
treea5c312b19d53e54fbe5a244b3e0ebda09c621dd5
parentfbcc52ab97c5e51b81ac2d6a7dda97e6ec3a2173 (diff)
downloadalienarm-3874c095858ad1b82350df4eedbf341a5a9de0d4.tar.gz
alienarm-3874c095858ad1b82350df4eedbf341a5a9de0d4.tar.xz
OPENJDK: Java 7 Update 21 with 'jamvm' as the Java Virtual Machine.
I was unable to compile OpenJDK on ARM using the 'cacao' JVM and therefore switched to the 'jamvm' which apparently is the default in other ARM distros as well. I guess I am late to the party...
-rw-r--r--source.local/l/openjdk/BUILDING.txt20
-rwxr-xr-xsource.local/l/openjdk/openjdk.SlackBuild49
-rw-r--r--source.local/l/openjdk/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch23
-rw-r--r--source.local/l/openjdk/patches/icedtea_zero_buildfix.patch349
-rw-r--r--source.local/l/openjdk/sources/BUILDING.txt20
-rw-r--r--source.local/l/openjdk/sources/Makefile.in160
-rw-r--r--source.local/l/openjdk/sources/hotspot.map4
7 files changed, 477 insertions, 148 deletions
diff --git a/source.local/l/openjdk/BUILDING.txt b/source.local/l/openjdk/BUILDING.txt
index b7d7b82..f55d75d 100644
--- a/source.local/l/openjdk/BUILDING.txt
+++ b/source.local/l/openjdk/BUILDING.txt
@@ -1,23 +1,23 @@
# You can run this script in the sources/ subdirectory to download the sources.
-# For icedtea-2.3.3 the tarballs are:
-wget http://icedtea.classpath.org/download/source/icedtea-2.3.3.tar.gz
+# For icedtea-2.3.9 the tarballs are:
+wget http://icedtea.classpath.org/download/source/icedtea-2.3.9.tar.gz
#
# These source URLs are constructed from reading the Makefile.in of icedtea:
# egrep '(^OPENJDK_VERSION|^JDK_UPDATE_VERSION|^CORBA_CHANGESET|^HOTSPOT_CHANGESET|^JAXP_CHANGESET|^JAXWS_CHANGESET|^JDK_CHANGESET|^LANGTOOLS_CHANGESET|^OPENJDK_CHANGESET|^CACAO_VERSION|^CACAO_BASE_URL|^JAMVM_VERSION|^JAMVM_BASE_URL|^ICEDTEA_PREFIX|^ICEDTEA_HG_URL)' Makefile.in
#
-# In icedtea-2.3.3 you can choose between "default" and "zero" versions
+# In icedtea-2.3.8 you can choose between "default" and "zero" versions
# of the VM. The zero vm is meant for ARM based systems.
# Use this command to find out the hash of the hopspot.zip
# grep default hotspot.map
#
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/301e79a966b4.tar.gz -O openjdk.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/9a95d714d136.tar.gz -O corba.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/f45296ac69be.tar.gz -O jaxp.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/5ec94d162f05.tar.gz -O jdk.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/ec73c6927fb7.tar.gz -O langtools.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/d2d0a106917c.tar.gz -O hotspot.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/03f54ef33914.tar.gz -O jaxws.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/12b96a57263c.tar.gz -O openjdk.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/47a6bf94ce11.tar.gz -O corba.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/d2142901bcb7.tar.gz -O jaxp.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/8e91101e36f0.tar.gz -O jdk.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/fd956199cb82.tar.gz -O langtools.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/b1877762d45c.tar.gz -O jaxws.tar.gz
wget http://icedtea.classpath.org/download/drops/cacao/a567bcb7f589.tar.gz -O cacao-a567bcb7f589.tar.gz
wget http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/ad5a321edea2.tar.gz -O hotspot.tar.gz
diff --git a/source.local/l/openjdk/openjdk.SlackBuild b/source.local/l/openjdk/openjdk.SlackBuild
index 8a83ee3..8590f5a 100755
--- a/source.local/l/openjdk/openjdk.SlackBuild
+++ b/source.local/l/openjdk/openjdk.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2011, 2012 Eric Hameleers, Eindhoven, The Netherlands
+# Copyright 2011, 2012, 2013 Eric Hameleers, Eindhoven, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,9 @@
PKGNAM1=openjdk
PKGNAM2=openjre
-JAVAVER=7u9
-JAVABLD=b30
-ICEDTEA=2.3.3
+JAVAVER=7u21
+JAVABLD=b02
+ICEDTEA=2.3.9
VERSION="${JAVAVER}_${JAVABLD}"
BUILD=${BUILD:-1}
@@ -50,7 +50,9 @@ DEBUGBUILD=${DEBUGBUILD:-"NO"}
# Sources the script requires. Note that the Makefile contains SHA256SUM values
# for all of these tarballs; if the tarball does not verify then it will be
# downloaded again:
+
SRC_CACAO=cacao-a567bcb7f589.tar.gz
+SRC_JAMVM=jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
SRC_CORBA=corba.tar.gz
SRC_HOTSPOT=hotspot.tar.gz
SRC_JAXP=jaxp.tar.gz
@@ -75,41 +77,32 @@ if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
LIB_ARCH=i386
- ARCH_OPTS=""
+ ARCH_OPTS=" --disable-jamvm "
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
LIB_ARCH=i386
- ARCH_OPTS=""
+ ARCH_OPTS=" --disable-jamvm "
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
LIB_ARCH=amd64
- ARCH_OPTS=""
+ ARCH_OPTS=" --disable-jamvm "
elif [ "$ARCH" = "arm" ]; then
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
- LIB_ARCH=arm
- #ARCH_OPTS="--enable-cacao --with-cacao-src-zip=$CWD/sources/${SRC_CACAO}"
- ARCH_OPTS="--enable-zero=yes"
+ LIB_ARCH=$ARCH
+ ARCH_OPTS="--enable-jamvm --with-jamvm-src-zip=$CWD/sources/${SRC_JAMVM}"
elif [ "$ARCH" = "armv7hl" ]; then
SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
LIBDIRSUFFIX=""
- export LIB_ARCH=arm
- export NO_DOCS=true
- export ZERO_BUILD=true
- export ZERO_LIBARCH=arm
- export ZERO_ARCHDEF=ARM
- export ZERO_ENDIANNESS=little
- export LIBFFI_CFLAGS="`pkg-config --cflags libffi` "
- export LIBFFI_LIBS="-lffi "
- #ARCH_OPTS="--enable-cacao --with-cacao-src-zip=$CWD/sources/${SRC_CACAO}"
- ARCH_OPTS="--enable-zero=yes"
+ LIB_ARCH=$ARCH
+ ARCH_OPTS="--enable-jamvm --with-jamvm-src-zip=$CWD/sources/${SRC_JAMVM}"
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
LIB_ARCH=$ARCH
- ARCH_OPTS=""
+ ARCH_OPTS=" --disable-jamvm "
fi
case "$ARCH" in
@@ -124,12 +117,6 @@ rm -rf icedtea-$ICEDTEA
tar xvf $CWD/sources/icedtea-$ICEDTEA.tar.?z* || exit 1
cd icedtea-$ICEDTEA || exit 1
-case "$ARCH" in
- arm*) # Fix a patch which fails to apply and thus aborts the build:
- cat $CWD/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch | patch -p1 --verbose || exit 1 ;;
- *) ;;
-esac
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -163,11 +150,8 @@ if [ "$BOOTSTRAP" = "YES" -o "$BOOTSTRAP" = "yes" ]; then
export RTJAR=$TMP/icedtea-$ICEDTEA/bootstrap/boot/jre/lib/rt.jar
! echo $PATH | grep -q jvm/bin && export PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH
EXTRA_OPTS="--enable-bootstrap --with-gcj=/usr/bin/gcj"
- # Bootstrap without cacao:
- case "$ARCH" in
- arm*) ARCH_OPTS="--enable-zero=yes" ;;
- *) ARCH_OPTS="" ;;
- esac
+ # Bootstrap without cacao/jamvm:
+ ARCH_OPTS=""
else
# Use a pre-installed OpenJDK:
export JVMDIR=/usr/lib${LIBDIRSUFFIX}/java
@@ -201,7 +185,6 @@ CXXFLAGS="$SLKCFLAGS" \
--with-openjdk-src-zip=$CWD/sources/${SRC_OPENJDK} \
--with-jdk-home=${JVMDIR} \
--disable-docs \
- --disable-jamvm \
--disable-jdk-tests \
--disable-langtools-tests \
--disable-system-lcms \
diff --git a/source.local/l/openjdk/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch b/source.local/l/openjdk/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch
deleted file mode 100644
index b9e059f..0000000
--- a/source.local/l/openjdk/patches/icedtea-2.3.3-refresh-6924259-string_offset.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: icedtea-2.3.3/patches/hotspot/zero/6924259-string_offset.patch
-===================================================================
---- icedtea-2.3.3.orig/patches/hotspot/zero/6924259-string_offset.patch 2012-10-17 10:20:09.779948816 +0200
-+++ icedtea-2.3.3/patches/hotspot/zero/6924259-string_offset.patch 2012-10-19 14:56:22.265958143 +0200
-@@ -378,7 +378,7 @@
- diff --git a/src/share/vm/memory/dump.cpp b/src/share/vm/memory/dump.cpp
- --- openjdk/hotspot/src/share/vm/memory/dump.cpp
- +++ openjdk/hotspot/src/share/vm/memory/dump.cpp
--@@ -78,8 +78,8 @@
-+@@ -78,8 +78,8 @@ public:
- void do_oop(oop* p) {
- if (p != NULL) {
- oop obj = *p;
-@@ -386,7 +386,7 @@
- -
- + if (obj->klass() == SystemDictionary::String_klass() &&
- + java_lang_String::has_hash_field()) {
-- int hash = java_lang_String::hash_string(obj);
-+ int hash = java_lang_String::to_hash(obj);
- obj->int_field_put(hash_offset, hash);
- }
- diff --git a/src/share/vm/opto/graphKit.cpp b/src/share/vm/opto/graphKit.cpp
-
diff --git a/source.local/l/openjdk/patches/icedtea_zero_buildfix.patch b/source.local/l/openjdk/patches/icedtea_zero_buildfix.patch
new file mode 100644
index 0000000..902e0cc
--- /dev/null
+++ b/source.local/l/openjdk/patches/icedtea_zero_buildfix.patch
@@ -0,0 +1,349 @@
+
+# HG changeset patch
+# User Andrew John Hughes <gnu_andrew@member.fsf.org>
+# Date 1358298469 0
+# Node ID 5fc3319dea01730bb3fdc1cd1b156f37e153553f
+# Parent fa200daee35457cb507ab8bf4b55cd3b3535e0b8
+Fix application of 6924259 to Zero's HotSpot, which was broken by addition of 7158800 in 2.1.3.
+
+2013-01-16 Andrew John Hughes <gnu.andrew@member.fsf.org>
+
+ * patches/hotspot/zero/6924259-string_offset.patch:
+ Fix patch to apply against HotSpot from 2.1.3.
+
+diff -r fa200daee354 -r 5fc3319dea01 ChangeLog
+--- a/ChangeLog Tue Jan 15 09:43:14 2013 +0000
++++ b/ChangeLog Wed Jan 16 01:07:49 2013 +0000
+@@ -1,3 +1,8 @@
++2013-01-16 Andrew John Hughes <gnu.andrew@member.fsf.org>
++
++ * patches/hotspot/zero/6924259-string_offset.patch:
++ Fix patch to apply against HotSpot from 2.1.3.
++
+ 2013-01-15 Andrew John Hughes <gnu.andrew@member.fsf.org>
+
+ * NEWS: Mention PaX bug fix from Gentoo,
+diff -r fa200daee354 -r 5fc3319dea01 patches/hotspot/zero/6924259-string_offset.patch
+--- a/patches/hotspot/zero/6924259-string_offset.patch Tue Jan 15 09:43:14 2013 +0000
++++ b/patches/hotspot/zero/6924259-string_offset.patch Wed Jan 16 01:07:49 2013 +0000
+@@ -1,15 +1,6 @@
+-# HG changeset patch
+-# User kvn
+-# Date 1337013360 25200
+-# Node ID 3facbb14e873f14af743e05139e6e48b5890ffcc
+-# Parent ea3152ff2a498749bf5d889b247902f5d02915be
+-6924259: Remove String.count/String.offset
+-Summary: Allow a version of String class that doesn't have count and offset fields.
+-Reviewed-by: never, coleenp
+-
+-diff --git a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
+---- openjdk/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
+-+++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
++diff -Nru openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp openjdk/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
++--- openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp 2013-01-16 00:42:59.059088003 +0000
+ @@ -1,5 +1,5 @@
+ /*
+ - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+@@ -99,9 +90,9 @@
+
+ __ lduh(base0, limit, chr0);
+ __ bind(Lloop);
+-diff --git a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
+---- openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
+-+++ openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
++diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
++--- openjdk.orig/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-01-16 00:41:43.257866830 +0000
+++++ openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-01-16 00:42:59.059088003 +0000
+ @@ -1,5 +1,5 @@
+ /*
+ - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+@@ -109,7 +100,7 @@
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+-@@ -505,19 +505,28 @@
++@@ -506,19 +506,28 @@
+
+ // Get addresses of first characters from both Strings
+ __ load_heap_oop(rsi, Address(rax, java_lang_String::value_offset_in_bytes()));
+@@ -145,9 +136,9 @@
+ __ mov (rcx, rbx);
+ __ subptr(rbx, rax); // subtract lengths
+ __ push (rbx); // result
+-diff --git a/src/share/vm/classfile/javaClasses.cpp b/src/share/vm/classfile/javaClasses.cpp
+---- openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp
+-+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp
++diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/javaClasses.cpp openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp
++--- openjdk.orig/hotspot/src/share/vm/classfile/javaClasses.cpp 2013-01-16 00:41:43.273867087 +0000
+++++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp 2013-01-16 00:42:59.071088195 +0000
+ @@ -1,5 +1,5 @@
+ /*
+ - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+@@ -155,7 +146,7 @@
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+-@@ -143,7 +143,27 @@
++@@ -144,7 +144,27 @@
+ }
+
+
+@@ -224,9 +215,9 @@
+
+ // java.lang.Class
+
+-diff --git a/src/share/vm/classfile/javaClasses.hpp b/src/share/vm/classfile/javaClasses.hpp
+---- openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp
+-+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp
++diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/javaClasses.hpp openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp
++--- openjdk.orig/hotspot/src/share/vm/classfile/javaClasses.hpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp 2013-01-16 00:42:59.071088195 +0000
+ @@ -1,5 +1,5 @@
+ /*
+ - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+@@ -349,10 +340,10 @@
+ }
+ static int utf8_length(oop java_string);
+
+-diff --git a/src/share/vm/classfile/systemDictionary.cpp b/src/share/vm/classfile/systemDictionary.cpp
+---- openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
+-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
+-@@ -1971,6 +1971,9 @@
++diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
++--- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp 2013-01-16 00:42:59.075088258 +0000
++@@ -1953,6 +1953,9 @@
+ // first do Object, String, Class
+ initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
+
+@@ -362,10 +353,10 @@
+ java_lang_Class::compute_offsets();
+
+ // Fixup mirrors for classes loaded before java.lang.Class.
+-diff --git a/src/share/vm/classfile/vmSymbols.hpp b/src/share/vm/classfile/vmSymbols.hpp
+---- openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp
+-+++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp
+-@@ -339,6 +339,9 @@
++diff -Nru openjdk.orig/hotspot/src/share/vm/classfile/vmSymbols.hpp openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp
++--- openjdk.orig/hotspot/src/share/vm/classfile/vmSymbols.hpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp 2013-01-16 00:42:59.083088388 +0000
++@@ -337,6 +337,9 @@
+ template(park_event_name, "nativeParkEventPointer") \
+ template(cache_field_name, "cache") \
+ template(value_name, "value") \
+@@ -375,9 +366,9 @@
+ template(frontCacheEnabled_name, "frontCacheEnabled") \
+ template(stringCacheEnabled_name, "stringCacheEnabled") \
+ template(numberOfLeadingZeros_name, "numberOfLeadingZeros") \
+-diff --git a/src/share/vm/memory/dump.cpp b/src/share/vm/memory/dump.cpp
+---- openjdk/hotspot/src/share/vm/memory/dump.cpp
+-+++ openjdk/hotspot/src/share/vm/memory/dump.cpp
++diff -Nru openjdk.orig/hotspot/src/share/vm/memory/dump.cpp openjdk/hotspot/src/share/vm/memory/dump.cpp
++--- openjdk.orig/hotspot/src/share/vm/memory/dump.cpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/memory/dump.cpp 2013-01-16 00:43:46.135846474 +0000
+ @@ -78,8 +78,8 @@
+ void do_oop(oop* p) {
+ if (p != NULL) {
+@@ -386,12 +377,12 @@
+ -
+ + if (obj->klass() == SystemDictionary::String_klass() &&
+ + java_lang_String::has_hash_field()) {
+- int hash = java_lang_String::hash_string(obj);
++ int hash = java_lang_String::to_hash(obj);
+ obj->int_field_put(hash_offset, hash);
+ }
+-diff --git a/src/share/vm/opto/graphKit.cpp b/src/share/vm/opto/graphKit.cpp
+---- openjdk/hotspot/src/share/vm/opto/graphKit.cpp
+-+++ openjdk/hotspot/src/share/vm/opto/graphKit.cpp
++diff -Nru openjdk.orig/hotspot/src/share/vm/opto/graphKit.cpp openjdk/hotspot/src/share/vm/opto/graphKit.cpp
++--- openjdk.orig/hotspot/src/share/vm/opto/graphKit.cpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/opto/graphKit.cpp 2013-01-16 00:42:59.091088517 +0000
+ @@ -1,5 +1,5 @@
+ /*
+ - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+@@ -399,7 +390,7 @@
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+-@@ -3748,3 +3748,81 @@
++@@ -3730,3 +3730,81 @@
+ final_sync(ideal);
+ }
+ #undef __
+@@ -481,9 +472,9 @@
+ + store_to_memory(ctrl, basic_plus_adr(str, count_offset),
+ + value, T_INT, count_field_idx);
+ +}
+-diff --git a/src/share/vm/opto/graphKit.hpp b/src/share/vm/opto/graphKit.hpp
+---- openjdk/hotspot/src/share/vm/opto/graphKit.hpp
+-+++ openjdk/hotspot/src/share/vm/opto/graphKit.hpp
++diff -Nru openjdk.orig/hotspot/src/share/vm/opto/graphKit.hpp openjdk/hotspot/src/share/vm/opto/graphKit.hpp
++--- openjdk.orig/hotspot/src/share/vm/opto/graphKit.hpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/opto/graphKit.hpp 2013-01-16 00:42:59.095088581 +0000
+ @@ -1,5 +1,5 @@
+ /*
+ - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+@@ -506,9 +497,9 @@
+ // Handy for making control flow
+ IfNode* create_and_map_if(Node* ctrl, Node* tst, float prob, float cnt) {
+ IfNode* iff = new (C, 2) IfNode(ctrl, tst, prob, cnt);// New IfNode's
+-diff --git a/src/share/vm/opto/library_call.cpp b/src/share/vm/opto/library_call.cpp
+---- openjdk/hotspot/src/share/vm/opto/library_call.cpp
+-+++ openjdk/hotspot/src/share/vm/opto/library_call.cpp
++diff -Nru openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp openjdk/hotspot/src/share/vm/opto/library_call.cpp
++--- openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/opto/library_call.cpp 2013-01-16 00:42:59.095088581 +0000
+ @@ -147,7 +147,8 @@
+ return generate_method_call(method_id, true, false);
+ }
+@@ -519,7 +510,7 @@
+ bool inline_string_compareTo();
+ bool inline_string_indexOf();
+ Node* string_indexOf(Node* string_object, ciTypeArray* target_array, jint offset, jint cache_i, jint md2_i);
+-@@ -844,48 +845,45 @@
++@@ -844,48 +845,76 @@
+
+
+ //------------------------------make_string_method_node------------------------
+@@ -588,13 +579,18 @@
+ result = new (C, 5) StrEqualsNode(control(), memory(TypeAryPtr::CHARS),
+ - str1_start, str2_start, cnt1);
+ + str1_start, str2_start, str1_len);
+- break;
+- default:
+- ShouldNotReachHere();
+-@@ -898,15 +896,42 @@
+- return _gvn.transform(result);
+- }
+-
+++ break;
+++ default:
+++ ShouldNotReachHere();
+++ return NULL;
+++ }
+++
+++ // All these intrinsics have checks.
+++ C->set_has_split_ifs(true); // Has chance for split-if optimization
+++
+++ return _gvn.transform(result);
+++}
+++
+ +// Helper method for String intrinsic functions. This version is called
+ +// with str1 and str2 pointing to char[] nodes, with cnt1 and cnt2 pointing
+ +// to Int nodes containing the lenghts of str1 and str2.
+@@ -614,20 +610,10 @@
+ + case Op_StrEquals:
+ + result = new (C, 5) StrEqualsNode(control(), memory(TypeAryPtr::CHARS),
+ + str1_start, str2_start, cnt1);
+-+ break;
+-+ default:
+-+ ShouldNotReachHere();
+-+ return NULL;
+-+ }
+-+
+-+ // All these intrinsics have checks.
+-+ C->set_has_split_ifs(true); // Has chance for split-if optimization
+-+
+-+ return _gvn.transform(result);
+-+}
+-+
+- //------------------------------inline_string_compareTo------------------------
+- bool LibraryCallKit::inline_string_compareTo() {
++ break;
++ default:
++ ShouldNotReachHere();
++@@ -903,10 +932,6 @@
+
+ if (!Matcher::has_match_rule(Op_StrComp)) return false;
+
+@@ -690,9 +676,6 @@
+ - // Get counts for string and argument
+ - Node* receiver_cnta = basic_plus_adr(receiver, receiver, count_offset);
+ - receiver_cnt = make_load(no_ctrl, receiver_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+--
+-- Node* argument_cnta = basic_plus_adr(argument, argument, count_offset);
+-- argument_cnt = make_load(no_ctrl, argument_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+ + Node* no_ctrl = NULL;
+ +
+ + // Get start addr of receiver
+@@ -707,7 +690,9 @@
+ + Node* argument_val = load_String_value(no_ctrl, argument);
+ + Node* argument_offset = load_String_offset(no_ctrl, argument);
+ + Node* argument_start = array_element_address(argument_val, argument_offset, T_CHAR);
+-+
++
++- Node* argument_cnta = basic_plus_adr(argument, argument, count_offset);
++- argument_cnt = make_load(no_ctrl, argument_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+ + // Get length of argument
+ + Node* argument_cnt = load_String_length(no_ctrl, argument);
+
+@@ -718,16 +703,14 @@
+ region->init_req(4, if_ne);
+ }
+ - }
+--
++
+ - // Check for count == 0 is done by mach node StrEquals.
+--
+++ // Check for count == 0 is done by assembler code for StrEquals.
++
+ - if (!stopped()) {
+ - Node* equals = make_string_method_node(Op_StrEquals, receiver, receiver_cnt, argument, argument_cnt);
+ - phi->init_req(1, equals);
+ - region->init_req(1, control());
+-+
+-+ // Check for count == 0 is done by assembler code for StrEquals.
+-+
+ + if (!stopped()) {
+ + Node* equals = make_string_method_node(Op_StrEquals, receiver_start, receiver_cnt, argument_start, argument_cnt);
+ + phi->init_req(1, equals);
+@@ -778,9 +761,6 @@
+ - // Get counts for string and substr
+ - Node* source_cnta = basic_plus_adr(receiver, receiver, count_offset);
+ - Node* source_cnt = make_load(no_ctrl, source_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+--
+-- Node* substr_cnta = basic_plus_adr(argument, argument, count_offset);
+-- Node* substr_cnt = make_load(no_ctrl, substr_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+ + // Get start addr of source string
+ + Node* source = load_String_value(no_ctrl, receiver);
+ + Node* source_offset = load_String_offset(no_ctrl, receiver);
+@@ -793,7 +773,9 @@
+ + Node* substr = load_String_value(no_ctrl, argument);
+ + Node* substr_offset = load_String_offset(no_ctrl, argument);
+ + Node* substr_start = array_element_address(substr, substr_offset, T_CHAR);
+-+
++
++- Node* substr_cnta = basic_plus_adr(argument, argument, count_offset);
++- Node* substr_cnt = make_load(no_ctrl, substr_cnta, TypeInt::INT, T_INT, string_type->add_offset(count_offset));
+ + // Get length of source string
+ + Node* substr_cnt = load_String_length(no_ctrl, argument);
+
+@@ -831,9 +813,9 @@
+ // constant strings have no offset and count == length which
+ // simplifies the resulting code somewhat so lets optimize for that.
+ if (o != 0 || c != pat->length()) {
+-diff --git a/src/share/vm/opto/stringopts.cpp b/src/share/vm/opto/stringopts.cpp
+---- openjdk/hotspot/src/share/vm/opto/stringopts.cpp
+-+++ openjdk/hotspot/src/share/vm/opto/stringopts.cpp
++diff -Nru openjdk.orig/hotspot/src/share/vm/opto/stringopts.cpp openjdk/hotspot/src/share/vm/opto/stringopts.cpp
++--- openjdk.orig/hotspot/src/share/vm/opto/stringopts.cpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/opto/stringopts.cpp 2013-01-16 00:42:59.099088646 +0000
+ @@ -1,5 +1,5 @@
+ /*
+ - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+@@ -912,9 +894,9 @@
+
+ // hook up the outgoing control and result
+ kit.replace_call(sc->end(), result);
+-diff --git a/src/share/vm/opto/stringopts.hpp b/src/share/vm/opto/stringopts.hpp
+---- openjdk/hotspot/src/share/vm/opto/stringopts.hpp
+-+++ openjdk/hotspot/src/share/vm/opto/stringopts.hpp
++diff -Nru openjdk.orig/hotspot/src/share/vm/opto/stringopts.hpp openjdk/hotspot/src/share/vm/opto/stringopts.hpp
++--- openjdk.orig/hotspot/src/share/vm/opto/stringopts.hpp 2012-10-17 08:52:30.000000000 +0100
+++++ openjdk/hotspot/src/share/vm/opto/stringopts.hpp 2013-01-16 00:42:59.103088711 +0000
+ @@ -1,5 +1,5 @@
+ /*
+ - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+
+
diff --git a/source.local/l/openjdk/sources/BUILDING.txt b/source.local/l/openjdk/sources/BUILDING.txt
index b7d7b82..f55d75d 100644
--- a/source.local/l/openjdk/sources/BUILDING.txt
+++ b/source.local/l/openjdk/sources/BUILDING.txt
@@ -1,23 +1,23 @@
# You can run this script in the sources/ subdirectory to download the sources.
-# For icedtea-2.3.3 the tarballs are:
-wget http://icedtea.classpath.org/download/source/icedtea-2.3.3.tar.gz
+# For icedtea-2.3.9 the tarballs are:
+wget http://icedtea.classpath.org/download/source/icedtea-2.3.9.tar.gz
#
# These source URLs are constructed from reading the Makefile.in of icedtea:
# egrep '(^OPENJDK_VERSION|^JDK_UPDATE_VERSION|^CORBA_CHANGESET|^HOTSPOT_CHANGESET|^JAXP_CHANGESET|^JAXWS_CHANGESET|^JDK_CHANGESET|^LANGTOOLS_CHANGESET|^OPENJDK_CHANGESET|^CACAO_VERSION|^CACAO_BASE_URL|^JAMVM_VERSION|^JAMVM_BASE_URL|^ICEDTEA_PREFIX|^ICEDTEA_HG_URL)' Makefile.in
#
-# In icedtea-2.3.3 you can choose between "default" and "zero" versions
+# In icedtea-2.3.8 you can choose between "default" and "zero" versions
# of the VM. The zero vm is meant for ARM based systems.
# Use this command to find out the hash of the hopspot.zip
# grep default hotspot.map
#
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/301e79a966b4.tar.gz -O openjdk.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/9a95d714d136.tar.gz -O corba.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/f45296ac69be.tar.gz -O jaxp.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/5ec94d162f05.tar.gz -O jdk.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/ec73c6927fb7.tar.gz -O langtools.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/d2d0a106917c.tar.gz -O hotspot.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/03f54ef33914.tar.gz -O jaxws.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/12b96a57263c.tar.gz -O openjdk.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/47a6bf94ce11.tar.gz -O corba.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/d2142901bcb7.tar.gz -O jaxp.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/8e91101e36f0.tar.gz -O jdk.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/fd956199cb82.tar.gz -O langtools.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/b1877762d45c.tar.gz -O jaxws.tar.gz
wget http://icedtea.classpath.org/download/drops/cacao/a567bcb7f589.tar.gz -O cacao-a567bcb7f589.tar.gz
wget http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/ad5a321edea2.tar.gz -O hotspot.tar.gz
diff --git a/source.local/l/openjdk/sources/Makefile.in b/source.local/l/openjdk/sources/Makefile.in
index fdfa5d5..db53d48 100644
--- a/source.local/l/openjdk/sources/Makefile.in
+++ b/source.local/l/openjdk/sources/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -72,122 +72,138 @@ host_triplet = @host@
@LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER_TRUE@ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
+#PR56553 - SSLParameters support missing
+@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@am__append_5 = \
+@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@ $(SHARE)/javax/net/ssl/SSLContext.java
+
+@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@am__append_6 = \
+@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@ $(SHARE)/javax/net/ssl/SSLEngine.java
+
+
+#PR57008 - Add missing SslRMIServerSocketFactory constructor from 7
+@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@am__append_7 = \
+@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@ $(SHARE)/javax/rmi/ssl/SslRMIServerSocketFactory.java
+
+
# Conditional patches
-@WITH_ALT_HSBUILD_TRUE@am__append_5 = \
+@WITH_ALT_HSBUILD_TRUE@am__append_8 = \
@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \
@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \
@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7116189-setnativethreadname.patch \
@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/6924259-string_offset.patch \
@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/revert_arm_debug.patch
-@WITH_RHINO_TRUE@am__append_6 = \
+@WITH_RHINO_TRUE@am__append_9 = \
@WITH_RHINO_TRUE@ patches/rhino.patch
-@BUILD_CACAO_TRUE@am__append_7 = \
+@BUILD_CACAO_TRUE@am__append_10 = \
@BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
@BUILD_CACAO_TRUE@ patches/cacao/jsig.patch \
@BUILD_CACAO_TRUE@ patches/cacao/memory.patch
-@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@am__append_8 = \
+@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@am__append_11 = \
@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@ patches/cacao/memory.patch
-@ENABLE_CACAO_TRUE@am__append_9 = \
+@ENABLE_CACAO_TRUE@am__append_12 = \
@ENABLE_CACAO_TRUE@ patches/cacao/ignore-tests.patch
-@BUILD_JAMVM_TRUE@am__append_10 = \
+@BUILD_JAMVM_TRUE@am__append_13 = \
@BUILD_JAMVM_TRUE@ patches/jamvm/remove-sun.misc.Perf-debug-code.patch
-@ENABLE_PULSE_JAVA_TRUE@am__append_11 = \
+@ENABLE_PULSE_JAVA_TRUE@am__append_14 = \
@ENABLE_PULSE_JAVA_TRUE@ patches/pulse-soundproperties.patch
-@ENABLE_SYSTEMTAP_TRUE@am__append_12 = patches/systemtap.patch
-@ENABLE_NSS_TRUE@am__append_13 = patches/nss-config.patch
-@ENABLE_NSS_FALSE@am__append_14 = patches/nss-not-enabled-config.patch
-@WITH_PAX_TRUE@am__append_15 = patches/test_gamma.patch
-@WITH_PAX_FALSE@am__append_16 = patches/boot/test_gamma.patch
-@CP39408_JAVAH_TRUE@am__append_17 = patches/boot/pr39408.patch
-@CP40188_JAVAH_TRUE@am__append_18 = patches/boot/pr40188.patch \
+@ENABLE_SYSTEMTAP_TRUE@am__append_15 = patches/systemtap.patch
+@ENABLE_NSS_TRUE@am__append_16 = patches/nss-config.patch
+@ENABLE_NSS_FALSE@am__append_17 = patches/nss-not-enabled-config.patch
+@WITH_PAX_TRUE@am__append_18 = \
+@WITH_PAX_TRUE@ patches/test_gamma.patch \
+@WITH_PAX_TRUE@ patches/pax-mark-rmic-java.patch
+
+@WITH_PAX_FALSE@am__append_19 = patches/boot/test_gamma.patch
+@CP39408_JAVAH_TRUE@am__append_20 = patches/boot/pr39408.patch
+@CP40188_JAVAH_TRUE@am__append_21 = patches/boot/pr40188.patch \
@CP40188_JAVAH_TRUE@ patches/boot/javah.patch
-@CP45526_JAVAH_TRUE@am__append_19 = patches/boot/explicit-inner-class-headers.patch
-@CP40616_TRUE@am__append_20 = patches/boot/pr40616.patch
-@LACKS_JAVA_UTIL_SCANNER_TRUE@am__append_21 = $(SCANNER_PATCHES)
-@CP40630_TRUE@@LACKS_JAVA_UTIL_SCANNER_FALSE@am__append_22 = $(SCANNER_PATCHES)
-@JAVAC_LACKS_DIAMOND_TRUE@am__append_23 = patches/boot/ecj-diamond.patch
-@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_TRUE@am__append_24 = patches/boot/compile-for-7-cacao-mem.patch
-@BUILD_CACAO_TRUE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_25 = patches/boot/compile-for-7-cacao-mem.patch
-@BUILD_CACAO_FALSE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_26 = patches/boot/compile-for-7.patch
-@DTDTYPE_QNAME_TRUE@am__append_27 = patches/boot/jaxws-getdtdtype.patch
-@NO_BYTECODE7_TRUE@am__append_28 = patches/boot/use_target_6_for_bootstrap_classes.patch
-@ENABLE_CACAO_TRUE@am__append_29 = \
+@CP45526_JAVAH_TRUE@am__append_22 = patches/boot/explicit-inner-class-headers.patch
+@CP40616_TRUE@am__append_23 = patches/boot/pr40616.patch
+@LACKS_JAVA_UTIL_SCANNER_TRUE@am__append_24 = $(SCANNER_PATCHES)
+@CP40630_TRUE@@LACKS_JAVA_UTIL_SCANNER_FALSE@am__append_25 = $(SCANNER_PATCHES)
+@JAVAC_LACKS_DIAMOND_TRUE@am__append_26 = patches/boot/ecj-diamond.patch
+@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_TRUE@am__append_27 = patches/boot/compile-for-7-cacao-mem.patch
+@BUILD_CACAO_TRUE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_28 = patches/boot/compile-for-7-cacao-mem.patch
+@BUILD_CACAO_FALSE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_29 = patches/boot/compile-for-7.patch
+@DTDTYPE_QNAME_TRUE@am__append_30 = patches/boot/jaxws-getdtdtype.patch
+@NO_BYTECODE7_TRUE@am__append_31 = patches/boot/use_target_6_for_bootstrap_classes.patch
+@ENABLE_CACAO_TRUE@am__append_32 = \
@ENABLE_CACAO_TRUE@ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
-@ENABLE_JAMVM_TRUE@am__append_30 = \
+@ENABLE_JAMVM_TRUE@am__append_33 = \
@ENABLE_JAMVM_TRUE@ ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)"
-@DISABLE_OPTIMIZATIONS_TRUE@am__append_31 = \
+@DISABLE_OPTIMIZATIONS_TRUE@am__append_34 = \
@DISABLE_OPTIMIZATIONS_TRUE@ NO_OPTIMIZATIONS="true" \
@DISABLE_OPTIMIZATIONS_TRUE@ CC_NO_OPT="-O0 -g"
-@ENABLE_DOCS_FALSE@am__append_32 = \
+@ENABLE_DOCS_FALSE@am__append_35 = \
@ENABLE_DOCS_FALSE@ NO_DOCS="true"
-@USE_ALT_JAR_TRUE@am__append_33 = \
+@USE_ALT_JAR_TRUE@am__append_36 = \
@USE_ALT_JAR_TRUE@ ALT_JAR_CMD="$(ALT_JAR_CMD)"
-@HAS_HOTSPOT_REVISION_TRUE@am__append_34 = \
+@HAS_HOTSPOT_REVISION_TRUE@am__append_37 = \
@HAS_HOTSPOT_REVISION_TRUE@ HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
-@WITH_RHINO_TRUE@am__append_35 = \
+@WITH_RHINO_TRUE@am__append_38 = \
@WITH_RHINO_TRUE@ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
-@USE_SYSTEM_ZLIB_TRUE@am__append_36 = \
+@USE_SYSTEM_ZLIB_TRUE@am__append_39 = \
@USE_SYSTEM_ZLIB_TRUE@ USE_SYSTEM_ZLIB="true" \
@USE_SYSTEM_ZLIB_TRUE@ ZLIB_LIBS="${ZLIB_LIBS}" \
@USE_SYSTEM_ZLIB_TRUE@ ZLIB_CFLAGS="${ZLIB_CFLAGS}"
-@USE_SYSTEM_LCMS_TRUE@am__append_37 = \
+@USE_SYSTEM_LCMS_TRUE@am__append_40 = \
@USE_SYSTEM_LCMS_TRUE@ USE_SYSTEM_LCMS="true" \
@USE_SYSTEM_LCMS_TRUE@ LCMS_LIBS="${LCMS2_LIBS}" \
@USE_SYSTEM_LCMS_TRUE@ LCMS_CFLAGS="${LCMS2_CFLAGS}"
-@USE_SYSTEM_JPEG_TRUE@am__append_38 = \
+@USE_SYSTEM_JPEG_TRUE@am__append_41 = \
@USE_SYSTEM_JPEG_TRUE@ USE_SYSTEM_JPEG="true" \
@USE_SYSTEM_JPEG_TRUE@ JPEG_LIBS="${JPEG_LIBS}" \
@USE_SYSTEM_JPEG_TRUE@ JPEG_CFLAGS="${JPEG_CFLAGS}"
-@USE_SYSTEM_PNG_TRUE@am__append_39 = \
+@USE_SYSTEM_PNG_TRUE@am__append_42 = \
@USE_SYSTEM_PNG_TRUE@ USE_SYSTEM_PNG="true" \
@USE_SYSTEM_PNG_TRUE@ PNG_LIBS="${PNG_LIBS}" \
@USE_SYSTEM_PNG_TRUE@ PNG_CFLAGS="${PNG_CFLAGS}"
-@USE_SYSTEM_GIF_TRUE@am__append_40 = \
+@USE_SYSTEM_GIF_TRUE@am__append_43 = \
@USE_SYSTEM_GIF_TRUE@ USE_SYSTEM_GIF="true" \
@USE_SYSTEM_GIF_TRUE@ GIF_LIBS="${GIF_LIBS}" \
@USE_SYSTEM_GIF_TRUE@ GIF_CFLAGS="${GIF_CFLAGS}"
-@USE_SYSTEM_GTK_TRUE@am__append_41 = \
+@USE_SYSTEM_GTK_TRUE@am__append_44 = \
@USE_SYSTEM_GTK_TRUE@ USE_SYSTEM_GTK="true" \
@USE_SYSTEM_GTK_TRUE@ GTK_LIBS="${GTK_LIBS}" \
@USE_SYSTEM_GTK_TRUE@ GTK_CFLAGS="${GTK_CFLAGS}"
-@USE_SYSTEM_GIO_TRUE@am__append_42 = \
+@USE_SYSTEM_GIO_TRUE@am__append_45 = \
@USE_SYSTEM_GIO_TRUE@ USE_SYSTEM_GIO="true" \
@USE_SYSTEM_GIO_TRUE@ GIO_LIBS="${GIO_LIBS}" \
@USE_SYSTEM_GIO_TRUE@ GIO_CFLAGS="${GIO_CFLAGS}"
-@USE_SYSTEM_FONTCONFIG_TRUE@am__append_43 = \
+@USE_SYSTEM_FONTCONFIG_TRUE@am__append_46 = \
@USE_SYSTEM_FONTCONFIG_TRUE@ USE_SYSTEM_FONTCONFIG="true" \
@USE_SYSTEM_FONTCONFIG_TRUE@ FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
@USE_SYSTEM_FONTCONFIG_TRUE@ FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}"
-@USE_SYSCALL_COMPILATION_TRUE@am__append_44 = \
+@USE_SYSCALL_COMPILATION_TRUE@am__append_47 = \
@USE_SYSCALL_COMPILATION_TRUE@ COMPILE_AGAINST_SYSCALLS="true"
-@ENABLE_JAR_COMPRESSION_TRUE@am__append_45 = \
+@ENABLE_JAR_COMPRESSION_TRUE@am__append_48 = \
@ENABLE_JAR_COMPRESSION_TRUE@ COMPRESS_JARS="true"
-@ADD_SHARK_BUILD_TRUE@am__append_46 = \
+@ADD_SHARK_BUILD_TRUE@am__append_49 = \
@ADD_SHARK_BUILD_TRUE@ --enable-shark
subdir = .
@@ -477,21 +493,21 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b30
-JDK_UPDATE_VERSION = 09
+OPENJDK_VERSION = b02
+JDK_UPDATE_VERSION = 21
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 9a95d714d136
-JAXP_CHANGESET = f45296ac69be
-JAXWS_CHANGESET = 03f54ef33914
-JDK_CHANGESET = 5ec94d162f05
-LANGTOOLS_CHANGESET = ec73c6927fb7
-OPENJDK_CHANGESET = 301e79a966b4
-CORBA_SHA256SUM = 4ad0ab1e0ab6f1e0402fd5a5f0b388bb33cc2c553df867e4c5e6ca78a4ede9bb
-JAXP_SHA256SUM = b088dd5d383f27b2ccd433eebcbf3f73c016b3359abdae2a5575455d56668141
-JAXWS_SHA256SUM = 86dfb4fda79de7459b17b6efac6b8d5d6fd7bb1175b7e4ff22ba2ce4a903c05a
-JDK_SHA256SUM = 11a77a35661b2239e73c3fb1318fb6371d0cd7130594d1405df1cb1b17040ea6
-LANGTOOLS_SHA256SUM = c7c67f6805d05c0fa5ddd2a7e406a6adcd0823dd008005563f2b2a88d1f3e6b6
-OPENJDK_SHA256SUM = dce85d9bcc6e213240b6ad49755bf57fc60a515461664890efcce2ed615ca70b
+CORBA_CHANGESET = 47a6bf94ce11
+JAXP_CHANGESET = d2142901bcb7
+JAXWS_CHANGESET = b1877762d45c
+JDK_CHANGESET = 8e91101e36f0
+LANGTOOLS_CHANGESET = fd956199cb82
+OPENJDK_CHANGESET = 12b96a57263c
+CORBA_SHA256SUM = 7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934
+JAXP_SHA256SUM = 8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6
+JAXWS_SHA256SUM = b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc
+JDK_SHA256SUM = 349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e
+LANGTOOLS_SHA256SUM = 2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12
+OPENJDK_SHA256SUM = 651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
@@ -561,11 +577,14 @@ SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
# Sources used from OpenJDK.
ICEDTEA_BOOTSTRAP_CLASSES = $(am__append_1) $(am__append_2) \
- $(am__append_3) $(am__append_4)
+ $(am__append_3) $(am__append_4) $(am__append_5) \
+ $(am__append_6) $(am__append_7)
+@NO_BYTECODE7_FALSE@IT_LANGUAGE_SOURCE_VERSION = 7
# Settings for javac
-IT_LANGUAGE_SOURCE_VERSION = 6
-IT_CLASS_TARGET_VERSION = 6
+@NO_BYTECODE7_TRUE@IT_LANGUAGE_SOURCE_VERSION = 6
+@NO_BYTECODE7_FALSE@IT_CLASS_TARGET_VERSION = 7
+@NO_BYTECODE7_TRUE@IT_CLASS_TARGET_VERSION = 6
IT_JAVAC_SETTINGS = -g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
IT_JAVACFLAGS = $(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
@@ -631,10 +650,11 @@ OPENJDK_BOOT_TREE = stamps/patch-boot.stamp
REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
# Patch list
-ICEDTEA_PATCHES = $(am__append_5) $(am__append_6) $(am__append_7) \
+ICEDTEA_PATCHES = patches/hotspot/$(HSBUILD)/revert-7017193.patch \
$(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12) $(am__append_13) \
- $(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
+ $(am__append_14) $(am__append_15) $(am__append_16) \
+ $(am__append_17) $(am__append_18) $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
@@ -661,11 +681,11 @@ ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
patches/boot/ecj-multicatch.patch \
patches/boot/ecj-trywithresources.patch \
patches/boot/ecj-autoboxing.patch patches/boot/xsltproc.patch \
- $(am__append_16) $(am__append_17) $(am__append_18) \
$(am__append_19) $(am__append_20) $(am__append_21) \
$(am__append_22) $(am__append_23) $(am__append_24) \
$(am__append_25) $(am__append_26) $(am__append_27) \
- $(am__append_28) $(DISTRIBUTION_BOOT_PATCHES)
+ $(am__append_28) $(am__append_29) $(am__append_30) \
+ $(am__append_31) $(DISTRIBUTION_BOOT_PATCHES)
# Patches for when java.util.Scanner is missing
# or has the bug #40630 (all these classes rely
@@ -679,7 +699,7 @@ SCANNER_PATCHES = patches/boot/scanner-spp.patch \
# OpenJDK build environment.
@ZERO_BUILD_TRUE@ICEDTEA_ZERO_BUILD = true
@SHARK_BUILD_TRUE@ICEDTEA_SHARK_BUILD = true
-ICEDTEA_NAME = IcedTea7
+ICEDTEA_NAME = IcedTea
@HAS_ICEDTEA_REVISION_TRUE@ICEDTEA_REV = +${ICEDTEA_REVISION}
@HAS_PKGVERSION_TRUE@ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
@ENABLE_WERROR_FALSE@WERROR_STATUS = false
@@ -714,13 +734,13 @@ ICEDTEA_ENV = ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" ANT="$(ANT)" \
USE_SYSTEM_CUPS="true" CUPS_LIBS="${CUPS_LIBS}" \
CUPS_CFLAGS="${CUPS_CFLAGS}" STRIP_POLICY=no_strip \
JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
- COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" $(am__append_29) \
- $(am__append_30) $(am__append_31) $(am__append_32) \
+ COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" $(am__append_32) \
$(am__append_33) $(am__append_34) $(am__append_35) \
$(am__append_36) $(am__append_37) $(am__append_38) \
$(am__append_39) $(am__append_40) $(am__append_41) \
$(am__append_42) $(am__append_43) $(am__append_44) \
- $(am__append_45)
+ $(am__append_45) $(am__append_46) $(am__append_47) \
+ $(am__append_48)
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
@@ -916,7 +936,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
ADD_ZERO_CONFIGURE_ARGS = \
--with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
- --disable-bootstrap --enable-zero $(am__append_46) \
+ --disable-bootstrap --enable-zero $(am__append_49) \
--disable-docs $(filter-out '--with-jdk-home=% '--with-ecj=% \
'--with-java=% '--with-javah=% '--with-javac=% '--with-javac=% \
'--with-rmic=% '--with-additional-vms=% '--disable-bootstrap% \
@@ -1744,7 +1764,7 @@ stamps/extract-cacao.stamp: stamps/download-cacao.stamp
clean-extract-cacao: clean-cacao
rm -f stamps/extract-cacao.stamp
-stamps/extract-jamvm.stamp:
+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
@BUILD_JAMVM_TRUE@ set -e ; \
@BUILD_JAMVM_TRUE@ if ! test -d jamvm ; \
@BUILD_JAMVM_TRUE@ then \
diff --git a/source.local/l/openjdk/sources/hotspot.map b/source.local/l/openjdk/sources/hotspot.map
index 0361943..71ae90e 100644
--- a/source.local/l/openjdk/sources/hotspot.map
+++ b/source.local/l/openjdk/sources/hotspot.map
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot d2d0a106917c 872e9e0c36b9fd93e81ac131e60deadb0afa22aa77447150bb45ede77ee6db8b
-zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot a456d0771ba0 09a64fca0beff0759ef1b461d63ed6a00e43032972781bb3a55e49d8b93f67d0
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot ad5a321edea2 c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac
+zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 2c4981784101 977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b