summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorSven Ebenfeld <sven.ebenfeld@gmail.com>2015-04-27 22:12:59 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-04-28 16:09:34 -0300
commit31460be0ffad5fea3d41e50fba3eccce7993e409 (patch)
treec1ccf05f875de56629939494facaf2ce30b9fae5 /recipes-core
parent00cc75e823ef742fae6966a83dce69b0d2f56a76 (diff)
downloadmeta-java-31460be0ffad5fea3d41e50fba3eccce7993e409.tar.gz
openjdk-7: Add IcedTea 2.5.4 OpenJDK 7u75b13
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-75b13/build-hacks.patch71
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/cacao-arm-ucontext.patch24
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/cacao-libtoolize.patch12
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/cacao-loadavg-makefile.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/cacao-loadavg.patch27
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/fix-checksums.patch28
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/fix_hotspot_crosscompile.patch52
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch19
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-crosscompile-fix.patch355
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-jdk-nio-use-host-cc.patch74
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-jdk-rmi-crosscompile.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch236
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-openjdk-remove-currency-data-generation-expi.patch25
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-remove_werror.patch16
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-shark-arm-linux-cpu-detection.patch113
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-unbreak-float.patch18
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-zero-hotspotfix.patch36
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/jvm.cfg43
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/remove-sun.misc.Perf-debug-code.patch47
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc1
-rw-r--r--recipes-core/openjdk/openjdk-7-release-75b13.inc102
-rw-r--r--recipes-core/openjdk/openjdk-7_75b13-2.5.4.bb36
23 files changed, 1374 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-75b13/build-hacks.patch b/recipes-core/openjdk/openjdk-7-75b13/build-hacks.patch
new file mode 100644
index 0000000..998e656
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/build-hacks.patch
@@ -0,0 +1,71 @@
1Index: icedtea-2.5.4/Makefile.am
2===================================================================
3--- icedtea-2.5.4.orig/Makefile.am 2013-07-26 18:17:45.499466367 +0000
4+++ icedtea-2.5.4/Makefile.am 2013-07-30 21:04:46.761410713 +0000
5@@ -474,6 +474,12 @@
6 FT2_LIBS="$(FREETYPE2_LIBS)" \
7 ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
8 HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
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@@ -1777,8 +1783,8 @@
19 rm -f stamps/add-tzdata-support.stamp
20
21 stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
22- if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
23- $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
24+ if [ -e $(abs_top_builddir)/bootstrap/jdk1.6.0/bin/java ] ; then \
25+ $(abs_top_builddir)/bootstrap/jdk1.6.0/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
26 fi
27 mkdir -p stamps
28 touch $@
29@@ -2124,7 +2130,11 @@
30 cd jamvm/jamvm && \
31 LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
32 ./autogen.sh --with-java-runtime-library=openjdk7 \
33- --prefix=$(abs_top_builddir)/jamvm/install ; \
34+ --prefix=$(abs_top_builddir)/jamvm/install \
35+ --host=$(host_alias) \
36+ --build=$(build_alias) \
37+ --target=$(target_alias) \
38+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \
39 $(MAKE) ; \
40 $(MAKE) install
41 mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
42@@ -2189,6 +2199,7 @@
43 --host=$(host_alias) \
44 --build=$(build_alias) \
45 --target=$(target_alias) \
46+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \
47 --prefix=$(abs_top_builddir)/cacao/install \
48 --with-java-runtime-library=openjdk7 \
49 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
50@@ -2256,7 +2267,7 @@
51 # configure script arguments, quoted in single quotes
52 CONFIGURE_ARGS = @CONFIGURE_ARGS@
53 ADD_ZERO_CONFIGURE_ARGS = \
54- --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
55+ --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
56 --disable-bootstrap --enable-zero
57 if ADD_SHARK_BUILD
58 ADD_ZERO_CONFIGURE_ARGS += \
59Index: icedtea-2.5.4/javac.in
60===================================================================
61--- icedtea-2.3.4.orig/javac.in 2013-07-24 21:33:57.224612327 +0000
62+++ icedtea-2.5.4/javac.in 2013-07-30 19:41:56.240277496 +0000
63@@ -77,5 +77,7 @@
64 my @CLASSPATH = ('@ECJ_JAR@');
65 push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
66 $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
67- exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
68+ # Compiling hotspot-tools consumes tons of memory and exceeds any default
69+ # limits for jamvm and cacao.
70+ exec '@JAVA@', '-Xmx1024m', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
71 }
diff --git a/recipes-core/openjdk/openjdk-7-75b13/cacao-arm-ucontext.patch b/recipes-core/openjdk/openjdk-7-75b13/cacao-arm-ucontext.patch
new file mode 100644
index 0000000..c21fcf1
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/cacao-arm-ucontext.patch
@@ -0,0 +1,24 @@
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-75b13/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-7-75b13/cacao-libtoolize.patch
new file mode 100644
index 0000000..484cb10
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/cacao-libtoolize.patch
@@ -0,0 +1,12 @@
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-75b13/cacao-loadavg-makefile.patch b/recipes-core/openjdk/openjdk-7-75b13/cacao-loadavg-makefile.patch
new file mode 100644
index 0000000..a389206
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/cacao-loadavg-makefile.patch
@@ -0,0 +1,13 @@
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-75b13/cacao-loadavg.patch b/recipes-core/openjdk/openjdk-7-75b13/cacao-loadavg.patch
new file mode 100644
index 0000000..0fc1a81
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/cacao-loadavg.patch
@@ -0,0 +1,27 @@
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-75b13/fix-checksums.patch b/recipes-core/openjdk/openjdk-7-75b13/fix-checksums.patch
new file mode 100644
index 0000000..5623448
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/fix-checksums.patch
@@ -0,0 +1,28 @@
1--- icedtea-2.5.4/Makefile.am 2015-04-02 10:48:12.919550836 +0200
2+++ icedtea-2.5.4/Makefile.am 2015-04-02 10:49:41.483806147 +0200
3@@ -11,12 +11,12 @@
4 LANGTOOLS_CHANGESET = 960cdffa8b3f
5 OPENJDK_CHANGESET = 6cf2880aab5e
6
7-CORBA_SHA256SUM = 7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b
8-JAXP_SHA256SUM = 84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3
9-JAXWS_SHA256SUM = 4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b
10-JDK_SHA256SUM = e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09
11-LANGTOOLS_SHA256SUM = 4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a
12-OPENJDK_SHA256SUM = 88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1
13+CORBA_SHA256SUM = da21a7e17c30f87f180a4e4712c32c382d9dc522c29736bb745cfc238bcea7a4
14+JAXP_SHA256SUM = d9e3c87357f0be354f7f76f820e97fb8fe918dd1bfeb223ff0958a662539f851
15+JAXWS_SHA256SUM = b8154336679168deaa4fc076a1951f54073153d398ab840dfed3df456e4f4ae9
16+JDK_SHA256SUM = a5db2c28f23fee351aaa7fd783fbcd14a6f77c62d753fe6d52ab8b5b97a4720b
17+LANGTOOLS_SHA256SUM = daab93539d7c840865121f06dc7e0ec441656c2dc249ecee44aa2049643a4db3
18+OPENJDK_SHA256SUM = 4387e53911667b6324421d9a1ea5c098fa5fb56a10f659124c1e10df3486e393
19
20 DROP_URL = http://icedtea.classpath.org/download/drops
21
22--- icedtea-2.5.4/hotspot.map.in 2015-01-22 05:28:55.952757442 +0100
23+++ icedtea-2.5.4/hotspot.map.in 2015-04-07 10:41:38.713960082 +0200
24@@ -1,3 +1,3 @@
25 # version type(drop/hg) url changeset sha256sum
26-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6144ca9b6a72 4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34
27+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 67b77521a2fd 050684e8c46b680728f477eba2546550d65ed3ded82329027f6163a3d8c5359a
28 aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4d25046abb67 60da8d427f7e3659f701e54c763ea8366d8af3280c7e10670004938b2f07efef
diff --git a/recipes-core/openjdk/openjdk-7-75b13/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-7-75b13/fix_hotspot_crosscompile.patch
new file mode 100644
index 0000000..6c829fc
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/fix_hotspot_crosscompile.patch
@@ -0,0 +1,52 @@
1Index: icedtea-2.1/acinclude.m4
2===================================================================
3--- icedtea-2.1.orig/acinclude.m4
4+++ icedtea-2.1/acinclude.m4
5@@ -906,6 +906,22 @@
6 AC_SUBST(VERSION_SUFFIX, $version_suffix)
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+
25 AC_DEFUN_ONCE([IT_WITH_GCJ],
26 [
27 AC_MSG_CHECKING([whether to compile ecj natively])
28Index: icedtea-2.1/configure.ac
29===================================================================
30--- icedtea-2.1.orig/configure.ac
31+++ icedtea-2.1/configure.ac
32@@ -22,6 +22,8 @@
33 AC_PROG_CC
34 AC_PROG_CXX
35
36+AC_CHECK_WITH_CC_FOR_BUILD
37+
38 IT_FIND_TOOLS([MAKE], [gmake make])
39 IT_FIND_TOOL([GZIP], [gzip])
40 IT_FIND_TOOL([ANT], [ant])
41Index: icedtea-2.1/Makefile.am
42===================================================================
43--- icedtea-2.1.orig/Makefile.am
44+++ icedtea-2.1/Makefile.am
45@@ -474,6 +474,7 @@
46 FT2_LIBS="$(FREETYPE2_LIBS)" \
47 ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
48 HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
49+ CC_FOR_BUILD="$(CC_FOR_BUILD)" \
50 OE_CFLAGS="$(OE_CFLAGS)" \
51 OE_CPPFLAGS="$(OE_CPPFLAGS)" \
52 OE_CXXFLAGS="$(OE_CXXFLAGS)" \
diff --git a/recipes-core/openjdk/openjdk-7-75b13/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch
new file mode 100644
index 0000000..fc78b96
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch
@@ -0,0 +1,19 @@
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@@ -410,9 +410,9 @@
9 * 7: The default directories, normally /lib and /usr/lib.
10 */
11 #if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390) || defined(AARCH64)) || defined(BUILTIN_SIM)
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-75b13/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-crosscompile-fix.patch
new file mode 100644
index 0000000..250f8a4
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-crosscompile-fix.patch
@@ -0,0 +1,355 @@
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 @@
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_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/')
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_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/')
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@@ -300,6 +300,7 @@
93 LFLAGS_VM += $(LLVM_LDFLAGS)
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@@ -162,28 +162,6 @@
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@@ -191,7 +169,7 @@
134 CFLAGS_REQUIRED_aarch64 += -fno-omit-frame-pointer -fsigned-char -D_LITTLE_ENDIAN
135 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
136 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
137-CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN
138+CFLAGS_REQUIRED_arm += -fsigned-char -fno-omit-frame-pointer -D_LITTLE_ENDIAN
139 CFLAGS_REQUIRED_hppa +=
140 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
141 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
142 @@ -359,7 +337,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
143 #
144 # -L paths for finding and -ljava
145 #
146-LDFLAGS_OPT = -Xlinker -O1
147+LDFLAGS_OPT = $(OE_LDFLAGS)
148 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
149 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
150
151diff --git openjdk/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
152index c23e96e..484afca 100644
153--- openjdk/jdk/make/common/shared/Platform.gmk
154+++ openjdk/jdk/make/common/shared/Platform.gmk
155@@ -169,9 +169,9 @@
156 mach := $(CROSS_COMPILE_ARCH)
157 else
158 mach := $(shell uname -m)
159- endif
160- ifneq (,$(wildcard /usr/bin/dpkg-architecture))
161- mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/')
162+ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
163+ mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/')
164+ endif
165 endif
166 archExpr = case "$(mach)" in \
167 i[3-9]86) \
168diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
169index cd336a2..1e5f8e5 100644
170--- openjdk/jdk/make/java/nio/Makefile
171+++ openjdk/jdk/make/java/nio/Makefile
172@@ -971,8 +971,12 @@ else
173 $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
174 $(prep-target)
175 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
176+ifdef CROSS_COMPILE_ARCH
177+ $(QEMU) $(GENSOR_EXE) >> $@
178+else
179 $(GENSOR_EXE) >> $@
180 endif
181+endif
182 #
183 # Generated sun.nio.cs SingleByte classes
184 #
185@@ -1006,8 +1010,12 @@ else
186 $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
187 $(prep-target)
188 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
189+ifdef CROSS_COMPILE_ARCH
190+ $(QEMU) $(GENUC_EXE) >> $@
191+else
192 $(GENUC_EXE) >> $@
193 endif
194+endif
195
196 GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
197
198@@ -1028,7 +1036,11 @@ else
199 $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
200 $(prep-target)
201 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
202+ifdef CROSS_COMPILE_ARCH
203+ $(QEMU) $(GENSC_EXE) >> $@
204+else
205 $(GENSC_EXE) >> $@
206 endif
207+endif
208
209 .PHONY: sources
210diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
211index b6e0d99..edc530e 100644
212--- openjdk/jdk/make/sun/awt/mawt.gmk
213+++ openjdk/jdk/make/sun/awt/mawt.gmk
214@@ -151,22 +151,6 @@ else
215 #endif
216
217 LIBXTST = -lXtst
218-ifeq ($(PLATFORM), linux)
219- ifeq ($(ARCH_DATA_MODEL), 64)
220- # XXX what about the rest of them?
221- LIBXT = -lXt
222- else
223- # Allows for builds on Debian GNU Linux, X11 is in a different place
224- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
225- $(wildcard /usr/lib/libXt.a))
226- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
227- $(wildcard /usr/lib/libSM.a))
228- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
229- $(wildcard /usr/lib/libICE.a))
230- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
231- $(wildcard /usr/lib/libXtst.a))
232- endif
233-endif
234
235 # Use -lXmu for EditRes support
236 LIBXMU_DBG = -lXmu
237@@ -181,7 +165,7 @@ ifneq (,$(findstring $(PLATFORM), linux macosx))
238 OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
239 # XXX what is this define below? Isn't it motif-related?
240 OTHER_CFLAGS += -DXMSTRINGDEFINES=1
241-OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
242+OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lXi -lX11
243 endif
244
245 endif
246@@ -230,12 +214,6 @@ else
247 CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
248 endif
249
250-ifndef HEADLESS
251-CPPFLAGS += -I$(OPENWIN_HOME)/include
252-LDFLAGS += -L$(OPENWIN_LIB)
253-
254-endif # !HEADLESS
255-
256 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
257 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
258 -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
259@@ -248,12 +248,6 @@
260 endif # !HEADLESS
261 endif # PLATFORM
262
263-ifeq ($(PLATFORM), linux)
264- # Checking for the X11/extensions headers at the additional location
265- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
266- $(wildcard /usr/include/X11/extensions))
267-endif
268-
269 ifeq ($(PLATFORM), macosx)
270 CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
271 -I$(OPENWIN_HOME)/include
272diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
273index 53d31f3..183c063 100644
274--- openjdk/jdk/make/sun/xawt/Makefile
275+++ openjdk/jdk/make/sun/xawt/Makefile
276@@ -198,20 +198,6 @@ else
277 CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/glib2
278 endif
279
280-ifeq ($(PLATFORM), linux)
281- ifndef CROSS_COMPILE_ARCH
282- # Allows for builds on Debian GNU Linux, X11 is in a different place
283- # This should really be handled at a higher-level so we don't have to
284- # work-around this when cross-compiling
285- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
286- -I/usr/include/X11/extensions \
287- -I$(OPENWIN_HOME)/include
288- else
289- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
290- -I$(OPENWIN_HOME)/include
291- endif
292-endif
293-
294 # We have some odd logic here because some Solaris 10 updates
295 # have a render.h file that suggests gradients are supported, but
296 # the Xrender.h doesn't have the corresponding type definitions.
297@@ -292,16 +278,10 @@ ifeq ($(ARCH_DATA_MODEL), 32)
298 SIZERS = $(SIZER).32
299 SIZERS_C = $(SIZER_32_C)
300 SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
301-ifdef CROSS_COMPILE_ARCH
302-CFLAGS_32 = -m32
303-endif
304 else # !32
305 SIZERS = $(SIZER).64
306 SIZERS_C = $(SIZER_64_C)
307 SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
308-ifdef CROSS_COMPILE_ARCH
309-CFLAGS_64 = -m64
310-endif
311 endif # 32
312 endif # !macosx
313 endif # solaris
314@@ -337,15 +321,11 @@ WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator
315 WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class
316 XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
317
318-ifndef CROSS_COMPILE_ARCH
319 SIZERS_CC = $(CC)
320-else
321-SIZERS_CC = $(HOST_CC)
322-endif
323
324 $(SIZERS): $(SIZERS_C)
325 $(prep-target)
326- $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
327+ $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -fuse-ld=bfd -o $@ $(SIZER)$(suffix $@).c
328
329 $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
330 $(prep-target)
331@@ -358,6 +334,16 @@ $(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
332 $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
333
334 $(SIZES): $(SIZERS)
335+ifdef CROSS_COMPILE_ARCH
336+ @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
337+ $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
338+ $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
339+ $(CHMOD) +w $@;\
340+ else \
341+ $(ECHO) GENERATING $@; \
342+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
343+ fi
344+else
345 @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
346 $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
347 $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
348@@ -366,6 +352,7 @@ $(SIZES): $(SIZERS)
349 $(ECHO) GENERATING $@; \
350 $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
351 fi
352+endif
353 @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
354 $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
355 $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
diff --git a/recipes-core/openjdk/openjdk-7-75b13/icedtea-jdk-nio-use-host-cc.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-jdk-nio-use-host-cc.patch
new file mode 100644
index 0000000..f966093
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-jdk-nio-use-host-cc.patch
@@ -0,0 +1,74 @@
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 gtk
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
74 \ No newline at end of file
diff --git a/recipes-core/openjdk/openjdk-7-75b13/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-jdk-rmi-crosscompile.patch
new file mode 100644
index 0000000..55f1f9c
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-jdk-rmi-crosscompile.patch
@@ -0,0 +1,13 @@
1diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile
2index eaf8a6e..4938613 100644
3--- openjdk/jdk/make/com/sun/jmx/Makefile
4+++ openjdk/jdk/make/com/sun/jmx/Makefile
5@@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/
6 # when available, we need to run with latest rmic version available. rmic
7 # launch tool not built at this stage but we can invoke via rmi class.
8
9-RMIC_JAVA = $(OUTPUTDIR)/bin/java
10+RMIC_JAVA = $(BOOTDIR)/bin/java
11 # need to treat 64bit solaris differently
12 ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
13 RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
diff --git a/recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch
new file mode 100644
index 0000000..e32feb0
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch
@@ -0,0 +1,236 @@
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@@ -403,7 +403,7 @@
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 ifeq ($(SYSTEM_GIO), true)
43 OTHER_LDLIBS += $(GIO_LIBS)
44 OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
45@@ -413,15 +413,15 @@
46 endif
47
48 ifeq ($(PLATFORM), macosx)
49-OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread -framework CoreFoundation
50+OTHER_LDLIBS += -L$(LIBDIR) -ljava -ljavanet -pthread -framework CoreFoundation
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
58 ifeq ($(PLATFORM), aix)
59-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
60+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
61 endif # PLATFORM
62
63 ifeq ($(COMPILE_AGAINST_SYSCALLS), true)
64diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
65index b7f0f2f..b093868 100644
66--- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
67+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
68@@ -69,7 +69,7 @@
69 */
70 static {
71 java.security.AccessController.doPrivileged(
72- new sun.security.action.LoadLibraryAction("net"));
73+ new sun.security.action.LoadLibraryAction("javanet"));
74 init();
75 }
76
77diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
78index c6a38ad..97de65b 100644
79--- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
80+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
81@@ -78,7 +78,7 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
82 */
83 static {
84 java.security.AccessController.doPrivileged(
85- new sun.security.action.LoadLibraryAction("net"));
86+ new sun.security.action.LoadLibraryAction("javanet"));
87 }
88
89 /**
90diff --git openjdk/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
91index 195ee86..6822a57 100644
92--- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
93+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
94@@ -47,7 +47,7 @@ class DatagramPacket {
95 */
96 static {
97 java.security.AccessController.doPrivileged(
98- new sun.security.action.LoadLibraryAction("net"));
99+ new sun.security.action.LoadLibraryAction("javanet"));
100 init();
101 }
102
103diff --git openjdk/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
104index 3ea28e4..7c78eae 100644
105--- openjdk/jdk/src/share/classes/java/net/InetAddress.java
106+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java
107@@ -260,7 +260,7 @@ class InetAddress implements java.io.Serializable {
108 static {
109 preferIPv6Address = java.security.AccessController.doPrivileged(
110 new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
111- AccessController.doPrivileged(new LoadLibraryAction("net"));
112+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
113 init();
114 }
115
116diff --git openjdk/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
117index 6314d15..761fdda 100644
118--- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
119+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
120@@ -53,7 +53,7 @@ public final class NetworkInterface {
121 private static final int defaultIndex; /* index of defaultInterface */
122
123 static {
124- AccessController.doPrivileged(new LoadLibraryAction("net"));
125+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
126 init();
127 defaultInterface = DefaultInterface.getDefault();
128 if (defaultInterface != null) {
129diff --git openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
130index 5baca6e..befd0b9 100644
131--- openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
132+++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
133@@ -76,6 +76,6 @@ public final class SdpSupport {
134
135 static {
136 AccessController.doPrivileged(
137- new sun.security.action.LoadLibraryAction("net"));
138+ new sun.security.action.LoadLibraryAction("javanet"));
139 }
140 }
141diff --git openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
142index d7aa358..9b2c719 100644
143--- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
144+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
145@@ -95,7 +95,7 @@ public class DefaultProxySelector extends ProxySelector {
146 }});
147 if (b != null && b.booleanValue()) {
148 java.security.AccessController.doPrivileged(
149- new sun.security.action.LoadLibraryAction("net"));
150+ new sun.security.action.LoadLibraryAction("javanet"));
151 hasSystemProxies = init();
152 }
153 }
154diff --git openjdk/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
155index 10662df..34d441a 100644
156--- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
157+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
158@@ -483,7 +483,7 @@ class Util {
159 return;
160 loaded = true;
161 java.security.AccessController
162- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
163+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
164 java.security.AccessController
165 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
166 // IOUtil must be initialized; Its native methods are called from
167diff --git openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
168index 3695b5d..7c833cc 100644
169--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
170+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
171@@ -247,7 +247,7 @@ public class ResolverConfigurationImpl
172
173 static {
174 java.security.AccessController.doPrivileged(
175- new sun.security.action.LoadLibraryAction("net"));
176+ new sun.security.action.LoadLibraryAction("javanet"));
177 }
178
179 }
180diff --git openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
181index 7970885..46ab112 100644
182--- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
183+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
184@@ -159,7 +159,7 @@ public class ResolverConfigurationImpl
185
186 static {
187 java.security.AccessController.doPrivileged(
188- new sun.security.action.LoadLibraryAction("net"));
189+ new sun.security.action.LoadLibraryAction("javanet"));
190 init0();
191
192 // start the address listener thread
193--- openjdk/jdk/src/windows/classes/sun/net/PortConfig.java 2015-01-08 21:19:49.000000000 +0100
194+++ openjdk/jdk/src/windows/classes/sun/net/PortConfig.java 2015-04-02 13:45:19.330199119 +0200
195@@ -43,7 +43,7 @@
196 AccessController.doPrivileged(
197 new java.security.PrivilegedAction<Void>() {
198 public Void run() {
199- System.loadLibrary("net");
200+ System.loadLibrary("javanet");
201 return null;
202 }
203 });
204--- openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java 2015-01-08 21:19:49.000000000 +0100
205+++ openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java 2015-04-02 13:47:48.245530982 +0200
206@@ -74,7 +74,7 @@
207 @Override
208 public Void run() {
209 // nio.dll has dependency on net.dll
210- System.loadLibrary("net");
211+ System.loadLibrary("javanet");
212 System.loadLibrary("nio");
213 return null;
214 }});
215--- openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java 2015-01-08 21:19:49.000000000 +0100
216+++ openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java 2015-04-02 13:48:46.363509265 +0200
217@@ -1124,7 +1124,7 @@
218 AccessController.doPrivileged(new PrivilegedAction<Void>() {
219 public Void run() {
220 // nio.dll has dependency on net.dll
221- System.loadLibrary("net");
222+ System.loadLibrary("javanet");
223 System.loadLibrary("nio");
224 return null;
225 }});
226--- openjdk/jdk/src/solaris/classes/sun/net/PortConfig.java 2015-01-08 21:19:49.000000000 +0100
227+++ openjdk/jdk/src/solaris/classes/sun/net/PortConfig.java 2015-04-02 13:49:49.541999538 +0200
228@@ -44,7 +44,7 @@
229 AccessController.doPrivileged(
230 new java.security.PrivilegedAction<Void>() {
231 public Void run() {
232- System.loadLibrary("net");
233+ System.loadLibrary("javanet");
234 String os = System.getProperty("os.name");
235 if (os.startsWith("Linux")) {
236 defaultLower = 32768;
diff --git a/recipes-core/openjdk/openjdk-7-75b13/icedtea-openjdk-remove-currency-data-generation-expi.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-openjdk-remove-currency-data-generation-expi.patch
new file mode 100644
index 0000000..6dd36af
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-openjdk-remove-currency-data-generation-expi.patch
@@ -0,0 +1,25 @@
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-75b13/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-remove_werror.patch
new file mode 100644
index 0000000..f78f2b3
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-remove_werror.patch
@@ -0,0 +1,16 @@
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-75b13/icedtea-shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-shark-arm-linux-cpu-detection.patch
new file mode 100644
index 0000000..f40bc51
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-shark-arm-linux-cpu-detection.patch
@@ -0,0 +1,113 @@
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-75b13/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-unbreak-float.patch
new file mode 100644
index 0000000..c03b23c
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-unbreak-float.patch
@@ -0,0 +1,18 @@
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-75b13/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch
new file mode 100644
index 0000000..3f7d70a
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch
@@ -0,0 +1,13 @@
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-75b13/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-zero-hotspotfix.patch
new file mode 100644
index 0000000..e97e4fc
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-zero-hotspotfix.patch
@@ -0,0 +1,36 @@
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@@ -33,26 +33,27 @@
6 Obj_Files += arm32JIT.o
7
8 CFLAGS += -DHOTSPOT_ASM
9+CCFLAGS += -DHOTSPOT_ASM
10
11 cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
12 arm32JIT.o: offsets_arm.s
13
14 offsets_arm.s: mkoffsets
15 @echo Generating assembler offsets
16- ./mkoffsets > $@
17+ $(QEMU) ./mkoffsets > $@
18
19 bytecodes_arm.s: bytecodes_arm.def mkbc
20 @echo Generating ARM assembler bytecode sequences
21- $(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
22+ $(CXX_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE)
23
24 mkbc: $(GAMMADIR)/tools/mkbc.c
25 @echo Compiling mkbc tool
26- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
27+ $(CC_COMPILE) -static -fuse-ld=bfd -o $@ $< $(COMPILE_DONE)
28
29 mkoffsets: asm_helper.cpp
30 @echo Compiling offset generator
31 $(QUIETLY) $(REMOVE_TARGET)
32- $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
33+ $(CXX_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
34
35 endif
36 endif
diff --git a/recipes-core/openjdk/openjdk-7-75b13/jvm.cfg b/recipes-core/openjdk/openjdk-7-75b13/jvm.cfg
new file mode 100644
index 0000000..ea97cda
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/jvm.cfg
@@ -0,0 +1,43 @@
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-75b13/remove-sun.misc.Perf-debug-code.patch b/recipes-core/openjdk/openjdk-7-75b13/remove-sun.misc.Perf-debug-code.patch
new file mode 100644
index 0000000..00b9660
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/remove-sun.misc.Perf-debug-code.patch
@@ -0,0 +1,47 @@
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-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 55d010e..b9ec571 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -226,6 +226,7 @@ PACKAGES = " \
226FILES_${JDKPN}-dbg = "\ 226FILES_${JDKPN}-dbg = "\
227 ${JDK_HOME}/bin/.debug \ 227 ${JDK_HOME}/bin/.debug \
228 ${JDK_HOME}/lib/.debug \ 228 ${JDK_HOME}/lib/.debug \
229 ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \
229 ${JDK_HOME}/jre/bin/.debug \ 230 ${JDK_HOME}/jre/bin/.debug \
230 ${JDK_HOME}/jre/lib/.debug \ 231 ${JDK_HOME}/jre/lib/.debug \
231 ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \ 232 ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \
diff --git a/recipes-core/openjdk/openjdk-7-release-75b13.inc b/recipes-core/openjdk/openjdk-7-release-75b13.inc
new file mode 100644
index 0000000..e60679b
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-release-75b13.inc
@@ -0,0 +1,102 @@
1require openjdk-7-common.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4
5FILESPATH =. "${FILE_DIRNAME}/openjdk-7-75b13:"
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.5"
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.bz2"
23#HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false"
24HOTSPOT_URI = "http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false"
25
26CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2"
27CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false"
28
29JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2"
30JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false"
31
32JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2"
33JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false"
34
35JDK_FILE = "${JDK_CHANGESET}.tar.bz2"
36JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false"
37
38LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2"
39LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false"
40
41CACAO_VERSION = "e215e36be9fc"
42CACAO_FILE = "${CACAO_VERSION}.tar.gz"
43CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false"
44SRC_URI[cacao.md5sum] = "79f95f0aea4ba04cf2f1a8632ac66d14"
45SRC_URI[cacao.sha256sum] = "4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab"
46
47JAMVM_VERSION = "ec18fb9e49e62dce16c5094ef1527eed619463aa"
48JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz"
49JAMVM_URI = "http://icedtea.wildebeest.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false"
50SRC_URI[jamvm.md5sum] = "d50ae193d01a9251e10679c7a2cc6ff1"
51SRC_URI[jamvm.sha256sum] = "31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc"
52
53# Allow overriding this separately
54OEPATCHES = "\
55 file://fix-checksums.patch \
56 file://build-hacks.patch \
57 file://cacao-libtoolize.patch \
58 file://cacao-loadavg-makefile.patch \
59 file://fix_hotspot_crosscompile.patch \
60 file://cacao-loadavg.patch;apply=no \
61 file://cacao-arm-ucontext.patch;apply=no \
62 file://remove-sun.misc.Perf-debug-code.patch;apply=no \
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-jdk-rmi-crosscompile.patch;apply=no \
75 file://icedtea-crosscompile-fix.patch;apply=no \
76 file://icedtea-unbreak-float.patch;apply=no \
77 file://icedtea-remove_werror.patch;apply=no \
78 file://icedtea-libnet-renaming.patch;apply=no \
79 file://icedtea-shark-arm-linux-cpu-detection.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 "
86
87# Allow overriding this separately
88DISTRIBUTION_PATCHES = "\
89 patches/icedtea-jdk-rmi-crosscompile.patch \
90 patches/icedtea-crosscompile-fix.patch \
91 patches/icedtea-unbreak-float.patch \
92 patches/icedtea-remove_werror.patch \
93 patches/icedtea-libnet-renaming.patch \
94 patches/icedtea-shark-arm-linux-cpu-detection.patch \
95 patches/icedtea-zero-hotspotfix.patch \
96 patches/icedtea-jdk-nio-use-host-cc.patch \
97 patches/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch \
98 patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \
99 patches/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch \
100 "
101
102export DISTRIBUTION_PATCHES
diff --git a/recipes-core/openjdk/openjdk-7_75b13-2.5.4.bb b/recipes-core/openjdk/openjdk-7_75b13-2.5.4.bb
new file mode 100644
index 0000000..ac37846
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7_75b13-2.5.4.bb
@@ -0,0 +1,36 @@
1require openjdk-7-release-75b13.inc
2
3PR = "${INC_PR}.1"
4
5SRC_URI[iced.md5sum] = "646064d7a8d57c2cae0ef35a05de57c8"
6SRC_URI[iced.sha256sum] = "5301b9a8592af2cf8e3e7a3650e5e1fe744c6d2de7f8ff78080b2eeae86a9800"
7
8CORBA_CHANGESET = "3c9f523bf96e"
9SRC_URI[corba.md5sum] = "fe08a1bdf6e5b9c6541f9ba5d12a8c7e"
10SRC_URI[corba.sha256sum] = "da21a7e17c30f87f180a4e4712c32c382d9dc522c29736bb745cfc238bcea7a4"
11
12JAXP_CHANGESET = "ca26767d3375"
13SRC_URI[jaxp.md5sum] = "9479cc9bbe888cef835da2529fa6e07e"
14SRC_URI[jaxp.sha256sum] = "d9e3c87357f0be354f7f76f820e97fb8fe918dd1bfeb223ff0958a662539f851"
15
16JAXWS_CHANGESET = "9a6c90336922"
17SRC_URI[jaxws.md5sum] = "a4cc532e6244637d2a185547075a057a"
18SRC_URI[jaxws.sha256sum] = "b8154336679168deaa4fc076a1951f54073153d398ab840dfed3df456e4f4ae9"
19
20JDK_CHANGESET = "1e6db4f8b0f3"
21SRC_URI[jdk.md5sum] = "466b5bac22960beea959f79ef9029899"
22SRC_URI[jdk.sha256sum] = "a5db2c28f23fee351aaa7fd783fbcd14a6f77c62d753fe6d52ab8b5b97a4720b"
23
24LANGTOOLS_CHANGESET = "960cdffa8b3f"
25SRC_URI[langtools.md5sum] = "a44baae860eafef49c6febb89c74acd8"
26SRC_URI[langtools.sha256sum] = "daab93539d7c840865121f06dc7e0ec441656c2dc249ecee44aa2049643a4db3"
27
28OPENJDK_CHANGESET = "6cf2880aab5e"
29SRC_URI[openjdk.md5sum] = "b3c781de9e0632b61c6a61bc87d93631"
30SRC_URI[openjdk.sha256sum] = "4387e53911667b6324421d9a1ea5c098fa5fb56a10f659124c1e10df3486e393"
31
32# located in hotspot.map
33# Replaced due to http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1851
34HOTSPOT_CHANGESET = "67b77521a2fd"
35SRC_URI[hotspot.md5sum] = "4bc7af1c7fd45c50ddfbb897730f0eb4"
36SRC_URI[hotspot.sha256sum] = "050684e8c46b680728f477eba2546550d65ed3ded82329027f6163a3d8c5359a"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-22 19:21:37 +0000