summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorSven Ebenfeld <sven.ebenfeld@gmail.com>2015-04-27 22:13:02 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-04-28 16:09:34 -0300
commitc84cbe25d21422121c5dcb622d8fb82ed9ac461b (patch)
treeba4c6d1ce418e411e186ab7e26befa67edaab76d /recipes-core
parente65fdc9c690405f4a2b53474866f24f7c5e966f1 (diff)
downloadmeta-java-c84cbe25d21422121c5dcb622d8fb82ed9ac461b.tar.gz
openjdk-7: remove IcedTea 2.3.12, OpenJDK 7u25b30
We have now updated to IcedTea 2.5.4, so we can remove the old version. Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch60
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch24
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch12
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch27
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch63
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/fix-checksums.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/fix_hotspot_crosscompile.patch51
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch19
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch31
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch363
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch16
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch23
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch15
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch28
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch39
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch73
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch65
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch41
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch41
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch10
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch188
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-openjdk-remove-currency-data-generation-expi.patch25
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-remove_werror.patch16
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-shark-arm-linux-cpu-detection.patch113
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch18
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch37
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/jvm.cfg43
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch47
-rw-r--r--recipes-core/openjdk/openjdk-7-release-25b30.inc137
-rw-r--r--recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb36
35 files changed, 0 insertions, 1739 deletions
diff --git a/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch b/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch
deleted file mode 100644
index bf68037..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1Index: icedtea-2.3.12/Makefile.am
2===================================================================
3--- icedtea-2.3.12.orig/Makefile.am 2013-07-26 18:17:45.499466367 +0000
4+++ icedtea-2.3.12/Makefile.am 2013-07-30 21:04:46.761410713 +0000
5@@ -471,6 +471,12 @@
6 JAVAC="" \
7 JAVA_HOME="" \
8 JDK_HOME="" \
9+ OE_CFLAGS="$(OE_CFLAGS)" \
10+ OE_CPPFLAGS="$(OE_CPPFLAGS)" \
11+ OE_CXXFLAGS="$(OE_CXXFLAGS)" \
12+ OE_LDFLAGS="$(OE_LDFLAGS)" \
13+ OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \
14+ DISTRIBUTION_ID="$(DIST_ID)" \
15 QUIETLY="" \
16 ANT_RESPECT_JAVA_HOME="TRUE" \
17 DISTRIBUTION_ID="$(DIST_ID)" \
18@@ -2028,7 +2034,11 @@
19 if BUILD_JAMVM
20 cd jamvm/jamvm && \
21 ./autogen.sh --with-java-runtime-library=openjdk7 \
22- --prefix=$(abs_top_builddir)/jamvm/install ; \
23+ --prefix=$(abs_top_builddir)/jamvm/install \
24+ --host=$(host_alias) \
25+ --build=$(build_alias) \
26+ --target=$(target_alias) \
27+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \
28 $(MAKE) ; \
29 $(MAKE) install
30 mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
31@@ -2093,6 +2103,7 @@
32 --host=$(host_alias) \
33 --build=$(build_alias) \
34 --target=$(target_alias) \
35+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \
36 --prefix=$(abs_top_builddir)/cacao/install \
37 --with-java-runtime-library=openjdk7 \
38 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
39@@ -2160,7 +2171,7 @@
40 # configure script arguments, quoted in single quotes
41 CONFIGURE_ARGS = @CONFIGURE_ARGS@
42 ADD_ZERO_CONFIGURE_ARGS = \
43- --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
44+ --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
45 --disable-bootstrap --enable-zero
46 if ADD_SHARK_BUILD
47 ADD_ZERO_CONFIGURE_ARGS += \
48Index: icedtea-2.3.12/javac.in
49===================================================================
50--- icedtea-2.3.12.orig/javac.in 2013-07-24 21:33:57.224612327 +0000
51+++ icedtea-2.3.12/javac.in 2013-07-30 19:41:56.240277496 +0000
52@@ -77,5 +77,7 @@
53 my @CLASSPATH = ('@ECJ_JAR@');
54 push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
55 $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
56- exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
57+ # Compiling hotspot-tools consumes tons of memory and exceeds any default
58+ # limits for jamvm and cacao.
59+ exec '@JAVA@', '-Xmx1024m', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
60 }
diff --git a/recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch
deleted file mode 100644
index c21fcf1..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Index: cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c
2===================================================================
3--- cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c 2013-01-26 21:30:54.206581090 +0100
4+++ cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c 2013-01-26 21:31:34.406991316 +0100
5@@ -28,19 +28,7 @@
6
7 #include <stdint.h>
8
9-#define ucontext broken_glibc_ucontext
10-#define ucontext_t broken_glibc_ucontext_t
11 #include <ucontext.h>
12-#undef ucontext
13-#undef ucontext_t
14-
15-typedef struct ucontext {
16- unsigned long uc_flags;
17- struct ucontext *uc_link;
18- stack_t uc_stack;
19- struct sigcontext uc_mcontext;
20- sigset_t uc_sigmask;
21-} ucontext_t;
22
23 #define scontext_t struct sigcontext
24
diff --git a/recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch
deleted file mode 100644
index 484cb10..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: icedtea6/Makefile.am
2===================================================================
3--- icedtea6.orig/Makefile.am 2011-12-21 22:58:23.000000000 +0100
4+++ icedtea6/Makefile.am 2011-12-21 23:00:21.405887186 +0100
5@@ -1922,6 +1922,7 @@
6 if BUILD_CACAO
7 if !USE_SYSTEM_CACAO
8 cd cacao/cacao && \
9+ rm -f libtool && \
10 ./autogen.sh && \
11 $(ARCH_PREFIX) ./configure \
12 --host=$(host_alias) \
diff --git a/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch
deleted file mode 100644
index 81ac590..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea-2.1.4/Makefile.am
2===================================================================
3--- icedtea-2.1.4.orig/Makefile.am 2013-01-26 18:20:55.152561203 +0100
4+++ icedtea-2.1.4/Makefile.am 2013-01-26 18:41:07.637992206 +0100
5@@ -1994,6 +1994,8 @@
6 if BUILD_CACAO
7 if !USE_SYSTEM_CACAO
8 cd cacao/cacao && \
9+ patch -p1 -N < $(abs_top_srcdir)/patches/cacao-loadavg.patch && \
10+ patch -p1 -N < $(abs_top_srcdir)/patches/cacao-arm-ucontext.patch && \
11 rm -f libtool && \
12 ./autogen.sh && \
13 $(ARCH_PREFIX) ./configure \
diff --git a/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch
deleted file mode 100644
index 0fc1a81..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Index: cacao-cff92704c4e0/src/vm/os.hpp
2===================================================================
3--- cacao-cff92704c4e0/src/vm/os.hpp 2011-12-08 13:40:45.000000000 +0100
4+++ cacao-cff92704c4e0/src/vm/os.hpp 2011-12-20 11:42:36.985633921 +0100
5@@ -425,7 +425,21 @@
6 #if defined(HAVE_GETLOADAVG)
7 return ::getloadavg(loadavg, nelem);
8 #else
9-# error getloadavg not available
10+ FILE *LOADAVG;
11+ double avg[3] = { 0.0, 0.0, 0.0 };
12+ int i, res = -1;;
13+
14+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
15+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
16+ res = 0;
17+ fclose(LOADAVG);
18+ }
19+
20+ for (i = 0; (i < nelem) && (i < 3); i++) {
21+ loadavg[i] = avg[i];
22+ }
23+
24+ return res;
25 #endif
26 }
27
diff --git a/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch
deleted file mode 100644
index cd6cdbf..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1
2# HG changeset patch
3# User Andrew John Hughes <gnu_andrew@member.fsf.org>
4# Date 1366807128 -3600
5# Node ID e562523c5037d8c6097afa00cc2932a959037a61
6# Parent d4e0f297cf8fb7a4e457d5bef8f0290623cf8b05
7Update CACAO to latest tip.
8
92013-04-24 Andrew John Hughes <gnu.andrew@member.fsf.org>
10
11 * patches/cacao/jsig.patch:
12 Removed.
13 * Makefile.am:
14 (CACAO_VERSION): Bump to current tip.
15 (CACAO_SHA256SUM): Likewise.
16 (ICEDTEA_PATCHES): Drop unneeded jsig patch.
17 * NEWS: Updated.
18
19diff -r d4e0f297cf8f -r e562523c5037 Makefile.am
20--- a/Makefile.am Wed Apr 24 10:24:40 2013 +0100
21+++ b/Makefile.am Wed Apr 24 13:38:48 2013 +0100
22@@ -18,8 +18,8 @@
23 LANGTOOLS_SHA256SUM = c412b61b095154fee4c45dc133f2baca3100fecd48b742f80da49a52ec473b02
24 OPENJDK_SHA256SUM = 44c3e4a130fe4b76c1ba977ae2251884cefa774b82a24c4415b64395aef9594c
25
26-CACAO_VERSION = a567bcb7f589
27-CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
28+CACAO_VERSION = e215e36be9fc
29+CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
30 CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
31 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
32 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
33@@ -266,7 +266,6 @@
34 if BUILD_CACAO
35 ICEDTEA_PATCHES += \
36 patches/cacao/launcher.patch \
37- patches/cacao/jsig.patch \
38 patches/cacao/memory.patch
39 else
40 if USING_CACAO
41diff -r d4e0f297cf8f -r e562523c5037 patches/cacao/jsig.patch
42--- a/patches/cacao/jsig.patch Wed Apr 24 10:24:40 2013 +0100
43+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
44@@ -1,18 +0,0 @@
45-diff -Nru cacao.orig/Makefile.am cacao/Makefile.am
46---- cacao.orig/cacao/src/cacao/Makefile.am 2008-08-04 17:51:28.000000000 +0100
47-+++ cacao/cacao/src/cacao/Makefile.am 2010-05-11 10:29:35.000000000 +0100
48-@@ -96,12 +96,12 @@
49- $(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server
50- $(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server
51- $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
52-- $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
53-+ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
54-
55- uninstall-local:
56- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so
57- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
58-- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
59-+ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
60- endif
61-
62-
63
diff --git a/recipes-core/openjdk/openjdk-7-25b30/fix-checksums.patch b/recipes-core/openjdk/openjdk-7-25b30/fix-checksums.patch
deleted file mode 100644
index bb05b3b..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/fix-checksums.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea-2.3.12/Makefile.am
2===================================================================
3--- icedtea-2.3.12.orig/Makefile.am 2013-07-29 13:18:15.437439600 +0000
4+++ icedtea-2.3.12/Makefile.am 2013-07-29 13:18:40.921456562 +0000
5@@ -16,7 +16,7 @@
6 JAXWS_SHA256SUM = b149c1fab323a586eae9b4459ccd929f0db8b35769e42dd7f4fbadc48b803dab
7 JDK_SHA256SUM = badbbf50c820325ffe592762a2eff3414df71e286460b75716a2100d7f6f2aa0
8 LANGTOOLS_SHA256SUM = b9e2e3c97393f566b0c4dc2b0ca826bfb3b3841f5522a850b82d1ff23745839b
9-OPENJDK_SHA256SUM = 7bc64e2285b5bfefeb6a3900729c58beb2f04f2c57184a4fe48341c5087c3f61
10+OPENJDK_SHA256SUM = d1132bdde0e19d8e4d2516213bce7aa50b4b6d1ab04a82bf7a0440d6184db842
11
12 CACAO_VERSION = a567bcb7f589
13 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff --git a/recipes-core/openjdk/openjdk-7-25b30/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-7-25b30/fix_hotspot_crosscompile.patch
deleted file mode 100644
index 8d2d045..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/fix_hotspot_crosscompile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1Index: icedtea-2.1/acinclude.m4
2===================================================================
3--- icedtea-2.1.orig/acinclude.m4
4+++ icedtea-2.1/acinclude.m4
5@@ -909,6 +909,21 @@ AC_DEFUN([IT_WITH_PROJECT],
6 AM_CONDITIONAL([USE_JDK7], test x"${project}" = "xjdk7")
7 ])
8
9+AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD],
10+[
11+ AC_MSG_CHECKING(for compiler used for subsidiary programs)
12+ AC_ARG_WITH([cc-for-build],
13+ [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)],
14+ [
15+ CC_FOR_BUILD="${withval}"
16+ ],
17+ [
18+ CC_FOR_BUILD="\$(CC)"
19+ ])
20+ AC_MSG_RESULT(${CC_FOR_BUILD})
21+ AC_SUBST(CC_FOR_BUILD)
22+])
23+
24 AC_DEFUN([IT_WITH_GCJ],
25 [
26 AC_MSG_CHECKING([whether to compile ecj natively])
27Index: icedtea-2.1/configure.ac
28===================================================================
29--- icedtea-2.1.orig/configure.ac
30+++ icedtea-2.1/configure.ac
31@@ -18,6 +18,8 @@ AC_PREFIX_DEFAULT([bootstrap])
32 AC_PROG_CC
33 AC_PROG_CXX
34
35+AC_CHECK_WITH_CC_FOR_BUILD
36+
37 IT_FIND_TOOL([MAKE], [make])
38 IT_FIND_TOOL([GZIP], [gzip])
39 IT_FIND_TOOL([ANT], [ant])
40Index: icedtea-2.1/Makefile.am
41===================================================================
42--- icedtea-2.1.orig/Makefile.am
43+++ icedtea-2.1/Makefile.am
44@@ -416,6 +416,7 @@ ICEDTEA_ENV = \
45 JAVAC="" \
46 JAVA_HOME="" \
47 JDK_HOME="" \
48+ CC_FOR_BUILD="$(CC_FOR_BUILD)" \
49 OE_CFLAGS="$(OE_CFLAGS)" \
50 OE_CPPFLAGS="$(OE_CPPFLAGS)" \
51 OE_CXXFLAGS="$(OE_CXXFLAGS)" \
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch
deleted file mode 100644
index fb48879..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1From: Mario Domenech Goulart <mario@ossystems.com.br>
2Organization: O.S. Systems Software LTDA.
3
4Upstream-Status: Pending
5---
6--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2015-03-30 13:43:43.433168285 -0300
7+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2015-03-30 13:45:57.601833592 -0300
8@@ -388,9 +388,9 @@
9 * 7: The default directories, normally /lib and /usr/lib.
10 */
11 #if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390))
12-#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
13+#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib:/usr/lib64/jni:/usr/lib/jni"
14 #else
15-#define DEFAULT_LIBPATH "/lib:/usr/lib"
16+#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/lib/jni"
17 #endif
18
19 #define EXTENSIONS_DIR "/lib/ext"
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch
deleted file mode 100644
index 3e2893c..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1diff --git openjdk/corba/make/Makefile openjdk/corba/make/Makefile
2index d81c66c..4f750e8 100644
3--- openjdk/corba/make/Makefile
4+++ openjdk/corba/make/Makefile
5@@ -134,7 +134,7 @@ default: all
6 #----- classes.jar
7
8 CLASSES_JAR = $(LIB_DIR)/classes.jar
9-$(CLASSES_JAR):
10+$(CLASSES_JAR): build
11 $(MKDIR) -p $(@D)
12 $(BOOT_JAR_CMD) -cf $@ -C $(CLASSES_DIR) .
13
14@@ -144,6 +144,7 @@ SRC_ZIP_FILES = $(shell $(FIND) $(SRC_CLASSES_DIR) \( -name \*-template \) -prun
15
16 SRC_ZIP = $(LIB_DIR)/src.zip
17 $(SRC_ZIP): $(SRC_ZIP_FILES)
18+ $(MKDIR) -p $(@D)
19 abs_src_zip=`cd $(@D) ; pwd`/$(@F) ; \
20 ( cd $(SRC_CLASSES_DIR) ; $(FIND) . \( -name \*-template \) -prune -o -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ; \
21 ( cd $(GENSRC_DIR) ; $(FIND) . -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ;
22@@ -153,7 +154,8 @@ $(SRC_ZIP): $(SRC_ZIP_FILES)
23 BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
24
25 BIN_ZIP = $(LIB_DIR)/bin.zip
26-$(BIN_ZIP): $(BIN_ZIP_FILES)
27+$(BIN_ZIP): build $(BIN_ZIP_FILES)
28+ $(MKDIR) -p $(@D)
29 abs_bin_zip=`cd $(@D) ; pwd`/$(@F) ; \
30 ( cd $(BUILD_DIR) ; $(FIND) lib -name "*.idl" -print | $(ZIP) -q $$abs_bin_zip -@ ) ;
31
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch
deleted file mode 100644
index 0c6aac4..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch
+++ /dev/null
@@ -1,363 +0,0 @@
1diff --git openjdk/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
2index fb575fa..e0426ad 100644
3--- openjdk/corba/make/common/shared/Platform.gmk
4+++ openjdk/corba/make/common/shared/Platform.gmk
5@@ -152,9 +152,13 @@ ifeq ($(SYSTEM_UNAME), Linux)
6 OS_NAME = linux
7 OS_VERSION := $(shell uname -r)
8 # Arch and OS name/version
9- mach := $(shell uname -m)
10- ifneq (,$(wildcard /usr/bin/dpkg-architecture))
11- mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
12+ ifdef CROSS_COMPILE_ARCH
13+ mach := $(CROSS_COMPILE_ARCH)
14+ else
15+ mach := $(shell uname -m)
16+ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
17+ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
18+ endif
19 endif
20 archExpr = case "$(mach)" in \
21 i[3-9]86) \
22diff --git openjdk/hotspot/make/linux/makefiles/build_vm_def.sh openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
23index ea81ff6..68b0d71 100644
24--- openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
25+++ openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
26@@ -1,10 +1,12 @@
27 #!/bin/sh
28
29 # If we're cross compiling use that path for nm
30-if [ "$CROSS_COMPILE_ARCH" != "" ]; then
31-NM=$ALT_COMPILER_PATH/nm
32-else
33-NM=nm
34+if [ "$NM" == "" ]; then
35+ if [ "$CROSS_COMPILE_ARCH" != "" ]; then
36+ NM=$ALT_COMPILER_PATH/nm
37+ else
38+ NM=nm
39+ fi
40 fi
41
42 $NM --defined-only $* \
43diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
44index 6fe5191..765fc6d 100644
45--- openjdk/hotspot/make/linux/makefiles/gcc.make
46+++ openjdk/hotspot/make/linux/makefiles/gcc.make
47@@ -164,7 +164,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
48 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
49
50 # The flags to use for an Optimized g++ build
51-OPT_CFLAGS += -O3
52+OPT_CFLAGS += $(OE_CFLAGS)
53
54 # Hotspot uses very unstrict aliasing turn this optimization off
55 OPT_CFLAGS += -fno-strict-aliasing
56@@ -208,15 +208,7 @@ LFLAGS += -Wl,-relax
57 endif
58
59 # Enable linker optimization
60-LFLAGS += -Xlinker -O1
61-
62-# If this is a --hash-style=gnu system, use --hash-style=both
63-# The gnu .hash section won't work on some Linux systems like SuSE 10.
64-_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | grep -- '--hash-style=gnu')
65-ifneq ($(_HAS_HASH_STYLE_GNU),)
66- LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
67-endif
68-LFLAGS += $(LDFLAGS_HASH_STYLE)
69+LFLAGS += $(OE_LDFLAGS)
70
71 # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
72 MAPFLAG = -Xlinker --version-script=FILENAME
73diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make
74index 0c102ea..f4dfbf6 100644
75--- openjdk/hotspot/make/linux/makefiles/launcher.make
76+++ openjdk/hotspot/make/linux/makefiles/launcher.make
77@@ -50,8 +50,8 @@ ifeq ($(LINK_INTO),AOUT)
78 LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
79 else
80 LAUNCHER.o = launcher.o
81- LFLAGS_LAUNCHER += -L `pwd`
82- LIBS_LAUNCHER += -l$(JVM) $(LIBS)
83+ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS)
84+ LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
85 endif
86
87 LINK_LAUNCHER = $(LINK.CC)
88diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
89index b0ffd9a..4e8c47c 100644
90--- openjdk/hotspot/make/linux/makefiles/vm.make
91+++ openjdk/hotspot/make/linux/makefiles/vm.make
92@@ -292,6 +292,7 @@ ifeq ($(SHARK_BUILD), true)
93 LIBS_VM += $(LLVM_LIBS)
94 endif
95
96+LFLAGS_VM += $(OE_LDFLAGS)
97 LINK_VM = $(LINK_LIB.CC)
98
99 # rule for building precompiled header
100diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
101index 69e1177..dc7f8e6 100644
102--- openjdk/jdk/make/common/Defs-linux.gmk
103+++ openjdk/jdk/make/common/Defs-linux.gmk
104@@ -165,35 +165,13 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
105 endif
106 endif
107
108-#
109-# Default optimization
110-#
111-
112-ifndef OPTIMIZATION_LEVEL
113- ifeq ($(PRODUCT), java)
114- OPTIMIZATION_LEVEL = HIGHER
115- else
116- OPTIMIZATION_LEVEL = LOWER
117- endif
118-endif
119-ifndef FASTDEBUG_OPTIMIZATION_LEVEL
120- FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
121-endif
122-
123-CC_OPT/NONE =
124-CC_OPT/LOWER = -O2
125-CC_OPT/HIGHER = -O3
126-CC_OPT/HIGHEST = -O3
127-
128-CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
129-
130 # For all platforms, do not omit the frame pointer register usage.
131 # We need this frame pointer to make it easy to walk the stacks.
132 # This should be the default on X86, but ia64 and amd64 may not have this
133 # as the default.
134 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
135 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
136-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
137+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
138 CFLAGS_REQUIRED_hppa +=
139 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
140 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
141@@ -283,7 +261,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
142 endif
143 endif
144
145-CFLAGS_OPT = $(CC_OPT)
146+CFLAGS_OPT = $(OE_CFLAGS)
147 CFLAGS_DBG = $(DEBUG_FLAG)
148 CFLAGS_COMMON += $(CFLAGS_REQUIRED)
149
150@@ -359,7 +337,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
151 #
152 # -L paths for finding and -ljava
153 #
154-LDFLAGS_OPT = -Xlinker -O1
155+LDFLAGS_OPT = $(OE_LDFLAGS)
156 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
157 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
158
159diff --git openjdk/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
160index c23e96e..484afca 100644
161--- openjdk/jdk/make/common/shared/Platform.gmk
162+++ openjdk/jdk/make/common/shared/Platform.gmk
163@@ -159,9 +159,9 @@ ifeq ($(SYSTEM_UNAME), Linux)
164 mach := $(CROSS_COMPILE_ARCH)
165 else
166 mach := $(shell uname -m)
167- endif
168- ifneq (,$(wildcard /usr/bin/dpkg-architecture))
169- mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
170+ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
171+ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
172+ endif
173 endif
174 archExpr = case "$(mach)" in \
175 i[3-9]86) \
176diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
177index cd336a2..1e5f8e5 100644
178--- openjdk/jdk/make/java/nio/Makefile
179+++ openjdk/jdk/make/java/nio/Makefile
180@@ -934,8 +934,12 @@ else
181 $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
182 $(prep-target)
183 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
184+ifdef CROSS_COMPILE_ARCH
185+ $(QEMU) $(GENSOR_EXE) >> $@
186+else
187 $(GENSOR_EXE) >> $@
188 endif
189+endif
190 #
191 # Generated sun.nio.cs SingleByte classes
192 #
193@@ -969,8 +973,12 @@ else
194 $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
195 $(prep-target)
196 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
197+ifdef CROSS_COMPILE_ARCH
198+ $(QEMU) $(GENUC_EXE) >> $@
199+else
200 $(GENUC_EXE) >> $@
201 endif
202+endif
203
204 GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
205
206@@ -991,7 +999,11 @@ else
207 $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
208 $(prep-target)
209 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
210+ifdef CROSS_COMPILE_ARCH
211+ $(QEMU) $(GENSC_EXE) >> $@
212+else
213 $(GENSC_EXE) >> $@
214 endif
215+endif
216
217 .PHONY: sources
218diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
219index b6e0d99..edc530e 100644
220--- openjdk/jdk/make/sun/awt/mawt.gmk
221+++ openjdk/jdk/make/sun/awt/mawt.gmk
222@@ -151,22 +151,6 @@ else
223 #endif
224
225 LIBXTST = -lXtst
226-ifeq ($(PLATFORM), linux)
227- ifeq ($(ARCH_DATA_MODEL), 64)
228- # XXX what about the rest of them?
229- LIBXT = -lXt
230- else
231- # Allows for builds on Debian GNU Linux, X11 is in a different place
232- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
233- $(wildcard /usr/lib/libXt.a))
234- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
235- $(wildcard /usr/lib/libSM.a))
236- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
237- $(wildcard /usr/lib/libICE.a))
238- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
239- $(wildcard /usr/lib/libXtst.a))
240- endif
241-endif
242
243 # Use -lXmu for EditRes support
244 LIBXMU_DBG = -lXmu
245@@ -181,7 +165,7 @@ ifneq (,$(findstring $(PLATFORM), linux macosx))
246 OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
247 # XXX what is this define below? Isn't it motif-related?
248 OTHER_CFLAGS += -DXMSTRINGDEFINES=1
249-OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
250+OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lXi -lX11
251 endif
252
253 endif
254@@ -230,12 +214,6 @@ else
255 CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
256 endif
257
258-ifndef HEADLESS
259-CPPFLAGS += -I$(OPENWIN_HOME)/include
260-LDFLAGS += -L$(OPENWIN_LIB)
261-
262-endif # !HEADLESS
263-
264 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
265 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
266 -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
267@@ -269,12 +247,6 @@ LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
268 endif # !HEADLESS
269 endif # PLATFORM
270
271-ifeq ($(PLATFORM), linux)
272- # Checking for the X11/extensions headers at the additional location
273- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
274- $(wildcard /usr/include/X11/extensions))
275-endif
276-
277 ifeq ($(PLATFORM), macosx))
278 CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
279 -I$(OPENWIN_HOME)/include
280diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
281index 53d31f3..183c063 100644
282--- openjdk/jdk/make/sun/xawt/Makefile
283+++ openjdk/jdk/make/sun/xawt/Makefile
284@@ -198,20 +198,6 @@ else
285 CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/glib2
286 endif
287
288-ifeq ($(PLATFORM), linux)
289- ifndef CROSS_COMPILE_ARCH
290- # Allows for builds on Debian GNU Linux, X11 is in a different place
291- # This should really be handled at a higher-level so we don't have to
292- # work-around this when cross-compiling
293- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
294- -I/usr/include/X11/extensions \
295- -I$(OPENWIN_HOME)/include
296- else
297- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
298- -I$(OPENWIN_HOME)/include
299- endif
300-endif
301-
302 # We have some odd logic here because some Solaris 10 updates
303 # have a render.h file that suggests gradients are supported, but
304 # the Xrender.h doesn't have the corresponding type definitions.
305@@ -292,16 +278,10 @@ ifeq ($(ARCH_DATA_MODEL), 32)
306 SIZERS = $(SIZER).32
307 SIZERS_C = $(SIZER_32_C)
308 SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
309-ifdef CROSS_COMPILE_ARCH
310-CFLAGS_32 = -m32
311-endif
312 else # !32
313 SIZERS = $(SIZER).64
314 SIZERS_C = $(SIZER_64_C)
315 SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
316-ifdef CROSS_COMPILE_ARCH
317-CFLAGS_64 = -m64
318-endif
319 endif # 32
320 endif # !macosx
321 endif # solaris
322@@ -337,15 +321,11 @@ WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator
323 WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class
324 XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
325
326-ifndef CROSS_COMPILE_ARCH
327 SIZERS_CC = $(CC)
328-else
329-SIZERS_CC = $(HOST_CC)
330-endif
331
332 $(SIZERS): $(SIZERS_C)
333 $(prep-target)
334- $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
335+ $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -fuse-ld=bfd -o $@ $(SIZER)$(suffix $@).c
336
337 $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
338 $(prep-target)
339@@ -358,6 +334,16 @@ $(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
340 $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
341
342 $(SIZES): $(SIZERS)
343+ifdef CROSS_COMPILE_ARCH
344+ @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
345+ $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
346+ $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
347+ $(CHMOD) +w $@;\
348+ else \
349+ $(ECHO) GENERATING $@; \
350+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
351+ fi
352+else
353 @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
354 $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
355 $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
356@@ -366,6 +352,7 @@ $(SIZES): $(SIZERS)
357 $(ECHO) GENERATING $@; \
358 $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
359 fi
360+endif
361 @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
362 $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
363 $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch
deleted file mode 100644
index 4bd8b2c..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
2===================================================================
3--- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2011-10-19 16:56:03.014276748 +0200
4+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2011-10-19 16:57:19.942658211 +0200
5@@ -29,7 +29,7 @@
6 #include "X11SurfaceData.h"
7
8 /*#include <xcb/xcb.h>*/
9-#include <Xrender.h>
10+#include <X11/extensions/Xrender.h>
11
12 #ifndef RepeatNone /* added in 0.10 */
13 #define RepeatNone 0
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch
deleted file mode 100644
index 657f722..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Index: openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-12-20 19:15:05.000000000 +0100
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-12-20 19:18:22.411503442 +0100
5@@ -2593,10 +2593,7 @@
6 // If we are running with earlier version, which did not have symbol versions,
7 // we should use the base version.
8 void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
9- void *f = dlvsym(handle, name, "libnuma_1.1");
10- if (f == NULL) {
11- f = dlsym(handle, name);
12- }
13+ void *f = dlsym(handle, name);
14 return f;
15 }
16
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch
deleted file mode 100644
index faa90ea..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200
5@@ -49,7 +49,6 @@
6 # include <string.h>
7 # include <syscall.h>
8 # include <sys/sysinfo.h>
9-# include <gnu/libc-version.h>
10 # include <sys/ipc.h>
11 # include <sys/shm.h>
12 # include <link.h>
13@@ -544,9 +543,7 @@
14 os::Linux::set_glibc_version(str);
15 } else {
16 // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
17- static char _gnu_libc_version[32];
18- jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
19- "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
20+ static char _gnu_libc_version[32] = "2.9";
21 os::Linux::set_glibc_version(_gnu_libc_version);
22 }
23
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch
deleted file mode 100644
index 7c5da59..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
2===================================================================
3--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:28.576131825 +0200
4+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:55.555711815 +0200
5@@ -235,8 +235,8 @@
6
7 // Checking for finiteness
8
9-inline int g_isfinite(jfloat f) { return finite(f); }
10-inline int g_isfinite(jdouble f) { return finite(f); }
11+inline int g_isfinite(jfloat f) { return isfinite(f); }
12+inline int g_isfinite(jdouble f) { return isfinite(f); }
13
14
15 // Wide characters
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch
deleted file mode 100644
index b2ddfa9..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1diff --git openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
2index 659d4da..68a06d5 100644
3--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
4+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
5@@ -253,7 +253,7 @@ inline int g_isnan(double f) { return isnand(f); }
6 #elif defined(__APPLE__)
7 inline int g_isnan(double f) { return isnan(f); }
8 #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
9-inline int g_isnan(float f) { return isnanf(f); }
10+inline int g_isnan(float f) { return __isnanf(f); }
11 inline int g_isnan(double f) { return isnan(f); }
12 #else
13 #error "missing platform-specific definition here"
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
deleted file mode 100644
index 7da41fd..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200
5@@ -4325,7 +4325,22 @@
6 // Linux doesn't yet have a (official) notion of processor sets,
7 // so just return the system wide load average.
8 int os::loadavg(double loadavg[], int nelem) {
9- return ::getloadavg(loadavg, nelem);
10+
11+ FILE *LOADAVG;
12+ double avg[3] = { 0.0, 0.0, 0.0 };
13+ int i, res = -1;;
14+
15+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
16+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
17+ res = 0;
18+ fclose(LOADAVG);
19+ }
20+
21+ for (i = 0; (i < nelem) && (i < 3); i++) {
22+ loadavg[i] = avg[i];
23+ }
24+
25+ return res;
26 }
27
28 void os::pause() {
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch
deleted file mode 100644
index 68f8581..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Index: openjdk/jdk/make/java/npt/Makefile
2===================================================================
3--- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200
4+++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200
5@@ -65,6 +65,8 @@
6 # We don't want to link against -ljava
7 JAVALIB=
8
9+LDLIBS += -liconv
10+
11 # Add -export options to explicitly spell exported symbols
12 ifeq ($(PLATFORM), windows)
13 OTHER_LCF += -export:nptInitialize -export:nptTerminate
14Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile
15===================================================================
16--- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200
17+++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200
18@@ -123,6 +123,8 @@
19 # We don't want to link against -ljava
20 JAVALIB=
21
22+LDLIBS += -liconv
23+
24 #
25 # Add to ambient vpath so we pick up the library files
26 #
27Index: openjdk/jdk/make/sun/splashscreen/Makefile
28===================================================================
29--- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200
30+++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200
31@@ -55,6 +55,8 @@
32
33 JAVALIB=
34
35+LDLIBS += -liconv
36+
37 #
38 # C Flags
39 #
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch
deleted file mode 100644
index 94416bb..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1Index: openjdk/jdk/make/java/nio/Makefile
2===================================================================
3--- openjdk/jdk/make/java/nio/Makefile 2013-10-01 21:20:11.000000000 -0700
4+++ openjdk/jdk/make/java/nio/Makefile 2013-10-01 21:30:40.901837422 -0700
5@@ -918,7 +918,7 @@
6 ifeq ($(PLATFORM), macosx)
7 NIO_CC=$(HOST_CC)
8 else
9- NIO_CC=$(CC)
10+ NIO_CC=$(CC_FOR_BUILD)
11 endif
12
13 $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
14@@ -934,12 +934,8 @@
15 $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
16 $(prep-target)
17 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
18-ifdef CROSS_COMPILE_ARCH
19- $(QEMU) $(GENSOR_EXE) >> $@
20-else
21 $(GENSOR_EXE) >> $@
22 endif
23-endif
24 #
25 # Generated sun.nio.cs SingleByte classes
26 #
27@@ -973,12 +969,8 @@
28 $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
29 $(prep-target)
30 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
31-ifdef CROSS_COMPILE_ARCH
32- $(QEMU) $(GENUC_EXE) >> $@
33-else
34 $(GENUC_EXE) >> $@
35 endif
36-endif
37
38 GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
39
40@@ -999,11 +991,7 @@
41 $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
42 $(prep-target)
43 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
44-ifdef CROSS_COMPILE_ARCH
45- $(QEMU) $(GENSC_EXE) >> $@
46-else
47 $(GENSC_EXE) >> $@
48 endif
49-endif
50
51 .PHONY: sources
52Index: openjdk/jdk/make/sun/Makefile
53===================================================================
54--- openjdk/jdk/make/sun/Makefile 2013-07-25 09:10:09.000000000 -0700
55+++ openjdk/jdk/make/sun/Makefile 2013-10-01 21:32:01.625839149 -0700
56@@ -55,7 +55,7 @@
57 endif
58 endif
59 HEADLESS_SUBDIR = headless
60- XAWT_SUBDIR = xawt
61+ XAWT_SUBDIR =
62 endif
63
64 ifeq ($(PLATFORM), macosx)
65@@ -87,7 +87,7 @@
66 endif
67 SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \
68 $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \
69- jawt font jpeg cmm $(DISPLAY_TOOLS) beans
70+ font jpeg cmm $(DISPLAY_TOOLS) beans
71 SUBDIRS_management = management
72 SUBDIRS_misc = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing
73 SUBDIRS_tools = native2ascii serialver tools jconsole
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch
deleted file mode 100644
index cc5e4e8..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1http://mail.openjdk.java.net/pipermail/zero-dev/2010-June/000346.html
2
3this cute C code does the same thing on powerpc as the assembly code that
4was here before. If the compiler was built with the SPE extensions instead
5of traditional FPU and double operations are performed in HW then we are
6one step further: The compiler turns this into evldd & evstdd. Voila :)
7
8This C code could also be activated on s390. The compiler turns this into
9a single mvc instruction which does the copy operation. I don't know if
10mvc's copy ability is atomic _or_ not and therefore I leave it as it.
11
12Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
13
14./openjdk-src-dir/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
15Index: openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
16===================================================================
17--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp.org 2011-11-14 14:07:32.000000000 -0800
18+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2012-07-19 07:28:26.208405923 -0700
19@@ -25,6 +25,16 @@
20
21 #ifndef OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
22 #define OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
23+#if defined(PPC) && !defined(_LP64)
24+
25+#ifndef __NO_FPRS__
26+#define ATOMIC64_COPY_THROUGH_DOUBLE 1
27+
28+#elif defined(__SPE__) && !defined(_SOFT_DOUBLE)
29+#define ATOMIC64_COPY_THROUGH_DOUBLE 1
30+
31+#endif
32+#endif
33
34 static void setup_fpu() {}
35
36@@ -36,12 +46,23 @@
37
38 // Atomically copy 64 bits of data
39 static void atomic_copy64(volatile void *src, volatile void *dst) {
40-#if defined(PPC) && !defined(_LP64)
41- double tmp;
42- asm volatile ("lfd %0, 0(%1)\n"
43- "stfd %0, 0(%2)\n"
44- : "=f"(tmp)
45- : "b"(src), "b"(dst));
46+#if ATOMIC64_COPY_THROUGH_DOUBLE
47+ /*
48+ * In order to copy 8 bytes atomicly we rely on the trick that some
49+ * architectures can load and store a double as a single operation.
50+ * gcc picks the correct opcode here and with optimization turned on
51+ * all temporary assignments are gone. - bigeasy
52+ */
53+ union {
54+ double *d;
55+ volatile void *v;
56+ } s, d;
57+
58+ s.v = src;
59+ d.v = dst;
60+
61+ *d.d = *s.d;
62+
63 #elif defined(S390) && !defined(_LP64)
64 double tmp;
65 asm volatile ("ld %0, 0(%1)\n"
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch
deleted file mode 100644
index 5bb7604..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1--- /dev/null 2012-07-25 13:25:05.651551001 -0700
2+++ openjdk/jdk/src/solaris/bin/ppc64/jvm.cfg 2012-08-10 23:59:02.651551157 -0700
3@@ -0,0 +1,38 @@
4+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
5+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6+#
7+# This code is free software; you can redistribute it and/or modify it
8+# under the terms of the GNU General Public License version 2 only, as
9+# published by the Free Software Foundation. Oracle designates this
10+# particular file as subject to the "Classpath" exception as provided
11+# by Oracle in the LICENSE file that accompanied this code.
12+#
13+# This code is distributed in the hope that it will be useful, but WITHOUT
14+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
15+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16+# version 2 for more details (a copy is included in the LICENSE file that
17+# accompanied this code).
18+#
19+# You should have received a copy of the GNU General Public License version
20+# 2 along with this work; if not, write to the Free Software Foundation,
21+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
22+#
23+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
24+# or visit www.oracle.com if you need additional information or have any
25+# questions.
26+#
27+# List of JVMs that can be used as an option to java, javac, etc.
28+# Order is important -- first in this list is the default JVM.
29+# NOTE that this both this file and its format are UNSUPPORTED and
30+# WILL GO AWAY in a future release.
31+#
32+# You may also select a JVM in an arbitrary location with the
33+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
34+# and may not be available in a future release.
35+#
36+-client KNOWN
37+-server KNOWN
38+-hotspot ERROR
39+-classic WARN
40+-native ERROR
41+-green ERROR
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch
deleted file mode 100644
index 5423fde..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
2===================================================================
3--- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:45:56.607257503 +0200
4+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:47:19.727254686 +0200
5@@ -27,9 +27,6 @@
6 #include <X11/Xutil.h>
7 #include <X11/Xos.h>
8 #include <X11/Xatom.h>
9-#ifdef __linux__
10-#include <execinfo.h>
11-#endif
12
13 #include <jvm.h>
14 #include <jni.h>
15@@ -689,26 +686,6 @@
16 return ret;
17 }
18
19-#ifdef __linux__
20-void print_stack(void)
21-{
22- void *array[10];
23- size_t size;
24- char **strings;
25- size_t i;
26-
27- size = backtrace (array, 10);
28- strings = backtrace_symbols (array, size);
29-
30- fprintf (stderr, "Obtained %zd stack frames.\n", size);
31-
32- for (i = 0; i < size; i++)
33- fprintf (stderr, "%s\n", strings[i]);
34-
35- free (strings);
36-}
37-#endif
38-
39 Window get_xawt_root_shell(JNIEnv *env) {
40 static jclass classXRootWindow = NULL;
41 static jmethodID methodGetXRootWindow = NULL;
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch
deleted file mode 100644
index 7e98767..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- openjdk/jdk/make/com/sun/java/pack/Makefile
2+++ openjdk/jdk/make/com/sun/java/pack/Makefile
3@@ -103,6 +103,7 @@ else
4 OTHER_LDLIBS += -lc $(LIBCXX)
5 # setup the list of libraries to link in...
6 ifeq ($(PLATFORM), linux)
7+ OTHER_LDLIBS += -lpthread
8 ifeq ("$(CC_VER_MAJOR)", "3")
9 OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
10 endif
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch
deleted file mode 100644
index b97745d..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/launcher.make
2===================================================================
3--- openjdk/hotspot/make/linux/makefiles/launcher.make 2011-12-20 10:33:37.000000000 +0100
4+++ openjdk/hotspot/make/linux/makefiles/launcher.make 2011-12-20 10:37:54.055022618 +0100
5@@ -51,7 +51,7 @@
6 else
7 LAUNCHER.o = launcher.o
8 LFLAGS_LAUNCHER += -L `pwd`
9- LIBS_LAUNCHER += -l$(JVM) $(LIBS)
10+ LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
11 ifeq ($(SHARK_BUILD), true)
12 LFLAGS_LAUNCHER += $(LLVM_LDFLAGS)
13 LIBS_LAUNCHER += $(LLVM_LIBS)
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch
deleted file mode 100644
index d6a599c..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch
+++ /dev/null
@@ -1,188 +0,0 @@
1diff --git openjdk/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
2index 4ae967f..fe669a9 100644
3--- openjdk/jdk/make/com/sun/nio/sctp/Makefile
4+++ openjdk/jdk/make/com/sun/nio/sctp/Makefile
5@@ -64,11 +64,11 @@ ifneq ($(COMPILER_WARNINGS_FATAL),false)
6 COMPILER_WARNINGS_FATAL=true
7 endif
8 #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
9-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
10+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -ldl
11 endif
12 ifeq ($(PLATFORM), solaris)
13 #LIBSCTP = -lsctp
14-OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
15+OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -ljavanet -lnio
16 endif # PLATFORM
17
18 else # windows
19diff --git openjdk/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
20index 7283e45..720f3d3 100644
21--- openjdk/jdk/make/java/net/Makefile
22+++ openjdk/jdk/make/java/net/Makefile
23@@ -25,7 +25,7 @@
24
25 BUILDDIR = ../..
26 PACKAGE = java.net
27-LIBRARY = net
28+LIBRARY = javanet
29 PRODUCT = sun
30 include $(BUILDDIR)/common/Defs.gmk
31
32diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
33index 191f17d..1e5f8e5 100644
34--- openjdk/jdk/make/java/nio/Makefile
35+++ openjdk/jdk/make/java/nio/Makefile
36@@ -369,7 +369,7 @@ ifeq ($(PLATFORM),windows)
37 endif
38
39 ifeq ($(PLATFORM), linux)
40- OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
41+ OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread $(LIBDL)
42 ifdef USE_SYSTEM_GIO
43 OTHER_LDLIBS += $(GIO_LIBS)
44 OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
45@@ -379,12 +379,12 @@ ifeq ($(PLATFORM), linux)
46 endif
47
48 ifeq ($(PLATFORM), macosx)
49-OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread
50+OTHER_LDLIBS += -L$(LIBDIR) -ljava -ljavanet -pthread
51 endif
52
53 ifeq ($(PLATFORM), solaris)
54 OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
55- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
56+ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
57 endif # PLATFORM
58
59 ifdef COMPILE_AGAINST_SYSCALLS
60diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
61index b7f0f2f..b093868 100644
62--- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
63+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
64@@ -69,7 +69,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
65 */
66 static {
67 java.security.AccessController.doPrivileged(
68- new sun.security.action.LoadLibraryAction("net"));
69+ new sun.security.action.LoadLibraryAction("javanet"));
70 }
71
72 /**
73diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
74index c6a38ad..97de65b 100644
75--- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
76+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
77@@ -78,7 +78,7 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
78 */
79 static {
80 java.security.AccessController.doPrivileged(
81- new sun.security.action.LoadLibraryAction("net"));
82+ new sun.security.action.LoadLibraryAction("javanet"));
83 }
84
85 /**
86diff --git openjdk/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
87index 195ee86..6822a57 100644
88--- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
89+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
90@@ -47,7 +47,7 @@ class DatagramPacket {
91 */
92 static {
93 java.security.AccessController.doPrivileged(
94- new sun.security.action.LoadLibraryAction("net"));
95+ new sun.security.action.LoadLibraryAction("javanet"));
96 init();
97 }
98
99diff --git openjdk/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
100index 3ea28e4..7c78eae 100644
101--- openjdk/jdk/src/share/classes/java/net/InetAddress.java
102+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java
103@@ -260,7 +260,7 @@ class InetAddress implements java.io.Serializable {
104 static {
105 preferIPv6Address = java.security.AccessController.doPrivileged(
106 new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
107- AccessController.doPrivileged(new LoadLibraryAction("net"));
108+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
109 init();
110 }
111
112diff --git openjdk/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
113index 6314d15..761fdda 100644
114--- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
115+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
116@@ -53,7 +53,7 @@ public final class NetworkInterface {
117 private static final int defaultIndex; /* index of defaultInterface */
118
119 static {
120- AccessController.doPrivileged(new LoadLibraryAction("net"));
121+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
122 init();
123 defaultInterface = DefaultInterface.getDefault();
124 if (defaultInterface != null) {
125diff --git openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
126index 5baca6e..befd0b9 100644
127--- openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
128+++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
129@@ -76,6 +76,6 @@ public final class SdpSupport {
130
131 static {
132 AccessController.doPrivileged(
133- new sun.security.action.LoadLibraryAction("net"));
134+ new sun.security.action.LoadLibraryAction("javanet"));
135 }
136 }
137diff --git openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
138index d7aa358..9b2c719 100644
139--- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
140+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
141@@ -95,7 +95,7 @@ public class DefaultProxySelector extends ProxySelector {
142 }});
143 if (b != null && b.booleanValue()) {
144 java.security.AccessController.doPrivileged(
145- new sun.security.action.LoadLibraryAction("net"));
146+ new sun.security.action.LoadLibraryAction("javanet"));
147 hasSystemProxies = init();
148 }
149 }
150diff --git openjdk/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
151index 10662df..34d441a 100644
152--- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
153+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
154@@ -483,7 +483,7 @@ class Util {
155 return;
156 loaded = true;
157 java.security.AccessController
158- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
159+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
160 java.security.AccessController
161 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
162 // IOUtil must be initialized; Its native methods are called from
163diff --git openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
164index 3695b5d..7c833cc 100644
165--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
166+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
167@@ -247,7 +247,7 @@ public class ResolverConfigurationImpl
168
169 static {
170 java.security.AccessController.doPrivileged(
171- new sun.security.action.LoadLibraryAction("net"));
172+ new sun.security.action.LoadLibraryAction("javanet"));
173 }
174
175 }
176diff --git openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
177index 7970885..46ab112 100644
178--- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
179+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
180@@ -159,7 +159,7 @@ public class ResolverConfigurationImpl
181
182 static {
183 java.security.AccessController.doPrivileged(
184- new sun.security.action.LoadLibraryAction("net"));
185+ new sun.security.action.LoadLibraryAction("javanet"));
186 init0();
187
188 // start the address listener thread
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-openjdk-remove-currency-data-generation-expi.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-openjdk-remove-currency-data-generation-expi.patch
deleted file mode 100644
index 6dd36af..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-openjdk-remove-currency-data-generation-expi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 7df2fd1014a0c31f518be4f6a0018533f469d584 Mon Sep 17 00:00:00 2001
2From: Alex Gonzalez <alex.gonzalez@digi.com>
3Date: Wed, 31 Dec 2014 16:07:32 +0100
4Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration
5 date
6
7Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
8---
9 .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 ---
10 1 file changed, 3 deletions(-)
11
12diff --git openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
13index bf335fa22c1d..0e421360fef9 100644
14--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
15+++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
16@@ -281,9 +281,6 @@ public class GenerateCurrencyData {
17 checkCurrencyCode(newCurrency);
18 String timeString = currencyInfo.substring(4, length - 4);
19 long time = format.parse(timeString).getTime();
20- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
21- throw new RuntimeException("time is more than 10 years from present: " + time);
22- }
23 specialCaseCutOverTimes[specialCaseCount] = time;
24 specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
25 specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency);
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-remove_werror.patch
deleted file mode 100644
index f78f2b3..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-remove_werror.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
2index 42f6843..765fc6d 100644
3--- openjdk/hotspot/make/linux/makefiles/gcc.make
4+++ openjdk/hotspot/make/linux/makefiles/gcc.make
5@@ -149,11 +149,6 @@ else
6 CFLAGS += -pipe
7 endif
8
9-# Compiler warnings are treated as errors
10-ifneq ($(COMPILER_WARNINGS_FATAL),false)
11-WARNINGS_ARE_ERRORS = -Werror
12-endif
13-
14 # Except for a few acceptable ones
15 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
16 # conversions which might affect the values. To avoid that, we need to turn
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-shark-arm-linux-cpu-detection.patch
deleted file mode 100644
index f40bc51..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-shark-arm-linux-cpu-detection.patch
+++ /dev/null
@@ -1,113 +0,0 @@
1Index: openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp
2===================================================================
3--- openjdk.orig/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:42:48.412103129 +0200
4+++ openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:50:51.680282178 +0200
5@@ -32,6 +32,96 @@
6
7 #if SHARK_LLVM_VERSION >= 27
8 namespace {
9+
10+#if defined(__arm__) && defined(__linux__)
11+#include <fcntl.h>
12+#include <linux/auxvec.h>
13+#include <asm/hwcap.h>
14+#define VECBUFF_SIZE 32
15+
16+bool TestARMLinuxHWCAP(int feature) {
17+ int fd;
18+ unsigned vecs[VECBUFF_SIZE];
19+ unsigned *p;
20+ int i, n;
21+ int rc;
22+
23+ rc = 0;
24+ fd = open("/proc/self/auxv", O_RDONLY);
25+ if (fd < 0) return 0;
26+ do {
27+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
28+ p = vecs;
29+ i = n/8;
30+ while (--i >=0) {
31+ unsigned tag = *p++;
32+ unsigned value = *p++;
33+ if (tag == 0) goto fini;
34+ if(tag == AT_HWCAP && (value & feature)) {
35+ rc = 1;
36+ goto fini;
37+ }
38+ }
39+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
40+fini:
41+ close(fd);
42+ return rc;
43+}
44+
45+char* TestARMLinuxAT(int auxvec) {
46+ int fd;
47+ unsigned vecs[VECBUFF_SIZE];
48+ unsigned *p;
49+ int i, n;
50+ char* rc;
51+
52+ rc = 0;
53+ fd = open("/proc/self/auxv", O_RDONLY);
54+ if (fd < 0) return 0;
55+ do {
56+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
57+ p = vecs;
58+ i = n/8;
59+ while (--i >=0) {
60+ unsigned tag = *p++;
61+ unsigned value = *p++;
62+ if (tag == 0) goto fini;
63+ if(tag == (unsigned) auxvec ) {
64+ rc = (char*)value;
65+ goto fini;
66+ }
67+ }
68+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
69+fini:
70+ close(fd);
71+ return rc;
72+}
73+
74+bool getARMHostCPUFeatures(StringMap<bool> &Features) {
75+ // FIXME LLVM PR6561 // Features["neon"]=TestARMLinuxHWCAP(HWCAP_NEON);
76+ Features["thumb2"]=TestARMLinuxHWCAP(HWCAP_THUMBEE);
77+ Features["vfp2"]=TestARMLinuxHWCAP(HWCAP_VFP);
78+
79+ std::string testArchKey(TestARMLinuxAT(AT_PLATFORM));
80+
81+ StringMap<std::string> archLinuxToLLVMMap;
82+ archLinuxToLLVMMap["v4l"]="v4t";
83+ archLinuxToLLVMMap["v5l"]="v5t";
84+ archLinuxToLLVMMap["v6l"]="v6";
85+ // FIXME change this from v6 to v7a when LLVM PR7048 have been fixed
86+ archLinuxToLLVMMap["v7l"]="v6";
87+
88+ llvm::StringMapIterator<std::string> resultIterator(archLinuxToLLVMMap.find(
89+ testArchKey));
90+ if(resultIterator->first()) {
91+ std::string arch(resultIterator->second);
92+ Features[arch]=true;
93+ }
94+
95+ return true;
96+}
97+#endif
98+
99 cl::opt<std::string>
100 MCPU("mcpu");
101
102@@ -64,7 +154,11 @@
103 #if SHARK_LLVM_VERSION >= 27
104 // Finetune LLVM for the current host CPU.
105 StringMap<bool> Features;
106+#if defined(__arm__) && defined(__linux__)
107+ bool gotCpuFeatures = getARMHostCPUFeatures(Features);
108+#else
109 bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features);
110+#endif
111 std::string cpu("-mcpu=" + llvm::sys::getHostCPUName());
112
113 std::vector<const char*> args;
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch
deleted file mode 100644
index c03b23c..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1diff --git openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
2index c24c781..ccdc41a 100644
3--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
4+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
5@@ -32,13 +32,11 @@
6 #endif
7 #include "jfdlibm.h"
8
9-#ifdef __NEWVALID /* special setup for Sun test regime */
10 #if defined(i386) || defined(i486) || \
11 defined(intel) || defined(x86) || defined(arm) || \
12 defined(i86pc) || defined(_M_IA64) || defined(ia64)
13 #define _LITTLE_ENDIAN
14 #endif
15-#endif
16
17 #ifdef _LITTLE_ENDIAN
18 #define __HI(x) *(1+(int*)&x)
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch
deleted file mode 100644
index 3f7d70a..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
2index 898272e..c5ca547 100644
3--- openjdk/jdk/make/java/nio/Makefile
4+++ openjdk/jdk/make/java/nio/Makefile
5@@ -48,6 +48,8 @@ include FILES_java.gmk
6 include FILES_c.gmk
7 include Exportedfiles.gmk
8
9+NIO_PLATFORM_CLASSES_ROOT_DIR =
10+
11 ifeq ($(PLATFORM), windows)
12 FILES_java += \
13 sun/nio/ch/Iocp.java \
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch
deleted file mode 100644
index 784f2de..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
2index c2a1484..156bdd0 100644
3--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
4+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
5@@ -32,26 +32,28 @@ Obj_Files += cppInterpreter_arm.o
6 Obj_Files += thumb2.o
7
8 CFLAGS += -DHOTSPOT_ASM
9+CCFLAGS += -DHOTSPOT_ASM
10+
11
12 cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
13 thumb2.o: offsets_arm.s
14
15 offsets_arm.s: mkoffsets
16 @echo Generating assembler offsets
17- ./mkoffsets > $@
18+ $(QEMU) ./mkoffsets > $@
19
20 bytecodes_arm.s: bytecodes_arm.def mkbc
21 @echo Generating ARM assembler bytecode sequences
22- $(CC_COMPILE) $(CFLAGS) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
23+ $(CC_COMPILE) $(CFLAGS) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE)
24
25 mkbc: $(GAMMADIR)/tools/mkbc.c
26 @echo Compiling mkbc tool
27- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
28+ $(CC_COMPILE) -static -fuse-ld=bfd -o $@ $< $(COMPILE_DONE)
29
30 mkoffsets: asm_helper.cpp
31 @echo Compiling offset generator
32 $(QUIETLY) $(REMOVE_TARGET)
33- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
34+ $(CC_COMPILE) $(CFLAGS) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
35
36 endif
37
diff --git a/recipes-core/openjdk/openjdk-7-25b30/jvm.cfg b/recipes-core/openjdk/openjdk-7-25b30/jvm.cfg
deleted file mode 100644
index ea97cda..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/jvm.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
1# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
2# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3#
4# This code is free software; you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 2 only, as
6# published by the Free Software Foundation. Sun designates this
7# particular file as subject to the "Classpath" exception as provided
8# by Sun in the LICENSE file that accompanied this code.
9#
10# This code is distributed in the hope that it will be useful, but WITHOUT
11# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13# version 2 for more details (a copy is included in the LICENSE file that
14# accompanied this code).
15#
16# You should have received a copy of the GNU General Public License version
17# 2 along with this work; if not, write to the Free Software Foundation,
18# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19#
20# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
21# CA 95054 USA or visit www.sun.com if you need additional information or
22# have any questions.
23#
24#
25# List of JVMs that can be used as an option to java, javac, etc.
26# Order is important -- first in this list is the default JVM.
27# NOTE that this both this file and its format are UNSUPPORTED and
28# WILL GO AWAY in a future release.
29#
30# You may also select a JVM in an arbitrary location with the
31# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
32# and may not be available in a future release.
33#
34-server ERROR
35-client IGNORE
36-hotspot ERROR
37-classic WARN
38-native ERROR
39-green ERROR
40-zero ALIASED_TO -server
41-shark ERROR
42-cacao ERROR
43-jamvm ERROR
diff --git a/recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch b/recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch
deleted file mode 100644
index 00b9660..0000000
--- a/recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1Index: openjdk/jdk/src/share/classes/java/net/URLClassLoader.java
2===================================================================
3--- openjdk.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-13 16:58:42.000000000 +0200
4+++ openjdk/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-28 18:43:50.114802612 +0200
5@@ -438,14 +438,12 @@
6 // Use (direct) ByteBuffer:
7 CodeSigner[] signers = res.getCodeSigners();
8 CodeSource cs = new CodeSource(url, signers);
9- sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0);
10 return defineClass(name, bb, cs);
11 } else {
12 byte[] b = res.getBytes();
13 // must read certificates AFTER reading bytes.
14 CodeSigner[] signers = res.getCodeSigners();
15 CodeSource cs = new CodeSource(url, signers);
16- sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0);
17 return defineClass(name, b, 0, b.length, cs);
18 }
19 }
20Index: openjdk/jdk/src/share/classes/java/lang/ClassLoader.java
21===================================================================
22--- openjdk.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-13 16:58:42.000000000 +0200
23+++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-28 18:43:50.142802778 +0200
24@@ -422,10 +422,6 @@
25 long t1 = System.nanoTime();
26 c = findClass(name);
27
28- // this is the defining class loader; record the stats
29- sun.misc.PerfCounter.getParentDelegationTime().addTime(t1 - t0);
30- sun.misc.PerfCounter.getFindClassTime().addElapsedTimeFrom(t1);
31- sun.misc.PerfCounter.getFindClasses().increment();
32 }
33 }
34 if (resolve) {
35Index: openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java
36===================================================================
37--- openjdk.orig/jdk/src/share/classes/java/util/zip/ZipFile.java
38+++ openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java
39@@ -213,8 +213,6 @@ class ZipFile implements ZipConstants, Closeable {
40 this.zc = ZipCoder.get(charset);
41 long t0 = System.nanoTime();
42 jzfile = open(name, mode, file.lastModified(), usemmap);
43- sun.misc.PerfCounter.getZipFileOpenTime().addElapsedTimeFrom(t0);
44- sun.misc.PerfCounter.getZipFileCount().increment();
45 this.name = name;
46 this.total = getTotal(jzfile);
47 this.locsig = startsWithLOC(jzfile);
diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc
deleted file mode 100644
index 9888ce3..0000000
--- a/recipes-core/openjdk/openjdk-7-release-25b30.inc
+++ /dev/null
@@ -1,137 +0,0 @@
1require openjdk-7-common.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4
5FILESPATH =. "${FILE_DIRNAME}/openjdk-7-25b30:"
6
7# Name of the directory containing the compiled output
8BUILD_DIR = "openjdk.build"
9BUILD_DIR_ECJ = "openjdk.build-ecj"
10
11# Force arm mode for now
12ARM_INSTRUCTION_SET_armv4t = "ARM"
13
14ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced"
15
16ICEDTEA_PREFIX = "icedtea7-forest-2.3"
17ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}"
18
19OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2"
20OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false"
21
22HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.gz"
23HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false"
24
25CORBA_FILE = "${CORBA_CHANGESET}.tar.gz"
26CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false"
27
28JAXP_FILE = "${JAXP_CHANGESET}.tar.gz"
29JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false"
30
31JAXWS_FILE = "${JAXWS_CHANGESET}.tar.gz"
32JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false"
33
34JDK_FILE = "${JDK_CHANGESET}.tar.gz"
35JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false"
36
37LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.gz"
38LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false"
39
40CACAO_VERSION = "e215e36be9fc"
41CACAO_FILE = "${CACAO_VERSION}.tar.gz"
42CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false"
43SRC_URI[cacao.md5sum] = "79f95f0aea4ba04cf2f1a8632ac66d14"
44SRC_URI[cacao.sha256sum] = "4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab"
45
46JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82"
47JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz"
48JAMVM_URI = "http://icedtea.wildebeest.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false"
49SRC_URI[jamvm.md5sum] = "f4616713ec609e35aa8070811bd952aa"
50SRC_URI[jamvm.sha256sum] = "bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03"
51
52# Allow overriding this separately
53OEPATCHES = "\
54 file://build-hacks.patch \
55 file://cacao-libtoolize.patch \
56 file://cacao-loadavg-makefile.patch \
57 file://fix_hotspot_crosscompile.patch \
58 file://cacao-update.patch \
59 file://cacao-loadavg.patch;apply=no \
60 file://cacao-arm-ucontext.patch;apply=no \
61 file://remove-sun.misc.Perf-debug-code.patch;apply=no \
62 file://fix-checksums.patch \
63 "
64
65# overrride the jamvm patch for now, needs to be solved upstream
66do_unpackpost() {
67 cp ${WORKDIR}/remove-sun.misc.Perf-debug-code.patch ${S}/patches/jamvm
68}
69
70addtask unpackpost after do_unpack before do_patch
71
72# Allow overriding this separately
73ICEDTEAPATCHES = "\
74 file://icedtea-crosscompile-fix.patch;apply=no \
75 file://icedtea-unbreak-float.patch;apply=no \
76 file://icedtea-remove_werror.patch;apply=no \
77 file://icedtea-libnet-renaming.patch;apply=no \
78 file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \
79 file://icedtea-corba-parallel-make.patch;apply=no \
80 file://icedtea-zero-hotspotfix.patch;apply=no \
81 file://icedtea-jdk-nio-use-host-cc.patch;apply=no \
82 file://icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch;apply=no \
83 file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no \
84 file://icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch;apply=no \
85 "
86ICEDTEAPATCHES_append_powerpc = " \
87 file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \
88 file://icedtea-jdk-powerpc-atomic64.patch;apply=no \
89 "
90ICEDTEAPATCHES_append_powerpc64 = " \
91 file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \
92 "
93ICEDTEAPATCHES_append_libc-uclibc = " \
94 file://icedtea-hotspot-isfinte.patch;apply=no \
95 file://icedtea-hotspot-glibc-version.patch;apply=no \
96 file://icedtea-hotspot-loadavg.patch;apply=no \
97 file://icedtea-hotspot-isnanf.patch;apply=no \
98 file://icedtea-jdk-iconv-uclibc.patch;apply=no \
99 file://icedtea-jdk-remove-unused-backtrace.patch;apply=no \
100 file://icedtea-jdk-unpack-uclibc.patch;apply=no \
101 file://icedtea-hotspot-dlvsym-uclibc.patch;apply=no \
102 "
103
104# Allow overriding this separately
105DISTRIBUTION_PATCHES = "\
106 patches/icedtea-crosscompile-fix.patch \
107 patches/icedtea-unbreak-float.patch \
108 patches/icedtea-remove_werror.patch \
109 patches/icedtea-libnet-renaming.patch \
110 patches/icedtea-shark-arm-linux-cpu-detection.patch \
111 patches/icedtea-corba-parallel-make.patch \
112 patches/icedtea-zero-hotspotfix.patch \
113 patches/icedtea-jdk-nio-use-host-cc.patch \
114 patches/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch \
115 patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \
116 patches/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch \
117 "
118
119DISTRIBUTION_PATCHES_append_libc-uclibc = "\
120 patches/icedtea-hotspot-isfinte.patch \
121 patches/icedtea-hotspot-isnanf.patch \
122 patches/icedtea-hotspot-glibc-version.patch \
123 patches/icedtea-hotspot-loadavg.patch \
124 patches/icedtea-jdk-iconv-uclibc.patch \
125 patches/icedtea-jdk-remove-unused-backtrace.patch \
126 patches/icedtea-jdk-unpack-uclibc.patch \
127 patches/icedtea-hotspot-dlvsym-uclibc.patch \
128 "
129
130DISTRIBUTION_PATCHES_append_powerpc = " \
131 patches/icedtea-jdk-ppc64-jvm-cfg.patch \
132 patches/icedtea-jdk-powerpc-atomic64.patch \
133 "
134DISTRIBUTION_PATCHES_append_powerpc64 = " \
135 patches/icedtea-jdk-ppc64-jvm-cfg.patch \
136 "
137export DISTRIBUTION_PATCHES
diff --git a/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb b/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb
deleted file mode 100644
index dcaf8bf..0000000
--- a/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1require openjdk-7-release-25b30.inc
2
3PR = "${INC_PR}.1"
4
5SRC_URI[iced.md5sum] = "9b3afa162021e3fca6161ba8f9f7dc11"
6SRC_URI[iced.sha256sum] = "3c4e88e7c1b2b39dcd7ed65c3b9a1a8dbd2a48848ce42e1d8a22a6821cf890d1"
7
8CORBA_CHANGESET = "ea108ff3be9a"
9SRC_URI[corba.md5sum] = "f76840f24d112a8fe259cb4122415a25"
10SRC_URI[corba.sha256sum] = "818f5613b218fe2a2036e6c65622b970839986c0c1ca95563f911b379a52b765"
11
12JAXP_CHANGESET = "332f0234a53e"
13SRC_URI[jaxp.md5sum] = "1b11d9fa16e7bf7613a8b9d32f6a586a"
14SRC_URI[jaxp.sha256sum] = "a3f99615331cdc3d5e38e7169bb4b03dc43ede25c73834114240b8768207b9dc"
15
16JAXWS_CHANGESET = "fdc4ad9f30c6"
17SRC_URI[jaxws.md5sum] = "f6eb8fcbf99d0914149b0e2deac0e34c"
18SRC_URI[jaxws.sha256sum] = "b149c1fab323a586eae9b4459ccd929f0db8b35769e42dd7f4fbadc48b803dab"
19
20JDK_CHANGESET = "4a0cf2c05cc6"
21SRC_URI[jdk.md5sum] = "89f3dac9c06581fd8b4f1b1103a6c2f9"
22SRC_URI[jdk.sha256sum] = "badbbf50c820325ffe592762a2eff3414df71e286460b75716a2100d7f6f2aa0"
23
24LANGTOOLS_CHANGESET = "6c9b532f4281"
25SRC_URI[langtools.md5sum] = "e932425860de3b52358cff66b9ceadbf"
26SRC_URI[langtools.sha256sum] = "b9e2e3c97393f566b0c4dc2b0ca826bfb3b3841f5522a850b82d1ff23745839b"
27
28OPENJDK_CHANGESET = "e62743867f54"
29SRC_URI[openjdk.md5sum] = "5680583c82703031d6acb0a141fd328f"
30SRC_URI[openjdk.sha256sum] = "d1132bdde0e19d8e4d2516213bce7aa50b4b6d1ab04a82bf7a0440d6184db842"
31
32# located in hotspot.map
33HOTSPOT_CHANGESET = "37b254871acb"
34SRC_URI[hotspot.md5sum] = "57f2077c4d4237de44b788e0a8456c83"
35SRC_URI[hotspot.sha256sum] = "60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e"
36
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-22 12:17:51 +0000